Merge pull request #12 from Chaordix/master

Make tyrant mode configurable.

Author: jarshwah

manifests/init.pp

@@ -56,6 +56,10 @@
 # [*app_directory*]
 #    Vassal directory for application config files
 #
+# [*tyrant*]
+#   Whether to run the emperor in tyrant mode
+#   Default: true
+#
 # [*install_pip*]
 #    Install pip if it's not already installed?
 #    Default: true
@@ -94,6 +98,7 @@
     $config_file         = $uwsgi::params::config_file,
     $log_file            = $uwsgi::params::log_file,
     $app_directory       = $uwsgi::params::app_directory,
+    $tyrant              = $uwsgi::params::tyrant,
     $install_pip         = $uwsgi::params::install_pip,
     $install_python_dev  = $uwsgi::params::install_python_dev,
     $python_pip          = $uwsgi::params::python_pip,

manifests/params.pp

@@ -15,6 +15,7 @@
     $service_provider    = 'upstart'
     $manage_service_file = true
     $config_file         = '/etc/uwsgi.ini'
+    $tyrant              = true
     $install_pip         = true
     $install_python_dev  = true
     $log_file            = '/var/log/uwsgi/uwsgi-emperor.log'

templates/uwsgi.ini.erb

@@ -7,7 +7,7 @@
 socket = <%= @socket %>
 pidfile = <%= @pidfile %>
 emperor = <%= @app_directory %>
-emperor-tyrant = true
+emperor-tyrant = <%= @tyrant %>
 master = true
 autoload = true
 log-date = true