introduce config::global for global configs in conf.d and config::include for vhost snippets in include.d

14 files changed, 46 insertions, 46 deletions

diff --git a/templates/vhosts/gitweb/gitweb.erb b/templates/vhosts/gitweb/gitweb.erb
index 8ba680b..c5cbb5d 100644
--- a/templates/vhosts/gitweb/gitweb.erb
+++ b/templates/vhosts/gitweb/gitweb.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
     ServerAlias <%= serveralias %>
@@ -68,8 +68,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
     ServerAlias <%= serveralias %>
diff --git a/templates/vhosts/passenger/passenger.erb b/templates/vhosts/passenger/passenger.erb
index f5f67b5..41b903b 100644
--- a/templates/vhosts/passenger/passenger.erb
+++ b/templates/vhosts/passenger/passenger.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -58,8 +58,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/perl/perl.erb b/templates/vhosts/perl/perl.erb
index bf31482..0e64da1 100644
--- a/templates/vhosts/perl/perl.erb
+++ b/templates/vhosts/perl/perl.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -73,8 +73,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/php/php.erb b/templates/vhosts/php/php.erb
index 84e5c26..411bfd6 100644
--- a/templates/vhosts/php/php.erb
+++ b/templates/vhosts/php/php.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -76,8 +76,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/php_drupal/php_drupal.erb b/templates/vhosts/php_drupal/php_drupal.erb
index 6c106ce..9d54940 100644
--- a/templates/vhosts/php_drupal/php_drupal.erb
+++ b/templates/vhosts/php_drupal/php_drupal.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -98,8 +98,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/php_joomla/php_joomla.erb b/templates/vhosts/php_joomla/php_joomla.erb
index a5f0d13..4bfef81 100644
--- a/templates/vhosts/php_joomla/php_joomla.erb
+++ b/templates/vhosts/php_joomla/php_joomla.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -27,7 +27,7 @@
     <%- end -%>
     <%- if not ssl_mode.to_s == 'force' then -%>
     <Directory "<%= documentroot %>/">
-        Include conf.d/joomla.inc
+        Include include.d/joomla.inc
 
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
@@ -99,8 +99,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -122,7 +122,7 @@
     AddDefaultCharset <%= default_charset %>
     <%- end -%>
     <Directory "<%= documentroot %>/">
-        Include conf.d/joomla.inc
+        Include include.d/joomla.inc
 
         AllowOverride <%= allow_override %>
         <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
diff --git a/templates/vhosts/php_mediawiki/php_mediawiki.erb b/templates/vhosts/php_mediawiki/php_mediawiki.erb
index c9585f3..cabe0c5 100644
--- a/templates/vhosts/php_mediawiki/php_mediawiki.erb
+++ b/templates/vhosts/php_mediawiki/php_mediawiki.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -71,8 +71,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/php_simplemachine/php_simplemachine.erb b/templates/vhosts/php_simplemachine/php_simplemachine.erb
index 8dc2c46..72f7b38 100644
--- a/templates/vhosts/php_simplemachine/php_simplemachine.erb
+++ b/templates/vhosts/php_simplemachine/php_simplemachine.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -70,8 +70,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/php_spip/php_spip.erb b/templates/vhosts/php_spip/php_spip.erb
index 84e5c26..411bfd6 100644
--- a/templates/vhosts/php_spip/php_spip.erb
+++ b/templates/vhosts/php_spip/php_spip.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -76,8 +76,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/php_typo3/php_typo3.erb b/templates/vhosts/php_typo3/php_typo3.erb
index 75182e1..a22c8ec 100644
--- a/templates/vhosts/php_typo3/php_typo3.erb
+++ b/templates/vhosts/php_typo3/php_typo3.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     AddDefaultCharset utf-8
 
@@ -88,8 +88,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     AddDefaultCharset utf-8
 
diff --git a/templates/vhosts/php_wordpress/php_wordpress.erb b/templates/vhosts/php_wordpress/php_wordpress.erb
index 83f9f4b..980fc26 100644
--- a/templates/vhosts/php_wordpress/php_wordpress.erb
+++ b/templates/vhosts/php_wordpress/php_wordpress.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -75,8 +75,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
index adbe666..4fdd8c2 100644
--- a/templates/vhosts/redirect/redirect.erb
+++ b/templates/vhosts/redirect/redirect.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
     ServerAlias <%= serveralias %>
@@ -22,8 +22,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
     ServerAlias <%= serveralias %>
diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb
index 016ded2..a7aa374 100644
--- a/templates/vhosts/static/static.erb
+++ b/templates/vhosts/static/static.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
     ServerAlias <%= serveralias %>
@@ -58,8 +58,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
     ServerAlias <%= serveralias %>
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb
index bf4f2d2..671ff58 100644
--- a/templates/vhosts/webdav/webdav.erb
+++ b/templates/vhosts/webdav/webdav.erb
@@ -1,7 +1,7 @@
 # <%= servername %>
 <%- unless ssl_mode.to_s == 'only'  then -%>
 <VirtualHost *:80>
-    Include conf.d/defaults.inc
+    Include include.d/defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -43,7 +43,7 @@
         require valid-user
         <%- end -%>
         <%- if ldap_auth.to_s == 'true' then -%>
-        Include conf.d/ldap_auth.inc
+        Include include.d/ldap_auth.inc
         <%- unless ldap_user.to_s == 'any' -%>
         Require ldap-user <%= ldap_user.to_s %>
         <%- else -%>
@@ -75,8 +75,8 @@
 
 <%- unless ssl_mode.to_s == 'false'  then -%>
 <VirtualHost *:443>
-    Include conf.d/defaults.inc
-    Include conf.d/ssl_defaults.inc
+    Include include.d/defaults.inc
+    Include include.d/ssl_defaults.inc
 
     ServerName <%= servername %>
     <%- unless serveralias.to_s.empty? then -%>
@@ -117,7 +117,7 @@
         require valid-user
         <%- end -%>
         <%- if ldap_auth.to_s == 'true' then -%>
-        Include conf.d/ldap_auth.inc
+        Include include.d/ldap_auth.inc
         <%- unless ldap_user.to_s == 'any' -%>
         Require ldap-user <%= ldap_user.to_s %>
         <%- else -%>