From b273746cce3e146d0f509d5c5c4cb36fde9cd8dd Mon Sep 17 00:00:00 2001
From: Brett <54408245+kowh-ai@users.noreply.github.com>
Date: Thu, 14 Jan 2021 11:15:44 +0100
Subject: [PATCH] .env.template

---
 .env          | 55 ---------------------------------------------------
 .env.template | 53 +++++++++++++++++++++----------------------------
 2 files changed, 22 insertions(+), 86 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 95fc9e9..0000000
--- a/.env
+++ /dev/null
@@ -1,55 +0,0 @@
-# DB image settings
-# POSTGRES_USER must be set to the database user used by CKAN, typically named ckan
-# Readwrite user/pass will be POSTGRES_USER:POSTGRES_PASSWORD
-POSTGRES_USER=ckan
-POSTGRES_PASSWORD=ckan
-# Readonly user/pass will be DATASTORE_READONLY_USER:DATASTORE_READONLY_PASSWORD
-DATASTORE_READONLY_USER=datastore_ro
-DATASTORE_READONLY_PASSWORD=datastore
-# POSTGRES_HOST must be set to the host for the postgres server.
-# As a default 'db' will point to the postgres running in the docker container specified by the docker-compose.yml file.
-POSTGRES_HOST=db
-
-# Basic
-CKAN_SITE_ID=default
-CKAN_SITE_URL=http://ckan:5000
-CKAN_PORT=5000
-CKAN_SYSADMIN_NAME=ckan_admin
-CKAN_SYSADMIN_PASSWORD=test1234
-CKAN_SYSADMIN_EMAIL=your_email@example.com
-TZ=UTC
-
-# Database connections (TODO: avoid duplication)
-CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
-CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
-CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
-
-# Test database connections
-#TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
-TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
-TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
-
-# Other services connections
-CKAN_SOLR_URL=http://solr:8983/solr/ckan
-CKAN_REDIS_URL=redis://redis:6379/1
-CKAN_DATAPUSHER_URL=http://datapusher:8801
-CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
-
-TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
-TEST_CKAN_REDIS_URL=redis://redis:6379/1
-
-# Core settings
-CKAN__STORAGE_PATH=/var/lib/ckan
-CKAN_SMTP_SERVER=smtp.corporateict.domain:25
-CKAN_SMTP_STARTTLS=True
-CKAN_SMTP_USER=user
-CKAN_SMTP_PASSWORD=pass
-CKAN_SMTP_MAIL_FROM=ckan@localhost
-
-# Extensions
-
-CKAN__PLUGINS=envvars image_view text_view recline_view datastore datapusher
-CKAN__HARVEST__MQ__TYPE=redis
-CKAN__HARVEST__MQ__HOSTNAME=redis
-CKAN__HARVEST__MQ__PORT=6379
-CKAN__HARVEST__MQ__REDIS_DB=1
\ No newline at end of file
diff --git a/.env.template b/.env.template
index 95fc9e9..a3d9300 100644
--- a/.env.template
+++ b/.env.template
@@ -1,53 +1,44 @@
-# DB image settings
-# POSTGRES_USER must be set to the database user used by CKAN, typically named ckan
-# Readwrite user/pass will be POSTGRES_USER:POSTGRES_PASSWORD
+# CKAN databases
 POSTGRES_USER=ckan
 POSTGRES_PASSWORD=ckan
-# Readonly user/pass will be DATASTORE_READONLY_USER:DATASTORE_READONLY_PASSWORD
 DATASTORE_READONLY_USER=datastore_ro
 DATASTORE_READONLY_PASSWORD=datastore
-# POSTGRES_HOST must be set to the host for the postgres server.
-# As a default 'db' will point to the postgres running in the docker container specified by the docker-compose.yml file.
 POSTGRES_HOST=db
+CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
+CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
+CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
 
-# Basic
+# Test database connections
+TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
+TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
+TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
+
+# CKAN core
 CKAN_SITE_ID=default
 CKAN_SITE_URL=http://ckan:5000
 CKAN_PORT=5000
 CKAN_SYSADMIN_NAME=ckan_admin
 CKAN_SYSADMIN_PASSWORD=test1234
 CKAN_SYSADMIN_EMAIL=your_email@example.com
-TZ=UTC
-
-# Database connections (TODO: avoid duplication)
-CKAN_SQLALCHEMY_URL=postgresql://ckan:ckan@db/ckan
-CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore
-CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore
-
-# Test database connections
-#TEST_CKAN_SQLALCHEMY_URL=postgres://ckan:ckan@db/ckan_test
-TEST_CKAN_DATASTORE_WRITE_URL=postgresql://ckan:ckan@db/datastore_test
-TEST_CKAN_DATASTORE_READ_URL=postgresql://datastore_ro:datastore@db/datastore_test
-
-# Other services connections
-CKAN_SOLR_URL=http://solr:8983/solr/ckan
-CKAN_REDIS_URL=redis://redis:6379/1
-CKAN_DATAPUSHER_URL=http://datapusher:8801
-CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
-
-TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
-TEST_CKAN_REDIS_URL=redis://redis:6379/1
-
-# Core settings
-CKAN__STORAGE_PATH=/var/lib/ckan
+CKAN_STORAGE_PATH=/var/lib/ckan
 CKAN_SMTP_SERVER=smtp.corporateict.domain:25
 CKAN_SMTP_STARTTLS=True
 CKAN_SMTP_USER=user
 CKAN_SMTP_PASSWORD=pass
 CKAN_SMTP_MAIL_FROM=ckan@localhost
+TZ=UTC
+
+# Other services
+CKAN_SOLR_URL=http://solr:8983/solr/ckan
+CKAN_REDIS_URL=redis://redis:6379/1
+CKAN_DATAPUSHER_URL=http://datapusher:8801
+CKAN__DATAPUSHER__CALLBACK_URL_BASE=http://ckan:5000
+
+# test connections
+TEST_CKAN_SOLR_URL=http://solr:8983/solr/ckan
+TEST_CKAN_REDIS_URL=redis://redis:6379/1
 
 # Extensions
-
 CKAN__PLUGINS=envvars image_view text_view recline_view datastore datapusher
 CKAN__HARVEST__MQ__TYPE=redis
 CKAN__HARVEST__MQ__HOSTNAME=redis