migrating a first part over to the new partial style

5 files changed, 8 insertions, 63 deletions

diff --git a/templates/vhosts/static/CentOS.erb b/templates/vhosts/static/CentOS.erb
deleted file mode 120000
index f10517f..0000000
--- a/templates/vhosts/static/CentOS.erb
+++ /dev/null
@@ -1 +0,0 @@
-static.erb
\ No newline at end of file
diff --git a/templates/vhosts/static/Debian.erb b/templates/vhosts/static/Debian.erb
deleted file mode 120000
index f10517f..0000000
--- a/templates/vhosts/static/Debian.erb
+++ /dev/null
@@ -1 +0,0 @@
-static.erb
\ No newline at end of file
diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb
deleted file mode 120000
index f10517f..0000000
--- a/templates/vhosts/static/OpenBSD.erb
+++ /dev/null
@@ -1 +0,0 @@
-static.erb
\ No newline at end of file
diff --git a/templates/vhosts/static/partial.erb b/templates/vhosts/static/partial.erb
new file mode 100644
index 0000000..03bd2f8
--- /dev/null
+++ b/templates/vhosts/static/partial.erb
@@ -0,0 +1,8 @@
+    <Directory "<%= documentroot %>/">
+        AllowOverride <%= allow_override %>
+        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
+        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
+
+        <%- end -%>
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+    </Directory>
\ No newline at end of file
diff --git a/templates/vhosts/static/static.erb b/templates/vhosts/static/static.erb
deleted file mode 100644
index e8e278b..0000000
--- a/templates/vhosts/static/static.erb
+++ /dev/null
@@ -1,60 +0,0 @@
-# <%= servername %>
-<%- 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 not ssl_mode.to_s == 'force' then -%>
-    <Directory "<%= documentroot %>/">
-        AllowOverride <%= allow_override %>
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%- unless options.to_s == 'absent' then -%><%= options %><%- end -%><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
-
-        <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Directory>
-    <%- 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') %>
-
-    <Directory "<%= documentroot %>/">
-        AllowOverride <%= allow_override %>
-        <%- if options.to_s != 'absent' or do_includes.to_s == 'true' then -%>
-        Options <%= options %><%- if do_includes.to_s == 'true' and not options.include?('+Includes') then -%> +Includes<%- end -%>
-
-        <%- end -%>
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Directory>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>