Side by Side Diff: manifests/webserver.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
|
« manifests/site.pp ('k')
|
modules/logrotate/manifests/init.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 node 'web2' { | 1 node 'web2' { |
| 2 include statsclient | 2 include statsclient |
| 3 | 3 |
| 4 class {'web::server': | 4 class {'web::server': |
| 5 vhost => 'adblockplus.org', | 5 vhost => 'adblockplus.org', |
| 6 certificate => 'adblockplus.org_sslcert.pem', | 6 certificate => 'adblockplus.org_sslcert.pem', |
| 7 private_key => 'adblockplus.org_sslcert.key', | 7 private_key => 'adblockplus.org_sslcert.key', |
| 8 is_default => true, | 8 is_default => true, |
| 9 aliases => ['www.adblockplus.org'], | 9 aliases => ['www.adblockplus.org'], |
| 10 custom_config => template('web/adblockplus.org.conf.erb'), | 10 custom_config => template('web/adblockplus.org.conf.erb'), |
| (...skipping 30 matching lines...) Expand all Loading... | |
| 41 command => "hg clone --noupdate https://hg.adblockplus.org/subscriptionlist $subscriptions_repo", | 41 command => "hg clone --noupdate https://hg.adblockplus.org/subscriptionlist $subscriptions_repo", |
| 42 path => '/usr/local/bin:/usr/bin:/bin', | 42 path => '/usr/local/bin:/usr/bin:/bin', |
| 43 user => 'sitescripts', | 43 user => 'sitescripts', |
| 44 timeout => 0, | 44 timeout => 0, |
| 45 onlyif => "test ! -d $subscriptions_repo", | 45 onlyif => "test ! -d $subscriptions_repo", |
| 46 require => [Package['mercurial'], File[$sitescripts_var_dir]] | 46 require => [Package['mercurial'], File[$sitescripts_var_dir]] |
| 47 } | 47 } |
| 48 | 48 |
| 49 cron {'update_repository_subscriptionlist': | 49 cron {'update_repository_subscriptionlist': |
| 50 ensure => present, | 50 ensure => present, |
| 51 environment => ['MAILTO=admins@adblockplus.org'], | 51 environment => hiera('cron::environment', []), |
| 52 command => "hg pull --quiet --repository $subscriptions_repo", | 52 command => "hg pull --quiet --repository $subscriptions_repo", |
| 53 user => 'sitescripts', | 53 user => 'sitescripts', |
| 54 minute => '*/10', | 54 minute => '*/10', |
| 55 require => Exec['fetch_repository_subscriptionlist'] | 55 require => Exec['fetch_repository_subscriptionlist'] |
| 56 } | 56 } |
| 57 } | 57 } |
| OLD | NEW |
« no previous file with comments
|
« manifests/site.pp ('k')
|
modules/logrotate/manifests/init.pp » ('j')
|
no next file with comments »
