Unified Diff: modules/notificationserver/manifests/init.pp
Issue 5734493784637440:
Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set:
Created April 2, 2014, 2:05 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/notificationserver/files/site.conf ('K')
|
« modules/notificationserver/files/site.conf ('k')
|
modules/rietveld/files/site.conf » ('j')
|
modules/trac/files/site.conf » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/notificationserver/manifests/init.pp |
| =================================================================== |
| --- a/modules/notificationserver/manifests/init.pp |
| +++ b/modules/notificationserver/manifests/init.pp |
| @@ -50,36 +50,16 @@ class notificationserver($is_default = f |
| } |
| File { |
| owner => root, |
| group => root, |
| mode => 0644, |
| } |
| - file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key': |
| - ensure => file, |
| - notify => Service['nginx'], |
| - before => Nginx::Hostconfig['notification.adblockplus.org'], |
| - mode => 0400, |
| - source => 'puppet:///modules/private/adblockplus.org_sslcert.key' |
| - } |
| - |
| - file {'/etc/nginx/sites-available/adblockplus.org_sslcert.pem': |
| - ensure => file, |
| - notify => Service['nginx'], |
| - before => Nginx::Hostconfig['notification.adblockplus.org'], |
| - mode => 0400, |
| - source => 'puppet:///modules/private/adblockplus.org_sslcert.pem' |
| - } |
| - |
| nginx::hostconfig{'notification.adblockplus.org': |
| - content => template('notificationserver/notification.adblockplus.org.erb'), |
| - enabled => true |
| - } |
| - |
| - file {'/etc/logrotate.d/nginx_notification.adblockplus.org': |
| - ensure => file, |
| - mode => 0444, |
| - require => Nginx::Hostconfig['notification.adblockplus.org'], |
| - source => 'puppet:///modules/notificationserver/logrotate' |
| + source => 'puppet:///modules/notificationserver/site.conf', |
| + is_default => $is_default, |
| + certificate => 'adblockplus.org_sslcert.pem', |
| + private_key => 'adblockplus.org_sslcert.key', |
| + log => 'access_log_notification' |
| } |
| } |
