Side by Side Diff: modules/filtermaster/manifests/init.pp
Issue 29329128:
Issue 123 - Integrate filtermaster cron::envrionment with Hiera (Closed)
Patch Set:
Created Oct. 14, 2015, 5:16 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
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 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 => concat(hiera('cron::environment', []), [ |
| 8 'PYTHONPATH=/opt/sitescripts', | |
| 9 ]), | |
| 8 } | 10 } |
| 9 | 11 |
| 10 include ssh | 12 include ssh |
| 11 | 13 |
| 12 concat::fragment {'sshd_max_limits': | 14 concat::fragment {'sshd_max_limits': |
| 13 target => 'sshd_config', | 15 target => 'sshd_config', |
| 14 order => '50', | 16 order => '50', |
| 15 content => ' | 17 content => ' |
| 16 MaxSessions 50 | 18 MaxSessions 50 |
| 17 MaxStartups 50 | 19 MaxStartups 50 |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 112 User['rsync'], | 114 User['rsync'], |
| 113 File['/home/rsync/update_repos.sh'] | 115 File['/home/rsync/update_repos.sh'] |
| 114 ], | 116 ], |
| 115 minute => '8-58/10' | 117 minute => '8-58/10' |
| 116 } | 118 } |
| 117 | 119 |
| 118 class {'sitescripts': | 120 class {'sitescripts': |
| 119 sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'), | 121 sitescriptsini_content => template('filtermaster/sitescripts.ini.erb'), |
| 120 } | 122 } |
| 121 } | 123 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
