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

Side by Side Diff: modules/filtermaster/manifests/init.pp

Issue 4799232384958464: Issue 2299 - Add adwarefilters to the filtermaster (Closed)
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:
View unified diff | Download patch
« no previous file with comments | « modules/filtermaster/files/sitescripts ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 'adblockpolska',
110 'facebookfilters', 110 'facebookfilters',
111 'youtubefilters', 111 'youtubefilters',
112 'antiadblockfilters' 112 'antiadblockfilters',
113 'adwarefilters',
113 ]: 114 ]:
114 } 115 }
115 116
116 cron {'update_subscription': 117 cron {'update_subscription':
117 ensure => present, 118 ensure => present,
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", 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 user => rsync, 120 user => rsync,
120 require => User['rsync'], 121 require => User['rsync'],
121 minute => '*/10' 122 minute => '*/10'
122 } 123 }
(...skipping 15 matching lines...) Expand all
138 User['rsync'], 139 User['rsync'],
139 File['/home/rsync/update_repos.sh'] 140 File['/home/rsync/update_repos.sh']
140 ], 141 ],
141 minute => '8-58/10' 142 minute => '8-58/10'
142 } 143 }
143 144
144 class {'sitescripts': 145 class {'sitescripts':
145 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts' 146 sitescriptsini_source => 'puppet:///modules/filtermaster/sitescripts'
146 } 147 }
147 } 148 }
OLDNEW
« no previous file with comments | « modules/filtermaster/files/sitescripts ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld