Side by Side Diff: modules/sitescripts/manifests/init.pp
Issue 5988173083574272:
Issue 1805 - ensure_dependencies.py needs to be called after updating sitescripts repository (Closed)
Patch Set: Changed call parameters now that #1806 and #1807 are resolved
Created Jan. 15, 2015, 10:56 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
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 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 17 matching lines...) Expand all Loading... | |
| 28 | 28 |
| 29 exec { "fetch_sitescripts": | 29 exec { "fetch_sitescripts": |
| 30 command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts ", | 30 command => "hg clone https://hg.adblockplus.org/sitescripts /opt/sitescripts ", |
| 31 path => ["/usr/bin/", "/bin/"], | 31 path => ["/usr/bin/", "/bin/"], |
| 32 require => Package['mercurial'], | 32 require => Package['mercurial'], |
| 33 onlyif => "test ! -d /opt/sitescripts" | 33 onlyif => "test ! -d /opt/sitescripts" |
| 34 } | 34 } |
| 35 | 35 |
| 36 cron {"update_sitescripts": | 36 cron {"update_sitescripts": |
| 37 ensure => present, | 37 ensure => present, |
| 38 command => "hg pull -q -u -R /opt/sitescripts", | 38 command => "hg pull -q -u -R /opt/sitescripts && /opt/sitescripts/ensure_dep endencies.py -q", |
| 39 environment => ['MAILTO=admins@adblockplus.org,root'], | 39 environment => ['MAILTO=admins@adblockplus.org,root'], |
| 40 user => root, | 40 user => root, |
| 41 require => Exec["fetch_sitescripts"], | 41 require => Exec["fetch_sitescripts"], |
| 42 } | 42 } |
| 43 } | 43 } |
| OLD | NEW |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
