From bf029b5006c61277086a079b6d95f0e6fff3c92a Mon Sep 17 00:00:00 2001
From: Janis Simsons <6424248+janissimsons@users.noreply.github.com>
Date: Sun, 9 Feb 2020 13:47:23 +0200
Subject: [PATCH 1/2] Update nginx-configuration.md

Added support for Raspbian Buster and described how to avoid issue #2828
---
 docs/guides/nginx-configuration.md | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/docs/guides/nginx-configuration.md b/docs/guides/nginx-configuration.md
index d8172e4..1500754 100644
--- a/docs/guides/nginx-configuration.md
+++ b/docs/guides/nginx-configuration.md
@@ -1,7 +1,9 @@
 ### Notes & Warnings
 
 - **This is an unsupported configuration created by the community**
+- If you're using Raspbian Buster (debian 10), then you should install 'php7.3-fpm' instead of v7.0, and change all instances of 'php7.0-fpm' to 'php7.3-fpm'.
 - If you're using php5, change all instances of `php7.0-fpm` to `php5-fpm` and change `/run/php/php7.0-fpm.sock` to `/var/run/php5-fpm.sock`
+- The `php7.0-sqlite` package must be installed otherwise Networking and Querying will throw an error that it can't access the database.
 
 ### Basic requirements
 
@@ -12,9 +14,16 @@
     ```
 
 2. Install necessary packages
+    - For Raspbian Stretch and lower:
 
     ```bash
-    apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils
+    apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils php7.0-sqlite
+    ```
+
+    - For Raspbian Buster:
+
+    ```bash
+    apt-get -y install nginx php7.3-fpm php7.3-zip apache2-utils php7.3-sqlite
     ```
 
 3. Disable lighttpd at startup
@@ -24,11 +33,18 @@
     ```
 
 4. Enable php7.0-fpm at startup
+    - For Raspbian Stretch and lower:
 
     ```bash
     systemctl enable php7.0-fpm
     ```
 
+    - For Raspbian Buster:
+
+    ```bash
+    systemctl enable php7.3-fpm
+    ```
+
 5. Enable nginx at startup
 
     ```bash
@@ -101,10 +117,18 @@
 
 10. Start php7.0-fpm daemon
 
+    - For Raspbian Stretch and below:
+
     ```bash
     service php7.0-fpm start
     ```
 
+    - For Raspbian Buster:
+
+    ```bash
+    service php7.3-fpm start
+    ```
+
 11. Start nginx web server
 
     ```bash

From 1710b6e3e60a3a8ad65ba1c72158b8d180034c06 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Mon, 24 Feb 2020 21:58:11 +0200
Subject: [PATCH 2/2] Update nginx-configuration.md

Simplify things
---
 docs/guides/nginx-configuration.md | 35 +++++-------------------------
 1 file changed, 6 insertions(+), 29 deletions(-)

diff --git a/docs/guides/nginx-configuration.md b/docs/guides/nginx-configuration.md
index 1500754..29b6b23 100644
--- a/docs/guides/nginx-configuration.md
+++ b/docs/guides/nginx-configuration.md
@@ -1,9 +1,8 @@
 ### Notes & Warnings
 
 - **This is an unsupported configuration created by the community**
-- If you're using Raspbian Buster (debian 10), then you should install 'php7.3-fpm' instead of v7.0, and change all instances of 'php7.0-fpm' to 'php7.3-fpm'.
-- If you're using php5, change all instances of `php7.0-fpm` to `php5-fpm` and change `/run/php/php7.0-fpm.sock` to `/var/run/php5-fpm.sock`
-- The `php7.0-sqlite` package must be installed otherwise Networking and Querying will throw an error that it can't access the database.
+- **Replace `7.3` with the PHP version you installed, e.g. if you're using Raspbian Stretch (Debian 9) replace `7.3` with 7.0`.**
+- The `php7.3-sqlite` package must be installed otherwise Networking and Querying will throw an error that it can't access the database.
 
 ### Basic requirements
 
@@ -14,16 +13,9 @@
     ```
 
 2. Install necessary packages
-    - For Raspbian Stretch and lower:
 
     ```bash
-    apt-get -y install nginx php7.0-fpm php7.0-zip apache2-utils php7.0-sqlite
-    ```
-
-    - For Raspbian Buster:
-
-    ```bash
-    apt-get -y install nginx php7.3-fpm php7.3-zip apache2-utils php7.3-sqlite
+    apt-get -y install nginx php7.3-fpm php7.3-zip php7.3-sqlite apache2-utils
     ```
 
 3. Disable lighttpd at startup
@@ -32,14 +24,7 @@
     systemctl disable lighttpd
     ```
 
-4. Enable php7.0-fpm at startup
-    - For Raspbian Stretch and lower:
-
-    ```bash
-    systemctl enable php7.0-fpm
-    ```
-
-    - For Raspbian Buster:
+4. Enable php7.3-fpm at startup
 
     ```bash
     systemctl enable php7.3-fpm
@@ -72,7 +57,7 @@
         location ~ \.php$ {
             include fastcgi_params;
             fastcgi_param SCRIPT_FILENAME $document_root/$fastcgi_script_name;
-            fastcgi_pass unix:/run/php/php7.0-fpm.sock;
+            fastcgi_pass unix:/run/php/php7.3-fpm.sock;
             fastcgi_param FQDN true;
             auth_basic "Restricted"; # For Basic Auth
             auth_basic_user_file /etc/nginx/.htpasswd; # For Basic Auth
@@ -115,15 +100,7 @@
     chmod -R 755 /var/www/html
     ```
 
-10. Start php7.0-fpm daemon
-
-    - For Raspbian Stretch and below:
-
-    ```bash
-    service php7.0-fpm start
-    ```
-
-    - For Raspbian Buster:
+10. Start php7.3-fpm daemon
 
     ```bash
     service php7.3-fpm start