Unified Diff: modules/downloadserver/manifests/init.pp
Issue 5734493784637440:
Issue 245 - Unify SSL configuration for all servers (Closed)
Patch Set: Converted Nagios site configuration and centralized error page configuration
Created April 10, 2014, 6:40 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/downloadserver/files/site.conf ('k')
|
modules/filterserver/files/logrotate » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/downloadserver/manifests/init.pp |
| =================================================================== |
| --- a/modules/downloadserver/manifests/init.pp |
| +++ b/modules/downloadserver/manifests/init.pp |
| @@ -1,9 +1,13 @@ |
| -class downloadserver { |
| +class downloadserver( |
| + $domain, |
| + $is_default = false |
| + ) { |
| + |
| class {'nginx': |
| worker_processes => 2, |
| worker_connections => 4000, |
| ssl_session_cache => off, |
| } |
| user {'hg': |
| ensure => present, |
| @@ -28,42 +32,22 @@ class downloadserver { |
| } |
| File { |
| owner => root, |
| group => root, |
| mode => 0644, |
| } |
| - file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key': |
| - ensure => file, |
| - notify => Service['nginx'], |
| - before => Nginx::Hostconfig['downloads.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['downloads.adblockplus.org'], |
| - mode => 0400, |
| - source => 'puppet:///modules/private/adblockplus.org_sslcert.pem' |
| - } |
| - |
| - nginx::hostconfig{'downloads.adblockplus.org': |
| - source => 'puppet:///modules/downloadserver/downloads.adblockplus.org', |
| - enabled => true |
| - } |
| - |
| - file {'/etc/logrotate.d/nginx_downloads.adblockplus.org': |
| - ensure => file, |
| - mode => 0444, |
| - require => Nginx::Hostconfig['downloads.adblockplus.org'], |
| - source => 'puppet:///modules/downloadserver/logrotate' |
| + nginx::hostconfig{$domain: |
| + source => 'puppet:///modules/downloadserver/site.conf', |
| + is_default => $is_default, |
| + certificate => 'adblockplus.org_sslcert.pem', |
| + private_key => 'adblockplus.org_sslcert.key', |
| + log => 'access_log_downloads' |
| } |
| cron {'mirror': |
| ensure => present, |
| command => 'hg pull -q -u -R /var/www/downloads/', |
| environment => ['MAILTO=admins@adblockplus.org,root'], |
| user => hg, |
| minute => '*/10' |
« no previous file with comments
|
« modules/downloadserver/files/site.conf ('k')
|
modules/filterserver/files/logrotate » ('j')
|
no next file with comments »
