Side by Side Diff: modules/statsmaster/manifests/init.pp
Issue 4810150141493248:
Issue 122 - Puppet ENC via Hiera (Closed)
Patch Set: 112 - Puppet ENC via Hiera
Created Oct. 8, 2014, 3:02 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/statsclient/manifests/init.pp ('K')
|
« modules/statsclient/manifests/init.pp ('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 $domain, | 2 $domain, |
| 3 $certificate, | 3 $certificate, |
| 4 $private_key, | 4 $private_key, |
| 5 $is_default=false | 5 $is_default=false |
| 6 ) { | 6 ) { |
| 7 | 7 |
| 8 include statsmaster::downloads, statsmaster::awstats | 8 include statsmaster::downloads, statsmaster::awstats |
| 9 | 9 |
| 10 #realize known_hosts from base module | |
| 11 Sshkey <| |> | |
| 12 | |
| 10 user {'stats': | 13 user {'stats': |
| 11 ensure => present, | 14 ensure => present, |
| 12 home => '/home/stats', | 15 home => '/home/stats', |
| 13 managehome => true, | 16 managehome => true, |
| 14 } | 17 } |
| 15 | 18 |
| 16 File { | 19 File { |
| 17 group => root, | 20 group => root, |
| 18 } | 21 } |
| 19 | 22 |
| 20 file {'/home/stats/.ssh': | 23 file {'/home/stats/.ssh': |
| 21 ensure => directory, | 24 ensure => directory, |
| 22 owner => stats, | 25 owner => stats, |
| 23 mode => 0600, | 26 mode => 0600, |
| 24 require => User['stats'], | 27 require => User['stats'], |
| 25 } | 28 } |
| 26 | 29 |
| 27 file {'/home/stats/.ssh/id_rsa': | 30 file {'/home/stats/.ssh/id_rsa': |
| 28 ensure => present, | 31 ensure => present, |
| 29 owner => stats, | 32 owner => stats, |
| 30 mode => 0400, | 33 mode => 0400, |
| 31 source => 'puppet:///modules/private/stats@stats.adblockplus.org', | 34 source => 'puppet:///modules/private/stats@stats.adblockplus.org', |
| 32 } | 35 } |
| 33 | 36 |
| 34 file {'/home/stats/.ssh/known_hosts': | |
| 35 ensure => present, | |
| 36 owner => stats, | |
| 37 mode => 0400, | |
| 38 source => 'puppet:///modules/statsmaster/known_hosts', | |
|
Wladimir Palant
2014/11/17 16:43:36
Remove that file now that it isn't needed any more
| |
| 39 } | |
| 40 | |
| 41 class {'nginx': | 37 class {'nginx': |
| 42 worker_processes => 2, | 38 worker_processes => 2, |
| 43 worker_connections => 4000, | 39 worker_connections => 4000, |
| 44 ssl_session_cache => off, | 40 ssl_session_cache => off, |
| 45 } | 41 } |
| 46 | 42 |
| 47 file {'/var/www': | 43 file {'/var/www': |
| 48 ensure => directory, | 44 ensure => directory, |
| 49 mode => 0755, | 45 mode => 0755, |
| 50 owner => root | 46 owner => root |
| (...skipping 29 matching lines...) Expand all Loading... | |
| 80 ensure => present, | 76 ensure => present, |
| 81 require => File['/opt/cron_geoipdb_update.py'], | 77 require => File['/opt/cron_geoipdb_update.py'], |
| 82 command => '/opt/cron_geoipdb_update.py', | 78 command => '/opt/cron_geoipdb_update.py', |
| 83 environment => ['MAILTO=admins@adblockplus.org,root'], | 79 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 84 user => root, | 80 user => root, |
| 85 hour => 3, | 81 hour => 3, |
| 86 minute => 15, | 82 minute => 15, |
| 87 monthday => 3, | 83 monthday => 3, |
| 88 } | 84 } |
| 89 } | 85 } |
| OLD | NEW |
« modules/statsclient/manifests/init.pp ('K')
|
« modules/statsclient/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
