diff options
| author | mh <mh@immerda.ch> | 2009-04-26 12:37:52 +0000 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2009-04-26 12:37:52 +0000 |
| commit | d82e8fc0b1a0b60d1c0c1cef4da02e30feb86d33 (patch) | |
| tree | 27341e38ac74b39d0c02f5ccc8dfe5ea7a123056 /templates/vhosts/php_joomla | |
| parent | 993a9d78da916fb1be46170fc7469a1c08d04ffd (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_joomla')
| -rw-r--r-- | templates/vhosts/php_joomla/CentOS.erb | 5 |
1 files changed, 4 insertions, 1 deletions
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 |