From 40a2856ae8e9ee302891711298389f1d5cc8e831 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Sat, 10 Jul 2021 10:02:59 -0400 Subject: [PATCH] Use correct PHP_FPM socket paths for Debian --- dist/debian/arsse.install | 4 ++-- dist/debian/rules | 3 +++ .../020_On_Debian_and_Derivatives.md | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dist/debian/arsse.install b/dist/debian/arsse.install index afb9a4f6..b3b7ebad 100644 --- a/dist/debian/arsse.install +++ b/dist/debian/arsse.install @@ -11,8 +11,8 @@ arsse.php usr/share/arsse/ config.defaults.php etc/arsse/ manual usr/share/doc/arsse/ dist/man/* usr/share/man/ -dist/nginx etc/arsse/ -dist/apache etc/arsse/ dist/debian/config.php etc/arsse/ dist/debian/dbconfig-common.php usr/share/arsse/ debian/bin/arsse usr/bin/ +debian/nginx etc/arsse/ +debian/apache etc/arsse/ diff --git a/dist/debian/rules b/dist/debian/rules index c16a7694..18a2ae70 100755 --- a/dist/debian/rules +++ b/dist/debian/rules @@ -21,3 +21,6 @@ execute_before_dh_install: mkdir -p debian/bin cp dist/arsse debian/bin/arsse sed -i -se 's/posix_getpwnam("arsse"/posix_getpwnam("www-data"/' debian/bin/arsse + # Change PHP-FPM socket paths + cp -r dist/apache dist/nginx debian + sed -i -se 's/arsse\.sock/php-fpm.sock/' debian/apache/arsse.conf debian/nginx/arsse.conf diff --git a/docs/en/020_Getting_Started/020_Download_and_Installation/020_On_Debian_and_Derivatives.md b/docs/en/020_Getting_Started/020_Download_and_Installation/020_On_Debian_and_Derivatives.md index 2aab5df7..67ca32b3 100644 --- a/docs/en/020_Getting_Started/020_Download_and_Installation/020_On_Debian_and_Derivatives.md +++ b/docs/en/020_Getting_Started/020_Download_and_Installation/020_On_Debian_and_Derivatives.md @@ -50,7 +50,7 @@ sudo dpkg-reconfigure arsse # Web server configuration -Sample configuration for both Nginx and Apache HTTP Server can be found in `/etc/arsse/nginx/` and `/etc/arsse/apache/`, respectively. The `example.conf` files are basic virtual host examples; the other files they include should normally be usable without modification, but may be modified if desired. +Sample configuration for both Nginx and Apache HTTP Server can be found in `/etc/arsse/nginx/` and `/etc/arsse/apache/`, respectively. The `example.conf` files are basic virtual host examples; the other files they include should normally be usable without modification, but may be modified if needed or desired. In particularly users of older Debians may need to change the PHP-FPM socket path in Nginx or Apache's `arsse.conf`. In order to use Apache HTTP Server the FastCGI proxy module must be enabled and the server restarted: