diff --git a/README.md b/README.md index 692991c..f27af50 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,7 @@ redhat init.d or upstart depending on the service provider. works on RedHat 6. Setting `service_provider` to `redhat` will now deploy the init.d service file, unless you specifically set `service_template` etc. - `systemd` will create a systemd service on RedHat 7. + `systemd` will create a systemd service on RedHat 7 and Debian 8. * `manage_service_file` Whether to override the system service file if it exists. @@ -264,3 +264,23 @@ uwsgi::emperor_options: no-orphans: 'true' ``` +## Contributers + +Contributions will be gratefully accepted. Please go to the project page, +fork the project, make your changes locally and then raise a pull request. +Details on how to do this are available at +https://guides.github.com/activities/contributing-to-open-source. + +### Additional Contributers + +**Release** | **PR/Issue/commit** | **Contributer** +-------------|-------------------------------------------------------------------------------------------------------------------|---------------------------------------- +1.3.0 | [Add systemd support](https://github.com/rvdh/puppet-uwsgi/pull/14) | [@andy-s-clark](https://github.com/andy-s-clark) +1.3.0 | [Make tyrant mode configurable](https://github.com/rvdh/puppet-uwsgi/pull/12) | [@TravellingGuy](https://github.com/TravellingGuy) +1.3.0 | [Additional Options](https://github.com/rvdh/puppet-uwsgi/pull/11) | [@elmerfud](https://github.com/elmerfud) +1.2.0 | [Support repeated application options by passing an array of values](https://github.com/rvdh/puppet-uwsgi/pull/6) | [@rayl](https://github.com/rayl) +1.1.0 | [Fix typo in Upstart script](https://github.com/rvdh/puppet-uwsgi/pull/5) | [@Kodapa](https://github.com/Kodapa) +1.1.0 | [Support multiple env options](https://github.com/rvdh/puppet-uwsgi/pull/4) | [@kimor79](https://github.com/kimor79) +1.0.1 | [Fix logging when using init.d](https://github.com/rvdh/puppet-uwsgi/pull/3) | [@kimor79](https://github.com/kimor79) +1.0.0 | [init.d support](https://github.com/rvdh/puppet-uwsgi/pull/2) | [@kimor79](https://github.com/kimor79) +0.9.0 | | [@jarshwah](https://github.com/jarshwah) diff --git a/manifests/init.pp b/manifests/init.pp index 4afbdab..05df958 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -42,7 +42,7 @@ # The service provider. Default: 'upstart' # 'upstart' is required for the default service_file, and # works on RedHat 6. -# 'systemd' works on RedHat 7. +# 'systemd' works on RedHat 7 and Debian 8. # # [*manage_service_file*] # Whether to override the system service file if it exists. Default: true @@ -192,13 +192,13 @@ } file { $service_file_real: - ensure => $file_ensure, - owner => 'root', - group => 'root', - mode => $service_file_mode_real, - replace => $manage_service_file, - content => template($service_template_real), - require => Package[$package_name] + ensure => $file_ensure, + owner => 'root', + group => 'root', + mode => $service_file_mode_real, + replace => $manage_service_file, + content => template($service_template_real), + require => Package[$package_name] } $required_files = [ $config_file, $service_file_real ] @@ -272,7 +272,7 @@ content => template('uwsgi/uwsgi_logrotate.erb'), } } - 'absent', 'purge', 'purged': { + default: { file { '/etc/logrotate.d/uwsgi': ensure => 'absent', } diff --git a/metadata.json b/metadata.json index 905f1b6..7eb3a52 100644 --- a/metadata.json +++ b/metadata.json @@ -1,12 +1,12 @@ { - "name": "engage-uwsgi", - "version": "1.3.0", - "author": "jarshwah ", + "name": "vandenhof-uwsgi", + "version": "1.3.1", + "author": "Rick van den Hof ", "summary": "Install and configure uwsgi in Emperor mode", "license": "MIT", - "source": "https://github.com/Engage/puppet-uwsgi", - "project_page": "https://github.com/Engage/puppet-uwsgi", - "issues_url": "https://github.com/Engage/puppet-uwsgi/issues", + "source": "https://github.com/rvdh/puppet-uwsgi", + "project_page": "https://github.com/rvdh/puppet-uwsgi", + "issues_url": "https://github.com/rvdh/puppet-uwsgi/issues", "dependencies": [ { "name": "puppetlabs-stdlib", diff --git a/templates/uwsgi_systemd.service.erb b/templates/uwsgi_systemd.service.erb index 9cd1ef6..e0e5ff6 100644 --- a/templates/uwsgi_systemd.service.erb +++ b/templates/uwsgi_systemd.service.erb @@ -5,11 +5,17 @@ # [Unit] Description=uWSGI Emperor -After=network.target +After=syslog.target [Service] -Type=simple ExecStart=<%= @binary_directory %>/uwsgi --die-on-term --ini <%= @config_file %> +# Requires systemd version 211 or newer +RuntimeDirectory=uwsgi +Restart=always +KillSignal=SIGQUIT +Type=notify +StandardError=syslog +NotifyAccess=all [Install] WantedBy=multi-user.target