| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 class filterserver { | 1 class filterserver { |
| 2 class {'nginx': | 2 class {'nginx': |
| 3 worker_processes => 2, | 3 worker_processes => 2, |
| 4 worker_connections => 4000, | 4 worker_connections => 4000, |
| 5 ssl_session_cache => off, | 5 ssl_session_cache => off, |
| 6 } | 6 } |
| 7 | 7 |
| 8 class {'statsclient': | 8 class {'statsclient': |
| 9 log_path => '/var/log/nginx/access_log_easylist_downloads.1.gz', | 9 log_path => '/var/log/nginx/access_log_easylist_downloads.1.gz', |
| 10 } | 10 } |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 95 content => 'filtermaster.adblockplus.org ', | 95 content => 'filtermaster.adblockplus.org ', |
| 96 order => 1, | 96 order => 1, |
| 97 } | 97 } |
| 98 | 98 |
| 99 concat::fragment {'filtermaster_hostkey': | 99 concat::fragment {'filtermaster_hostkey': |
| 100 target => '/home/rsync/.ssh/known_hosts', | 100 target => '/home/rsync/.ssh/known_hosts', |
| 101 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub', | 101 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub', |
| 102 order => 2, | 102 order => 2, |
| 103 } | 103 } |
| 104 | 104 |
| 105 file {'/home/rsync/.ssh/id_rsa': | 105 file {'/home/rsync/.ssh/id_ecdsa': |
|
Wladimir Palant
2013/11/18 17:36:23
Actually, this change should be reverted - for ide
| |
| 106 ensure => file, | 106 ensure => file, |
| 107 require => [ | 107 require => [ |
| 108 File['/home/rsync/.ssh'], | 108 File['/home/rsync/.ssh'], |
| 109 User['rsync'] | 109 User['rsync'] |
| 110 ], | 110 ], |
| 111 owner => rsync, | 111 owner => rsync, |
| 112 mode => 0400, | 112 mode => 0400, |
| 113 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or g' | 113 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or g' |
| 114 } | 114 } |
| 115 | 115 |
| 116 file {'/home/rsync/.ssh/id_rsa.pub': | 116 file {'/home/rsync/.ssh/id_ecdsa.pub': |
| 117 ensure => file, | 117 ensure => file, |
| 118 require => [ | 118 require => [ |
| 119 File['/home/rsync/.ssh'], | 119 File['/home/rsync/.ssh'], |
| 120 User['rsync'] | 120 User['rsync'] |
| 121 ], | 121 ], |
| 122 owner => rsync, | 122 owner => rsync, |
| 123 mode => 0400, | 123 mode => 0400, |
| 124 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or g.pub' | 124 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or g.pub' |
| 125 } | 125 } |
| 126 | 126 |
| 127 cron {'mirror': | 127 cron {'mirror': |
| 128 ensure => present, | 128 ensure => present, |
| 129 require => [ | 129 require => [ |
| 130 File['/home/rsync/.ssh/known_hosts'], | 130 File['/home/rsync/.ssh/known_hosts'], |
| 131 File['/home/rsync/.ssh/id_rsa'], | 131 File['/home/rsync/.ssh/id_ecdsa'], |
| 132 User['rsync'] | 132 User['rsync'] |
| 133 ], | 133 ], |
| 134 command => 'rsync -e ssh -ltprz --delete rsync@filtermaster.adblockplus.org: . /var/www/easylist/', | 134 command => 'rsync -e "ssh -o CheckHostIP=no" -ltprz --delete rsync@filtermas ter.adblockplus.org:. /var/www/easylist/', |
|
Felix Dahlke
2013/11/18 16:29:22
This seems unrelated, but I guess this is what we
| |
| 135 environment => ['MAILTO=admins@adblockplus.org,root'], | 135 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 136 user => rsync, | 136 user => rsync, |
| 137 hour => '*', | 137 hour => '*', |
| 138 minute => '2-52/10' | 138 minute => '2-52/10' |
| 139 } | 139 } |
| 140 } | 140 } |
| OLD | NEW |