| OLD | NEW |
| 1 class statsmaster( | 1 class statsmaster( |
| 2 $domain, | 2 $domain, |
| 3 $certificate, |
| 4 $private_key, |
| 3 $is_default=false | 5 $is_default=false |
| 4 ) { | 6 ) { |
| 5 user {'stats': | 7 user {'stats': |
| 6 ensure => present, | 8 ensure => present, |
| 7 home => '/home/stats', | 9 home => '/home/stats', |
| 8 managehome => true, | 10 managehome => true, |
| 9 } | 11 } |
| 10 | 12 |
| 11 file {'/home/stats/.ssh': | 13 file {'/home/stats/.ssh': |
| 12 ensure => directory, | 14 ensure => directory, |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 73 | 75 |
| 74 file {'/var/www/htpasswd': | 76 file {'/var/www/htpasswd': |
| 75 ensure => file, | 77 ensure => file, |
| 76 mode => 0444, | 78 mode => 0444, |
| 77 source => 'puppet:///modules/private/stats-htpasswd', | 79 source => 'puppet:///modules/private/stats-htpasswd', |
| 78 } | 80 } |
| 79 | 81 |
| 80 nginx::hostconfig{$domain: | 82 nginx::hostconfig{$domain: |
| 81 source => 'puppet:///modules/statsmaster/site.conf', | 83 source => 'puppet:///modules/statsmaster/site.conf', |
| 82 is_default => $is_default, | 84 is_default => $is_default, |
| 83 certificate => 'adblockplus.org_sslcert.pem', | 85 certificate => $certificate, |
| 84 private_key => 'adblockplus.org_sslcert.key', | 86 private_key => $private_key, |
| 85 log => 'access_log_stats' | 87 log => 'access_log_stats' |
| 86 } | 88 } |
| 87 | 89 |
| 88 cron {'updatestats': | 90 cron {'updatestats': |
| 89 ensure => present, | 91 ensure => present, |
| 90 require => [ | 92 require => [ |
| 91 Package['pypy'], | 93 Package['pypy'], |
| 92 Package['python-jinja2'], | 94 Package['python-jinja2'], |
| 93 Exec["fetch_sitescripts"] | 95 Exec["fetch_sitescripts"] |
| 94 ], | 96 ], |
| (...skipping 15 matching lines...) Expand all Loading... |
| 110 ensure => present, | 112 ensure => present, |
| 111 require => File['/opt/cron_geoipdb_update.sh'], | 113 require => File['/opt/cron_geoipdb_update.sh'], |
| 112 command => '/opt/cron_geoipdb_update.sh', | 114 command => '/opt/cron_geoipdb_update.sh', |
| 113 environment => ['MAILTO=admins@adblockplus.org,root'], | 115 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 114 user => root, | 116 user => root, |
| 115 hour => 3, | 117 hour => 3, |
| 116 minute => 15, | 118 minute => 15, |
| 117 monthday => 3, | 119 monthday => 3, |
| 118 } | 120 } |
| 119 } | 121 } |
| OLD | NEW |