Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make tyrant mode configurable. #12

Merged
merged 1 commit into from Apr 13, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion templates/uwsgi.ini.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
socket = <%= @socket %>
pidfile = <%= @pidfile %>
emperor = <%= @app_directory %>
emperor-tyrant = true
emperor-tyrant = <%= @tyrant %>
master = true
autoload = true
log-date = true
Expand Down