diff options
| -rw-r--r-- | manifests/defines/vhost_files.pp | 3 | ||||
| -rw-r--r-- | manifests/defines/vhost_varieties.pp | 14 | ||||
| -rw-r--r-- | templates/vhosts/perl/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_joomla/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_simplemachine/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/php_wordpress/CentOS.erb | 3 | ||||
| -rw-r--r-- | templates/vhosts/static/OpenBSD.erb | 3 |
8 files changed, 35 insertions, 0 deletions
diff --git a/manifests/defines/vhost_files.pp b/manifests/defines/vhost_files.pp index 5343d22..9b0c868 100644 --- a/manifests/defines/vhost_files.pp +++ b/manifests/defines/vhost_files.pp @@ -21,6 +21,7 @@ define apache::vhost( $content = 'absent', $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $allow_override = 'None', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', @@ -56,6 +57,7 @@ define apache::vhost( path => $path, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, php_upload_tmp_dir => $php_upload_tmp_dir, php_session_save_path => $php_session_save_path, cgi_binpath => $cgi_binpath, @@ -192,6 +194,7 @@ define apache::vhost::template( $path = 'absent', $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $allow_override = 'None', $php_upload_tmp_dir = 'absent', $php_session_save_path = 'absent', diff --git a/manifests/defines/vhost_varieties.pp b/manifests/defines/vhost_varieties.pp index 85fc8b9..3fe557b 100644 --- a/manifests/defines/vhost_varieties.pp +++ b/manifests/defines/vhost_varieties.pp @@ -20,6 +20,7 @@ define apache::vhost::static( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $owner = root, $group = 0, @@ -59,6 +60,7 @@ define apache::vhost::static( vhost_destination => $vhost_destination, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, allow_override => $allow_override, do_includes => $do_includes, options => $options, @@ -81,6 +83,7 @@ define apache::vhost::php::standard( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $template_mode = 'php', $owner = root, @@ -139,6 +142,7 @@ define apache::vhost::php::standard( vhost_destination => $vhost_destination, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, run_mode => $run_mode, run_uid => $run_uid, run_gid => $run_gid, @@ -166,6 +170,7 @@ define apache::vhost::php::joomla( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $owner = root, $group = 0, @@ -208,6 +213,7 @@ define apache::vhost::php::joomla( ensure => $ensure, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, path => $path, template_mode => 'php_joomla', owner => $owner, @@ -263,6 +269,7 @@ define apache::vhost::php::wordpress( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $owner = root, $group = 0, @@ -304,6 +311,7 @@ define apache::vhost::php::wordpress( ensure => $ensure, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, path => $path, template_mode => 'php_wordpress', owner => $owner, @@ -346,6 +354,7 @@ define apache::vhost::php::simplemachine( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $owner = root, $group = 0, @@ -386,6 +395,7 @@ define apache::vhost::php::simplemachine( ensure => $ensure, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, path => $path, template_mode => 'php_simplemachine', owner => $owner, @@ -428,6 +438,7 @@ define apache::vhost::modperl( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $owner = root, $group = 0, @@ -493,6 +504,7 @@ define apache::vhost::modperl( vhost_destination => $vhost_destination, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, run_mode => $run_mode, run_uid => $run_uid, run_gid => $run_gid, @@ -519,6 +531,7 @@ define apache::vhost::php::webapp( $ensure = present, $domain = 'absent', $domainalias = 'absent', + $server_admin = 'absent', $path = 'absent', $template_mode, $owner = root, @@ -582,6 +595,7 @@ define apache::vhost::php::webapp( ensure => $ensure, domain => $domain, domainalias => $domainalias, + server_admin => $server_admin, path => $path, template_mode => $template_mode, owner => $owner, 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 |