change OS-specific vhost templates into links, add Debian (though not all are tested on Debian)

4 files changed, 44 insertions, 42 deletions

diff --git a/templates/vhosts/redirect/CentOS.erb b/templates/vhosts/redirect/CentOS.erb
index 58a2ba5..12a8583 120000
--- a/templates/vhosts/redirect/CentOS.erb
+++ b/templates/vhosts/redirect/CentOS.erb
@@ -1 +1 @@
-OpenBSD.erb
\ No newline at end of file
+redirect.erb
\ No newline at end of file
diff --git a/templates/vhosts/redirect/Debian.erb b/templates/vhosts/redirect/Debian.erb
new file mode 120000
index 0000000..12a8583
--- /dev/null
+++ b/templates/vhosts/redirect/Debian.erb
@@ -0,0 +1 @@
+redirect.erb
\ No newline at end of file
diff --git a/templates/vhosts/redirect/OpenBSD.erb b/templates/vhosts/redirect/OpenBSD.erb
index adbe666..12a8583 100644..120000
--- a/templates/vhosts/redirect/OpenBSD.erb
+++ b/templates/vhosts/redirect/OpenBSD.erb
@@ -1,41 +1 @@
-# <%= servername %>
-<%- unless ssl_mode.to_s == 'only'  then -%>
-<VirtualHost *:80>
-    Include conf.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 conf.d/defaults.inc
-    Include conf.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 -%>
+redirect.erb
\ No newline at end of file
diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb
new file mode 100644
index 0000000..adbe666
--- /dev/null
+++ b/templates/vhosts/redirect/redirect.erb
@@ -0,0 +1,41 @@
+# <%= servername %>
+<%- unless ssl_mode.to_s == 'only'  then -%>
+<VirtualHost *:80>
+    Include conf.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 conf.d/defaults.inc
+    Include conf.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 -%>