| OLD | NEW |
| 1 class filtermaster( | 1 class filtermaster( |
| 2 $repos = hiera('filtermaster::repos', []), | 2 $repos = hiera('filtermaster::repos', []), |
| 3 $repo_downloads = hiera('filtermaster::repo_downloads', {}), | 3 $repo_downloads = hiera('filtermaster::repo_downloads', {}), |
| 4 ) { | 4 ) { |
| 5 | 5 |
| 6 Cron { | 6 Cron { |
| 7 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript
s'], | 7 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript
s'], |
| 8 } | 8 } |
| 9 | 9 |
| 10 include ssh | 10 include ssh |
| 11 | 11 |
| 12 concat::fragment {'sshd_max_limits': | 12 concat::fragment {'sshd_max_limits': |
| 13 target => 'sshd_config', | 13 target => 'sshd_config', |
| 14 order => '50', | 14 order => '50', |
| 15 content => ' | 15 content => ' |
| 16 MaxSessions 50 | 16 MaxSessions 50 |
| 17 MaxStartups 50 | 17 MaxStartups 50 |
| 18 ' | 18 ' |
| 19 } | 19 } |
| 20 | 20 |
| 21 concat::fragment {'sshd_user_rsync': | 21 concat::fragment {'sshd_user_rsync': |
| 22 target => 'sshd_config', | 22 target => 'sshd_config', |
| 23 order => '99', | 23 order => '99', |
| 24 content => ' | 24 content => template('filtermaster/sshd_rsync.erb'), |
| 25 Match User rsync | |
| 26 AllowTcpForwarding no | |
| 27 X11Forwarding no | |
| 28 AllowAgentForwarding no | |
| 29 GatewayPorts no | |
| 30 ForceCommand rsync --server --sender -vltprz --delete-excluded . /home/r
sync/generated/data/ | |
| 31 ' | |
| 32 } | 25 } |
| 33 | 26 |
| 34 user {'rsync': | 27 user {'rsync': |
| 35 ensure => present, | 28 ensure => present, |
| 36 comment => 'Filter list mirror user', | 29 comment => 'Filter list mirror user', |
| 37 home => '/home/rsync', | 30 home => '/home/rsync', |
| 38 managehome => true | 31 managehome => true |
| 39 } | 32 } |
| 40 | 33 |
| 41 file {'/home/rsync/update_repos.sh': | 34 file {'/home/rsync/update_repos.sh': |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 User['rsync'], | 112 User['rsync'], |
| 120 File['/home/rsync/update_repos.sh'] | 113 File['/home/rsync/update_repos.sh'] |
| 121 ], | 114 ], |
| 122 minute => '8-58/10' | 115 minute => '8-58/10' |
| 123 } | 116 } |
| 124 | 117 |
| 125 class {'sitescripts': | 118 class {'sitescripts': |
| 126 sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'), | 119 sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'), |
| 127 } | 120 } |
| 128 } | 121 } |
| OLD | NEW |