| OLD | NEW |
| 1 class statsmaster { | 1 class statsmaster { |
| 2 user {'stats': | 2 user {'stats': |
| 3 ensure => present, | 3 ensure => present, |
| 4 home => '/home/stats', | 4 home => '/home/stats', |
| 5 managehome => true, | 5 managehome => true, |
| 6 } | 6 } |
| 7 | 7 |
| 8 file {'/home/stats/.ssh': | 8 file {'/home/stats/.ssh': |
| 9 ensure => directory, | 9 ensure => directory, |
| 10 owner => stats, | 10 owner => stats, |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 54 mode => 0755, | 54 mode => 0755, |
| 55 owner => stats, | 55 owner => stats, |
| 56 } | 56 } |
| 57 | 57 |
| 58 file {'/var/www/statsdata': | 58 file {'/var/www/statsdata': |
| 59 ensure => directory, | 59 ensure => directory, |
| 60 mode => 0755, | 60 mode => 0755, |
| 61 owner => stats, | 61 owner => stats, |
| 62 } | 62 } |
| 63 | 63 |
| 64 file {'/var/www/statsdata/usercounts.html': |
| 65 ensure => file, |
| 66 mode => 0444, |
| 67 source => 'puppet:///modules/statsmaster/usercounts.html', |
| 68 owner => stats, |
| 69 } |
| 70 |
| 64 file {'/var/www/htpasswd': | 71 file {'/var/www/htpasswd': |
| 65 ensure => file, | 72 ensure => file, |
| 66 mode => 0444, | 73 mode => 0444, |
| 67 source => 'puppet:///modules/private/stats-htpasswd', | 74 source => 'puppet:///modules/private/stats-htpasswd', |
| 68 } | 75 } |
| 69 | 76 |
| 70 file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key': | 77 file {'/etc/nginx/sites-available/adblockplus.org_sslcert.key': |
| 71 ensure => file, | 78 ensure => file, |
| 72 notify => Service['nginx'], | 79 notify => Service['nginx'], |
| 73 before => Nginx::Hostconfig['stats.adblockplus.org'], | 80 before => Nginx::Hostconfig['stats.adblockplus.org'], |
| (...skipping 29 matching lines...) Expand all Loading... |
| 103 Package['python-jinja2'], | 110 Package['python-jinja2'], |
| 104 Exec["fetch_sitescripts"] | 111 Exec["fetch_sitescripts"] |
| 105 ], | 112 ], |
| 106 command => "python -m sitescripts.stats.bin.datamerger && python -m sitescri
pts.stats.bin.pagegenerator", | 113 command => "python -m sitescripts.stats.bin.datamerger && python -m sitescri
pts.stats.bin.pagegenerator", |
| 107 environment => ['MAILTO=admins@adblockplus.org,root', 'PYTHONPATH=/opt/sites
cripts'], | 114 environment => ['MAILTO=admins@adblockplus.org,root', 'PYTHONPATH=/opt/sites
cripts'], |
| 108 user => stats, | 115 user => stats, |
| 109 hour => 4, | 116 hour => 4, |
| 110 minute => 30, | 117 minute => 30, |
| 111 } | 118 } |
| 112 } | 119 } |
| OLD | NEW |