Commit b0f90cc2 authored by mh's avatar mh
Browse files

upgrade api to the new way

parent 5bed1390
......@@ -43,6 +43,7 @@ define webhosting::modperl(
$default_charset = 'absent',
$ssl_mode = false,
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -140,4 +141,9 @@ define webhosting::modperl(
}
}
}
if ($template_partial != 'absent') {
Apache::Vhost::Modperl[$name]{
template_partial => $template_partial,
}
}
}
......@@ -20,12 +20,6 @@
# - absent: $name will be passed
# - any: any authenticated ldap user will work
# - everything else will be used as a required ldap username
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -61,11 +55,11 @@ define webhosting::php(
$default_charset = 'absent',
$php_use_smarty = false,
$php_use_pear = false,
$php_safe_mode = true,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$ssl_mode = false,
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -133,11 +127,8 @@ define webhosting::php(
options => $options,
additional_options => $additional_options,
default_charset => $default_charset,
php_use_smarty => $php_use_smarty,
php_use_pear => $php_use_pear,
php_safe_mode => $php_safe_mode,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_default_charset => $php_default_charset,
php_settings => $php_settings,
php_options => $php_options,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
vhost_mode => $vhost_mode,
......@@ -182,5 +173,10 @@ define webhosting::php(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Standard[$name]{
template_partial => $template_partial
}
}
}
......@@ -48,9 +48,10 @@ define webhosting::php::drupal(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_options = {},
$php_settings = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -117,8 +118,8 @@ define webhosting::php::drupal(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -189,4 +190,9 @@ define webhosting::php::drupal(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Drupal[$name]{
template_partial => $template_partial,
}
}
}
......@@ -48,9 +48,10 @@ define webhosting::php::gallery2(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -103,11 +104,6 @@ define webhosting::php::gallery2(
}
$documentroot = "${path}/www"
$real_php_safe_mode_exec_bins = $php_safe_mode_exec_bins ? {
'absent' => [ '/usr/bin/convert', '/usr/bin/composite', '/usr/bin/identify' ],
default => "${php_safe_mode_exec_bins}"
}
apache::vhost::php::gallery2{"${name}":
ensure => $ensure,
domainalias => $domainalias,
......@@ -121,8 +117,8 @@ define webhosting::php::gallery2(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $real_php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -192,4 +188,10 @@ define webhosting::php::gallery2(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Gallery2[$name]{
template_partial => $template_partial
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -116,8 +110,8 @@ define webhosting::php::joomla(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -187,4 +181,9 @@ define webhosting::php::joomla(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Joomla[$name]{
template_partial => $template_partial,
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -47,9 +41,10 @@ define webhosting::php::mediawiki(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -119,8 +114,8 @@ define webhosting::php::mediawiki(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -184,5 +179,10 @@ define webhosting::php::mediawiki(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Mediawiki[$name]{
template_partial => $template_partial
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -48,9 +42,10 @@ define webhosting::php::silverstripe(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -116,8 +111,8 @@ define webhosting::php::silverstripe(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -187,4 +182,9 @@ define webhosting::php::silverstripe(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Silverstripe[$name]{
template_partial => $template_partial,
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -48,9 +42,10 @@ define webhosting::php::simplemachine(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -116,8 +111,8 @@ define webhosting::php::simplemachine(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -187,4 +182,9 @@ define webhosting::php::simplemachine(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Simplemachine[$name]{
template_partial => $template_partial
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -48,9 +42,10 @@ define webhosting::php::spip(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -112,8 +107,8 @@ define webhosting::php::spip(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_setttings => $php_setttings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -149,4 +144,9 @@ define webhosting::php::spip(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Spip[$name]{
template_partial => $template_partial
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -48,9 +42,10 @@ define webhosting::php::typo3(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_options = {},
$php_settings = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -116,8 +111,8 @@ define webhosting::php::typo3(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -187,4 +182,9 @@ define webhosting::php::typo3(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Typo3[$name]{
template_partial => $template_partial,
}
}
}
......@@ -11,12 +11,6 @@
# and run_uid and run_gid are used as vhost users
# run_uid: the uid the vhost should run as with the itk module
# run_gid: the gid the vhost should run as with the itk module
# php_safe_mode_exec_bins: An array of local binaries which should be linked in the
# safe_mode_exec_bin for this hosting
# *default*: None
# php_default_charset: default charset header for php.
# *default*: absent, which will set the same as default_charset
# of apache
#
# logmode:
# - default: Do normal logging to CustomLog and ErrorLog
......@@ -50,9 +44,10 @@ define webhosting::php::wordpress(
$additional_options = 'absent',
$default_charset = 'absent',
$ssl_mode = false,
$php_safe_mode_exec_bins = 'absent',
$php_default_charset = 'absent',
$php_settings = {},
$php_options = {},
$vhost_mode = 'template',
$template_partial = 'absent',
$vhost_source = 'absent',
$vhost_destination = 'absent',
$htpasswd_file = 'absent',
......@@ -118,8 +113,8 @@ define webhosting::php::wordpress(
default_charset => $default_charset,
run_mode => $run_mode,
ssl_mode => $ssl_mode,
php_default_charset => $php_default_charset,
php_safe_mode_exec_bins => $php_safe_mode_exec_bins,
php_settings => $php_settings,
php_options => $php_options,
vhost_mode => $vhost_mode,
vhost_source => $vhost_source,
vhost_destination => $vhost_destination,
......@@ -189,5 +184,10 @@ define webhosting::php::wordpress(
}
}
}
if $template_partial != 'absent' {
Apache::Vhost::Php::Wordpress[$name]{
template_partial => $template_partial,
}
}
}
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