From 993a9d78da916fb1be46170fc7469a1c08d04ffd Mon Sep 17 00:00:00 2001 From: andreas Date: Sat, 25 Apr 2009 18:44:02 +0000 Subject: server_admin variable for ServerAdmin line in vhosts --- templates/vhosts/perl/CentOS.erb | 3 +++ templates/vhosts/php/CentOS.erb | 3 +++ templates/vhosts/php_joomla/CentOS.erb | 3 +++ templates/vhosts/php_simplemachine/CentOS.erb | 3 +++ templates/vhosts/php_wordpress/CentOS.erb | 3 +++ templates/vhosts/static/OpenBSD.erb | 3 +++ 6 files changed, 18 insertions(+) (limited to 'templates/vhosts') diff --git a/templates/vhosts/perl/CentOS.erb b/templates/vhosts/perl/CentOS.erb index c03433d..eecd290 100644 --- a/templates/vhosts/perl/CentOS.erb +++ b/templates/vhosts/perl/CentOS.erb @@ -6,6 +6,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> + <%- unless server_admin.to_s.empty? 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 cf7b5bd..1d31f5e 100644 --- a/templates/vhosts/php/CentOS.erb +++ b/templates/vhosts/php/CentOS.erb @@ -6,6 +6,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> + <%- unless server_admin.to_s.empty? 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 65d485a..3e61a7a 100644 --- a/templates/vhosts/php_joomla/CentOS.erb +++ b/templates/vhosts/php_joomla/CentOS.erb @@ -6,6 +6,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> + <%- unless server_admin.to_s.empty? 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 75ea550..d4a4b08 100644 --- a/templates/vhosts/php_simplemachine/CentOS.erb +++ b/templates/vhosts/php_simplemachine/CentOS.erb @@ -6,6 +6,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> + <%- unless server_admin.to_s.empty? 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 5f8b2b6..a327f07 100644 --- a/templates/vhosts/php_wordpress/CentOS.erb +++ b/templates/vhosts/php_wordpress/CentOS.erb @@ -6,6 +6,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> + <%- unless server_admin.to_s.empty? 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 5abbd5c..d3cea21 100644 --- a/templates/vhosts/static/OpenBSD.erb +++ b/templates/vhosts/static/OpenBSD.erb @@ -5,6 +5,9 @@ <%- unless serveralias.to_s.empty? then -%> ServerAlias <%= serveralias %> <%- end -%> + <%- unless server_admin.to_s.empty? then -%> + ServerAdmin <%= server_admin %> + <%- end -%> DocumentRoot <%= documentroot %>/ ErrorLog <%= logdir %>/error_log -- cgit v1.2.3