summaryrefslogtreecommitdiff
path: root/manifests/defines
diff options
context:
space:
mode:
Diffstat (limited to 'manifests/defines')
-rw-r--r--manifests/defines/vhost_files.pp3
-rw-r--r--manifests/defines/vhost_varieties.pp14
2 files changed, 17 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,