diff -Nur smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares smeserver-shared-folders-0.3_phpfpm/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares --- smeserver-shared-folders-0.3/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2017-07-13 15:20:20.341603722 +0200 +++ smeserver-shared-folders-0.3_phpfpm/root/etc/e-smith/templates/etc/httpd/conf/httpd.conf/90e-smithAccess50shares 2017-07-13 15:19:49.045596077 +0200 @@ -120,20 +120,33 @@ if ($dynamicContent eq 'enabled') { $OUT .= " Options +Includes\n"; - $OUT .= " AddType application/x-httpd-php .php .php3 .phtml\n"; - $OUT .= " AddType application/x-httpd-php-source .phps\n"; + if ($fastcgi_mod eq 'mod_fastcgi'){ + $OUT .= ' AddHandler php' . $key . '-fastcgi .php' . "\n"; + } + elsif ($fastcgi_mod eq 'mod_proxy_fcgi'){ + my $version = $properties{'PHPVersion'} || ''; + $OUT .=<<"_EOF"; + + SetHandler "proxy:unix:/var/run/php-fpm/php$version-$key.sock|fcgi://localhost" + +_EOF + } + else{ + $OUT .= " AddType application/x-httpd-php .php .php3 .phtml\n"; + $OUT .= " AddType application/x-httpd-php-source .phps\n"; - my $basedir = $properties{PHPBaseDir} - || ("/home/e-smith/files/shares/$key/"); - $OUT .= " php_admin_value open_basedir $basedir\n"; - $OUT .= " php_admin_flag register_globals on\n" - if (($properties{PHPRegisterGlobals} || 'disabled') eq 'enabled'); - $OUT .= " php_admin_flag allow_url_fopen on\n" - if (($properties{PHPAllowUrlFopen} || 'disabled') eq 'enabled'); - $OUT .= " php_admin_value memory_limit $properties{PHPMemoryLimit}\n" - if ($properties{PHPMemoryLimit}); - $OUT .= " php_admin_value max_execution_time $properties{PHPMaxExecutionTime}\n" - if ($properties{PHPMaxExecutionTime}); + my $basedir = $properties{PHPBaseDir} + || ("/home/e-smith/files/shares/$key/"); + $OUT .= " php_admin_value open_basedir $basedir\n"; + $OUT .= " php_admin_flag register_globals on\n" + if (($properties{PHPRegisterGlobals} || 'disabled') eq 'enabled'); + $OUT .= " php_admin_flag allow_url_fopen on\n" + if (($properties{PHPAllowUrlFopen} || 'disabled') eq 'enabled'); + $OUT .= " php_admin_value memory_limit $properties{PHPMemoryLimit}\n" + if ($properties{PHPMemoryLimit}); + $OUT .= " php_admin_value max_execution_time $properties{PHPMaxExecutionTime}\n" + if ($properties{PHPMaxExecutionTime}); + } } else { $OUT .= " DirectoryIndex index.shtml index.htm index.html\n";