From 3f1a3db930f68bfae3ba578b06a30e74ba63a7e2 Mon Sep 17 00:00:00 2001
From: Samuel Galson <samgalson@gmail.com>
Date: Fri, 26 Jan 2018 16:42:15 +0000
Subject: [PATCH] initialise couch
---
provisioning/couchdb-statefulset.yaml | 3 ++-
templates/xpub-collabra-configmap-initscripts.yaml | 5 +++++
templates/xpub-collabra-configmap-nodeconfig.yaml | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/provisioning/couchdb-statefulset.yaml b/provisioning/couchdb-statefulset.yaml
index a7f005a..ba7051f 100644
--- a/provisioning/couchdb-statefulset.yaml
+++ b/provisioning/couchdb-statefulset.yaml
@@ -62,7 +62,8 @@ spec:
- metadata:
name: couchdb
labels:
- app: couchdb-${CI_ENVIRONMENT_SLUG}
+ env: ${CI_ENVIRONMENT_SLUG}
+ branch: ${CI_COMMIT_REF_NAME}
spec:
storageClassName: aws-efs
accessModes:
diff --git a/templates/xpub-collabra-configmap-initscripts.yaml b/templates/xpub-collabra-configmap-initscripts.yaml
index 4a53fec..d5ee810 100644
--- a/templates/xpub-collabra-configmap-initscripts.yaml
+++ b/templates/xpub-collabra-configmap-initscripts.yaml
@@ -7,6 +7,11 @@ metadata:
branch: ${CI_COMMIT_REF_NAME}
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
+
if [[ -n "$(printenv FORCE_FRESH_DB)" ]]; then
npx pubsweet setupdb --username=cokouser --password=cokopassword --email=cokouser@example.com --clobber
else
diff --git a/templates/xpub-collabra-configmap-nodeconfig.yaml b/templates/xpub-collabra-configmap-nodeconfig.yaml
index 6f8050e..77b1995 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}/${CI_ENVIRONMENT_SLUG}"
+ "dbPath": "https://${COUCHDB_USER}:${COUCHDB_PASSWORD}@couchdb-${CI_ENVIRONMENT_SLUG}/pubsweet"
},
"password-reset": {
"url": "${CI_ENVIRONMENT_URL}/password-reset"
--
GitLab