Merge branch 'feature/vagrant-upgrade-php-7-1-2989'

fixes #2989

.puppet/modules/php/manifests/init.pp

@@ -9,6 +9,8 @@
 # Requires:
 #
 #   apache
+#   epel
+#   scl
 #
 # Sample Usage:
 #
@@ -18,11 +20,16 @@ class php {
 
   include apache
   include epel
+  include scl
 
-  package { 'php':
+  package { 'rh-php71-php-fpm':
     ensure  => latest,
     notify  => Service['apache'],
-    require => Package['apache'],
+    require => [ Class['scl'], Package['apache'] ],
+  }
+  -> service { 'rh-php71-php-fpm':
+    ensure => running,
+    enable => true,
   }
 
   package { 'php-pecl-xdebug':

.puppet/modules/php/manifests/phpd.pp

@@ -17,6 +17,6 @@ define php::phpd {
   file { "/etc/php.d/$name.ini":
     content => template("php/$name.ini.erb"),
     notify  => Service['apache'],
-    require => Package['php'],
+    require => Package['rh-php71-php-fpm'],
   }
 }

.puppet/modules/scl/manifests/init.pp

@@ -0,0 +1,19 @@
+# Class: scl
+#
+#   This class installs centos-release-scl.
+#
+# Parameters:
+#
+# Actions:
+#
+# Requires:
+#
+# Sample Usage:
+#
+#   include scl
+#
+class scl {
+  package { 'centos-release-scl':
+    ensure => latest,
+  }
+}

.puppet/profiles/icingaweb2_dev/manifests/init.pp

@@ -21,7 +21,15 @@ class icingaweb2_dev (
   }
 
   # TODO(el): icinga-gui is not a icingaweb2_dev package
-  package { [ 'php-gd', 'php-intl', 'php-pdo', 'php-ldap', 'php-phpunit-PHPUnit' ]:
+  package { [
+    'rh-php71-php-gd',
+    'rh-php71-php-intl',
+    'rh-php71-php-pdo',
+    'rh-php71-php-mysqlnd',
+    'rh-php71-php-pgsql',
+    'rh-php71-php-ldap',
+    'php-phpunit-PHPUnit'
+  ]:
     ensure => latest,
     notify => Service['apache'],
     require => Class['icinga_packages'],

.puppet/profiles/icingaweb2_dev/templates/icingaweb.conf.erb

@@ -18,8 +18,10 @@ Alias /<%= @web_path %> "/vagrant/public"
     </IfModule>
 
     SetEnv ICINGAWEB_CONFIGDIR <%= @config %>
+    SetEnvIf Authorization "(.*)" HTTP_AUTHORIZATION=$1
 
     EnableSendfile Off
+    DirectoryIndex index.php
 
     <IfModule mod_rewrite.c>
         RewriteEngine on
@@ -31,6 +33,12 @@ Alias /<%= @web_path %> "/vagrant/public"
         RewriteRule ^.*$ index.php [NC,L]
     </IfModule>
 
+
+    <FilesMatch "\.php$">
+        SetHandler "proxy:fcgi://127.0.0.1:9000"
+        ErrorDocument 503 /icingaweb2/error_unavailable.html
+    </FilesMatch>
+
     <IfModule !mod_rewrite.c>
         DirectoryIndex error_norewrite.html
         ErrorDocument 404 /error_norewrite.html