12 files changed, 23 insertions, 0 deletions
diff --git a/manifests/vhost/template.pp b/manifests/vhost/template.pp
index 26f5bd2..84e7f33 100644
--- a/manifests/vhost/template.pp
+++ b/manifests/vhost/template.pp
@@ -13,6 +13,7 @@
 #   - false: don't enable ssl for this vhost (default)
 #   - true: enable ssl for this vhost
 #   - force: enable ssl and redirect non-ssl to ssl
+#   - only: enable ssl only
 #
 define apache::vhost::template(
     $ensure = present,
diff --git a/templates/vhosts/gitweb/CentOS.erb b/templates/vhosts/gitweb/CentOS.erb
index 15a81fc..33b9624 100644
--- a/templates/vhosts/gitweb/CentOS.erb
+++ b/templates/vhosts/gitweb/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
     ServerName <%= servername %>
@@ -47,6 +48,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/passenger/CentOS.erb b/templates/vhosts/passenger/CentOS.erb
index 3c27f48..4e515c7 100644
--- a/templates/vhosts/passenger/CentOS.erb
+++ b/templates/vhosts/passenger/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -51,6 +52,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb
index f77a196..5eca429 100644
--- a/templates/vhosts/perl/CentOS.erb
+++ b/templates/vhosts/perl/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -66,6 +67,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb
index afba3ce..f18e8c6 100644
--- a/templates/vhosts/php/CentOS.erb
+++ b/templates/vhosts/php/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -60,6 +61,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/php_drupal/CentOS.erb b/templates/vhosts/php_drupal/CentOS.erb
index 0b51c3b..267f393 100644
--- a/templates/vhosts/php_drupal/CentOS.erb
+++ b/templates/vhosts/php_drupal/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -85,6 +86,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb
index fb8a49f..bc98cdb 100644
--- a/templates/vhosts/php_joomla/CentOS.erb
+++ b/templates/vhosts/php_joomla/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -86,6 +87,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/php_mediawiki/CentOS.erb b/templates/vhosts/php_mediawiki/CentOS.erb
index ce43055..9d2b9a2 100644
--- a/templates/vhosts/php_mediawiki/CentOS.erb
+++ b/templates/vhosts/php_mediawiki/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -61,6 +62,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/php_simplemachine/CentOS.erb b/templates/vhosts/php_simplemachine/CentOS.erb
index 271aea8..8ccaaba 100644
--- a/templates/vhosts/php_simplemachine/CentOS.erb
+++ b/templates/vhosts/php_simplemachine/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -60,6 +61,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb
index ff46637..f12ab6f 100644
--- a/templates/vhosts/php_wordpress/CentOS.erb
+++ b/templates/vhosts/php_wordpress/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -62,6 +63,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb
index 3f95989..6ba3cf3 100644
--- a/templates/vhosts/static/OpenBSD.erb
+++ b/templates/vhosts/static/OpenBSD.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
     ServerName <%= servername %>
@@ -38,6 +39,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
diff --git a/templates/vhosts/webdav/CentOS.erb b/templates/vhosts/webdav/CentOS.erb
index d7c685b..4b2bb0d 100644
--- a/templates/vhosts/webdav/CentOS.erb
+++ b/templates/vhosts/webdav/CentOS.erb
@@ -1,4 +1,5 @@
 # <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
     Include conf.d/defaults.inc
 
@@ -68,6 +69,7 @@
     <%= additional_options %>
     <%- end -%>
 </VirtualHost>
+<%- end -%>
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>