| OLD | NEW |
| 1 class filterserver($is_default = false) { | 1 class filterserver($is_default = false) { |
| 2 if !defined(Class['nginx']) { | 2 if !defined(Class['nginx']) { |
| 3 class {'nginx': | 3 class {'nginx': |
| 4 worker_connections => 4000, | 4 worker_connections => 4000, |
| 5 ssl_session_cache => off, | 5 ssl_session_cache => off, |
| 6 } | 6 } |
| 7 } | 7 } |
| 8 | 8 |
| 9 if !defined(File['/var/www']) { | 9 if !defined(File['/var/www']) { |
| 10 file {'/var/www': | 10 file {'/var/www': |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 ensure => directory, | 36 ensure => directory, |
| 37 owner => rsync | 37 owner => rsync |
| 38 } | 38 } |
| 39 | 39 |
| 40 nginx::hostconfig{'easylist-downloads.adblockplus.org': | 40 nginx::hostconfig{'easylist-downloads.adblockplus.org': |
| 41 alt_names => ['easylist-msie.adblockplus.org'], | 41 alt_names => ['easylist-msie.adblockplus.org'], |
| 42 source => 'puppet:///modules/filterserver/site.conf', | 42 source => 'puppet:///modules/filterserver/site.conf', |
| 43 is_default => $is_default, | 43 is_default => $is_default, |
| 44 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', | 44 certificate => 'easylist-downloads.adblockplus.org_sslcert.pem', |
| 45 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', | 45 private_key => 'easylist-downloads.adblockplus.org_sslcert.key', |
| 46 log => 'access_log_easylist_downloads' | 46 log => 'access_log_easylist_downloads', |
| 47 global_config => join([ |
| 48 'proxy_cache_path /var/cache/nginx/proxy levels=1 keys_zone=filters:1m;', |
| 49 ], "\n"), |
| 47 } | 50 } |
| 48 | 51 |
| 49 file {'/home/rsync/.ssh': | 52 file {'/home/rsync/.ssh': |
| 50 ensure => directory, | 53 ensure => directory, |
| 51 require => User['rsync'], | 54 require => User['rsync'], |
| 52 owner => rsync, | 55 owner => rsync, |
| 53 mode => 0600; | 56 mode => 0600; |
| 54 } | 57 } |
| 55 | 58 |
| 56 concat {'/home/rsync/.ssh/known_hosts': | 59 concat {'/home/rsync/.ssh/known_hosts': |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 File['/home/rsync/.ssh/id_rsa'], | 102 File['/home/rsync/.ssh/id_rsa'], |
| 100 User['rsync'] | 103 User['rsync'] |
| 101 ], | 104 ], |
| 102 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas
ter.adblockplus.org:. /var/www/easylist/', | 105 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas
ter.adblockplus.org:. /var/www/easylist/', |
| 103 environment => hiera('cron::environment', []), | 106 environment => hiera('cron::environment', []), |
| 104 user => rsync, | 107 user => rsync, |
| 105 hour => '*', | 108 hour => '*', |
| 106 minute => '2-52/10' | 109 minute => '2-52/10' |
| 107 } | 110 } |
| 108 } | 111 } |
| OLD | NEW |