| Index: modules/downloadserver/manifests/init.pp |
| =================================================================== |
| --- a/modules/downloadserver/manifests/init.pp |
| +++ b/modules/downloadserver/manifests/init.pp |
| @@ -1,10 +1,12 @@ |
| class downloadserver( |
| $domain, |
| + $certificate, |
| + $private_key, |
| $is_default = false |
| ) { |
| class {'nginx': |
| worker_processes => 2, |
| worker_connections => 4000, |
| ssl_session_cache => off, |
| } |
| @@ -35,18 +37,18 @@ class downloadserver( |
| owner => root, |
| group => root, |
| mode => 0644, |
| } |
| nginx::hostconfig{$domain: |
| source => 'puppet:///modules/downloadserver/site.conf', |
| is_default => $is_default, |
| - certificate => 'adblockplus.org_sslcert.pem', |
| - private_key => 'adblockplus.org_sslcert.key', |
| + certificate => $certificate, |
| + private_key => $private_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, |