OLD | NEW |
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_content => template('statsmaster/sitescripts.ini.erb'), | 5 sitescriptsini_content => template('statsmaster/sitescripts.ini.erb'), |
6 } | 6 } |
7 | 7 |
8 file {['/var/www/stats', '/var/www/statsdata']: | 8 file {['/var/www/stats', '/var/www/statsdata']: |
9 ensure => directory, | 9 ensure => directory, |
10 mode => 0755, | 10 mode => 0755, |
11 owner => stats, | 11 owner => stats, |
12 } | 12 } |
13 | 13 |
14 file {'/var/www/statsdata/usercounts.html': | 14 file {'/var/www/statsdata/usercounts.html': |
15 ensure => file, | 15 ensure => file, |
16 mode => 0444, | 16 mode => 0444, |
17 source => 'puppet:///modules/statsmaster/usercounts.html', | 17 source => 'puppet:///modules/statsmaster/usercounts.html', |
18 owner => stats, | 18 owner => stats, |
19 } | 19 } |
20 | 20 |
21 cron {'updatestats': | 21 cron {'updatestats': |
22 ensure => present, | 22 ensure => present, |
23 require => [ | 23 require => [ |
24 Package['pypy'], | 24 Package['pypy'], |
25 Package['python-jinja2'], | 25 Package['python-jinja2'], |
26 Class["sitescripts"] | 26 Class["sitescripts"] |
27 ], | 27 ], |
28 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", |
29 environment => ['MAILTO=admins@adblockplus.org,root', | 29 environment => concat(hiera('cron::environment', []), [ |
30 'PYTHONPATH=/opt/sitescripts'], | 30 'PYTHONPATH=/opt/sitescripts', |
| 31 ]), |
31 user => stats, | 32 user => stats, |
32 hour => 1, | 33 hour => 1, |
33 minute => 30, | 34 minute => 30, |
34 } | 35 } |
35 } | 36 } |
OLD | NEW |