diff options
| author | mh <mh@immerda.ch> | 2015-02-14 18:04:30 +0100 |
|---|---|---|
| committer | mh <mh@immerda.ch> | 2015-02-14 18:04:30 +0100 |
| commit | 4994912452fa83356c91af9278f5835cd934d47a (patch) | |
| tree | e3391c08ed9fe7fac1d705cb534fbc85fe4eee73 | |
| parent | 677c74d5c8b49c43f2ff68eb580280bba4839264 (diff) | |
make it possible to set the php installation for joomlas
| -rw-r--r-- | manifests/vhost/php/joomla.pp | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp index eea39b5..ed0696f 100644 --- a/manifests/vhost/php/joomla.pp +++ b/manifests/vhost/php/joomla.pp @@ -1,21 +1,26 @@ -# run_mode: controls in which mode the vhost should be run, there are different setups -# possible: -# - normal: (*default*) run vhost with the current active worker (default: prefork) don't -# setup anything special -# - itk: run vhost with the mpm_itk module (Incompatibility: cannot be used in combination -# with 'proxy-itk' & 'static-itk' mode) -# - proxy-itk: run vhost with a dual prefork/itk setup, where prefork just proxies all the -# requests for the itk setup, that listens only on the loobpack device. -# (Incompatibility: cannot be used in combination with the itk setup.) -# - static-itk: run vhost with a dual prefork/itk setup, where prefork serves all the static -# content and proxies the dynamic calls to the itk setup, that listens only on -# the loobpack device (Incompatibility: cannot be used in combination with -# 'itk' mode) +# run_mode: controls in which mode the vhost should be run, there are different +# setups possible: +# - normal: (*default*) run vhost with the current active worker +# (default: prefork) don't setup anything special +# - itk: run vhost with the mpm_itk module (Incompatibility: cannot be used in +# combination with 'proxy-itk' & 'static-itk' mode) +# - proxy-itk: run vhost with a dual prefork/itk setup, where prefork just +# proxies all the requests for the itk setup, that listens only +# on the loobpack device. +# (Incompatibility: cannot be used in combination with the itk +# setup.) +# - static-itk: run vhost with a dual prefork/itk setup, where prefork serves +# all the static +# content and proxies the dynamic calls to the itk setup, that +# listens only on the loobpack device +# (Incompatibility: cannot be used in combination with 'itk' +# mode) # # 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 # -# mod_security: Whether we use mod_security or not (will include mod_security module) +# mod_security: Whether we use mod_security or not (will include mod_security +# module) # - false: don't activate mod_security # - true: (*default*) activate mod_security # @@ -43,6 +48,7 @@ define apache::vhost::php::joomla( $allow_override = 'None', $php_settings = {}, $php_options = {}, + $php_installation = 'system', $do_includes = false, $options = 'absent', $additional_options = 'absent', @@ -123,8 +129,10 @@ define apache::vhost::php::joomla( run_uid => $run_uid, run_gid => $run_gid, allow_override => $allow_override, - php_settings => merge($std_joomla_php_settings, $php_settings), + php_settings => merge($std_joomla_php_settings, + $php_settings), php_options => $php_options, + php_installation => $php_installation, do_includes => $do_includes, options => $options, additional_options => $additional_options, @@ -141,7 +149,7 @@ define apache::vhost::php::joomla( htpasswd_file => $htpasswd_file, htpasswd_path => $htpasswd_path, manage_directories => $manage_directories, - managed_directories => [ "${documentroot}/administrator/backups", + managed_directories => [ "${documentroot}/administrator/backups", "${documentroot}/administrator/components", "${documentroot}/administrator/language", "${documentroot}/administrator/modules", |