Merge remote-tracking branch 'immerda/master'

1 files changed, 79 insertions, 63 deletions

diff --git a/manifests/vhost/php/joomla.pp b/manifests/vhost/php/joomla.pp
index 3962efa..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
 #
@@ -25,41 +30,43 @@
 #   - anonym: Don't log ips for CustomLog, send ErrorLog to /dev/null
 #   - semianonym: Don't log ips for CustomLog, log normal ErrorLog
 define apache::vhost::php::joomla(
-    $ensure                           = present,
-    $domain                           = 'absent',
-    $domainalias                      = 'absent',
-    $server_admin                     = 'absent',
-    $logmode                          = 'default',
-    $path                             = 'absent',
-    $owner                            = root,
-    $group                            = apache,
-    $documentroot_owner               = apache,
-    $documentroot_group               = 0,
-    $documentroot_mode                = '0640',
-    $run_mode                         = 'normal',
-    $run_uid                          = 'absent',
-    $run_gid                          = 'absent',
-    $allow_override                   = 'None',
-    $php_settings                     = {},
-    $php_options                      = {},
-    $do_includes                      = false,
-    $options                          = 'absent',
-    $additional_options               = 'absent',
-    $default_charset                  = 'absent',
-    $mod_security                     = true,
-    $mod_security_relevantonly        = true,
-    $mod_security_rules_to_disable    = [],
-    $mod_security_additional_options  = 'absent',
-    $ssl_mode                         = false,
-    $vhost_mode                       = 'template',
-    $template_partial                 = 'apache/vhosts/php_joomla/partial.erb',
-    $vhost_source                     = 'absent',
-    $vhost_destination                = 'absent',
-    $htpasswd_file                    = 'absent',
-    $htpasswd_path                    = 'absent',
-    $manage_config                    = true,
-    $config_webwriteable              = false,
-    $manage_directories               = true
+  $ensure                           = present,
+  $configuration                    = {},
+  $domain                           = 'absent',
+  $domainalias                      = 'absent',
+  $server_admin                     = 'absent',
+  $logmode                          = 'default',
+  $path                             = 'absent',
+  $owner                            = root,
+  $group                            = apache,
+  $documentroot_owner               = apache,
+  $documentroot_group               = 0,
+  $documentroot_mode                = '0640',
+  $run_mode                         = 'normal',
+  $run_uid                          = 'absent',
+  $run_gid                          = 'absent',
+  $allow_override                   = 'None',
+  $php_settings                     = {},
+  $php_options                      = {},
+  $php_installation                 = 'system',
+  $do_includes                      = false,
+  $options                          = 'absent',
+  $additional_options               = 'absent',
+  $default_charset                  = 'absent',
+  $mod_security                     = true,
+  $mod_security_relevantonly        = true,
+  $mod_security_rules_to_disable    = [],
+  $mod_security_additional_options  = 'absent',
+  $ssl_mode                         = false,
+  $vhost_mode                       = 'template',
+  $template_partial                 = 'apache/vhosts/php_joomla/partial.erb',
+  $vhost_source                     = 'absent',
+  $vhost_destination                = 'absent',
+  $htpasswd_file                    = 'absent',
+  $htpasswd_path                    = 'absent',
+  $manage_config                    = true,
+  $config_webwriteable              = false,
+  $manage_directories               = true
 ){
   include ::apache::include::joomla
 
@@ -73,34 +80,41 @@ define apache::vhost::php::joomla(
 
   if $mod_security_additional_options == 'absent' {
     $id_str = $::operatingsystem ? {
-      'CentOS'  => $::lsbmajdistrelease ? {
+      'CentOS'  => $::operatingsystemmajrelease ? {
         5       => '',
         default => 'id:1199400,'
       },
       default => ''
     }
-    $real_mod_security_additional_options = "# http://optics.csufresno.edu/~kriehn/fedora/fedora_files/f9/howto/modsecurity.html
-        # Exceptions for Joomla Root Directory
-        <LocationMatch \"^/\">
-            SecRuleRemoveById 950013
-        </LocationMatch>
+    $real_mod_security_additional_options = "
+    # http://optics.csufresno.edu/~kriehn/fedora/fedora_files/f9/howto/modsecurity.html
+    # Exceptions for Joomla Root Directory
+    <LocationMatch \"^/\">
+        SecRuleRemoveById 950013
+    </LocationMatch>
 
-        # Exceptions for Joomla Administration Panel
-        SecRule REQUEST_FILENAME \"/administrator/index2.php\" \"${id_str}allow,phase:1,nolog,ctl:ruleEngine=Off\"
+    # Exceptions for Joomla Administration Panel
+    SecRule REQUEST_FILENAME \"/administrator/index2.php\" \"${id_str}allow,phase:1,nolog,ctl:ruleEngine=Off\"
 
-        # Exceptions for Joomla Component Expose
-        <LocationMatch \"^/components/com_expose/expose/manager/amfphp/gateway.php\">
-            SecRuleRemoveById 960010
-        </LocationMatch>
+    # Exceptions for Joomla Component Expose
+    <LocationMatch \"^/components/com_expose/expose/manager/amfphp/gateway.php\">
+        SecRuleRemoveById 960010
+    </LocationMatch>
 "
   } else {
     $real_mod_security_additional_options = $mod_security_additional_options
   }
 
+  $std_joomla_php_settings = {
+    'allow_url_fopen'   => 'on',
+    'allow_url_include' => 'off',
+  }
+
   # create vhost configuration file
   ::apache::vhost::php::webapp{
     $name:
       ensure                          => $ensure,
+      configuration                   => $configuration,
       domain                          => $domain,
       domainalias                     => $domainalias,
       server_admin                    => $server_admin,
@@ -115,8 +129,10 @@ define apache::vhost::php::joomla(
       run_uid                         => $run_uid,
       run_gid                         => $run_gid,
       allow_override                  => $allow_override,
-      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,
@@ -133,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",