aboutsummaryrefslogtreecommitdiffstats
path: root/modules/apache
diff options
context:
space:
mode:
Diffstat (limited to 'modules/apache')
-rw-r--r--modules/apache/manifests/init.pp11
-rw-r--r--modules/apache/templates/customization.conf1
-rw-r--r--modules/apache/templates/ssl.conf1
3 files changed, 12 insertions, 1 deletions
diff --git a/modules/apache/manifests/init.pp b/modules/apache/manifests/init.pp
index d49cadbf..94405a43 100644
--- a/modules/apache/manifests/init.pp
+++ b/modules/apache/manifests/init.pp
@@ -106,6 +106,17 @@ class apache {
require => Package["apache-conf"],
content => template("apache/01_default_ssl_vhost.conf")
}
+
+ file { "ssl.conf":
+ ensure => present,
+ path => "/etc/httpd/conf.d/ssl.conf",
+ content => template("apache/ssl.conf"),
+ require => Package["apache-conf"],
+ notify => Service["apache"],
+ owner => root,
+ group => root,
+ mode => 644,
+ }
}
class mod_wsgi inherits base {
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