Left: | ||
Right: |
LEFT | RIGHT |
---|---|
1 class filtermaster { | 1 class filtermaster { |
2 Cron { | 2 Cron { |
3 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], | 3 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], |
4 } | 4 } |
5 | 5 |
6 include ssh | 6 include ssh |
Wladimir Palant
2014/09/09 18:15:06
Isn't it already included by the base module?
mathias
2014/10/08 03:02:33
It is, but that does not ensure that the base/ssh
| |
7 | 7 |
8 concat::fragment {'sshd_max_limits': | 8 concat::fragment {'sshd_max_limits': |
9 target => 'sshd_config', | 9 target => 'sshd_config', |
10 order => '50', | 10 order => '50', |
11 content => ' | 11 content => ' |
12 MaxSessions 50 | 12 MaxSessions 50 |
13 MaxStartups 50 | 13 MaxStartups 50 |
14 ' | 14 ' |
15 } | 15 } |
16 | 16 |
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
99 repo_download {['easylist', | 99 repo_download {['easylist', |
100 'easylistgermany', | 100 'easylistgermany', |
101 'easylistitaly', | 101 'easylistitaly', |
102 'easylistchina', | 102 'easylistchina', |
103 'easylistcombinations', | 103 'easylistcombinations', |
104 'malwaredomains', | 104 'malwaredomains', |
105 'ruadlist', | 105 'ruadlist', |
106 'listefr', | 106 'listefr', |
107 'exceptionrules', | 107 'exceptionrules', |
108 'easylistdutch', | 108 'easylistdutch', |
109 'adblockpolska', | |
109 'facebookfilters', | 110 'facebookfilters', |
110 'youtubefilters', | 111 'youtubefilters', |
111 'antiadblockfilters' | 112 'antiadblockfilters' |
112 ]: | 113 ]: |
113 } | 114 } |
114 | 115 |
115 cron {'update_subscription': | 116 cron {'update_subscription': |
116 ensure => present, | 117 ensure => present, |
117 command => "python -m sitescripts.subscriptions.bin.updateSubscriptionDownlo ads 3>&1 1>/dev/null 2>&3 | perl -pe 's/^/\"[\" . scalar localtime() . \"] \"/e' >> /tmp/subscription_errors && chmod 666 /tmp/subscription_errors 2>/dev/null", | 118 command => "python -m sitescripts.subscriptions.bin.updateSubscriptionDownlo ads 3>&1 1>/dev/null 2>&3 | perl -pe 's/^/\"[\" . scalar localtime() . \"] \"/e' >> /tmp/subscription_errors && chmod 666 /tmp/subscription_errors 2>/dev/null", |
118 user => rsync, | 119 user => rsync, |
(...skipping 18 matching lines...) Expand all Loading... | |
137 User['rsync'], | 138 User['rsync'], |
138 File['/home/rsync/update_repos.sh'] | 139 File['/home/rsync/update_repos.sh'] |
139 ], | 140 ], |
140 minute => '8-58/10' | 141 minute => '8-58/10' |
141 } | 142 } |
142 | 143 |
143 class {'sitescripts': | 144 class {'sitescripts': |
144 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' | 145 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' |
145 } | 146 } |
146 } | 147 } |
LEFT | RIGHT |