aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache/templates
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2011-11-09 22:14:05 +0000
committerNicolas Vigier <boklm@mageia.org>2011-11-09 22:14:05 +0000
commit5b60bffdc9603975cf9d2642e414b93d1043eb8a (patch)
treea9062cb288fb3e9881f1ffd246c5e4246f0af4c8 /modules/apache/templates
parent0e16990becf746d2f141919b80aab0f1a7cb7e53 (diff)
downloadpuppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar
puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar.gz
puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar.bz2
puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.tar.xz
puppet-5b60bffdc9603975cf9d2642e414b93d1043eb8a.zip
only add NameVirtualHost on port 443 when mod_ssl has been selected
Diffstat (limited to 'modules/apache/templates')
-rw-r--r--modules/apache/templates/customization.conf1
-rw-r--r--modules/apache/templates/ssl.conf1
2 files changed, 1 insertions, 1 deletions
diff --git a/modules/apache/templates/customization.conf b/modules/apache/templates/customization.conf
index 81424c42..41e15e3a 100644
--- a/modules/apache/templates/customization.conf
+++ b/modules/apache/templates/customization.conf
@@ -1,2 +1 @@
NameVirtualHost *:80
-NameVirtualHost *:443
diff --git a/modules/apache/templates/ssl.conf b/modules/apache/templates/ssl.conf
new file mode 100644
index 00000000..bcfe8201
--- /dev/null
+++ b/modules/apache/templates/ssl.conf
@@ -0,0 +1 @@
+NameVirtualHost *:443