migrating a first part over to the new partial style

5 files changed, 8 insertions, 60 deletions

diff --git a/templates/vhosts/proxy/CentOS.erb b/templates/vhosts/proxy/CentOS.erb
deleted file mode 120000
index 15a1b7c..0000000
--- a/templates/vhosts/proxy/CentOS.erb
+++ /dev/null
@@ -1 +0,0 @@
-proxy.erb
\ No newline at end of file
diff --git a/templates/vhosts/proxy/Debian.erb b/templates/vhosts/proxy/Debian.erb
deleted file mode 120000
index 15a1b7c..0000000
--- a/templates/vhosts/proxy/Debian.erb
+++ /dev/null
@@ -1 +0,0 @@
-proxy.erb
\ No newline at end of file
diff --git a/templates/vhosts/proxy/OpenBSD.erb b/templates/vhosts/proxy/OpenBSD.erb
deleted file mode 120000
index 15a1b7c..0000000
--- a/templates/vhosts/proxy/OpenBSD.erb
+++ /dev/null
@@ -1 +0,0 @@
-proxy.erb
\ No newline at end of file
diff --git a/templates/vhosts/proxy/partial.erb b/templates/vhosts/proxy/partial.erb
new file mode 100644
index 0000000..f0d4c9d
--- /dev/null
+++ b/templates/vhosts/proxy/partial.erb
@@ -0,0 +1,8 @@
+    <Proxy *>
+      Order deny,allow
+      Allow from all
+<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
+    </Proxy>
+    ProxyRequests Off
+    ProxyPass        /   <%= options %>/
+    ProxyPassReverse /   <%= options %>/
\ No newline at end of file
diff --git a/templates/vhosts/proxy/proxy.erb b/templates/vhosts/proxy/proxy.erb
deleted file mode 100644
index 622dd43..0000000
--- a/templates/vhosts/proxy/proxy.erb
+++ /dev/null
@@ -1,57 +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]
-    <% else -%>
-    <Proxy *>
-      Order deny,allow
-      Allow from all
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Proxy>
-    ProxyRequests Off
-    ProxyPass        /   <%= options %>/
-    ProxyPassReverse /   <%= options %>/
-    <%- 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') %>
-
-<%= scope.function_template('apache/vhosts/partials/mod_security.erb') %>
-
-    <Proxy *>
-      Order deny,allow
-      Allow from all
-<%= scope.function_template('apache/vhosts/partials/authentication.erb') %>
-    </Proxy>
-    ProxyRequests Off
-    ProxyPass        /   <%= options %>/
-    ProxyPassReverse /   <%= options %>/
-
-    <%- unless additional_options.to_s == 'absent' then -%>
-    <%= additional_options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>