Side by Side Diff: modules/statsmaster/manifests/init.pp
Issue 11468051:
Update stats processing (Closed)
Patch Set: Dropped Jinja2 requirement
Created Aug. 29, 2013, 9:06 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/statsmaster/files/stats.adblockplus.org ('k')
|
no next file »
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| 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, |
| 11 mode => 0600, | 11 mode => 0600, |
| 12 require => User['stats'], | 12 require => User['stats'], |
| 13 } | 13 } |
| 14 | 14 |
| 15 file {'/home/stats/.ssh/id_rsa': | 15 file {'/home/stats/.ssh/id_rsa': |
| 16 ensure => present, | 16 ensure => present, |
| 17 owner => stats, | 17 owner => stats, |
| 18 mode => 0400, | 18 mode => 0400, |
| 19 source => 'puppet:///modules/private/stats@stats.adblockplus.org', | 19 source => 'puppet:///modules/private/stats@stats.adblockplus.org', |
| 20 } | 20 } |
| 21 | 21 |
| 22 file {'/home/stats/.ssh/known_hosts': | 22 file {'/home/stats/.ssh/known_hosts': |
| 23 ensure => present, | 23 ensure => present, |
| 24 owner => stats, | 24 owner => stats, |
| 25 mode => 0400, | 25 mode => 0400, |
| 26 source => 'puppet:///modules/statsmaster/known_hosts', | 26 source => 'puppet:///modules/statsmaster/known_hosts', |
| 27 } | 27 } |
| 28 | 28 |
| 29 package {'python-simplejson':} | 29 package {['python-simplejson', 'python-jinja2']:} |
| 30 | |
| 31 package {'python-jinja2':} | |
| 32 | 30 |
| 33 class {'sitescripts': | 31 class {'sitescripts': |
| 34 sitescriptsini_source => 'puppet:///modules/statsmaster/sitescripts.ini', | 32 sitescriptsini_source => 'puppet:///modules/statsmaster/sitescripts.ini', |
| 35 } | 33 } |
| 36 | 34 |
| 37 class {'nginx': | 35 class {'nginx': |
| 38 worker_processes => 2, | 36 worker_processes => 2, |
| 39 worker_connections => 4000, | 37 worker_connections => 4000, |
| 40 ssl_session_cache => off, | 38 ssl_session_cache => off, |
| 41 } | 39 } |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 105 Package['python-jinja2'], | 103 Package['python-jinja2'], |
| 106 Exec["fetch_sitescripts"] | 104 Exec["fetch_sitescripts"] |
| 107 ], | 105 ], |
| 108 command => "python -m sitescripts.stats.bin.datamerger && python -m sitescri pts.stats.bin.pagegenerator", | 106 command => "python -m sitescripts.stats.bin.datamerger && python -m sitescri pts.stats.bin.pagegenerator", |
| 109 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], | 107 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], |
| 110 user => stats, | 108 user => stats, |
| 111 hour => 12, | 109 hour => 12, |
| 112 minute => 0, | 110 minute => 0, |
| 113 } | 111 } |
| 114 } | 112 } |
| OLD | NEW |
« no previous file with comments
|
« modules/statsmaster/files/stats.adblockplus.org ('k')
|
no next file »
|
no next file with comments »
