From 9513cf4a201d0e7148aa5f0db490a29a02611b19 Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 23 Dec 2009 15:24:09 -0500 Subject: change OS-specific vhost templates into links, add Debian (though not all are tested on Debian) --- templates/vhosts/redirect/CentOS.erb | 2 +- templates/vhosts/redirect/Debian.erb | 1 + templates/vhosts/redirect/OpenBSD.erb | 42 +--------------------------------- templates/vhosts/redirect/redirect.erb | 41 +++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 42 deletions(-) create mode 120000 templates/vhosts/redirect/Debian.erb mode change 100644 => 120000 templates/vhosts/redirect/OpenBSD.erb create mode 100644 templates/vhosts/redirect/redirect.erb (limited to 'templates/vhosts/redirect') 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 deleted file mode 100644 index adbe666..0000000 --- a/templates/vhosts/redirect/OpenBSD.erb +++ /dev/null @@ -1,41 +0,0 @@ -# <%= servername %> -<%- unless ssl_mode.to_s == 'only' then -%> - - 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 -%> - -<%- end -%> - -<%- unless ssl_mode.to_s == 'false' then -%> - - 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 %> - - -<%- end -%> diff --git a/templates/vhosts/redirect/OpenBSD.erb b/templates/vhosts/redirect/OpenBSD.erb new file mode 120000 index 0000000..12a8583 --- /dev/null +++ b/templates/vhosts/redirect/OpenBSD.erb @@ -0,0 +1 @@ +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 -%> + + 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 -%> + +<%- end -%> + +<%- unless ssl_mode.to_s == 'false' then -%> + + 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 %> + + +<%- end -%> -- cgit v1.2.3 From d2c4bdf792815f0a0f54d717bdec619f03d984ab Mon Sep 17 00:00:00 2001 From: Jerome Charaoui Date: Wed, 23 Dec 2009 16:06:45 -0500 Subject: introduce config::global for global configs in conf.d and config::include for vhost snippets in include.d --- templates/vhosts/redirect/redirect.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'templates/vhosts/redirect') diff --git a/templates/vhosts/redirect/redirect.erb b/templates/vhosts/redirect/redirect.erb index adbe666..4fdd8c2 100644 --- a/templates/vhosts/redirect/redirect.erb +++ b/templates/vhosts/redirect/redirect.erb @@ -1,7 +1,7 @@ # <%= servername %> <%- unless ssl_mode.to_s == 'only' then -%> - Include conf.d/defaults.inc + Include include.d/defaults.inc ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> @@ -22,8 +22,8 @@ <%- unless ssl_mode.to_s == 'false' then -%> - Include conf.d/defaults.inc - Include conf.d/ssl_defaults.inc + Include include.d/defaults.inc + Include include.d/ssl_defaults.inc ServerName <%= servername %> <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> -- cgit v1.2.3