Update stats processing

modules/statsclient/manifests/init.pp

 class statsclient (
     $log_path,
     $custom_sitescriptsini_source = [],
   ) {
 
   $sitescriptsini_source = flatten(['puppet:///modules/statsclient/sitescripts.ini', $custom_sitescriptsini_source])
 
   user {'stats':
     ensure => present,
     home => '/home/stats',
@@ skipping 20 matching lines @@
         X11Forwarding no
         AllowAgentForwarding no
         GatewayPorts no
         ForceCommand cat /var/www/stats.json',
   }
 
   class {'sitescripts':
     sitescriptsini_source => $sitescriptsini_source,
   }
 
-  package {'python-geoip':}
-
-  package {'python-simplejson':}
-
-  package {'python-jinja2':}

[Wladimir Palant, 2013/08/23 14:01:38]

The log processor doesn't really need Jinja2. However, it uses the name of Gecko
application IDs from buildtools and buildtools depends on Jinja2. :-(

[Felix Dahlke, 2013/08/28 14:43:32]

Did you know that you can require multiple packages in a single line? We tend to
do that:

package {['python-geoip', 'python-simplejson', 'python-jinja2']:}

Also, I'm not entirely sure if the default value for ensure is "present". But if
it works, it's fine I guess.

+  package {'pypy':}
 
   file {'/var/www/stats.json':
     ensure => present,
     owner => stats,
     mode => 644,
   }
 
   file {'/opt/cron_geoipdb_update.sh':
     ensure => file,
     owner => root,
     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,
     require => File['/opt/cron_geoipdb_update.sh'],
     command => '/opt/cron_geoipdb_update.sh',
     user => root,
     hour => 3,
     minute => 15,
     monthday => 3,
   }
 }