Merge remote-tracking branch 'shared/master' into riseup

Conflicts:
	README

5 files changed, 1 insertions, 44 deletions

diff --git a/templates/vhosts/redirect/CentOS.erb b/templates/vhosts/redirect/CentOS.erb
deleted file mode 120000
index 12a8583..0000000
--- a/templates/vhosts/redirect/CentOS.erb
+++ /dev/null
@@ -1 +0,0 @@
-redirect.erb
\ No newline at end of file
diff --git a/templates/vhosts/redirect/Debian.erb b/templates/vhosts/redirect/Debian.erb
deleted file mode 120000
index 12a8583..0000000
--- a/templates/vhosts/redirect/Debian.erb
+++ /dev/null
@@ -1 +0,0 @@
-redirect.erb
\ No newline at end of file
diff --git a/templates/vhosts/redirect/OpenBSD.erb b/templates/vhosts/redirect/OpenBSD.erb
deleted file mode 120000
index 12a8583..0000000
--- a/templates/vhosts/redirect/OpenBSD.erb
+++ /dev/null
@@ -1 +0,0 @@
-redirect.erb
\ No newline at end of file
diff --git a/templates/vhosts/redirect/partial.erb b/templates/vhosts/redirect/partial.erb
new file mode 100644
index 0000000..3b7af7a
--- /dev/null
+++ b/templates/vhosts/redirect/partial.erb
@@ -0,0 +1 @@
+    Redirect permanent / https://<%= options %>
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
deleted file mode 100644
index 4fdd8c2..0000000
--- a/templates/vhosts/redirect/redirect.erb
+++ /dev/null
@@ -1,41 +0,0 @@
-# <%= servername %>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-    Include include.d/defaults.inc
-    ServerName <%= servername %>
-    <%- unless serveralias.to_s.empty? then -%>
-    ServerAlias <%= serveralias %>
-    <%- end -%>
-    <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%>
-    ServerAdmin <%= server_admin %>
-    <%- end -%>
-
-    ErrorLog logs/redirect_<%= servername %>_error.log
-    CustomLog logs/redirect_<%= servername %>_access.log combined
-    <%- if ssl_mode.to_s == 'force' then -%>
-    Redirect permanent / https://<%= servername %>/
-    <% else -%>
-    Redirect permanent / http://<%= options %>
-    <%- end -%>
-</VirtualHost>
-<%- end -%>
-
-<%- unless ssl_mode.to_s == 'false'  then -%>
-<VirtualHost *:443>
-    Include include.d/defaults.inc
-    Include include.d/ssl_defaults.inc
-    ServerName <%= servername %>
-    <%- unless serveralias.to_s.empty? then -%>
-    ServerAlias <%= serveralias %>
-    <%- end -%>
-    <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%>
-    ServerAdmin <%= server_admin %>
-    <%- end -%>
-
-    ErrorLog logs/redirect_<%= servername %>_error.log
-    CustomLog logs/redirect_<%= servername %>_access.log combined
-
-    Redirect permanent / https://<%= options %>
-
-</VirtualHost>
-<%- end -%>