aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2012-03-25 12:47:20 +0000
committerMichael Scherer <misc@mageia.org>2012-03-25 12:47:20 +0000
commitcc807e7c63668180a38f62fd7b1b01a0333e4e20 (patch)
treeeeea05a0e8e3e374b273ad479ca28be89460e06b /modules/apache
parente8a1c18d0fadfbfef7e5ddcd8eab19bfab031f8f (diff)
downloadpuppet-cc807e7c63668180a38f62fd7b1b01a0333e4e20.tar
puppet-cc807e7c63668180a38f62fd7b1b01a0333e4e20.tar.gz
puppet-cc807e7c63668180a38f62fd7b1b01a0333e4e20.tar.bz2
puppet-cc807e7c63668180a38f62fd7b1b01a0333e4e20.tar.xz
puppet-cc807e7c63668180a38f62fd7b1b01a0333e4e20.zip
split redirect_ssl in a separate file
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/manifests/init.pp7
-rw-r--r--modules/apache/manifests/vhost/redirect_ssl.pp6
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index 1662eadf..7002aa7d 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -1,11 +1,4 @@
class apache {
- define vhost_redirect_ssl() {
- apache::vhost::base { "redirect_ssl_$name":
- vhost => $name,
- content => template("apache/vhost_ssl_redirect.conf")
- }
- }
-
define vhost_catalyst_app($script, $location = '', $process = 4, $use_ssl = false, $vhost = false) {
include apache::mod::fastcgi
diff --git a/modules/apache/manifests/vhost/redirect_ssl.pp b/modules/apache/manifests/vhost/redirect_ssl.pp
new file mode 100644
index 00000000..3458d59d
--- /dev/null
+++ b/modules/apache/manifests/vhost/redirect_ssl.pp
@@ -0,0 +1,6 @@
+define apache::vhost::redirect_ssl() {
+ apache::vhost::base { "redirect_ssl_$name":
+ vhost => $name,
+ content => template('apache/vhost_ssl_redirect.conf')
+ }
+}