summaryrefslogtreecommitdiff
path: root/templates/vhosts/php_wordpress
diff options
context:
space:
mode:
authormh <mh@immerda.ch>2009-04-26 12:37:52 +0000
committermh <mh@immerda.ch>2009-04-26 12:37:52 +0000
commitd82e8fc0b1a0b60d1c0c1cef4da02e30feb86d33 (patch)
tree27341e38ac74b39d0c02f5ccc8dfe5ea7a123056 /templates/vhosts/php_wordpress
parent993a9d78da916fb1be46170fc7469a1c08d04ffd (diff)
fixing ServerAdmin stuff
ServerAdmin was missing for ssl vhosts ServerAdmin was set if the variable have been set to 'absent'
Diffstat (limited to 'templates/vhosts/php_wordpress')
-rw-r--r--templates/vhosts/php_wordpress/CentOS.erb7
1 files changed, 5 insertions, 2 deletions
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