Side by Side Diff: modules/web/manifests/server.pp
Issue 5571831209656320:
Fix admin email address (Closed)
Patch Set:
Created Jan. 9, 2014, 10:44 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« modules/filtermaster/manifests/init.pp ('k')
|
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 web::server($vhost, $repository, $multiplexer_locations = undef) { | 1 class web::server($vhost, $repository, $multiplexer_locations = undef) { |
| 2 File { | 2 File { |
| 3 owner => 'root', | 3 owner => 'root', |
| 4 group => 'root', | 4 group => 'root', |
| 5 mode => 0644, | 5 mode => 0644, |
| 6 } | 6 } |
| 7 | 7 |
| 8 Cron { | 8 Cron { |
| 9 environment => ['MAILTO=admin@adblockplus.org', 'PYTHONPATH=/opt/sitescripts '], | 9 environment => ['MAILTO=admins@adblockplus.org', 'PYTHONPATH=/opt/sitescript s'], |
| 10 } | 10 } |
| 11 | 11 |
| 12 include nginx | 12 include nginx |
| 13 | 13 |
| 14 package {['python-jinja2', 'python-markdown']:} | 14 package {['python-jinja2', 'python-markdown']:} |
| 15 | 15 |
| 16 nginx::hostconfig {$vhost: | 16 nginx::hostconfig {$vhost: |
| 17 content => template('web/site.erb'), | 17 content => template('web/site.erb'), |
| 18 enabled => true, | 18 enabled => true, |
| 19 } | 19 } |
| (...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 mode => 755, | 82 mode => 755, |
| 83 } | 83 } |
| 84 | 84 |
| 85 cron {'update_repo': | 85 cron {'update_repo': |
| 86 ensure => present, | 86 ensure => present, |
| 87 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}", | 87 command => "hg pull -q -R /home/www/${repository} && python -m sitescripts.c ms.bin.generate_static_pages /home/www/${repository} /var/www/${vhost}", |
| 88 user => www, | 88 user => www, |
| 89 minute => '*/10', | 89 minute => '*/10', |
| 90 } | 90 } |
| 91 } | 91 } |
| OLD | NEW |
« no previous file with comments
|
« modules/filtermaster/manifests/init.pp ('k')
|
no next file »
|
no next file with comments »
