From a496393b79ca725f1c35ffd586d1175a424dbf29 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Thu, 23 Jun 2022 13:04:30 -0700
Subject: [PATCH] Release 5.3.11 - See CHANGELOG.md

---
 .dockerignore                                               | 1 +
 CHANGELOG.md                                                | 6 ++++++
 Dockerfile                                                  | 1 +
 .../{conf.d/default.conf => sites.available/backuppc.conf}  | 4 ++--
 4 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 .dockerignore
 rename install/etc/nginx/{conf.d/default.conf => sites.available/backuppc.conf} (81%)

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..d838da9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+examples/
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08646ca..8c6d8b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 5.3.11 2022-06-23 <dave at tiredofit dot ca>
+
+   ### Added
+      - Support tiredofit/nginx:6.0.0 and tiredofit/nginx-php-fpm:7.0.0 changes
+
+
 ## 5.3.10 2022-05-24 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/Dockerfile b/Dockerfile
index 41d1c9a..4f25e59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ ENV BACKUPPC_VERSION=4.4.0 \
     NGINX_ENABLE_CREATE_SAMPLE_HTML=FALSE \
     NGINX_USER=backuppc \
     NGINX_GROUP=backuppc \
+    NGINX_SITE_ENABLED=backuppc \
     CONTAINER_ENABLE_MESSAGING=TRUE \
     IMAGE_NAME="tiredofit/backuppc" \
     IMAGE_REPO_URL="https://github.com/tiredofit/docker-backuppc/"
diff --git a/install/etc/nginx/conf.d/default.conf b/install/etc/nginx/sites.available/backuppc.conf
similarity index 81%
rename from install/etc/nginx/conf.d/default.conf
rename to install/etc/nginx/sites.available/backuppc.conf
index b9db092..3969df0 100644
--- a/install/etc/nginx/conf.d/default.conf
+++ b/install/etc/nginx/sites.available/backuppc.conf
@@ -20,6 +20,6 @@
       }
 
       ### Don't edit past here
-      include /etc/nginx/nginx.conf.d/site_optimization.conf;
-      include /etc/nginx/nginx.conf.d/exploit_protection.conf;
+      include /etc/nginx/snippets/site_optimization.conf;
+      include /etc/nginx/snippets/exploit_protection.conf;
 }