Index: modules/statsclient/manifests/init.pp |
=================================================================== |
--- a/modules/statsclient/manifests/init.pp |
+++ b/modules/statsclient/manifests/init.pp |
@@ -33,21 +33,17 @@ class statsclient ( |
GatewayPorts no |
ForceCommand cat /var/www/stats.json', |
} |
class {'sitescripts': |
sitescriptsini_source => $sitescriptsini_source, |
} |
- package {'python-geoip':} |
- |
- package {'python-simplejson':} |
- |
- package {'python-jinja2':} |
+ package {'pypy':} |
file {'/var/www/stats.json': |
ensure => present, |
owner => stats, |
mode => 644, |
} |
file {'/opt/cron_geoipdb_update.sh': |
@@ -56,20 +52,20 @@ class statsclient ( |
mode => 0750, |
source => 'puppet:///modules/statsclient/cron_geoipdb_update.sh', |
} |
cron {'mirrorstats': |
ensure => present, |
require => [ |
User['stats'], |
- Package['python-geoip'], |
+ Package['pypy'], |
Exec["fetch_sitescripts"] |
], |
- command => "gzip -cd ${log_path} | python -m sitescripts.stats.bin.logprocessor", |
+ command => "gzip -cd ${log_path} | pypy -m sitescripts.stats.bin.logprocessor", |
environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescripts'], |
user => stats, |
hour => 0, |
minute => 25, |
} |
cron {'geoipdb_update': |
ensure => present, |