Unified Diff: manifests/webserver.pp
Issue 29325553:
Issue 2974 - Integrate eyeo.com with Hiera (Closed)
Patch Set:
Created Sept. 2, 2015, 1:54 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« hiera/roles/web/eyeo.yaml ('k')
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: manifests/webserver.pp |
| diff --git a/manifests/webserver.pp b/manifests/webserver.pp |
| index 0f0b8b2fbc8cc70f86bfb49a68a169c3af7b0fc3..f7ab08f0d37843eefc60338c9b6f0fbf1c2d23ee 100644 |
| --- a/manifests/webserver.pp |
| +++ b/manifests/webserver.pp |
| @@ -1,36 +1,3 @@ |
| -node 'web1' { |
| - include statsclient |
| - |
| - class {'web::server': |
| - vhost => 'eyeo.com', |
| - certificate => 'eyeo.com_sslcert.pem', |
| - private_key => 'eyeo.com_sslcert.key', |
| - is_default => true, |
| - aliases => ['www.eyeo.com', 'eyeo.de', 'www.eyeo.de'], |
| - custom_config => ' |
| - rewrite ^(/de)?/index\.html$ / permanent; |
| - rewrite ^(/de)?/job\.html$ /jobs permanent; |
| - |
| - location ~ ^(/[^/]+/jobs)/ |
| - { |
| - error_page 404 $1/not-available; |
| - } |
| - ', |
| - repository => 'web.eyeo.com', |
| - multiplexer_locations => ['/formmail'], |
| - } |
| - |
| - concat::fragment {'formmail_template': |
| - target => '/etc/sitescripts.ini', |
| - content => '[DEFAULT] |
| -mailer=/usr/sbin/sendmail |
| -[multiplexer] |
| -sitescripts.formmail.web.formmail = |
| -[formmail] |
| -template=formmail/template/eyeo.mail', |
| - } |
| -} |
| - |
| node 'web2' { |
| include statsclient |
« no previous file with comments
|
« hiera/roles/web/eyeo.yaml ('k')
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
no next file with comments »
