From 53874c3c8a7cad8229dc3c178b4639a4825b9973 Mon Sep 17 00:00:00 2001
From: Sandeep Kadam <sandeep@ebi.ac.uk>
Date: Thu, 2 May 2019 16:00:27 +0100
Subject: [PATCH] Updated some env variables & added AWS prod build job

---
 .env           | 15 ++++++++++-----
 .gitlab-ci.yml | 28 +++++++++++++++-------------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.env b/.env
index b3a97d807..5abc74bdd 100644
--- a/.env
+++ b/.env
@@ -10,9 +10,6 @@ PROJECT_NAME=wordpresslocal
 
 WP_SITE_TITLE="Wordpress demo site"
 WP_SITE_DESCRIPTION="This is my WP Demo Site Description"
-WP_SITE_ADMIN_USERNAME="admin"
-WP_SITE_ADMIN_PASSWORD="admin"
-WP_SITE_ADMIN_EMAIL="admin@mysite.com"
 
 # WP default plugins/posts/comments config changes
 WP_NEED_BLANK_SITE=No
@@ -25,6 +22,16 @@ WP_GROUP_WHAT_TAXONOMY_SLUG=what-embl-org-sitemap-taxonomy-locations-embl-ebi-hi
 WP_GROUP_WHERE_TAXONOMY_SLUG=where-sites-embl-ebi-hinxton-web-development
 WP_GROUP_TEAM_SHORT_DESCRIPTION="The Web Development team maintain the EMBL-EBI website, internal websites, and bespoke websites for projects in which EMBL-EBI is a collaborator. The team support teams and projects throughout the organisation with web development and User Experience design."
 
+# Default config values irrespective of local or env dev deployments
+WP_SITE_ADMIN_USERNAME="admin"
+WP_SITE_ADMIN_PASSWORD="admin"
+WP_SITE_ADMIN_EMAIL="admin@mysite.com"
+VF_CDN_STYLESHEET="https://dev.assets.emblstatic.net/vf/v2.0.0-alpha.5/css/styles.css"
+VF_CDN_JAVASCRIPT="https://dev.assets.emblstatic.net/vf/v2.0.0-alpha.5/scripts/scripts.js"
+VF_API_URL="https://dev.beta.embl.org/api/v1/"
+THEME_HEADER="vf_ebi_global_header"
+THEME_FOOTER="vf_ebi_global_footer"
+
 ##############################################
 # you shouldn't need to edit below this line
 
@@ -49,8 +56,6 @@ DOCKER_DATABASE_USER=docker
 DOCKER_DATABASE_PASS=docker
 DB_ROOT_PASSWORD=rootpassword
 
-GIT_EMBL_DE_TOKEN=tHJezuyyt53veqK-MSs6
-
 ### PROJECT SETTINGS
 PHP_TAG=7.1-dev-4.4.5
 MARIADB_TAG=10.1-3.2.2
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbfc52f41..0741431c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -51,16 +51,18 @@ deploy-dev-aws:
     - /^v\d+\.\d+\.\d+$/
     - /^v\d+\.\d+\.\d+-(alpha|beta|rc)\.\d+$/
 
-#deploy-aws-prod:
-#  stage: deploy
-#  image: ebiwd/alpine-ssh
-#  tags:
-#    - docker
-#  before_script:
-#    - add-aws-key ${AWS_KEY} ${AWS_SECRET}
-#  script:
-#    - bin/deploy-aws prod
-#  only:
-#    # only match on specific tag patterns
-#    - /^v\d+\.\d+\.\d+$/
-#    - /^v\d+\.\d+\.\d+-(alpha|beta|rc)\.\d+$/
+deploy-aws-prod:
+  stage: deploy
+  image: ebiwd/alpine-ssh
+  tags:
+    - docker
+  before_script:
+    - add-aws-key ${AWS_KEY} ${AWS_SECRET}
+  dependencies:
+    - build
+  script:
+    - bin/deploy-aws prod
+  only:
+    # only match on specific tag patterns
+    - /^v\d+\.\d+\.\d+$/
+    - /^v\d+\.\d+\.\d+-(alpha|beta|rc)\.\d+$/