diff --git a/lam-packaging/RPM/lam.nginx.conf b/lam-packaging/RPM/lam.nginx.conf
index 9b0429b5..6929826a 100644
--- a/lam-packaging/RPM/lam.nginx.conf
+++ b/lam-packaging/RPM/lam.nginx.conf
@@ -5,7 +5,7 @@ location /lam {
location ~ \.php$ {
fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass unix:/var/run/php5-fpm.sock;
+ fastcgi_pass unix:/var/run/php7-fpm.sock;
fastcgi_index index.php;
include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $request_filename;
diff --git a/lam-packaging/debian/lam.nginx.conf b/lam-packaging/debian/lam.nginx.conf
index 9b0429b5..d11bd0b9 100644
--- a/lam-packaging/debian/lam.nginx.conf
+++ b/lam-packaging/debian/lam.nginx.conf
@@ -4,10 +4,8 @@ location /lam {
autoindex off;
location ~ \.php$ {
- fastcgi_split_path_info ^(.+\.php)(/.+)$;
- fastcgi_pass unix:/var/run/php5-fpm.sock;
- fastcgi_index index.php;
- include fastcgi_params;
+ include snippets/fastcgi-php.conf;
+ fastcgi_pass unix:/var/run/php/php7.0-fpm.sock;
fastcgi_param SCRIPT_FILENAME $request_filename;
}
diff --git a/lam/docs/manual-sources/appendix-security.xml b/lam/docs/manual-sources/appendix-security.xml
index 55be64b1..369910f3 100644
--- a/lam/docs/manual-sources/appendix-security.xml
+++ b/lam/docs/manual-sources/appendix-security.xml
@@ -403,14 +403,14 @@ semodule -i httpdlocal.pp
server {
...
- include /etc/ldap-account-manager/lam.nginx.conf;
+ include /etc/ldap-account-manager/nginx.conf;
...
}
- The included config file uses PHP 5. In case you run with PHP 7
- please update the parameter "fastcgi_pass" to
- "/var/run/php7-fpm.sock".
+ The included config file uses PHP 7.0. In case you run with PHP
+ 7.1 or PHP 5 please update the parameter "fastcgi_pass" to
+ "/var/run/php/php7.1-fpm.sock".
diff --git a/lam/docs/manual-sources/chapter-installation.xml b/lam/docs/manual-sources/chapter-installation.xml
index 6a6ed8aa..0f19a5dd 100644
--- a/lam/docs/manual-sources/chapter-installation.xml
+++ b/lam/docs/manual-sources/chapter-installation.xml
@@ -574,6 +574,13 @@
version. Unless explicitly noticed there is no need to install an
intermediate release.
+
+ 6.0 -> 6.1
+
+ DEB+RPM configuration for nginx uses PHP 7 by default. Please
+ see /etc/ldap-account-manager/nginx.conf if you use PHP 5.
+
+