| Index: modules/statsmaster/manifests/downloads.pp |
| =================================================================== |
| --- a/modules/statsmaster/manifests/downloads.pp |
| +++ b/modules/statsmaster/manifests/downloads.pp |
| @@ -1,22 +1,16 @@ |
| class statsmaster::downloads { |
| package {['pypy', 'python-jinja2']:} |
| class {'sitescripts': |
| sitescriptsini_source => 'puppet:///modules/statsmaster/sitescripts.ini', |
| } |
| - file {'/var/www/stats': |
| - ensure => directory, |
| - mode => 0755, |
| - owner => stats, |
| - } |
| - |
| - file {'/var/www/statsdata': |
| + file {['/var/www/stats', '/var/www/statsdata']: |
| ensure => directory, |
| mode => 0755, |
| owner => stats, |
| } |
| file {'/var/www/statsdata/usercounts.html': |
| ensure => file, |
| mode => 0444, |
| @@ -27,14 +21,15 @@ class statsmaster::downloads { |
| cron {'updatestats': |
| ensure => present, |
| require => [ |
| Package['pypy'], |
| Package['python-jinja2'], |
| Exec["fetch_sitescripts"] |
| ], |
| command => "pypy -m sitescripts.stats.bin.logprocessor && python -m sitescripts.stats.bin.pagegenerator", |
| - environment => ['MAILTO=admins@adblockplus.org,root', 'PYTHONPATH=/opt/sitescripts'], |
| + environment => ['MAILTO=admins@adblockplus.org,root', |
| + 'PYTHONPATH=/opt/sitescripts'], |
| user => stats, |
| hour => 1, |
| minute => 30, |
| } |
| } |