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

Delta Between Two Patch Sets: modules/statsmaster/manifests/downloads.pp

Issue 6293281981857792: Issue 239 - Move AWStats processing to the stats server (Closed)
Left Patch Set: Created April 23, 2014, 1:14 p.m.
Right Patch Set: Added IP address anonymization and addressed review comments Created April 25, 2014, 7:38 a.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/statsmaster/manifests/awstats.pp ('k') | modules/statsmaster/templates/anonymize_ips_head.erb » ('j') | 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 statsmaster::downloads { 1 class statsmaster::downloads {
2 package {['pypy', 'python-jinja2']:} 2 package {['pypy', 'python-jinja2']:}
3 3
4 class {'sitescripts': 4 class {'sitescripts':
5 sitescriptsini_source => 'puppet:///modules/statsmaster/sitescripts.ini', 5 sitescriptsini_source => 'puppet:///modules/statsmaster/sitescripts.ini',
6 } 6 }
7 7
8 file {'/var/www/stats': 8 file {['/var/www/stats', '/var/www/statsdata']:
Felix Dahlke 2014/04/25 04:37:08 Could also be merged with the file resource below
9 ensure => directory,
10 mode => 0755,
11 owner => stats,
12 }
13
14 file {'/var/www/statsdata':
15 ensure => directory, 9 ensure => directory,
16 mode => 0755, 10 mode => 0755,
17 owner => stats, 11 owner => stats,
18 } 12 }
19 13
20 file {'/var/www/statsdata/usercounts.html': 14 file {'/var/www/statsdata/usercounts.html':
21 ensure => file, 15 ensure => file,
22 mode => 0444, 16 mode => 0444,
23 source => 'puppet:///modules/statsmaster/usercounts.html', 17 source => 'puppet:///modules/statsmaster/usercounts.html',
24 owner => stats, 18 owner => stats,
25 } 19 }
26 20
27 cron {'updatestats': 21 cron {'updatestats':
28 ensure => present, 22 ensure => present,
29 require => [ 23 require => [
30 Package['pypy'], 24 Package['pypy'],
31 Package['python-jinja2'], 25 Package['python-jinja2'],
32 Exec["fetch_sitescripts"] 26 Exec["fetch_sitescripts"]
33 ], 27 ],
34 command => "pypy -m sitescripts.stats.bin.logprocessor && python -m sitescri pts.stats.bin.pagegenerator", 28 command => "pypy -m sitescripts.stats.bin.logprocessor && python -m sitescri pts.stats.bin.pagegenerator",
35 environment => ['MAILTO=admins@adblockplus.org,root', 'PYTHONPATH=/opt/sites cripts'], 29 environment => ['MAILTO=admins@adblockplus.org,root',
Felix Dahlke 2014/04/25 04:37:08 Nit: Wrap at 80 columns? (Note that for the line a
30 'PYTHONPATH=/opt/sitescripts'],
36 user => stats, 31 user => stats,
37 hour => 1, 32 hour => 1,
38 minute => 30, 33 minute => 30,
39 } 34 }
40 } 35 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld