From d82e8fc0b1a0b60d1c0c1cef4da02e30feb86d33 Mon Sep 17 00:00:00 2001 From: mh Date: Sun, 26 Apr 2009 12:37:52 +0000 Subject: fixing ServerAdmin stuff ServerAdmin was missing for ssl vhosts ServerAdmin was set if the variable have been set to 'absent' --- templates/vhosts/perl/CentOS.erb | 5 ++++- templates/vhosts/php/CentOS.erb | 5 ++++- templates/vhosts/php_joomla/CentOS.erb | 5 ++++- templates/vhosts/php_simplemachine/CentOS.erb | 5 ++++- templates/vhosts/php_wordpress/CentOS.erb | 7 +++++-- templates/vhosts/static/OpenBSD.erb | 5 ++++- 6 files changed, 25 insertions(+), 7 deletions(-) (limited to 'templates/vhosts') diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb index eecd290..6566090 100644 --- a/templates/vhosts/perl/CentOS.erb +++ b/templates/vhosts/perl/CentOS.erb @@ -6,7 +6,7 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> - <%- unless server_admin.to_s.empty? then -%> + <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> ServerAdmin <%= server_admin %> <%- end -%> DocumentRoot <%= documentroot %>/ @@ -76,6 +76,9 @@ <%- 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 -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log diff --git a/templates/vhosts/php/CentOS.erb b/templates/vhosts/php/CentOS.erb index 1d31f5e..5138a73 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -6,7 +6,7 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> - <%- unless server_admin.to_s.empty? then -%> + <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> ServerAdmin <%= server_admin %> <%- end -%> DocumentRoot <%= documentroot %>/ @@ -70,6 +70,9 @@ <%- 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 -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log diff --git a/templates/vhosts/php_joomla/CentOS.erb b/templates/vhosts/php_joomla/CentOS.erb index 3e61a7a..ac81dff 100644 --- a/templates/vhosts/php_joomla/CentOS.erb +++ b/templates/vhosts/php_joomla/CentOS.erb @@ -6,7 +6,7 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> - <%- unless server_admin.to_s.empty? then -%> + <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> ServerAdmin <%= server_admin %> <%- end -%> DocumentRoot <%= documentroot %>/ @@ -96,6 +96,9 @@ <%- 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 -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log diff --git a/templates/vhosts/php_simplemachine/CentOS.erb b/templates/vhosts/php_simplemachine/CentOS.erb index d4a4b08..4f8eb57 100644 --- a/templates/vhosts/php_simplemachine/CentOS.erb +++ b/templates/vhosts/php_simplemachine/CentOS.erb @@ -6,7 +6,7 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> - <%- unless server_admin.to_s.empty? then -%> + <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> ServerAdmin <%= server_admin %> <%- end -%> DocumentRoot <%= documentroot %>/ @@ -70,6 +70,9 @@ <%- 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 -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log diff --git a/templates/vhosts/php_wordpress/CentOS.erb b/templates/vhosts/php_wordpress/CentOS.erb index a327f07..93ee1d8 100644 --- a/templates/vhosts/php_wordpress/CentOS.erb +++ b/templates/vhosts/php_wordpress/CentOS.erb @@ -6,9 +6,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> - <%- unless server_admin.to_s.empty? then -%> + <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> ServerAdmin <%= server_admin %> - <%- end -%> + <%- end -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log @@ -72,6 +72,9 @@ <%- 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 -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log diff --git a/templates/vhosts/static/OpenBSD.erb b/templates/vhosts/static/OpenBSD.erb index d3cea21..91d578d 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -5,7 +5,7 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> - <%- unless server_admin.to_s.empty? then -%> + <%- unless server_admin.to_s.empty? or server_admin.to_s == 'absent' then -%> ServerAdmin <%= server_admin %> <%- end -%> DocumentRoot <%= documentroot %>/ @@ -47,6 +47,9 @@ <%- 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 -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log -- cgit v1.2.3