Side by Side Diff: modules/filterserver/manifests/init.pp
Issue 9351014:
Add logrotate cronjob to all servers, don`t run logrotate unnecessarily on provisioning and use con… (Closed)
Patch Set:
Created Feb. 7, 2013, 3:06 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« modules/base/manifests/init.pp ('K')
|
« modules/filterserver/files/logrotate ('k')
|
modules/logrotate/manifests/init.pp » ('j')
|
modules/logrotate/manifests/init.pp » ('J')
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 filterserver { | 1 class filterserver { |
| 2 user {'subscriptionstat': | 2 user {'subscriptionstat': |
| 3 ensure => present, | 3 ensure => present, |
| 4 home => '/home/subscriptionstat', | 4 home => '/home/subscriptionstat', |
| 5 managehome => true | 5 managehome => true |
| 6 } | 6 } |
| 7 | 7 |
| 8 file {'/home/subscriptionstat/.ssh': | 8 file {'/home/subscriptionstat/.ssh': |
| 9 ensure => directory, | 9 ensure => directory, |
| 10 owner => subscriptionstat, | 10 owner => subscriptionstat, |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 110 source => 'puppet:///modules/filterserver/easylist-downloads.adblockplus.org ', | 110 source => 'puppet:///modules/filterserver/easylist-downloads.adblockplus.org ', |
| 111 enabled => true | 111 enabled => true |
| 112 } | 112 } |
| 113 | 113 |
| 114 file {'/etc/logrotate.d/nginx_easylist-downloads.adblockplus.org': | 114 file {'/etc/logrotate.d/nginx_easylist-downloads.adblockplus.org': |
| 115 ensure => file, | 115 ensure => file, |
| 116 require => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], | 116 require => Nginx::Hostconfig['easylist-downloads.adblockplus.org'], |
| 117 source => 'puppet:///modules/filterserver/logrotate' | 117 source => 'puppet:///modules/filterserver/logrotate' |
| 118 } | 118 } |
| 119 | 119 |
| 120 exec {'ensure_logrotate_status': | |
| 121 command => '/etc/cron.daily/logrotate', | |
| 122 require => File['/etc/logrotate.d/nginx_easylist-downloads.adblockplus.org'] | |
| 123 } | |
| 124 | |
| 125 cron {'logrotate': | |
| 126 ensure => present, | |
| 127 require => [ | |
| 128 Exec['ensure_logrotate_status'] | |
| 129 ], | |
| 130 command => '/usr/sbin/logrotate /etc/logrotate.conf', | |
| 131 user => root, | |
| 132 hour => '0', | |
| 133 minute => '0' | |
| 134 } | |
| 135 | |
| 136 file {'/home/rsync/.ssh': | 120 file {'/home/rsync/.ssh': |
| 137 ensure => directory, | 121 ensure => directory, |
| 138 require => User['rsync'], | 122 require => User['rsync'], |
| 139 owner => rsync, | 123 owner => rsync, |
| 140 mode => 0600; | 124 mode => 0600; |
| 141 } | 125 } |
| 142 | 126 |
| 143 file {'/home/rsync/.ssh/known_hosts': | 127 file {'/home/rsync/.ssh/known_hosts': |
| 144 ensure => file, | 128 ensure => file, |
| 145 require => [ | 129 require => [ |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 209 ensure => present, | 193 ensure => present, |
| 210 require => File['/opt/cron_geoipdb_update.sh'], | 194 require => File['/opt/cron_geoipdb_update.sh'], |
| 211 command => '/opt/cron_geoipdb_update.sh', | 195 command => '/opt/cron_geoipdb_update.sh', |
| 212 user => root, | 196 user => root, |
| 213 hour => 3, | 197 hour => 3, |
| 214 minute => 15, | 198 minute => 15, |
| 215 monthday => 3 | 199 monthday => 3 |
| 216 } | 200 } |
| 217 | 201 |
| 218 } | 202 } |
| OLD | NEW |
