Side by Side Diff: modules/sitescripts/manifests/init.pp
Issue 29329120:
Issue 123 - Integrate website cron::envrionment with Hiera (Closed)
Patch Set:
Created Oct. 14, 2015, 4:55 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/private-stub/hiera/base.yaml ('k')
|
modules/web/manifests/server.pp » ('j')
|
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 sitescripts ( | 1 class sitescripts ( |
| 2 $sitescriptsini_source = '', | 2 $sitescriptsini_source = '', |
| 3 $sitescriptsini_content = '', | 3 $sitescriptsini_content = '', |
| 4 ){ | 4 ){ |
| 5 | 5 |
| 6 concat {'/etc/sitescripts.ini': | 6 concat {'/etc/sitescripts.ini': |
| 7 mode => 644, | 7 mode => 644, |
| 8 owner => root, | 8 owner => root, |
| 9 group => root, | 9 group => root, |
| 10 } | 10 } |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 32 exec { "fetch_sitescripts": | 32 exec { "fetch_sitescripts": |
| 33 command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts ", | 33 command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts ", |
| 34 path => ["/usr/bin/", "/bin/"], | 34 path => ["/usr/bin/", "/bin/"], |
| 35 require => Package['mercurial'], | 35 require => Package['mercurial'], |
| 36 onlyif => "test ! -d /opt/sitescripts" | 36 onlyif => "test ! -d /opt/sitescripts" |
| 37 } | 37 } |
| 38 | 38 |
| 39 cron {"update_sitescripts": | 39 cron {"update_sitescripts": |
| 40 ensure => present, | 40 ensure => present, |
| 41 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q", | 41 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q", |
| 42 environment => ['MAILTO=admins@adblockplus.org,root'], | 42 environment => hiera('cron::environment', []), |
| 43 user => root, | 43 user => root, |
| 44 require => Exec["fetch_sitescripts"], | 44 require => Exec["fetch_sitescripts"], |
| 45 } | 45 } |
| 46 } | 46 } |
| OLD | NEW |
« no previous file with comments
|
« modules/private-stub/hiera/base.yaml ('k')
|
modules/web/manifests/server.pp » ('j')
|
no next file with comments »
