From 736260e18f17a4c97623c44f700efb5571e141b0 Mon Sep 17 00:00:00 2001 From: Todd Courtnage Date: Thu, 12 Mar 2015 14:54:21 -0600 Subject: [PATCH] Make tyrant mode configurable. --- manifests/init.pp | 5 +++++ manifests/params.pp | 1 + templates/uwsgi.ini.erb | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/manifests/init.pp b/manifests/init.pp index 0c14b18..6d03512 100644 --- a/manifests/init.pp +++ b/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, diff --git a/manifests/params.pp b/manifests/params.pp index 33f4ffd..a092fdb 100644 --- a/manifests/params.pp +++ b/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' diff --git a/templates/uwsgi.ini.erb b/templates/uwsgi.ini.erb index 15572b2..280793c 100644 --- a/templates/uwsgi.ini.erb +++ b/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