Side by Side Diff: modules/filterserver/manifests/init.pp
Issue 11037080:
Use ssh.adblockplus.org for SSH (Closed)
Patch Set: Updated known_hosts
Created July 9, 2013, 2:56 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/filterserver/files/known_hosts ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 class filterserver { | 1 class filterserver { |
| 2 user {'subscriptionstat': | 2 user {'subscriptionstat': |
| 3 ensure => present, | 3 ensure => present, |
| 4 home => '/home/subscriptionstat', | 4 home => '/home/subscriptionstat', |
| 5 managehome => true | 5 managehome => true |
| 6 } | 6 } |
| 7 | 7 |
| 8 file {'/home/subscriptionstat/.ssh': | 8 file {'/home/subscriptionstat/.ssh': |
| 9 ensure => directory, | 9 ensure => directory, |
| 10 owner => subscriptionstat, | 10 owner => subscriptionstat, |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 155 source => 'puppet:///modules/filterserver/cron_geoipdb_update.sh' | 155 source => 'puppet:///modules/filterserver/cron_geoipdb_update.sh' |
| 156 } | 156 } |
| 157 | 157 |
| 158 cron {'mirror': | 158 cron {'mirror': |
| 159 ensure => present, | 159 ensure => present, |
| 160 require => [ | 160 require => [ |
| 161 File['/home/rsync/.ssh/known_hosts'], | 161 File['/home/rsync/.ssh/known_hosts'], |
| 162 File['/home/rsync/.ssh/id_rsa'], | 162 File['/home/rsync/.ssh/id_rsa'], |
| 163 User['rsync'] | 163 User['rsync'] |
| 164 ], | 164 ], |
| 165 command => 'rsync -e ssh -ltprz rsync@adblockplus.org:. /var/www/easylist/', | 165 command => 'rsync -e ssh -ltprz rsync@ssh.adblockplus.org:. /var/www/easylis t/', |
| 166 user => rsync, | 166 user => rsync, |
| 167 hour => '*', | 167 hour => '*', |
| 168 minute => '2-52/10' | 168 minute => '2-52/10' |
| 169 } | 169 } |
| 170 | 170 |
| 171 cron {'mirrorstats': | 171 cron {'mirrorstats': |
| 172 ensure => present, | 172 ensure => present, |
| 173 require => [ | 173 require => [ |
| 174 User['rsync'], | 174 User['rsync'], |
| 175 Package['python-geoip'] | 175 Package['python-geoip'] |
| 176 ], | 176 ], |
| 177 command => 'gzip -cd /var/log/nginx/access_log_easylist_downloads.1.gz | pyt hon -m sitescripts.logs.bin.extractSubscriptionStats', | 177 command => 'gzip -cd /var/log/nginx/access_log_easylist_downloads.1.gz | pyt hon -m sitescripts.logs.bin.extractSubscriptionStats', |
| 178 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], | 178 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], |
| 179 user => rsync, | 179 user => rsync, |
| 180 hour => 1, | 180 hour => 1, |
| 181 minute => 25 | 181 minute => 25 |
| 182 } | 182 } |
| 183 | 183 |
| 184 cron {'geoipdb_update': | 184 cron {'geoipdb_update': |
| 185 ensure => present, | 185 ensure => present, |
| 186 require => File['/opt/cron_geoipdb_update.sh'], | 186 require => File['/opt/cron_geoipdb_update.sh'], |
| 187 command => '/opt/cron_geoipdb_update.sh', | 187 command => '/opt/cron_geoipdb_update.sh', |
| 188 user => root, | 188 user => root, |
| 189 hour => 3, | 189 hour => 3, |
| 190 minute => 15, | 190 minute => 15, |
| 191 monthday => 3 | 191 monthday => 3 |
| 192 } | 192 } |
| 193 | 193 |
| 194 } | 194 } |
| OLD | NEW |
« no previous file with comments
|
« modules/filterserver/files/known_hosts ('k')
|
no next file »
|
no next file with comments »
