From a64375de41d0ad62213554a877f51dea8beedf17 Mon Sep 17 00:00:00 2001
From: ajaxify <78984825+ajaxify@users.noreply.github.com>
Date: Mon, 25 Oct 2021 14:56:17 -0700
Subject: [PATCH 1/4] add LE_EMAIL to .env.sample

---
 .env.example | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.env.example b/.env.example
index fdf6057..48b4074 100644
--- a/.env.example
+++ b/.env.example
@@ -1,6 +1,8 @@
 PROJECT_ROOT=""
 CONTAINER_NAME="pf"
 DOMAIN=""
+# Emails from Let's Encrypt about your certificate will go here
+LE_EMAIL=""
 APP_PASSWORD=""
 MYSQL_PASSWORD=""
 CCP_SSO_CLIENT_ID=""

From 8bab7c2cd8f8f7e9f5b926209d4c845646628904 Mon Sep 17 00:00:00 2001
From: ajaxify <78984825+ajaxify@users.noreply.github.com>
Date: Mon, 25 Oct 2021 14:58:59 -0700
Subject: [PATCH 2/4] Let's Encrypt README updates

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3164986..adfa08d 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ A fork of techfreak's [Pathfinder-container](https://gitlab.com/techfreak/pathfi
     docker-compose exec pfdb /bin/sh -c "unzip -p eve_universe.sql.zip | mysql -u root -p\$MYSQL_ROOT_PASSWORD eve_universe";
 
 1. **When everthing works, configure Traefik correctly for production**
-    * Remove the beta CA server lines [(#87 - #90)](https://github.com/goryn-clade/pathfinder-containers/blob/master/docker-compose.yml#L87-L90) from `docker-compose.yml`. 
+    * Remove the staging CA server line [(#89)](https://github.com/goryn-clade/pathfinder-containers/blob/master/docker-compose.yml#L89) from `docker-compose.yml`. 
     * Delete the `./letsencrypt/acme.json` configuration file so Let's Encrypt will get a new certificate.</br></br>
     * If you are not the root user on your host you may need to edit file permissions. Docker-engine creates the `letsencrypt` director as root user, which means that you would need to prefix `sudo` on any future docker commands (`sudo docker-compose up` etc). To avoid doing this you can take ownership of the letsencrypt directory by running `sudo chown -R $USER ./letsencrypt`.
 

From 4c1902a19d2ebc6f56687da78c8ee46579045130 Mon Sep 17 00:00:00 2001
From: ajaxify <78984825+ajaxify@users.noreply.github.com>
Date: Mon, 25 Oct 2021 15:01:10 -0700
Subject: [PATCH 3/4] Use env var LE_EMAIL for Let's Encrypt email

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5b1fca3..50668c0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -87,7 +87,7 @@ services:
       - "--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
       # Remove below line when ready for production
       - "--certificatesresolvers.letsencrypt.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory"
-      - "--certificatesresolvers.letsencrypt.acme.email=MYEMAIL@someemailprobablygmail.com"
+      - "--certificatesresolvers.letsencrypt.acme.email=${LE_EMAIL}"
     ports:
       - "80:80"
       - "443:443"

From ae6badfc64318a10184dfa8e1e2f72bc36203417 Mon Sep 17 00:00:00 2001
From: fleischsalatinspace <fleischsalat@space>
Date: Wed, 22 Sep 2021 17:45:23 +0200
Subject: [PATCH 4/4] Dockerfile: symlink nginx logs to stdout/stderr for
 supervisord logging

---
 Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index e149c2e..29689c2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,6 +14,9 @@ RUN composer install
 
 FROM trafex/alpine-nginx-php7:ba1dd422
 RUN apk update && apk add --no-cache busybox-suid sudo php7-redis php7-pdo php7-pdo_mysql php7-fileinfo shadow gettext bash apache2-utils
+# symlink nginx logs to stdout/stderr for supervisord
+RUN ln -sf /dev/stdout /var/log/nginx/access.log \
+ && ln -sf /dev/stderr /var/log/nginx/error.log
 
 COPY static/nginx/nginx.conf /etc/nginx/templateNginx.conf
 # we need to create sites_enabled directory in order for entrypoint.sh being able to copy file after envsubst