Side by Side Diff: modules/filterserver/manifests/init.pp
Issue 6029451183783936:
Add Filtermaster (Closed)
Patch Set: All Done
Created Nov. 14, 2013, 3:26 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')
|
modules/private-stub/files/filtermaster.adblockplus.org_ssh.key » ('j')
|
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 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 77 source => 'puppet:///modules/filterserver/logrotate' | 77 source => 'puppet:///modules/filterserver/logrotate' |
| 78 } | 78 } |
| 79 | 79 |
| 80 file {'/home/rsync/.ssh': | 80 file {'/home/rsync/.ssh': |
| 81 ensure => directory, | 81 ensure => directory, |
| 82 require => User['rsync'], | 82 require => User['rsync'], |
| 83 owner => rsync, | 83 owner => rsync, |
| 84 mode => 0600; | 84 mode => 0600; |
| 85 } | 85 } |
| 86 | 86 |
| 87 file {'/home/rsync/.ssh/known_hosts': | 87 concat {'/home/rsync/.ssh/known_hosts': |
| 88 ensure => file, | |
| 89 require => [ | |
| 90 File['/home/rsync/.ssh'], | |
| 91 User['rsync'] | |
| 92 ], | |
| 93 owner => rsync, | 88 owner => rsync, |
| 94 mode => 0444, | 89 mode => 0444, |
| 95 source => 'puppet:///modules/filterserver/known_hosts' | 90 } |
| 91 | |
| 92 concat::fragment {'filtermaster_hostname': | |
| 93 target => '/home/rsync/.ssh/known_hosts', | |
| 94 content => 'filtermaster.adblockplus.org ', | |
| 95 order => 1, | |
| 96 } | |
| 97 | |
| 98 concat::fragment {'filtermaster_hostkey': | |
| 99 target => '/home/rsync/.ssh/known_hosts', | |
| 100 source => 'puppet:///modules/private/filtermaster.adblockplus.org_ssh.pub', | |
| 101 order => 2, | |
| 96 } | 102 } |
| 97 | 103 |
| 98 file {'/home/rsync/.ssh/id_rsa': | 104 file {'/home/rsync/.ssh/id_rsa': |
| 99 ensure => file, | 105 ensure => file, |
| 100 require => [ | 106 require => [ |
| 101 File['/home/rsync/.ssh'], | 107 File['/home/rsync/.ssh'], |
| 102 User['rsync'] | 108 User['rsync'] |
| 103 ], | 109 ], |
| 104 owner => rsync, | 110 owner => rsync, |
| 105 mode => 0400, | 111 mode => 0400, |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 117 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or g.pub' | 123 source => 'puppet:///modules/private/rsync@easylist-downloads.adblockplus.or g.pub' |
| 118 } | 124 } |
| 119 | 125 |
| 120 cron {'mirror': | 126 cron {'mirror': |
| 121 ensure => present, | 127 ensure => present, |
| 122 require => [ | 128 require => [ |
| 123 File['/home/rsync/.ssh/known_hosts'], | 129 File['/home/rsync/.ssh/known_hosts'], |
| 124 File['/home/rsync/.ssh/id_rsa'], | 130 File['/home/rsync/.ssh/id_rsa'], |
| 125 User['rsync'] | 131 User['rsync'] |
| 126 ], | 132 ], |
| 127 command => 'rsync -e ssh -ltprz --delete rsync@ssh.adblockplus.org:. /var/ww w/easylist/', | 133 command => 'rsync -e ssh -ltprz --delete rsync@filtermaster1.adblockplus.org :. /var/www/easylist/', |
| 128 environment => ['MAILTO=admins@adblockplus.org,root'], | 134 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 129 user => rsync, | 135 user => rsync, |
| 130 hour => '*', | 136 hour => '*', |
| 131 minute => '2-52/10' | 137 minute => '2-52/10' |
| 132 } | 138 } |
| 133 } | 139 } |
| OLD | NEW |
« no previous file with comments
|
« modules/filterserver/files/known_hosts ('k')
|
modules/private-stub/files/filtermaster.adblockplus.org_ssh.key » ('j')
|
no next file with comments »
