Unified Diff: modules/downloadserver/manifests/init.pp
Issue 29329601:
Issue 123 - Integrate downloadserver cron::environment with Hiera (Closed)
Patch Set:
Created Nov. 2, 2015, 11:49 a.m.
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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: modules/downloadserver/manifests/init.pp |
| diff --git a/modules/downloadserver/manifests/init.pp b/modules/downloadserver/manifests/init.pp |
| index b20ea6a25a044f2ba2261ec14eee2550b1e24ed8..73300a1f438933675a51a6ed21cab35c2f52658a 100644 |
| --- a/modules/downloadserver/manifests/init.pp |
| +++ b/modules/downloadserver/manifests/init.pp |
| @@ -75,7 +75,7 @@ class downloadserver( |
| cron {'mirror': |
| ensure => present, |
| command => 'hg pull -q -u -R /var/www/downloads/', |
| - environment => ['MAILTO=admins@adblockplus.org,root'], |
| + environment => hiera('cron::environment', []), |
| user => hg, |
| minute => '*/10' |
| } |
| @@ -125,7 +125,7 @@ class downloadserver( |
| File['/home/rsync/.ssh/id_rsa'], |
| File['/var/www/devbuilds']], |
| command => 'rsync -e ssh -ltprz --delete devbuilds@ssh.adblockplus.org:. /var/www/devbuilds', |
| - environment => ['MAILTO=admins@adblockplus.org,root'], |
| + environment => hiera('cron::environment', []), |
| user => rsync, |
| hour => '*', |
| minute => '4-54/10' |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
