diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 19:42:44 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-19 19:42:44 -0200 |
| commit | 4d1b391d0284d04be05801102b11cc7d36c8824e (patch) | |
| tree | 1936daa9bb2869e7a3592f6371236a1f5a61868d | |
| parent | 5b8827a1b5bbf04e17a31be00d8cdd599362c9d3 (diff) | |
| download | puppet-nodo-4d1b391d0284d04be05801102b11cc7d36c8824e.tar.gz puppet-nodo-4d1b391d0284d04be05801102b11cc7d36c8824e.tar.bz2 | |
Renaming $apache_https_proxy to $nodo_https_proxy
| -rw-r--r-- | manifests/master.pp | 2 | ||||
| -rw-r--r-- | manifests/subsystems/websites.pp | 3 | ||||
| -rw-r--r-- | manifests/vserver.pp | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/manifests/master.pp b/manifests/master.pp index 2bb5898..e355e8e 100644 --- a/manifests/master.pp +++ b/manifests/master.pp @@ -37,7 +37,7 @@ class nodo::master { } # We should run master nodes web server behind an HTTPS proxy - $apache_https_proxy = 'yes' + $nodo_https_proxy = 'yes' # These should be included after puppetmaster include nodo::vserver diff --git a/manifests/subsystems/websites.pp b/manifests/subsystems/websites.pp index 2968a3f..764ed97 100644 --- a/manifests/subsystems/websites.pp +++ b/manifests/subsystems/websites.pp @@ -1,8 +1,7 @@ class websites::setup { # Include apache - # TODO: find a better way to pass parameters class { 'apache': - https_proxy => $apache_https_proxy, + https_proxy => $nodo_https_proxy, } # The needed apache modules diff --git a/manifests/vserver.pp b/manifests/vserver.pp index c39c9fe..fdd8ed2 100644 --- a/manifests/vserver.pp +++ b/manifests/vserver.pp @@ -35,7 +35,7 @@ class nodo::vserver inherits nodo { Monkeysphere_host <<| title == $hostname |>> # Set proxy configuration - $apache_https_proxy = 'yes' + $nodo_https_proxy = 'yes' } "third-party": { # Apply munin and monkeysphere configuration for |