From 2181d2108fdeef5e103ba905e7b80b6db8914b74 Mon Sep 17 00:00:00 2001
From: Samuel Galson <samgalson@gmail.com>
Date: Fri, 26 Jan 2018 16:50:10 +0000
Subject: [PATCH] use http within the cluster
---
templates/xpub-collabra-configmap-initscripts.yaml | 4 ++--
templates/xpub-collabra-configmap-nodeconfig.yaml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/templates/xpub-collabra-configmap-initscripts.yaml b/templates/xpub-collabra-configmap-initscripts.yaml
index d5ee810..f0c8b4e 100644
--- a/templates/xpub-collabra-configmap-initscripts.yaml
+++ b/templates/xpub-collabra-configmap-initscripts.yaml
@@ -9,8 +9,8 @@ data:
createdb.sh: | # NB envsubst cannot escape env vars
# initialise couch if it is the first deployment
- curl -X PUT https://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984/_users
- curl -X PUT https://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984/_replicator
+ curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984/_users
+ curl -X PUT http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}:5984/_replicator
if [[ -n "$(printenv FORCE_FRESH_DB)" ]]; then
npx pubsweet setupdb --username=cokouser --password=cokopassword --email=cokouser@example.com --clobber
diff --git a/templates/xpub-collabra-configmap-nodeconfig.yaml b/templates/xpub-collabra-configmap-nodeconfig.yaml
index 77b1995..b43c434 100644
--- a/templates/xpub-collabra-configmap-nodeconfig.yaml
+++ b/templates/xpub-collabra-configmap-nodeconfig.yaml
@@ -12,7 +12,7 @@ data:
},
"pubsweet-server": {
"secret": "${PUBSWEET_SERVER_SECRET}",
- "dbPath": "https://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}/pubsweet"
+ "dbPath": "http://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}/pubsweet"
},
"password-reset": {
"url": "${CI_ENVIRONMENT_URL}/password-reset"
--
GitLab