Unified Diff: manifests/webserver.pp
Issue 4810150141493248:
Issue 122 - Puppet ENC via Hiera (Closed)
Patch Set:
Created Sept. 8, 2014, 11:56 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« hiera/vagrant.yaml ('K')
|
« manifests/updateserver.pp ('k')
|
modules/base/manifests/init.pp » ('j')
|
modules/base/manifests/init.pp » ('J')
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 86c6983e3a8f02c9c0d8db50df06b6bb2ab8d13d..dde2704dbb0920074ec30202c64d40b0a9f4322c 100644 |
| --- a/manifests/webserver.pp |
| +++ b/manifests/webserver.pp |
| @@ -1,5 +1,5 @@ |
| node 'web1' { |
| - include base, statsclient |
| + include statsclient |
| class {'web::server': |
| vhost => 'eyeo.com', |
| @@ -22,8 +22,4 @@ mailer=/usr/sbin/sendmail |
| [formmail] |
| template=formmail/template/eyeo.mail', |
| } |
| - |
| - class {'nagios::client': |
| - server_address => 'monitoring.adblockplus.org' |
| - } |
| } |
« hiera/vagrant.yaml ('K')
|
« manifests/updateserver.pp ('k')
|
modules/base/manifests/init.pp » ('j')
|
modules/base/manifests/init.pp » ('J')
