Unified Diff: manifests/webserver.pp
Issue 6484340657618944:
Issue 2168 - Unbreak web2 configuration (Closed)
Patch Set:
Created March 18, 2015, 8:16 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
modules/private-stub/hiera/hosts.yaml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: manifests/webserver.pp |
| =================================================================== |
| --- a/manifests/webserver.pp |
| +++ b/manifests/webserver.pp |
| @@ -22,24 +22,20 @@ mailer=/usr/sbin/sendmail |
| [multiplexer] |
| sitescripts.formmail.web.formmail = |
| [formmail] |
| template=formmail/template/eyeo.mail', |
| } |
| } |
| node 'web2' { |
| - include base, statsclient |
| + include statsclient |
| class {'web::server': |
| vhost => 'beta.adblockplus.org', |
| certificate => 'beta.adblockplus.org_sslcert.pem', |
| private_key => 'beta.adblockplus.org_sslcert.key', |
| is_default => true, |
| repository => 'web.adblockplus.org', |
| # Hack: This server doesn't need multiplexer but it needs sitescripts |
| multiplexer_locations => [], |
| } |
| - |
| - class {'nagios::client': |
| - server_address => 'monitoring.adblockplus.org' |
| - } |
| } |
« no previous file with comments
|
« no previous file
|
modules/private-stub/hiera/hosts.yaml » ('j')
|
modules/private-stub/hiera/hosts.yaml » ('J')
