From 692fafbb57497a73baa37c82fda86dda14f8c43c Mon Sep 17 00:00:00 2001
From: ckulka <ckulka@wlgore.com>
Date: Sun, 11 Dec 2022 18:41:00 -0500
Subject: [PATCH] Fixed bad file descriptor issue with latest nginx image

Corrected "nginx" image tag listing
---
 .gitignore                                    | 1 +
 README.md                                     | 2 +-
 files/40-disable-nginx-ipv6-if-unsupported.sh | 2 +-
 files/40-fix-baikal-permissions.sh            | 6 +++---
 files/40-php-fpm.sh                           | 4 ++--
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0a9c4bb..63a78b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 docker-compose.override.yml
+examples/acme.json
 
 # Apple
 *.DS_Store
diff --git a/README.md b/README.md
index eaccc49..f38c7b5 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ The following tags support multiple architectures, e.g. `amd64`, `arm32v7`, `arm
 - [`0.9.3-nginx-php8.0`, `nginx-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.3/nginx-php8.0.dockerfile)
 - [`0.9.2`, `0.9.2-apache`](https://github.com/ckulka/baikal-docker/blob/0.9.2/apache.dockerfile)
 - [`0.9.2-php8.0`, `0.9.2-apache-php8.0`, `apache-php8.0`, `latest-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.2/apache-php8.0.dockerfile)
-- [`0.9.2-nginx`, `nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.2/nginx.dockerfile)
+- [`0.9.2-nginx`](https://github.com/ckulka/baikal-docker/blob/0.9.2/nginx.dockerfile)
 - [`0.9.2-nginx-php8.0`, `nginx-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.2/nginx-php8.0.dockerfile)
 - [`0.9.1`, `0.9.1-apache`](https://github.com/ckulka/baikal-docker/blob/0.9.1/apache.dockerfile)
 - [`0.9.1-php8.0`, `0.9.1-apache-php8.0`](https://github.com/ckulka/baikal-docker/blob/0.9.1/apache-php8.0.dockerfile)
diff --git a/files/40-disable-nginx-ipv6-if-unsupported.sh b/files/40-disable-nginx-ipv6-if-unsupported.sh
index 374d9ca..19f3436 100755
--- a/files/40-disable-nginx-ipv6-if-unsupported.sh
+++ b/files/40-disable-nginx-ipv6-if-unsupported.sh
@@ -9,6 +9,6 @@ ME=$(basename $0)
 # Disable IPv6 configuration if not supported or nginx is not installed
 # Added to resolve https://github.com/ckulka/baikal-docker/issues/73
 if nginx -t 2>&1 >/dev/null | grep -q '\[emerg\] socket() \[::\]:80 failed (97: Address family not supported by protocol)'; then
-    echo >&3 "$ME: info: Disable IPv6 in configuration"
+    echo "$ME: info: Disable IPv6 in configuration"
     sed -i 's/listen \[::\]:80;/# listen \[::\]:80/' /etc/nginx/conf.d/default.conf
 fi
diff --git a/files/40-fix-baikal-permissions.sh b/files/40-fix-baikal-permissions.sh
index 307044e..0e93f1a 100755
--- a/files/40-fix-baikal-permissions.sh
+++ b/files/40-fix-baikal-permissions.sh
@@ -5,14 +5,14 @@ ME=$(basename $0)
 
 if ! [ -d /var/www/baikal/Specific/db ]
 then
-  echo >&3 "$ME: info: Creating new Baikal database folder"
+  echo "$ME: info: Creating new Baikal database folder"
   mkdir -p /var/www/baikal/Specific/db
 fi
 
 # Detect if we're running in the Apache httpd image
 if [ ! -z ${APACHE_CONFDIR+x} ]
 then
-  echo >&3 "$ME: info: Adjusting Baikal file permissions for Apache httpd"
+  echo "$ME: info: Adjusting Baikal file permissions for Apache httpd"
   chown -R www-data:www-data /var/www/baikal
 
   # Inject ServerName and ServerAlias if specified
@@ -31,6 +31,6 @@ fi
 # Detect if we're running in the nginx image
 if [ ! -z ${NGINX_VERSION+x} ]
 then
-  echo >&3 "$ME: info: Adjusting Baikal file permissions for nginx"
+  echo "$ME: info: Adjusting Baikal file permissions for nginx"
   chown -R nginx:nginx /var/www/baikal
 fi
diff --git a/files/40-php-fpm.sh b/files/40-php-fpm.sh
index 5df6beb..ce46c61 100755
--- a/files/40-php-fpm.sh
+++ b/files/40-php-fpm.sh
@@ -5,9 +5,9 @@ ME=$(basename $0)
 
 # Start PHP FPM if it exists
 if [ -f "/etc/init.d/php8.0-fpm" ]; then
-  echo >&3 "$ME: info: Starting PHP 8.0"
+  echo "$ME: info: Starting PHP 8.0"
   /etc/init.d/php8.0-fpm start
 elif [ -f "/etc/init.d/php8.1-fpm" ]; then
-  echo >&3 "$ME: info: Starting PHP 8.1"
+  echo "$ME: info: Starting PHP 8.1"
   /etc/init.d/php8.1-fpm start
 fi