Commit ba3771a3 authored by o@immerda.ch's avatar o@immerda.ch
Browse files

pass through configuration hash

this hash shall replace most other parameters in the future
parent cdbe7ce7
......@@ -17,6 +17,7 @@
# - everything else will be used as a required ldap username
define webhosting::common(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -187,6 +188,7 @@ define webhosting::common(
if ($user_access == 'webdav'){
apache::vhost::webdav{"webdav.${name}":
domain => $webdav_domain,
configuration => $configuration,
manage_webdir => false,
path => $vhost_path,
path_is_webdir => true,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::modperl(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -69,6 +70,7 @@ define webhosting::modperl(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -92,6 +94,7 @@ define webhosting::modperl(
}
apache::vhost::modperl{"${name}":
ensure => $ensure,
configuration => $configuration,
domain => $domain,
domainalias => $domainalias,
server_admin => $server_admin,
......
......@@ -24,6 +24,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::passenger(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -88,6 +89,7 @@ define webhosting::passenger(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -114,6 +116,7 @@ define webhosting::passenger(
}
apache::vhost::passenger{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -28,6 +28,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -98,6 +99,7 @@ define webhosting::php(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -127,6 +129,7 @@ define webhosting::php(
}
apache::vhost::php::standard{$name:
ensure => $ensure,
configuration => $configuration,
domain => $domain,
domainalias => $domainalias,
server_admin => $server_admin,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::drupal(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -77,6 +78,7 @@ define webhosting::php::drupal(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -109,6 +111,7 @@ define webhosting::php::drupal(
apache::vhost::php::drupal{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::gallery2(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -76,6 +77,7 @@ define webhosting::php::gallery2(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -108,6 +110,7 @@ define webhosting::php::gallery2(
apache::vhost::php::gallery2{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::joomla(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -76,6 +77,7 @@ define webhosting::php::joomla(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -108,6 +110,7 @@ define webhosting::php::joomla(
apache::vhost::php::joomla{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::mediawiki(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -85,6 +86,7 @@ define webhosting::php::mediawiki(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -119,6 +121,7 @@ define webhosting::php::mediawiki(
apache::vhost::php::mediawiki{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::silverstripe(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -76,6 +77,7 @@ define webhosting::php::silverstripe(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -108,6 +110,7 @@ define webhosting::php::silverstripe(
apache::vhost::php::silverstripe{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::simplemachine(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -76,6 +77,7 @@ define webhosting::php::simplemachine(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -108,6 +110,7 @@ define webhosting::php::simplemachine(
apache::vhost::php::simplemachine{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::spip(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -72,6 +73,7 @@ define webhosting::php::spip(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -104,6 +106,7 @@ define webhosting::php::spip(
apache::vhost::php::spip{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::typo3(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -76,6 +77,7 @@ define webhosting::php::typo3(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -108,6 +110,7 @@ define webhosting::php::typo3(
apache::vhost::php::typo3{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -19,6 +19,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::php::wordpress(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -80,6 +81,7 @@ define webhosting::php::wordpress(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -112,6 +114,7 @@ define webhosting::php::wordpress(
apache::vhost::php::wordpress{$name:
ensure => $ensure,
configuration => $configuration,
domainalias => $domainalias,
server_admin => $server_admin,
logmode => $logmode,
......
......@@ -13,6 +13,7 @@
# - semianonym: Don't log ips for CustomLog, log normal ErrorLog
define webhosting::static(
$ensure = present,
$configuration = {},
$uid = 'absent',
$uid_name = 'absent',
$gid = 'uid',
......@@ -56,6 +57,7 @@ define webhosting::static(
}
webhosting::common{$name:
ensure => $ensure,
configuration => $configuration,
uid => $uid,
uid_name => $real_uid_name,
gid => $gid,
......@@ -74,6 +76,7 @@ define webhosting::static(
}
apache::vhost::static{$name:
ensure => $ensure,
configuration => $configuration,
domain => $domain,
domainalias => $domainalias,
server_admin => $server_admin,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment