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/php_wordpress/CentOS.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'templates/vhosts/php_wordpress/CentOS.erb') 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 -- cgit v1.2.3