HOTFIX: ops: add support for MW API EMAIL USER/PW

Bug: T409420

Author: jsnshrmn

bin/debian_swarm_deploy.sh

@@ -38,25 +38,29 @@ usermod -a -G docker twlight
 rm -rf /srv/TWLight
 # Pull TWLight code and make twlight user the owner
 git clone https://github.com/WikipediaLibrary/TWLight.git /srv/TWLight
-cd /srv/TWLight
+cd /srv/TWLight || exit
 # Get on correct branch
 echo "Enter git branch:"
 read TWLIGHT_GIT_BRANCH
 git checkout "${TWLIGHT_GIT_BRANCH}" && git pull
 
 # Get input from human
 echo "Enter DJANGO_DB_NAME:"
-read DJANGO_DB_NAME
+read -r DJANGO_DB_NAME
 echo "Enter DJANGO_DB_USER:"
-read DJANGO_DB_USER
+read -r DJANGO_DB_USER
 echo "Enter TWLIGHT_OAUTH_CONSUMER_KEY:"
-read TWLIGHT_OAUTH_CONSUMER_KEY
+read -r TWLIGHT_OAUTH_CONSUMER_KEY
 echo "Enter TWLIGHT_OAUTH_CONSUMER_SECRET:"
-read TWLIGHT_OAUTH_CONSUMER_SECRET
+read -r TWLIGHT_OAUTH_CONSUMER_SECRET
 echo "Enter TWLIGHT_EZPROXY_SECRET:"
-read TWLIGHT_EZPROXY_SECRET
+read -r TWLIGHT_EZPROXY_SECRET
+echo "Enter MW_API_EMAIL_USER"
+read -r MW_API_EMAIL_USER
+echo "Enter MW_API_EMAIL_PASSWORD"
+read -r MW_API_EMAIL_PASSWORD
 echo "Enter stack environment (eg. override | staging | production):"
-read TWLIGHT_STACK_ENV
+read -r TWLIGHT_STACK_ENV
 
 # Setup DKIM
 ssh-keygen -t rsa -b 1024 -m PEM -P "" -f dkim
@@ -92,6 +96,8 @@ printf "${SECRET_KEY}" | docker secret create SECRET_KEY -
 printf "${TWLIGHT_OAUTH_CONSUMER_KEY}" | docker secret create TWLIGHT_OAUTH_CONSUMER_KEY -
 printf "${TWLIGHT_OAUTH_CONSUMER_SECRET}" | docker secret create TWLIGHT_OAUTH_CONSUMER_SECRET -
 printf "${TWLIGHT_EZPROXY_SECRET}" | docker secret create TWLIGHT_EZPROXY_SECRET -
+printf "${MW_API_EMAIL_USER}" | docker secret create MW_API_EMAIL_USER -
+printf "${MW_API_EMAIL_PASSWORD}" | docker secret create MW_API_EMAIL_PASSWORD -
 echo "Deploying stack"
 docker stack deploy -c "docker-compose.yml" -c "docker-compose.${TWLIGHT_STACK_ENV}.yml" "${TWLIGHT_STACK_ENV}"
 echo "Setting up crontab. *WARNING* This will create duplicate jobs if run repeatedly."

bin/twlight_docker_secrets.sh

@@ -2,40 +2,59 @@
 
 if  [ ! -n "${DJANGO_DB_NAME+isset}" ]
 then
-    export DJANGO_DB_NAME=$(cat /run/secrets/DJANGO_DB_NAME 2>/dev/null)
+    DJANGO_DB_NAME=$(cat /run/secrets/DJANGO_DB_NAME 2>/dev/null)
+	export DJANGO_DB_NAME
 fi
 
 if  [ ! -n "${DJANGO_DB_USER+isset}" ]
 then
-    export DJANGO_DB_USER=$(cat /run/secrets/DJANGO_DB_USER 2>/dev/null)
+    DJANGO_DB_USER=$(cat /run/secrets/DJANGO_DB_USER 2>/dev/null)
+	export DJANGO_DB_USER
 fi
 
 if  [ ! -n "${DJANGO_DB_PASSWORD+isset}" ]
 then
-    export DJANGO_DB_PASSWORD=$(cat /run/secrets/DJANGO_DB_PASSWORD 2>/dev/null)
+    DJANGO_DB_PASSWORD=$(cat /run/secrets/DJANGO_DB_PASSWORD 2>/dev/null)
+	export DJANGO_DB_PASSWORD
 fi
 
 if  [ ! -n "${DKIM_PRIVATE_KEY+isset}" ]
 then
-    export DKIM_PRIVATE_KEY=$(cat /run/secrets/DKIM_PRIVATE_KEY 2>/dev/null)
+    DKIM_PRIVATE_KEY=$(cat /run/secrets/DKIM_PRIVATE_KEY 2>/dev/null)
+	export DKIM_PRIVATE_KEY
 fi
 
 if  [ ! -n "${SECRET_KEY+isset}" ]
 then
-    export SECRET_KEY=$(cat /run/secrets/SECRET_KEY 2>/dev/null)
+    SECRET_KEY=$(cat /run/secrets/SECRET_KEY 2>/dev/null)
+	export SECRET_KEY
 fi
 
 if  [ ! -n "${TWLIGHT_OAUTH_CONSUMER_KEY+isset}" ]
 then
-    export TWLIGHT_OAUTH_CONSUMER_KEY=$(cat /run/secrets/TWLIGHT_OAUTH_CONSUMER_KEY 2>/dev/null)
+    TWLIGHT_OAUTH_CONSUMER_KEY=$(cat /run/secrets/TWLIGHT_OAUTH_CONSUMER_KEY 2>/dev/null)
+	export TWLIGHT_OAUTH_CONSUMER_KEY
 fi
 
 if  [ ! -n "${TWLIGHT_OAUTH_CONSUMER_SECRET+isset}" ]
 then
-    export TWLIGHT_OAUTH_CONSUMER_SECRET=$(cat /run/secrets/TWLIGHT_OAUTH_CONSUMER_SECRET 2>/dev/null)
+    TWLIGHT_OAUTH_CONSUMER_SECRET=$(cat /run/secrets/TWLIGHT_OAUTH_CONSUMER_SECRET 2>/dev/null)
+	export TWLIGHT_OAUTH_CONSUMER_SECRET
 fi
 
 if  [ ! -n "${TWLIGHT_EZPROXY_SECRET+isset}" ]
 then
-    export TWLIGHT_EZPROXY_SECRET=$(cat /run/secrets/TWLIGHT_EZPROXY_SECRET 2>/dev/null)
+    TWLIGHT_EZPROXY_SECRET=$(cat /run/secrets/TWLIGHT_EZPROXY_SECRET 2>/dev/null)
+	export TWLIGHT_EZPROXY_SECRET
+fi
+
+if  [ ! -n "${MW_API_EMAIL_USER+isset}" ]
+then
+	MW_API_EMAIL_USER=$(cat /run/secrets/MW_API_EMAIL_USER 2>/dev/null)
+	export MW_API_EMAIL_USER
+fi
+if  [ ! -n "${MW_API_EMAIL_PASSWORD+isset}" ]
+then
+    MW_API_EMAIL_PASSWORD=$(cat /run/secrets/MW_API_EMAIL_PASSWORD 2>/dev/null)
+	export MW_API_EMAIL_PASSWORD
 fi

docker-compose.override.yml

@@ -22,6 +22,10 @@ secrets:
     file: ./secrets/TWLIGHT_OAUTH_CONSUMER_SECRET
   TWLIGHT_EZPROXY_SECRET:
     file: ./secrets/TWLIGHT_EZPROXY_SECRET
+  MW_API_EMAIL_USER:
+    file: ./secrets/MW_API_EMAIL_USER
+  MW_API_EMAIL_PASSWORD:
+    file: ./secrets/MW_API_EMAIL_PASSWORD
 
 services:
   twlight:

docker-compose.production.yml

@@ -21,6 +21,10 @@ secrets:
     external: true
   TWLIGHT_EZPROXY_SECRET:
     external: true
+  MW_API_EMAIL_USER:
+    external: true
+  MW_API_EMAIL_PASSWORD:
+    external: true
 
 services:
   migrate:

docker-compose.staging.yml

@@ -21,6 +21,10 @@ secrets:
     external: true
   TWLIGHT_EZPROXY_SECRET:
     external: true
+  MW_API_EMAIL_USER:
+    external: true
+  MW_API_EMAIL_PASSWORD:
+    external: true
 
 services:
   migrate:

docker-compose.yml

@@ -51,6 +51,8 @@ services:
       - TWLIGHT_OAUTH_CONSUMER_KEY
       - TWLIGHT_OAUTH_CONSUMER_SECRET
       - TWLIGHT_EZPROXY_SECRET
+      - MW_API_EMAIL_USER
+      - MW_API_EMAIL_PASSWORD
   web:
     ports:
       - "80:80"