introduce a new template style, less duplicated things, more handy options

2 files changed, 21 insertions, 161 deletions

diff --git a/templates/vhosts/webdav/partial.erb b/templates/vhosts/webdav/partial.erb
new file mode 100644
index 0000000..2f78d7b
--- /dev/null
+++ b/templates/vhosts/webdav/partial.erb
@@ -0,0 +1,21 @@
+    DAVLockDB <%= real_dav_db_dir %>/DAVLock
+    <Directory "<%= documentroot %>/">
+        Dav on
+        AllowOverride None
+        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
+        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- unless options.include?('Indexes') then -%> Indexes<%- end -%>
+
+        <%- else -%>
+        Options Indexes
+
+        <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+        <%- if ldap_auth.to_s == 'true' then -%>
+        Include include.d/ldap_auth.inc
+        <%- unless ldap_user.to_s == 'any' -%>
+        Require ldap-user <%= ldap_user.to_s %>
+        <%- else -%>
+        Require valid-user
+        <%- end -%>
+        <%- end -%>
+    </Directory>
diff --git a/templates/vhosts/webdav/webdav.erb b/templates/vhosts/webdav/webdav.erb
deleted file mode 100644
index ad5f5e4..0000000
--- a/templates/vhosts/webdav/webdav.erb
+++ /dev/null
@@ -1,161 +0,0 @@
-# <%= servername %>
-<%- if run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-<IfDefine HttpdLocal>
-<%- end -%>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:normal) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
-
-    <%- end -%>
-
-    <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
-    <IfModule mpm_itk_module>
-        AssignUserId <%= run_uid+" "+run_gid %>
-    </IfModule>
-
-    <%- end -%>
-    <%- if not ssl_mode.to_s == 'force' then -%>
-    DAVLockDB <%= real_dav_db_dir %>/DAVLock
-    <Directory "<%= documentroot %>/">
-        Dav on
-        AllowOverride None
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- unless options.include?('Indexes') then -%> Indexes<%- end -%>
-
-        <%- else -%>
-        Options Indexes
-
-        <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-        <%- if ldap_auth.to_s == 'true' then -%>
-        Include include.d/ldap_auth.inc
-        <%- unless ldap_user.to_s == 'any' -%>
-        Require ldap-user <%= ldap_user.to_s %>
-        <%- else -%>
-        Require valid-user
-        <%- end -%>
-        <%- end -%>
-    </Directory>
-    <%- end -%>
-
-    <%- unless run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-    <%- end -%>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:ssl) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-    <%- if run_mode.to_s =~ /(proxy\-|static\-)?itk/ -%>
-
-    <IfModule mpm_itk_module>
-        AssignUserId <%= run_uid+" "+run_gid %>
-    </IfModule>
-    <%- end -%>
-
-    DAVLockDB <%= real_dav_db_dir %>/DAVLock
-    <Directory "<%= documentroot %>/">
-        Dav on
-        AllowOverride None
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- unless options.include?('Indexes') then -%> Indexes<%- end -%>
-
-        <%- else -%>
-        Options Indexes
-
-        <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-        <%- if ldap_auth.to_s == 'true' then -%>
-        Include include.d/ldap_auth.inc
-        <%- unless ldap_user.to_s == 'any' -%>
-        Require ldap-user <%= ldap_user.to_s %>
-        <%- else -%>
-        Require valid-user
-        <%- end -%>
-        <%- end -%>
-    </Directory>
-
-    <%- unless run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-    <%- end -%>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-<%- if run_mode.to_s =~ /(proxy\-|static\-)itk/ -%>
-</IfDefine>
-<IfDefine !HttpdLocal>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:normal) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    ProxyPreserveHost On
-    ProxyRequests off
-    ProxyPass / http://127.0.0.1/
-    ProxyPassReverse / http://127.0.0.1/
-
-    <%- if ssl_mode.to_s == 'force' then -%>
-    RewriteEngine On
-    RewriteCond %{HTTPS} !=on
-    RewriteRule (.*) https://%{SERVER_NAME}$1 [R=permanent,L]
-
-    <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-<%  scope.unsetvar('vhost_part')
-  scope.setvar('vhost_part',:ssl) -%> 
-  <%= scope.function_template('apache/vhosts/partials/header_default.erb') %>
-<%  scope.unsetvar('vhost_part') -%>
-
-<%= scope.function_template('apache/vhosts/partials/logs.erb') %>
-
-    ProxyPreserveHost On
-    ProxyRequests off
-    SSLProxyEngine On
-    ProxyPass / https://127.0.0.1/
-    ProxyPassReverse / https://127.0.0.1/
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-</IfDefine>
-<%- end -%>