diff options
| -rw-r--r-- | deployment/websites/manifests/forum_proxy.pp | 4 | ||||
| -rw-r--r-- | manifests/nodes/alamut.pp | 2 | ||||
| -rw-r--r-- | modules/apache/manifests/init.pp | 11 | ||||
| -rw-r--r-- | modules/apache/manifests/vhost/reverse_proxy.pp | 10 |
4 files changed, 13 insertions, 14 deletions
diff --git a/deployment/websites/manifests/forum_proxy.pp b/deployment/websites/manifests/forum_proxy.pp index 5048b219..06e9f433 100644 --- a/deployment/websites/manifests/forum_proxy.pp +++ b/deployment/websites/manifests/forum_proxy.pp @@ -1,11 +1,11 @@ class websites::forum_proxy { $web_domain = "forums.$::domain" - apache::vhost_reverse_proxy { $web_domain: + apache::vhost::reverse_proxy { $web_domain: url => "http://$web_domain/", } - apache::vhost_reverse_proxy { "ssl_$web_domain": + apache::vhost::reverse_proxy { "ssl_$web_domain": vhost => $web_domain, use_ssl => true, url => "http://$web_domain/", diff --git a/manifests/nodes/alamut.pp b/manifests/nodes/alamut.pp index e7ac5e0e..b2d28fa3 100644 --- a/manifests/nodes/alamut.pp +++ b/manifests/nodes/alamut.pp @@ -45,7 +45,7 @@ node alamut { # connect to ssl so the proxy do not shoke if trying to # enforce ssl ( note that this has not been tested, maybe this # is uneeded ) - apache::vhost_reverse_proxy { "ssl_forums.$domain": + apache::vhost::reverse_proxy { "ssl_forums.$domain": url => "https://forums.$domain/", vhost => "forums.$domain", use_ssl => true, diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp index 9318a51c..bac1858d 100644 --- a/modules/apache/manifests/init.pp +++ b/modules/apache/manifests/init.pp @@ -27,15 +27,4 @@ class apache { } } - define vhost_reverse_proxy($url, - $vhost = false, - $use_ssl = false) { - include apache::mod::proxy - apache::vhost::base { $name: - use_ssl => $use_ssl, - vhost => $vhost, - content => template("apache/vhost_reverse_proxy.conf") - } - } - } diff --git a/modules/apache/manifests/vhost/reverse_proxy.pp b/modules/apache/manifests/vhost/reverse_proxy.pp new file mode 100644 index 00000000..a6570c2f --- /dev/null +++ b/modules/apache/manifests/vhost/reverse_proxy.pp @@ -0,0 +1,10 @@ +define apache::vhost::reverse_proxy($url, + $vhost = false, + $use_ssl = false) { + include apache::mod::proxy + apache::vhost::base { $name: + use_ssl => $use_ssl, + vhost => $vhost, + content => template('apache/vhost_reverse_proxy.conf') + } +} |