From a0d52958e8da8909fea0f5a671eb980751dc322c Mon Sep 17 00:00:00 2001
From: Iurii Tatishchev <itatishch@gmail.com>
Date: Fri, 24 Mar 2023 03:11:28 -0700
Subject: [PATCH] fix: remove quotes from docker .env files because they are
 not parsed properly

---
 roles/gitea/templates/.env.db.j2            |  2 +-
 roles/gitea/templates/.env.gitea.j2         | 17 +++++++++--------
 roles/jellyfin/templates/.env.jellyfin.j2   |  2 +-
 roles/nextcloud/templates/.env.db.j2        |  2 +-
 roles/nextcloud/templates/.env.nextcloud.j2 | 12 ++++++++----
 roles/nextcloud/templates/.env.redis.j2     |  2 +-
 6 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/roles/gitea/templates/.env.db.j2 b/roles/gitea/templates/.env.db.j2
index 59eb7f9..f164ebb 100644
--- a/roles/gitea/templates/.env.db.j2
+++ b/roles/gitea/templates/.env.db.j2
@@ -1,3 +1,3 @@
 POSTGRES_USER=gitea
 POSTGRES_DB=gitea
-POSTGRES_PASSWORD="{{ db_password }}"
+POSTGRES_PASSWORD={{ db_password }}
diff --git a/roles/gitea/templates/.env.gitea.j2 b/roles/gitea/templates/.env.gitea.j2
index 7752c11..bc74e67 100644
--- a/roles/gitea/templates/.env.gitea.j2
+++ b/roles/gitea/templates/.env.gitea.j2
@@ -3,9 +3,9 @@ GITEA____APP_NAME=CazGitea
 # Database
 GITEA__database__DB_TYPE=postgres
 GITEA__database__HOST=db:5432
-GITEA__database__NAME="{{ db_user }}"
-GITEA__database__USER="{{ db_name }}"
-GITEA__database__PASSWD="{{ db_password }}"
+GITEA__database__NAME={{ db_user }}
+GITEA__database__USER={{ db_name }}
+GITEA__database__PASSWD={{ db_password }}
 
 # Server
 GITEA__server__ROOT_URL=https://gitea.{{ domain }}/
@@ -13,16 +13,17 @@ GITEA__server__DISABLE_SSH=true
 
 # Mail
 GITEA__mailer__ENABLED=true
-GITEA__mailer__HOST=smtp.sendgrid.net:587
+GITEA__mailer__SMTP_ADDR=smtp.sendgrid.net
+GITEA__mailer__SMTP_PORT=587
 GITEA__mailer__FROM=gitea@cazzzer.com
 GITEA__mailer__USER=apikey
-GITEA__mailer__PASSWD="{{ sendgrid_api_key }}"
+GITEA__mailer__PASSWD={{ sendgrid_api_key }}
 
 # Security
-GITEA__security__SECRET_KEY="{{ secret_key }}"
-GITEA__security__INTERNAL_TOKEN="{{ internal_token }}"
+GITEA__security__SECRET_KEY={{ secret_key }}
+GITEA__security__INTERNAL_TOKEN={{ internal_token }}
 
-GITEA__oauth2__JWT_SECRET="{{ jwt_secret }}"
+GITEA__oauth2__JWT_SECRET={{ jwt_secret }}
 
 # Indexer
 GITEA__indexer__REPO_INDEXER_ENABLED=true
diff --git a/roles/jellyfin/templates/.env.jellyfin.j2 b/roles/jellyfin/templates/.env.jellyfin.j2
index 0bea84a..873db15 100644
--- a/roles/jellyfin/templates/.env.jellyfin.j2
+++ b/roles/jellyfin/templates/.env.jellyfin.j2
@@ -1 +1 @@
-JELLYFIN_PublishedServerUrl="https://jellyfin.{{ domain }}"
+JELLYFIN_PublishedServerUrl=https://jellyfin.{{ domain }}
diff --git a/roles/nextcloud/templates/.env.db.j2 b/roles/nextcloud/templates/.env.db.j2
index b921070..65d25bf 100644
--- a/roles/nextcloud/templates/.env.db.j2
+++ b/roles/nextcloud/templates/.env.db.j2
@@ -1,3 +1,3 @@
 POSTGRES_USER=nextcloud
 POSTGRES_DB=nextcloud
-POSTGRES_PASSWORD="{{ db_password }}"
+POSTGRES_PASSWORD={{ db_password }}
diff --git a/roles/nextcloud/templates/.env.nextcloud.j2 b/roles/nextcloud/templates/.env.nextcloud.j2
index 215b9fc..602ced0 100644
--- a/roles/nextcloud/templates/.env.nextcloud.j2
+++ b/roles/nextcloud/templates/.env.nextcloud.j2
@@ -1,18 +1,22 @@
 POSTGRES_DB=nextcloud
 POSTGRES_USER=nextcloud
-POSTGRES_PASSWORD="{{ db_password }}"
+POSTGRES_PASSWORD={{ db_password }}
 POSTGRES_HOST=db
 
-NEXTCLOUD_TRUSTED_DOMAINS="nc.{{ domain }}"
+NEXTCLOUD_TRUSTED_DOMAINS=nc.{{ domain }}
 
 REDIS_HOST=redis
-REDIS_HOST_PASSWORD="{{ redis_password }}"
+REDIS_HOST_PASSWORD={{ redis_password }}
 
 SMTP_HOST=smtp.sendgrid.net
 SMTP_SECURE=tls
 SMTP_PORT=587
 SMTP_AUTHTYPE=LOGIN
 SMTP_NAME=apikey
-SMTP_PASSWORD="{{ sendgrid_api_key }}"
+SMTP_PASSWORD={{ sendgrid_api_key }}
 MAIL_FROM_ADDRESS=nc
 MAIL_DOMAIN=cazzzer.com
+
+OVERWRITEHOST=nc.{{ domain }}
+OVERWRITEPROTOCOL=https
+OVERWRITECLIURL=https://nc.{{ domain }}
diff --git a/roles/nextcloud/templates/.env.redis.j2 b/roles/nextcloud/templates/.env.redis.j2
index a8a0212..8dadbc3 100644
--- a/roles/nextcloud/templates/.env.redis.j2
+++ b/roles/nextcloud/templates/.env.redis.j2
@@ -1 +1 @@
-REDIS_PASSWORD="{{ redis_password }}"
+REDIS_PASSWORD={{ redis_password }}