Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: modules/filtermaster/manifests/init.pp

Issue 4799232384958464: Issue 2299 - Add adwarefilters to the filtermaster (Closed)
Left Patch Set: Created April 29, 2015, 8:39 a.m.
Right Patch Set: Add trailing comma Created April 29, 2015, 4:19 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « modules/filtermaster/files/sitescripts ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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
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',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'adblockpolska',
110 'facebookfilters', 110 'facebookfilters',
111 'youtubefilters', 111 'youtubefilters',
112 'antiadblockfilters', 112 'antiadblockfilters',
113 'adwarefilters' 113 'adwarefilters',
Wladimir Palant 2015/04/29 16:09:01 Nit: Feel free to add a trailing comma here so tha
Felix Dahlke 2015/04/29 16:20:14 True, we're doing doing that quite a bit in Puppet
114 ]: 114 ]:
115 } 115 }
116 116
117 cron {'update_subscription': 117 cron {'update_subscription':
118 ensure => present, 118 ensure => present,
119 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", 119 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",
120 user => rsync, 120 user => rsync,
121 require => User['rsync'], 121 require => User['rsync'],
122 minute => '*/10' 122 minute => '*/10'
123 } 123 }
(...skipping 15 matching lines...) Expand all
139 User['rsync'], 139 User['rsync'],
140 File['/home/rsync/update_repos.sh'] 140 File['/home/rsync/update_repos.sh']
141 ], 141 ],
142 minute => '8-58/10' 142 minute => '8-58/10'
143 } 143 }
144 144
145 class {'sitescripts': 145 class {'sitescripts':
146 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' 146 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts'
147 } 147 }
148 } 148 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld