From 142caf1dcc91cf3f7ccecaf124ecbd825a8a480d Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Thu, 4 Feb 2021 20:07:51 +0000
Subject: [PATCH] Making progress

---
 .gitignore          |  1 +
 configure-script.js | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07c6f4e..a40b5e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,6 +110,7 @@ public/*.css
 public/*.map
 public/*.gz
 
+letsencrypt/
 mysql/
 Dockerfile
 docker-compose.yml
diff --git a/configure-script.js b/configure-script.js
index b5fa6a9..8a47738 100644
--- a/configure-script.js
+++ b/configure-script.js
@@ -42,17 +42,18 @@ const question = (prompt, def) => {
 	const databaseTimeZone = await question('Database Timezone', 'Australia/Sydney');
 
 	//traefic configuration
-	const supportEmail = await question('Support Email', 'postmaster@example.com');
+	const supportEmail = await question('Support Email', projectMailUser);
 
 const yml = `
+version: "3.6"
 services:
   ${projectName}:
     build: .
     ports:
-      - "3000:3000"
+      - "3000"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${projectName}router.rule=Host('${projectWebAddress}')"
+      - "traefik.http.routers.${projectName}router.rule=Host(\`${projectWebAddress}\`)"
       - "traefik.http.routers.${projectName}router.entrypoints=websecure"
       - "traefik.http.routers.${projectName}router.tls.certresolver=myresolver"
       - "traefik.http.routers.${projectName}router.service=${projectName}service@docker"
@@ -82,10 +83,10 @@ services:
   ${newsName}:
     image: krgamestudios/news-server:v1.0.0
     ports:
-      - "3100:3100"
+      - "3100"
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.${newsName}router.rule=Host('${newsWebAddress}')"
+      - "traefik.http.routers.${newsName}router.rule=Host(\`${newsWebAddress}\`)"
       - "traefik.http.routers.${newsName}router.entrypoints=websecure"
       - "traefik.http.routers.${newsName}router.tls.certresolver=myresolver"
       - "traefik.http.routers.${newsName}router.service=newsservice@docker"
@@ -123,7 +124,8 @@ services:
   traefik:
     image: "traefik:v2.4"
     container_name: "traefik"
-    command: >
+    command:
+      - "--log.level=ERROR"
       - "--api.insecure=false"
       - "--providers.docker=true"
       - "--providers.docker.exposedbydefault=false"
@@ -131,6 +133,7 @@ services:
       - "--certificatesresolvers.myresolver.acme.tlschallenge=true"
       - "--certificatesresolvers.myresolver.acme.email=${supportEmail}"
       - "--certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json"
+      - " traefik.docker.network=app-network"
     ports:
       - "80:80"
       - "443:443"