From 3b339845803aa1b34ffcaeb96ad2358e70d5c0c1 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Mon, 9 Jul 2018 15:44:16 -0400
Subject: [PATCH 001/137] TE-2639 Support for named release images

(cherry picked from commit a76042b19aeb8fc8b02d93d3db4be783a54a0be1)
---
 Makefile                              |  3 +++
 README.rst                            | 27 ++++++++++++++++---
 docker-compose-analytics-pipeline.yml | 14 +++++-----
 docker-compose-marketing-site.yml     |  2 +-
 docker-compose-watchers.yml           |  4 +--
 docker-compose-xqueue.yml             |  4 +--
 docker-compose.yml                    | 20 +++++++-------
 repo.sh                               | 39 ++++++++++++++++++++++++++-
 8 files changed, 86 insertions(+), 27 deletions(-)

diff --git a/Makefile b/Makefile
index a844eb7398..e1abb70edb 100644
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,9 @@ upgrade: ## Upgrade requirements with pip-tools
 		requirements/pip-tools.txt \
 		requirements/base.txt \
 
+dev.checkout: ## Check out "openedx-release/$OPENEDX_RELEASE" in each repo if set, "master" otherwise
+	./repo.sh checkout
+
 dev.clone: ## Clone service repos to the parent directory
 	./repo.sh clone
 
diff --git a/README.rst b/README.rst
index 7b7f2926ca..42fdb5fbd3 100644
--- a/README.rst
+++ b/README.rst
@@ -351,14 +351,17 @@ How do I build images?
 
 There are `Docker CI Jenkins jobs`_ on tools-edx-jenkins that build and push new
 Docker images to DockerHub on code changes to either the configuration repository or the IDA's codebase. These images
-are tagged ``latest``. Images that require tags other than ``latest`` are built and pushed by hand (see NOTES below).
+are tagged according to the branch from which they were built (see NOTES below).
 If you want to build the images on your own, the Dockerfiles are available in the ``edx/configuration`` repo.
 
 NOTES:
 
-1. edxapp and IDAs use the ``latest`` tag since their configuration changes have been merged to master branch of
-   ``edx/configuration``.
-2. The elasticsearch used in devstack is built using elasticsearch-devstack/Dockerfile and the ``devstack`` tag.
+1. edxapp and IDAs use the ``latest`` tag for configuration changes which have been merged to master branch of
+   their repository and ``edx/configuration``.
+2. Images for a named Open edX release are built from the corresponding branch
+   of each repository and tagged appropriately, for example ``hawthorn.master``
+   or ``hawthorn.rc1``.
+3. The elasticsearch used in devstack is built using elasticsearch-devstack/Dockerfile and the ``devstack`` tag.
 
 BUILD COMMANDS:
 
@@ -385,6 +388,22 @@ For example, if you wanted to build tag ``release-2017-03-03`` for the
 E-Commerce Service, you would modify ``ECOMMERCE_VERSION`` in
 ``docker/build/ecommerce/ansible_overrides.yml``.
 
+How do I run the images for a named Open edX release?
+-----------------------------------------------------
+
+1. Set the ``OPENEDX_RELEASE`` environment variable to the appropriate image
+   tag; "hawthorn.master", "zebrawood.rc1", etc.  Note that unlike a server
+   install, ``OPENEDX_RELEASE`` should not have the "open-release/" prefix.
+2. Use ``make dev.checkout`` to check out the correct branch in the local
+   checkout of each service repository once you've set the ``OPENEDX_RELEASE``
+   environment variable above.
+3. ``make pull`` to get the correct images.
+
+All ``make`` target and ``docker-compose`` calls should now use the correct
+images until you change or unset ``OPENEDX_RELEASE`` again.  To work on the
+master branches and ``latest`` images, unset ``OPENEDX_RELEASE`` or set it to
+an empty string.
+
 How do I create database dumps?
 -------------------------------
 We use database dumps to speed up provisioning and generally spend less time running migrations. These dumps should be
diff --git a/docker-compose-analytics-pipeline.yml b/docker-compose-analytics-pipeline.yml
index 5e3a294ed6..eef6b6fa24 100644
--- a/docker-compose-analytics-pipeline.yml
+++ b/docker-compose-analytics-pipeline.yml
@@ -2,7 +2,7 @@ version: "2.1"
 
 services:
   namenode:
-    image: edxops/analytics_pipeline_hadoop_namenode:latest
+    image: edxops/analytics_pipeline_hadoop_namenode:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline.namenode
     hostname: namenode
     environment:
@@ -14,7 +14,7 @@ services:
       - namenode_data:/hadoop/dfs/name
 
   datanode:
-    image: edxops/analytics_pipeline_hadoop_datanode:latest
+    image: edxops/analytics_pipeline_hadoop_datanode:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline.datanode
     hostname: datanode
     environment:
@@ -28,7 +28,7 @@ services:
       - datanode_data:/hadoop/dfs/data
 
   resourcemanager:
-    image: edxops/analytics_pipeline_hadoop_resourcemanager:latest
+    image: edxops/analytics_pipeline_hadoop_resourcemanager:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline.resourcemanager
     hostname: resourcemanager
     environment:
@@ -45,7 +45,7 @@ services:
     command: ["/run.sh"]
 
   nodemanager:
-    image: edxops/analytics_pipeline_hadoop_nodemanager:latest
+    image: edxops/analytics_pipeline_hadoop_nodemanager:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline.nodemanager
     hostname: nodemanager
     environment:
@@ -66,7 +66,7 @@ services:
     command: ["/run.sh"]
 
   sparkmaster:
-    image: edxops/analytics_pipeline_spark_master:latest
+    image: edxops/analytics_pipeline_spark_master:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline.sparkmaster
     hostname: sparkmaster
     ports:
@@ -76,7 +76,7 @@ services:
       - 127.0.0.1:18080:18080     # spark history server
 
   sparkworker:
-    image: edxops/analytics_pipeline_spark_worker:latest
+    image: edxops/analytics_pipeline_spark_worker:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline.sparkworker
     hostname: sparkworker
     depends_on:
@@ -93,7 +93,7 @@ services:
       - vertica_data:/home/dbadmin/docker
 
   analyticspipeline:
-    image: edxops/analytics_pipeline:latest
+    image: edxops/analytics_pipeline:${OPENEDX_RELEASE:-latest}
     container_name: edx.devstack.analytics_pipeline
     hostname: analyticspipeline
     volumes:
diff --git a/docker-compose-marketing-site.yml b/docker-compose-marketing-site.yml
index 1051b4f872..4bd2693b7a 100644
--- a/docker-compose-marketing-site.yml
+++ b/docker-compose-marketing-site.yml
@@ -25,6 +25,6 @@ services:
       - DRUPAL_EXTRA_SETTINGS=${DRUPAL_EXTRA_SETTINGS:-/var/www/html/sites/default/docker.settings.php}
       # IP address of your machine to enable debugging (IP_ADDRESS set in .env file)
       - XDEBUG_CONFIG=remote_host=${XDEBUG_IP_ADDRESS:-127.0.0.1}
-    image: edxops/edx-mktg:latest
+    image: edxops/edx-mktg:${OPENEDX_RELEASE:-latest}
     ports:
       - "8080:80"
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 34c9074a0b..aedd8fd710 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -7,7 +7,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:latest
+    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -19,7 +19,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:latest
+    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
diff --git a/docker-compose-xqueue.yml b/docker-compose-xqueue.yml
index 04db96f2b7..bf4a73ac54 100644
--- a/docker-compose-xqueue.yml
+++ b/docker-compose-xqueue.yml
@@ -3,7 +3,7 @@ version: "2.1"
 services:
   xqueue:
     container_name: edx.devstack.xqueue
-    image: edxops/xqueue:latest
+    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
     command: bash -c 'source /edx/app/xqueue/xqueue_env && while true; do python /edx/app/xqueue/xqueue/manage.py runserver 0.0.0.0:18040 ; sleep 2; done'
     volumes:
       - ${DEVSTACK_WORKSPACE}/xqueue:/edx/app/xqueue/xqueue:cached
@@ -13,7 +13,7 @@ services:
 
   xqueue_consumer:
     container_name: edx.devstack.xqueue_consumer
-    image: edxops/xqueue:latest
+    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
     command: bash -c 'source /edx/app/xqueue/xqueue_env && while true; do python /edx/app/xqueue/xqueue/manage.py run_consumer ; sleep 2; done'
     volumes:
       - ${DEVSTACK_WORKSPACE}/xqueue:/edx/app/xqueue/xqueue:cached
diff --git a/docker-compose.yml b/docker-compose.yml
index 63fa74b86c..2c496de921 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,7 @@ services:
   # Third-party services
   chrome:
     container_name: edx.devstack.chrome
-    image: edxops/chrome:latest
+    image: edxops/chrome:${OPENEDX_RELEASE:-latest}
     shm_size: 2g
     ports:
       - "15900:5900"
@@ -35,7 +35,7 @@ services:
 
   firefox:
     container_name: edx.devstack.firefox
-    image: edxops/firefox:latest
+    image: edxops/firefox:${OPENEDX_RELEASE:-latest}
     shm_size: 2g
     ports:
       - "25900:5900"
@@ -88,7 +88,7 @@ services:
       DB_HOST: edx.devstack.mysql
       SOCIAL_AUTH_EDX_OIDC_URL_ROOT: http://edx.devstack.lms:18000/oauth2
       ENABLE_DJANGO_TOOLBAR: 1
-    image: edxops/credentials:latest
+    image: edxops/credentials:${OPENEDX_RELEASE:-latest}
     ports:
       - "18150:18150"
 
@@ -105,7 +105,7 @@ services:
     environment:
       TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
       ENABLE_DJANGO_TOOLBAR: 1
-    image: edxops/discovery:latest
+    image: edxops/discovery:${OPENEDX_RELEASE:-latest}
     ports:
       - "18381:18381"
     volumes:
@@ -122,7 +122,7 @@ services:
     tty: true
     environment:
       ENABLE_DJANGO_TOOLBAR: 0
-    image: edxops/ecommerce:latest
+    image: edxops/ecommerce:${OPENEDX_RELEASE:-latest}
     ports:
       - "18130:18130"
 
@@ -143,7 +143,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: edxops/edxapp:latest
+    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
@@ -159,7 +159,7 @@ services:
       - devpi
       - elasticsearch
       - mysql
-    image: edxops/notes:latest
+    image: edxops/notes:${OPENEDX_RELEASE:-latest}
     ports:
       - "18120:18120"
     environment:
@@ -189,7 +189,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: edxops/edxapp:latest
+    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging
@@ -205,13 +205,13 @@ services:
       - mongo
       - memcached
       - elasticsearch
-    image: edxops/forum:latest
+    image: edxops/forum:${OPENEDX_RELEASE:-latest}
     ports:
       - "44567:4567"
 
   devpi:
     container_name: edx.devstack.devpi
-    image: edxops/devpi:latest
+    image: edxops/devpi:${OPENEDX_RELEASE:-latest}
     ports:
       - "3141:3141"
     volumes:
diff --git a/repo.sh b/repo.sh
index 669979714b..e8f9e802b6 100755
--- a/repo.sh
+++ b/repo.sh
@@ -36,6 +36,38 @@ private_repos=(
 
 name_pattern=".*edx/(.*).git"
 
+_checkout ()
+{
+    repos_to_checkout=("$@")
+
+    if [ -z "$OPENEDX_RELEASE" ]; then
+        branch="master"
+    else
+        branch="open-release/${OPENEDX_RELEASE}"
+    fi
+    for repo in "${repos_to_checkout[@]}"
+    do
+        # Use Bash's regex match operator to capture the name of the repo.
+        # Results of the match are saved to an array called $BASH_REMATCH.
+        [[ $repo =~ $name_pattern ]]
+        name="${BASH_REMATCH[1]}"
+
+        # If a directory exists and it is nonempty, assume the repo has been cloned.
+        if [ -d "$name" -a -n "$(ls -A "$name" 2>/dev/null)" ]; then
+            cd $name
+            echo "Checking out branch $branch of $name"
+            git pull
+            git checkout "$branch"
+            cd ..
+        fi
+    done
+}
+
+checkout ()
+{
+    _checkout "${repos[@]}"
+}
+
 _clone ()
 {
     # for repo in ${repos[*]}
@@ -57,6 +89,9 @@ _clone ()
             else
                 git clone $repo
             fi
+            if [ -n "${OPENEDX_RELEASE}" ]; then
+                git checkout open-release/${OPENEDX_RELEASE}
+            fi
         fi
     done
     cd - &> /dev/null
@@ -107,7 +142,9 @@ status ()
     cd - &> /dev/null
 }
 
-if [ "$1" == "clone" ]; then
+if [ "$1" == "checkout" ]; then
+    checkout
+elif [ "$1" == "clone" ]; then
     clone
 elif [ "$1" == "whitelabel" ]; then
     clone_private

From 1f1b82d278208e56e4bc02a6a899b059467399b4 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Sun, 24 Feb 2019 10:28:31 +0200
Subject: [PATCH 002/137] Edraak Hawthorn devstack

---
 Makefile                    |  9 +++++++++
 README.rst                  |  2 +-
 docker-compose-watchers.yml |  4 ++--
 docker-compose.yml          |  4 ++--
 repo.sh                     | 23 +++++++++++++----------
 5 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index e1abb70edb..219c819ba2 100644
--- a/Makefile
+++ b/Makefile
@@ -60,6 +60,15 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
 
 dev.up: | check-memory ## Bring up all services with host volumes
 	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
+
+	# Start: Edraak hacks
+	# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
+	docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
+	docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'
+	docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	# End: Edraak hacks
+
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	./programs/provision.sh cache >/dev/null
 
diff --git a/README.rst b/README.rst
index 42fdb5fbd3..12f8367309 100644
--- a/README.rst
+++ b/README.rst
@@ -369,7 +369,7 @@ BUILD COMMANDS:
 
     git checkout master
     git pull
-    docker build -f docker/build/edxapp/Dockerfile . -t edxops/edxapp:latest
+    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:latest
 
 .. code:: sh
 
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index aedd8fd710..85cd39bcbe 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -7,7 +7,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -19,7 +19,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
diff --git a/docker-compose.yml b/docker-compose.yml
index 2c496de921..6b7f8482c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -143,7 +143,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
@@ -189,7 +189,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: edxops/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging
diff --git a/repo.sh b/repo.sh
index e8f9e802b6..6f33884e1c 100755
--- a/repo.sh
+++ b/repo.sh
@@ -18,15 +18,15 @@ else
 fi
 
 repos=(
-    "https://github.com/edx/course-discovery.git"
-    "https://github.com/edx/credentials.git"
-    "https://github.com/edx/cs_comments_service.git"
-    "https://github.com/edx/ecommerce.git"
-    "https://github.com/edx/edx-e2e-tests.git"
-    "https://github.com/edx/edx-notes-api.git"
-    "https://github.com/edx/edx-platform.git"
-    "https://github.com/edx/xqueue.git"
-    "https://github.com/edx/edx-analytics-pipeline.git"
+    "https://github.com/Edraak/course-discovery.git"
+    "https://github.com/Edraak/credentials.git"
+    "https://github.com/Edraak/cs_comments_service.git"
+    "https://github.com/Edraak/ecommerce.git"
+    "https://github.com/Edraak/edx-e2e-tests.git"
+    "https://github.com/Edraak/edx-notes-api.git"
+    "https://github.com/Edraak/edx-platform.git"
+    "https://github.com/Edraak/xqueue.git"
+    "https://github.com/Edraak/edx-analytics-pipeline.git"
 )
 
 private_repos=(
@@ -34,7 +34,7 @@ private_repos=(
     "https://github.com/edx/edx-themes.git"
 )
 
-name_pattern=".*edx/(.*).git"
+name_pattern=".*Edraak/(.*).git"
 
 _checkout ()
 {
@@ -45,6 +45,9 @@ _checkout ()
     else
         branch="open-release/${OPENEDX_RELEASE}"
     fi
+
+    branch="master"  # Edraak: Use master, because it's pinned to Hawthorn.
+
     for repo in "${repos_to_checkout[@]}"
     do
         # Use Bash's regex match operator to capture the name of the repo.

From ee136b6bb4f0b62eadb6e9bc25e1a737aede4bd5 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Tue, 30 Apr 2019 18:19:23 +0300
Subject: [PATCH 003/137] Patch for Hawthorn devstack Changes

---
 repo.sh | 44 +++++++++++++++++++++++++++++---------------
 1 file changed, 29 insertions(+), 15 deletions(-)

diff --git a/repo.sh b/repo.sh
index 6f33884e1c..6fe7703700 100755
--- a/repo.sh
+++ b/repo.sh
@@ -24,11 +24,15 @@ repos=(
     "https://github.com/Edraak/ecommerce.git"
     "https://github.com/Edraak/edx-e2e-tests.git"
     "https://github.com/Edraak/edx-notes-api.git"
-    "https://github.com/Edraak/edx-platform.git"
+    "https://github.com/Edraak/edraak-platform.git"
     "https://github.com/Edraak/xqueue.git"
     "https://github.com/Edraak/edx-analytics-pipeline.git"
 )
 
+repo_alternative_directory=(
+	"https://github.com/Edraak/edraak-platform.git,edx-platform"
+)
+
 private_repos=(
     # Needed to run whitelabel tests.
     "https://github.com/edx/edx-themes.git"
@@ -36,6 +40,24 @@ private_repos=(
 
 name_pattern=".*Edraak/(.*).git"
 
+_get_name()
+{
+	for altdir in "${repo_alternative_directory[@]}"
+	do
+		# Use Bash's regex match operator to capture the name of the repo.
+		# Results of the match are saved to an array called $BASH_REMATCH.
+		[[ $altdir =~ (.*),(.*) ]]
+
+		if [ "${1}" == "${BASH_REMATCH[1]}" ]; then
+			echo "${BASH_REMATCH[2]}"
+			return 0
+		fi
+	done
+
+	[[ $1 =~ $name_pattern ]]
+	echo "${BASH_REMATCH[1]}"
+}
+
 _checkout ()
 {
     repos_to_checkout=("$@")
@@ -50,10 +72,7 @@ _checkout ()
 
     for repo in "${repos_to_checkout[@]}"
     do
-        # Use Bash's regex match operator to capture the name of the repo.
-        # Results of the match are saved to an array called $BASH_REMATCH.
-        [[ $repo =~ $name_pattern ]]
-        name="${BASH_REMATCH[1]}"
+        name=$(_get_name $repo)
 
         # If a directory exists and it is nonempty, assume the repo has been cloned.
         if [ -d "$name" -a -n "$(ls -A "$name" 2>/dev/null)" ]; then
@@ -78,19 +97,16 @@ _clone ()
 
     for repo in "${repos_to_clone[@]}"
     do
-        # Use Bash's regex match operator to capture the name of the repo.
-        # Results of the match are saved to an array called $BASH_REMATCH.
-        [[ $repo =~ $name_pattern ]]
-        name="${BASH_REMATCH[1]}"
+        name=$(_get_name $repo)
 
         # If a directory exists and it is nonempty, assume the repo has been checked out.
         if [ -d "$name" -a -n "$(ls -A "$name" 2>/dev/null)" ]; then
             printf "The [%s] repo is already checked out. Continuing.\n" $name
         else
             if [ "${SHALLOW_CLONE}" == "1" ]; then
-                git clone --depth=1 $repo
+                git clone --depth=1 $repo $name
             else
-                git clone $repo
+                git clone $repo $name
             fi
             if [ -n "${OPENEDX_RELEASE}" ]; then
                 git checkout open-release/${OPENEDX_RELEASE}
@@ -115,8 +131,7 @@ reset ()
     currDir=$(pwd)
     for repo in ${repos[*]}
     do
-        [[ $repo =~ $name_pattern ]]
-        name="${BASH_REMATCH[1]}"
+        name=$(_get_name $repo)
 
         if [ -d "$name" ]; then
             cd $name;git reset --hard HEAD;git checkout master;git reset --hard origin/master;git pull;cd "$currDir"
@@ -132,8 +147,7 @@ status ()
     currDir=$(pwd)
     for repo in ${repos[*]}
     do
-        [[ $repo =~ $name_pattern ]]
-        name="${BASH_REMATCH[1]}"
+        name=$(_get_name $repo)
 
         if [ -d "$name" ]; then
             printf "\nGit status for [%s]:\n" $name

From 0fe838cd6b1f43c8084502eedb01d0aa19ad67d7 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Sun, 21 Jul 2019 11:21:53 +0300
Subject: [PATCH 004/137] Adding edraak-programs to Devstack

---
 docker-compose-host.yml |  8 ++++-
 docker-compose.yml      | 28 ++++++++++++++++
 edraak.mk               | 73 +++++++++++++++++++++++++++++++++++++++++
 provision-edraak.sh     | 28 ++++++++++++++++
 provision-edraak.sql    |  2 ++
 provision.sh            |  1 +
 6 files changed, 139 insertions(+), 1 deletion(-)
 create mode 100644 edraak.mk
 create mode 100755 provision-edraak.sh
 create mode 100644 provision-edraak.sql

diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index cf848e98eb..da8527872f 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -33,7 +33,13 @@ services:
   forum:
     volumes:
       - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-      
+  edraak_programs:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+  edraak_marketing:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
+
 volumes:
   credentials_node_modules:
   discovery_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
index 6b7f8482c9..866ab8c4c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -217,6 +217,34 @@ services:
     volumes:
       - devpi_data:/data
 
+  edraak_programs:
+    image: edraak-devstack-programs
+    environment:
+      PROGS_CFG: '/app/docker.json'
+      NODE_ENV: development
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
+    container_name: edraak.devstack.programs
+    working_dir: /app
+    ports:
+      - "18901:8800"
+    depends_on:
+      - mysql
+      - mongo
+      - memcached
+
+  edraak_marketing:
+    image: edraak-devstack-marketing
+    environment:
+      NODE_ENV: development
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=marketingsite.envs.dev; sleep 2; done'
+    container_name: edraak.devstack.marketing
+    working_dir: /app
+    ports:
+      - "18902:8800"
+    depends_on:
+      - mysql
+      - memcached
+
 volumes:
   discovery_assets:
   edxapp_lms_assets:
diff --git a/edraak.mk b/edraak.mk
new file mode 100644
index 0000000000..c5f4db2651
--- /dev/null
+++ b/edraak.mk
@@ -0,0 +1,73 @@
+edraak.provision:
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
+
+provision.edraak:
+	$(MAKE) edraak.provision
+
+edraak.build.all:
+	$(MAKE) edraak.build.programs
+	$(MAKE) edraak.build.marketing
+
+edraak.build.programs:
+	docker build -t edraak-devstack-programs -f ../edraak-programs/Dockerfile ../edraak-programs
+
+edraak.build.marketing:
+	docker build -t edraak-devstack-marketing -f ../marketing-site/Dockerfile ../marketing-site
+
+edraak.programs.help:
+	echo ""
+	echo "make edraak.programs.COMMAND"
+	echo "======================================"
+	echo ""
+	echo "Commands:"
+	echo ""
+	echo "migrate:              Run django migrations i.e. python manage.py migrate"
+	echo "compile_static:       Run python manage.py compilestatic --settings=edraakprograms.static"
+	echo "install_pip:          Install python dependencies in 'requirements.txt' file"
+	echo "install_npm:          Install npm dependencies in 'package.json' file"
+	echo "gulp:                 Run gulp command"
+	echo "install_all:          Runs install_pip, install_npm, migrate, compilestatic"
+	echo "watch_js:             Run watcher to watch JavaScript changes"
+	echo "watch_css:            Run watcher to watch and compile scss changes"
+	echo "manage:               Run any manage.py command"
+	echo "shell:                Open bash inside docker container"
+	echo "copy_cache:           Copy node_modules, installed at build time, to the current app"
+	echo "help:                 Print help and exit"
+	echo ""
+
+edraak.programs.migrate:
+	docker-compose exec edraak_programs python manage.py migrate --settings=edraakprograms.dev
+
+edraak.programs.compile_static:
+	docker-compose exec edraak_programs python manage.py compilestatic --settings=edraakprograms.static
+
+edraak.programs.install_pip:
+	docker-compose exec edraak_programs pip install -r requirements.txt
+
+edraak.programs.install_npm:
+	docker-compose exec edraak_programs npm install
+
+edraak.programs.copy_cache:
+	docker-compose exec edraak_programs cp -Rnv /cache/node_modules /cache/.compiled /app
+
+edraak.programs.gulp:
+	docker-compose exec edraak_programs gulp
+
+edraak.programs.install_all:
+	$(MAKE) edraak.programs.copy_cache
+	$(MAKE) edraak.programs.gulp
+	$(MAKE) edraak.programs.migrate
+	$(MAKE) edraak.programs.compilestatic
+
+edraak.programs.watch_js:
+	docker-compose exec edraak_programs gulp watch
+
+edraak.programs.watch_css:
+	docker-compose exec edraak_programs npm run watch-scss
+
+edraak.programs.shell:
+	docker-compose exec edraak_programs bash
+
+edraak.marketing.shell:
+	docker-compose exec edraak_marketing bash
+
diff --git a/provision-edraak.sh b/provision-edraak.sh
new file mode 100755
index 0000000000..f278b46984
--- /dev/null
+++ b/provision-edraak.sh
@@ -0,0 +1,28 @@
+set -e
+
+echo "** Bringing up **"
+docker-compose $DOCKER_COMPOSE_FILES up -d mysql edraak_programs edraak_marketing
+
+echo "** Creating databases **"
+docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-edraak.sql
+
+echo "** Restarting **"
+docker-compose restart edraak_programs
+docker-compose restart edraak_marketing
+
+echo "** Migrating databases **"
+docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+
+echo "** Compiling assets **"
+docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/node_modules /cache/.compiled /app'
+docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
+docker-compose exec edraak_programs bash -c 'gulp'
+docker-compose exec edraak_programs bash -c 'python manage.py compilestatic --settings=edraakprograms.static'
+docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker-compose exec edraak_marketing bash -c 'yarn'
+docker-compose exec edraak_marketing bash -c 'npx gulp'
+
+echo "** Restarting **"
+docker-compose restart edraak_programs
+docker-compose restart edraak_marketing
diff --git a/provision-edraak.sql b/provision-edraak.sql
new file mode 100644
index 0000000000..855aa29418
--- /dev/null
+++ b/provision-edraak.sql
@@ -0,0 +1,2 @@
+CREATE DATABASE IF NOT EXISTS edraakprograms;
+CREATE DATABASE IF NOT EXISTS marketingsite;
diff --git a/provision.sh b/provision.sh
index 8324ff18dc..9b907ec7be 100755
--- a/provision.sh
+++ b/provision.sh
@@ -48,6 +48,7 @@ docker-compose $DOCKER_COMPOSE_FILES up -d studio
 ./provision-e2e.sh
 ./provision-forum.sh
 ./provision-notes.sh
+./provision-edraak.sh
 
 docker image prune -f
 

From 69fb08c1bdfbc594423842c4fe0e01da0d3dfa27 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Sun, 6 Oct 2019 18:49:34 +0300
Subject: [PATCH 005/137] Editable envs

---
 Makefile | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 219c819ba2..aaf958ea3b 100644
--- a/Makefile
+++ b/Makefile
@@ -58,17 +58,27 @@ dev.status: ## Prints the status of all git repositories
 dev.repo.reset: ## Attempts to reset the local repo checkouts to the master working state
 	./repo.sh reset
 
+dev.editable-envs:  ## Copy env files to the docker-devstack so it's editable by the developer
+	@sudo mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
+	@docker exec -it edx.devstack.lms bash -c 'test -f /edx/src/edxapp-envs/lms.env.json || mv /edx/app/edxapp/lms.{env,auth}.json /edx/src/edxapp-envs/'
+	@docker exec -it edx.devstack.lms bash -c 'ln -sf /edx/src/edxapp-envs/lms.{env,auth}.json /edx/app/edxapp/'
+	@docker exec -it edx.devstack.studio bash -c 'test -f /edx/src/edxapp-envs/cms.env.json || mv /edx/app/edxapp/cms.{env,auth}.json /edx/src/edxapp-envs/'
+	@docker exec -it edx.devstack.studio bash -c 'ln -sf /edx/src/edxapp-envs/cms.{env,auth}.json /edx/app/edxapp/'
+	@sudo chown $(USER) -R $(DEVSTACK_WORKSPACE)/src
+	@make lms-restart
+	@make studio-restart
+
 dev.up: | check-memory ## Bring up all services with host volumes
 	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
 
-	# Start: Edraak hacks
-	# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
-	docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
-	docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'
-	docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
-	docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
-	# End: Edraak hacks
-
+	@# Start: Edraak hacks
+	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
+	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
+	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'
+	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	@docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	@make dev.editable-envs
+	@# End: Edraak hacks
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	./programs/provision.sh cache >/dev/null
 

From 75f88f2243b90391362bfa84bb1aa898e869815d Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Tue, 8 Oct 2019 14:11:41 +0300
Subject: [PATCH 006/137] Mount themes

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index aaf958ea3b..9867ee45e3 100644
--- a/Makefile
+++ b/Makefile
@@ -58,7 +58,7 @@ dev.status: ## Prints the status of all git repositories
 dev.repo.reset: ## Attempts to reset the local repo checkouts to the master working state
 	./repo.sh reset
 
-dev.editable-envs:  ## Copy env files to the docker-devstack so it's editable by the developer
+dev.editable-envs:  ## Copy env files outside the docker containers so it's editable by the developer
 	@sudo mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
 	@docker exec -it edx.devstack.lms bash -c 'test -f /edx/src/edxapp-envs/lms.env.json || mv /edx/app/edxapp/lms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.lms bash -c 'ln -sf /edx/src/edxapp-envs/lms.{env,auth}.json /edx/app/edxapp/'
@@ -69,7 +69,7 @@ dev.editable-envs:  ## Copy env files to the docker-devstack so it's editable by
 	@make studio-restart
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d
 
 	@# Start: Edraak hacks
 	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image

From 6cc7c222cabea0088887b7f61af08365d95d9b87 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Mon, 21 Oct 2019 07:18:48 +0300
Subject: [PATCH 007/137] Split Edraak Provision into Two Files

---
 edraak.mk                     |  5 +++++
 provision-edraak-marketing.sh | 14 ++++++++++++++
 provision-edraak-programs.sh  | 17 +++++++++++++++++
 provision-edraak.sh           | 23 ++++-------------------
 4 files changed, 40 insertions(+), 19 deletions(-)
 create mode 100755 provision-edraak-marketing.sh
 create mode 100755 provision-edraak-programs.sh

diff --git a/edraak.mk b/edraak.mk
index c5f4db2651..b2df7c68da 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -62,6 +62,9 @@ edraak.programs.install_all:
 edraak.programs.watch_js:
 	docker-compose exec edraak_programs gulp watch
 
+edraak.programs.provision:
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-programs.sh
+
 edraak.programs.watch_css:
 	docker-compose exec edraak_programs npm run watch-scss
 
@@ -71,3 +74,5 @@ edraak.programs.shell:
 edraak.marketing.shell:
 	docker-compose exec edraak_marketing bash
 
+edraak.marketing.provision:
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-marketing.sh
diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
new file mode 100755
index 0000000000..7fc52485e7
--- /dev/null
+++ b/provision-edraak-marketing.sh
@@ -0,0 +1,14 @@
+set -e
+
+echo "** Restarting **"
+docker-compose restart edraak_marketing
+
+echo "** Migrating databases **"
+docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+
+echo "** Compiling assets **"
+docker-compose exec edraak_marketing bash -c 'yarn'
+docker-compose exec edraak_marketing bash -c 'npx gulp'
+
+echo "** Restarting **"
+docker-compose restart edraak_marketing
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
new file mode 100755
index 0000000000..500c75dd80
--- /dev/null
+++ b/provision-edraak-programs.sh
@@ -0,0 +1,17 @@
+set -e
+
+echo "** Restarting **"
+docker-compose restart edraak_programs
+
+echo "** Migrating databases **"
+docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+
+echo "** Compiling assets **"
+docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/node_modules /cache/.compiled /app'
+docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
+docker-compose exec edraak_programs bash -c 'gulp'
+docker-compose exec edraak_programs bash -c 'python manage.py compilestatic --settings=edraakprograms.static'
+docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+
+echo "** Restarting **"
+docker-compose restart edraak_programs
diff --git a/provision-edraak.sh b/provision-edraak.sh
index f278b46984..713f541fd7 100755
--- a/provision-edraak.sh
+++ b/provision-edraak.sh
@@ -6,23 +6,8 @@ docker-compose $DOCKER_COMPOSE_FILES up -d mysql edraak_programs edraak_marketin
 echo "** Creating databases **"
 docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-edraak.sql
 
-echo "** Restarting **"
-docker-compose restart edraak_programs
-docker-compose restart edraak_marketing
+echo "** Marketing **"
+./provision-edraak-marketing.sh
 
-echo "** Migrating databases **"
-docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
-docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
-
-echo "** Compiling assets **"
-docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/node_modules /cache/.compiled /app'
-docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
-docker-compose exec edraak_programs bash -c 'gulp'
-docker-compose exec edraak_programs bash -c 'python manage.py compilestatic --settings=edraakprograms.static'
-docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
-docker-compose exec edraak_marketing bash -c 'yarn'
-docker-compose exec edraak_marketing bash -c 'npx gulp'
-
-echo "** Restarting **"
-docker-compose restart edraak_programs
-docker-compose restart edraak_marketing
+echo "** Programs **"
+./provision-edraak-programs.sh

From 337e9e70a66affcad0bcfc9ea4817be335c50598 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Mon, 21 Oct 2019 18:41:24 +0300
Subject: [PATCH 008/137] Adding Marketing and Programs in repo cloning list

---
 repo.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repo.sh b/repo.sh
index 6fe7703700..2adbdfa5f1 100755
--- a/repo.sh
+++ b/repo.sh
@@ -27,6 +27,8 @@ repos=(
     "https://github.com/Edraak/edraak-platform.git"
     "https://github.com/Edraak/xqueue.git"
     "https://github.com/Edraak/edx-analytics-pipeline.git"
+    "git@github.com:Edraak/marketing-site.git"
+    "git@github.com:Edraak/edraak-programs.git"
 )
 
 repo_alternative_directory=(

From b4ee7b29b51f256f546c038fac56ba4de010d05e Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Fri, 25 Oct 2019 17:28:22 +0300
Subject: [PATCH 009/137] Enable the gulp/webpack watchers for marketing by
 default + more devstack shortcuts

---
 docker-compose-host.yml |  3 +++
 docker-compose.yml      | 11 +++++++++++
 edraak.mk               | 12 ++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index da8527872f..b6d5ff2d5e 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -39,6 +39,9 @@ services:
   edraak_marketing:
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
+  edraak_marketing_gulp:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
 
 volumes:
   credentials_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
index 866ab8c4c7..29df9218c1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -245,6 +245,17 @@ services:
       - mysql
       - memcached
 
+  edraak_marketing_gulp:
+    image: edraak-devstack-marketing
+    environment:
+      NODE_ENV: development
+    command: bash -c 'while true; do npx gulp; sleep 2; done'
+    container_name: edraak.devstack.marketing-gulp
+    working_dir: /app
+    depends_on:
+      - mysql
+      - memcached
+
 volumes:
   discovery_assets:
   edxapp_lms_assets:
diff --git a/edraak.mk b/edraak.mk
index b2df7c68da..2990e9f20b 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -76,3 +76,15 @@ edraak.marketing.shell:
 
 edraak.marketing.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-marketing.sh
+
+marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
+	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
+
+programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
+	docker exec -t edraak.devstack.programs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
+
+edraak.restart:  ## Restart all of the lms, studio, marketing and progs
+	make marketing-restart
+	make programs-restart
+	make lms-restart
+	make studio-restart

From d98f8e85066e7cb714e262449749b5aec162ef9f Mon Sep 17 00:00:00 2001
From: Salomari1987 <ahasan@qrf.org>
Date: Tue, 29 Oct 2019 16:05:56 +0700
Subject: [PATCH 010/137] disable discovery, ecommerce, programs, get
 docker-sync in sync

---
 Makefile                  |  14 ++-
 README.rst                |   9 +-
 docker-compose-host.yml   |  44 +++++-----
 docker-compose-sync.yml   |  43 ++++++----
 docker-compose-themes.yml |  12 +--
 docker-compose.yml        | 176 +++++++++++++++++++-------------------
 docker-sync.yml           |  43 +++++++---
 edraak.mk                 |   4 +-
 provision.sh              |  10 +--
 repo.sh                   |  14 +--
 10 files changed, 207 insertions(+), 162 deletions(-)

diff --git a/Makefile b/Makefile
index 9867ee45e3..3aa2cf8251 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,7 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
 	./repo.sh reset
 
 dev.editable-envs:  ## Copy env files outside the docker containers so it's editable by the developer
-	@sudo mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
+	mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
 	@docker exec -it edx.devstack.lms bash -c 'test -f /edx/src/edxapp-envs/lms.env.json || mv /edx/app/edxapp/lms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.lms bash -c 'ln -sf /edx/src/edxapp-envs/lms.{env,auth}.json /edx/app/edxapp/'
 	@docker exec -it edx.devstack.studio bash -c 'test -f /edx/src/edxapp-envs/cms.env.json || mv /edx/app/edxapp/cms.{env,auth}.json /edx/src/edxapp-envs/'
@@ -80,7 +80,7 @@ dev.up: | check-memory ## Bring up all services with host volumes
 	@make dev.editable-envs
 	@# End: Edraak hacks
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
-	./programs/provision.sh cache >/dev/null
+	#./programs/provision.sh cache >/dev/null
 
 dev.up.watchers: | check-memory ## Bring up asset watcher containers
 	docker-compose -f docker-compose-watchers.yml up -d
@@ -100,6 +100,16 @@ dev.sync.requirements: ## Install requirements
 
 dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync enabled
 	docker-compose -f docker-compose.yml -f docker-compose-sync.yml up -d
+	@# Start: Edraak hacks
+	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
+	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
+	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'
+	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	@docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	@make dev.editable-envs
+	@# End: Edraak hacks
+	@# Comment out this next line if you want to save some time and don't care about catalog programs
+	#./programs/provision.sh cache >/dev/null
 
 provision: | dev.provision ## This command will be deprecated in a future release, use dev.provision
 	echo "\033[0;31mThis command will be deprecated in a future release, use dev.provision\033[0m"
diff --git a/README.rst b/README.rst
index 12f8367309..9f230c301f 100644
--- a/README.rst
+++ b/README.rst
@@ -73,7 +73,7 @@ you should configure Docker with a sufficient
 amount of resources. We find that `configuring Docker for Mac`_ with
 a minimum of 2 CPUs and 6GB of memory works well.
 
-1. Install the requirements inside of a `Python virtualenv`_.
+1. (Optional) Install the requirements inside of a `Python virtualenv`_.
 
    .. code:: sh
 
@@ -120,6 +120,13 @@ a minimum of 2 CPUs and 6GB of memory works well.
        make dev.sync.provision
 
 
+4. Build edraak images
+
+   .. code:: sh
+
+       edraak.build.all
+
+
 4. Start the services. This command will mount the repositories under the
    DEVSTACK\_WORKSPACE directory.
 
diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index b6d5ff2d5e..66ffb7668e 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -1,30 +1,30 @@
 version: "2.1"
 
 services:
-  credentials:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/credentials:/edx/app/credentials/credentials:cached
-      - credentials_node_modules:/edx/app/credentials/credentials/node_modules
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  discovery:
-      volumes:
-      - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:cached
-      - discovery_node_modules:/edx/app/discovery/discovery/node_modules
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  ecommerce:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/ecommerce:/edx/app/ecommerce/ecommerce:cached
-      - ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+#  credentials:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/credentials:/edx/app/credentials/credentials:cached
+#      - credentials_node_modules:/edx/app/credentials/credentials/node_modules
+#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+#  discovery:
+#      volumes:
+#      - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:cached
+#      - discovery_node_modules:/edx/app/discovery/discovery/node_modules
+#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+#  ecommerce:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/ecommerce:/edx/app/ecommerce/ecommerce:cached
+#      - ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
+#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   lms:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  edx_notes_api:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+#  edx_notes_api:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
+#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   studio:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
@@ -44,7 +44,7 @@ services:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
 
 volumes:
-  credentials_node_modules:
-  discovery_node_modules:
-  ecommerce_node_modules:
+#  credentials_node_modules:
+#  discovery_node_modules:
+#  ecommerce_node_modules:
   edxapp_node_modules:
diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml
index 00900eee18..ae792fb9fd 100644
--- a/docker-compose-sync.yml
+++ b/docker-compose-sync.yml
@@ -1,15 +1,15 @@
 version: "2.1"
 
 services:
-  credentials:
-    volumes:
-      - credentials-sync:/edx/app/credentials/credentials:nocopy
-  discovery:
-    volumes:
-      - discovery-sync:/edx/app/discovery/discovery:nocopy
-  ecommerce:
-    volumes:
-      - ecommerce-sync:/edx/app/ecommerce/ecommerce:nocopy
+#  credentials:
+#    volumes:
+#      - credentials-sync:/edx/app/credentials/credentials:nocopy
+#  discovery:
+#    volumes:
+#      - discovery-sync:/edx/app/discovery/discovery:nocopy
+#  ecommerce:
+#    volumes:
+#      - ecommerce-sync:/edx/app/ecommerce/ecommerce:nocopy
   lms:
     volumes:
       - edxapp-sync:/edx/app/edxapp/edx-platform:nocopy
@@ -19,15 +19,28 @@ services:
   forum:
     volumes:
       - forum-sync:/edx/app/forum/cs_comments_service:nocopy
+  edraak_marketing:
+    volumes:
+      - edraak-marketing-sync:/app:nocopy
+  edraak_marketing_gulp:
+    volumes:
+      - edraak-marketing-sync:/app:nocopy
+  edraak_programs:
+    volumes:
+      - edraak-programs-sync:/app:nocopy
 
 volumes:
-  credentials-sync:
-    external: true
-  discovery-sync:
-    external: true
-  ecommerce-sync:
-    external: true
+#  credentials-sync:
+#    external: true
+#  discovery-sync:
+#    external: true
+#  ecommerce-sync:
+#    external: true
   edxapp-sync:
     external: true
   forum-sync:
     external: true
+  edraak-marketing-sync:
+    external: true
+  edraak-programs-sync:
+    external: true
diff --git a/docker-compose-themes.yml b/docker-compose-themes.yml
index 8396e5c2c9..889e597ba8 100644
--- a/docker-compose-themes.yml
+++ b/docker-compose-themes.yml
@@ -1,12 +1,12 @@
 version: "2.1"
 
 services:
-  discovery:
-      volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
-  ecommerce:
-      volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
+#  discovery:
+#      volumes:
+#      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
+#  ecommerce:
+#      volumes:
+#      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
   lms:
       volumes:
       - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
diff --git a/docker-compose.yml b/docker-compose.yml
index 29df9218c1..a1b09cf64d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,15 +12,15 @@ version: "2.1"
 
 services:
   # Third-party services
-  chrome:
-    container_name: edx.devstack.chrome
-    image: edxops/chrome:${OPENEDX_RELEASE:-latest}
-    shm_size: 2g
-    ports:
-      - "15900:5900"
-    volumes:  # for file uploads
-      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
-      - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
+#  chrome:
+#    container_name: edx.devstack.chrome
+#    image: edxops/chrome:${OPENEDX_RELEASE:-latest}
+#    shm_size: 2g
+#    ports:
+#      - "15900:5900"
+#    volumes:  # for file uploads
+#      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
+#      - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
   elasticsearch:
     container_name: edx.devstack.elasticsearch
@@ -33,15 +33,15 @@ services:
       - elasticsearch_data:/usr/share/elasticsearch/data
       - elasticsearch_data:/usr/share/elasticsearch/logs
 
-  firefox:
-    container_name: edx.devstack.firefox
-    image: edxops/firefox:${OPENEDX_RELEASE:-latest}
-    shm_size: 2g
-    ports:
-      - "25900:5900"
-    volumes:  # for file uploads
-      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
-      - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
+#  firefox:
+#    container_name: edx.devstack.firefox
+#    image: edxops/firefox:${OPENEDX_RELEASE:-latest}
+#    shm_size: 2g
+#    ports:
+#      - "25900:5900"
+#    volumes:  # for file uploads
+#      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
+#      - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
   memcached:
     container_name: edx.devstack.memcached
@@ -73,58 +73,58 @@ services:
     volumes:
       - mysql_data:/var/lib/mysql
 
-  # edX services
-  credentials:
-    command: bash -c 'source /edx/app/credentials/credentials_env && while true; do python /edx/app/credentials/credentials/manage.py runserver 0.0.0.0:18150; sleep 2; done'
-    container_name: edx.devstack.credentials
-    depends_on:
-      - mysql
-      - memcached
-    # Allows attachment to the credentials service using 'docker attach <containerID>'.
-    stdin_open: true
-    tty: true
-    environment:
-      CACHE_LOCATION: edx.devstack.memcached:12211
-      DB_HOST: edx.devstack.mysql
-      SOCIAL_AUTH_EDX_OIDC_URL_ROOT: http://edx.devstack.lms:18000/oauth2
-      ENABLE_DJANGO_TOOLBAR: 1
-    image: edxops/credentials:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "18150:18150"
+#  # edX services
+#  credentials:
+#    command: bash -c 'source /edx/app/credentials/credentials_env && while true; do python /edx/app/credentials/credentials/manage.py runserver 0.0.0.0:18150; sleep 2; done'
+#    container_name: edx.devstack.credentials
+#    depends_on:
+#      - mysql
+#      - memcached
+#    # Allows attachment to the credentials service using 'docker attach <containerID>'.
+#    stdin_open: true
+#    tty: true
+#    environment:
+#      CACHE_LOCATION: edx.devstack.memcached:12211
+#      DB_HOST: edx.devstack.mysql
+#      SOCIAL_AUTH_EDX_OIDC_URL_ROOT: http://edx.devstack.lms:18000/oauth2
+#      ENABLE_DJANGO_TOOLBAR: 1
+#    image: edxops/credentials:${OPENEDX_RELEASE:-latest}
+#    ports:
+#      - "18150:18150"
 
-  discovery:
-    command: bash -c 'source /edx/app/discovery/discovery_env && while true; do python /edx/app/discovery/discovery/manage.py runserver 0.0.0.0:18381; sleep 2; done'
-    container_name: edx.devstack.discovery
-    depends_on:
-      - mysql
-      - elasticsearch
-      - memcached
-    # Allows attachment to the discovery service using 'docker attach <containerID>'.
-    stdin_open: true
-    tty: true
-    environment:
-      TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
-      ENABLE_DJANGO_TOOLBAR: 1
-    image: edxops/discovery:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "18381:18381"
-    volumes:
-      - discovery_assets:/edx/var/discovery/
+#  discovery:
+#    command: bash -c 'source /edx/app/discovery/discovery_env && while true; do python /edx/app/discovery/discovery/manage.py runserver 0.0.0.0:18381; sleep 2; done'
+#    container_name: edx.devstack.discovery
+#    depends_on:
+#      - mysql
+#      - elasticsearch
+#      - memcached
+#    # Allows attachment to the discovery service using 'docker attach <containerID>'.
+#    stdin_open: true
+#    tty: true
+#    environment:
+#      TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
+#      ENABLE_DJANGO_TOOLBAR: 1
+#    image: edxops/discovery:${OPENEDX_RELEASE:-latest}
+#    ports:
+#      - "18381:18381"
+#    volumes:
+#      - discovery_assets:/edx/var/discovery/
 
-  ecommerce:
-    command: bash -c 'source /edx/app/ecommerce/ecommerce_env && while true; do python /edx/app/ecommerce/ecommerce/manage.py runserver 0.0.0.0:18130; sleep 2; done'
-    container_name: edx.devstack.ecommerce
-    depends_on:
-      - mysql
-      - memcached
-    # Allows attachment to the ecommerce service using 'docker attach <containerID>'.
-    stdin_open: true
-    tty: true
-    environment:
-      ENABLE_DJANGO_TOOLBAR: 0
-    image: edxops/ecommerce:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "18130:18130"
+#  ecommerce:
+#    command: bash -c 'source /edx/app/ecommerce/ecommerce_env && while true; do python /edx/app/ecommerce/ecommerce/manage.py runserver 0.0.0.0:18130; sleep 2; done'
+#    container_name: edx.devstack.ecommerce
+#    depends_on:
+#      - mysql
+#      - memcached
+#    # Allows attachment to the ecommerce service using 'docker attach <containerID>'.
+#    stdin_open: true
+#    tty: true
+#    environment:
+#      ENABLE_DJANGO_TOOLBAR: 0
+#    image: edxops/ecommerce:${OPENEDX_RELEASE:-latest}
+#    ports:
+#      - "18130:18130"
 
   lms:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done'
@@ -152,25 +152,25 @@ services:
     volumes:
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
 
-  edx_notes_api:
-    command: bash -c 'source /edx/app/edx_notes_api/edx_notes_api_env && while true; do python /edx/app/edx_notes_api/edx_notes_api/manage.py runserver 0.0.0.0:18120 --settings notesserver.settings.devstack; sleep 2; done'
-    container_name: edx.devstack.edx_notes_api
-    depends_on:
-      - devpi
-      - elasticsearch
-      - mysql
-    image: edxops/notes:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "18120:18120"
-    environment:
-      DB_ENGINE: "django.db.backends.mysql"
-      DB_HOST: "edx.devstack.mysql"
-      DB_NAME: "notes"
-      DB_PASSWORD: "password"
-      DB_PORT: "3306"
-      DB_USER: "notes001"
-      ENABLE_DJANGO_TOOLBAR: 1
-      ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
+#  edx_notes_api:
+#    command: bash -c 'source /edx/app/edx_notes_api/edx_notes_api_env && while true; do python /edx/app/edx_notes_api/edx_notes_api/manage.py runserver 0.0.0.0:18120 --settings notesserver.settings.devstack; sleep 2; done'
+#    container_name: edx.devstack.edx_notes_api
+#    depends_on:
+#      - devpi
+#      - elasticsearch
+#      - mysql
+#    image: edxops/notes:${OPENEDX_RELEASE:-latest}
+#    ports:
+#      - "18120:18120"
+#    environment:
+#      DB_ENGINE: "django.db.backends.mysql"
+#      DB_HOST: "edx.devstack.mysql"
+#      DB_NAME: "notes"
+#      DB_PASSWORD: "password"
+#      DB_PORT: "3306"
+#      DB_USER: "notes001"
+#      ENABLE_DJANGO_TOOLBAR: 1
+#      ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
 
   studio:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 2; done'
@@ -257,7 +257,7 @@ services:
       - memcached
 
 volumes:
-  discovery_assets:
+#  discovery_assets:
   edxapp_lms_assets:
   edxapp_studio_assets:
   elasticsearch_data:
diff --git a/docker-sync.yml b/docker-sync.yml
index 527b174c76..91744a451f 100644
--- a/docker-sync.yml
+++ b/docker-sync.yml
@@ -5,20 +5,20 @@ options:
   compose-dev-file-path: 'docker-compose-sync.yml'
 
 syncs:
-  credentials-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../credentials/'
-    sync_excludes: [ '.git', '.idea' ]
-
-  discovery-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../course-discovery/'
-    sync_excludes: [ '.git', '.idea' ]
-
-  ecommerce-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../ecommerce/'
-    sync_excludes: [ '.git', '.idea' ]
+#  credentials-sync:
+#    host_disk_mount_mode: 'cached'
+#    src: '../credentials/'
+#    sync_excludes: [ '.git', '.idea' ]
+#
+#  discovery-sync:
+#    host_disk_mount_mode: 'cached'
+#    src: '../course-discovery/'
+#    sync_excludes: [ '.git', '.idea' ]
+#
+#  ecommerce-sync:
+#    host_disk_mount_mode: 'cached'
+#    src: '../ecommerce/'
+#    sync_excludes: [ '.git', '.idea' ]
 
   edxapp-sync:
     host_disk_mount_mode: 'cached'
@@ -29,3 +29,18 @@ syncs:
     host_disk_mount_mode: 'cached'
     src: '../cs_comments_service/'
     sync_excludes: [ '.git', '.idea' ]
+
+  edraak-marketing-sync:
+    host_disk_mount_mode: 'cached'
+    src: '../marketing-site/'
+    sync_excludes: [ '.git', '.idea']
+
+  edraak-programs-sync:
+    host_disk_mount_mode: 'cached'
+    src: '../edraak-programs/'
+    sync_excludes: [ '.git', '.idea']
+
+  src-sync:
+    host_disk_mount_mode: 'cached'
+    src: '../src/'
+    sync_excludes: [ '.git', '.idea']
diff --git a/edraak.mk b/edraak.mk
index 2990e9f20b..8a7f5a715c 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -1,8 +1,8 @@
 edraak.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
 
-provision.edraak:
-	$(MAKE) edraak.provision
+edraak.sync.provision: | dev.sync.daemon.start
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
 
 edraak.build.all:
 	$(MAKE) edraak.build.programs
diff --git a/provision.sh b/provision.sh
index 9b907ec7be..9867e67199 100755
--- a/provision.sh
+++ b/provision.sh
@@ -42,12 +42,12 @@ docker exec -i edx.devstack.mongo mongo < mongo-provision.js
 
 # Nothing special needed for studio
 docker-compose $DOCKER_COMPOSE_FILES up -d studio
-./provision-ecommerce.sh
-./provision-discovery.sh
-./provision-credentials.sh
-./provision-e2e.sh
+#./provision-ecommerce.sh
+#./provision-discovery.sh
+#./provision-credentials.sh
+#./provision-e2e.sh
 ./provision-forum.sh
-./provision-notes.sh
+#./provision-notes.sh
 ./provision-edraak.sh
 
 docker image prune -f
diff --git a/repo.sh b/repo.sh
index 2adbdfa5f1..11da41fd1c 100755
--- a/repo.sh
+++ b/repo.sh
@@ -18,15 +18,15 @@ else
 fi
 
 repos=(
-    "https://github.com/Edraak/course-discovery.git"
-    "https://github.com/Edraak/credentials.git"
+#    "https://github.com/Edraak/course-discovery.git"
+#    "https://github.com/Edraak/credentials.git"
     "https://github.com/Edraak/cs_comments_service.git"
-    "https://github.com/Edraak/ecommerce.git"
-    "https://github.com/Edraak/edx-e2e-tests.git"
-    "https://github.com/Edraak/edx-notes-api.git"
+#    "https://github.com/Edraak/ecommerce.git"
+#    "https://github.com/Edraak/edx-e2e-tests.git"
+#    "https://github.com/Edraak/edx-notes-api.git"
     "https://github.com/Edraak/edraak-platform.git"
-    "https://github.com/Edraak/xqueue.git"
-    "https://github.com/Edraak/edx-analytics-pipeline.git"
+#    "https://github.com/Edraak/xqueue.git"
+#    "https://github.com/Edraak/edx-analytics-pipeline.git"
     "git@github.com:Edraak/marketing-site.git"
     "git@github.com:Edraak/edraak-programs.git"
 )

From a9dc78df2b8d7000af5b86e745d79e776362a2ee Mon Sep 17 00:00:00 2001
From: Salomari1987 <ahasan@qrf.org>
Date: Tue, 29 Oct 2019 17:05:02 +0700
Subject: [PATCH 011/137] Added a todo to change the port, make chmod
 compatible with mac

---
 Makefile           | 4 ++--
 docker-compose.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3aa2cf8251..1a745401a1 100644
--- a/Makefile
+++ b/Makefile
@@ -59,12 +59,12 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
 	./repo.sh reset
 
 dev.editable-envs:  ## Copy env files outside the docker containers so it's editable by the developer
-	mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
+	sudo mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
 	@docker exec -it edx.devstack.lms bash -c 'test -f /edx/src/edxapp-envs/lms.env.json || mv /edx/app/edxapp/lms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.lms bash -c 'ln -sf /edx/src/edxapp-envs/lms.{env,auth}.json /edx/app/edxapp/'
 	@docker exec -it edx.devstack.studio bash -c 'test -f /edx/src/edxapp-envs/cms.env.json || mv /edx/app/edxapp/cms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.studio bash -c 'ln -sf /edx/src/edxapp-envs/cms.{env,auth}.json /edx/app/edxapp/'
-	@sudo chown $(USER) -R $(DEVSTACK_WORKSPACE)/src
+	@sudo chown -R $(USER) $(DEVSTACK_WORKSPACE)/src
 	@make lms-restart
 	@make studio-restart
 
diff --git a/docker-compose.yml b/docker-compose.yml
index a1b09cf64d..8f25724e65 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -226,7 +226,7 @@ services:
     container_name: edraak.devstack.programs
     working_dir: /app
     ports:
-      - "18901:8800"
+      - "18901:8800" # TODO: change to "18800:8800"
     depends_on:
       - mysql
       - mongo
@@ -240,7 +240,7 @@ services:
     container_name: edraak.devstack.marketing
     working_dir: /app
     ports:
-      - "18902:8800"
+      - "18902:8800" # TODO: change to "18500:8500"
     depends_on:
       - mysql
       - memcached

From bec59951fd0180ef059dc25427fe4b612582a188 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Wed, 30 Oct 2019 13:10:39 +0300
Subject: [PATCH 012/137] I forgot to add gulp watch, now it's here

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 29df9218c1..30179b5023 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -249,7 +249,7 @@ services:
     image: edraak-devstack-marketing
     environment:
       NODE_ENV: development
-    command: bash -c 'while true; do npx gulp; sleep 2; done'
+    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
     container_name: edraak.devstack.marketing-gulp
     working_dir: /app
     depends_on:

From 02f389b6fa83a4c19ad859508e36eee751b1f964 Mon Sep 17 00:00:00 2001
From: Salomari1987 <ahasan@qrf.org>
Date: Wed, 30 Oct 2019 17:12:48 +0700
Subject: [PATCH 013/137] make file update

---
 Makefile  | 17 ++++++-----------
 edraak.mk |  2 +-
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 1a745401a1..954dbb5bce 100644
--- a/Makefile
+++ b/Makefile
@@ -70,15 +70,7 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 
 dev.up: | check-memory ## Bring up all services with host volumes
 	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d
-
-	@# Start: Edraak hacks
-	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
-	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
-	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'
-	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
-	@docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
-	@make dev.editable-envs
-	@# End: Edraak hacks
+	@make edraak.dev.up.hacks
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
@@ -100,6 +92,11 @@ dev.sync.requirements: ## Install requirements
 
 dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync enabled
 	docker-compose -f docker-compose.yml -f docker-compose-sync.yml up -d
+	@make edraak.dev.up.hacks
+	@# Comment out this next line if you want to save some time and don't care about catalog programs
+	#./programs/provision.sh cache >/dev/null
+
+edraak.dev.up.hacks:
 	@# Start: Edraak hacks
 	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
 	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
@@ -108,8 +105,6 @@ dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync ena
 	@docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
 	@make dev.editable-envs
 	@# End: Edraak hacks
-	@# Comment out this next line if you want to save some time and don't care about catalog programs
-	#./programs/provision.sh cache >/dev/null
 
 provision: | dev.provision ## This command will be deprecated in a future release, use dev.provision
 	echo "\033[0;31mThis command will be deprecated in a future release, use dev.provision\033[0m"
diff --git a/edraak.mk b/edraak.mk
index 8a7f5a715c..8856ac7cf2 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -2,7 +2,7 @@ edraak.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
 
 edraak.sync.provision: | dev.sync.daemon.start
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-sync.yml" ./provision-edraak.sh
 
 edraak.build.all:
 	$(MAKE) edraak.build.programs

From 083f3ee394053fe488b7b765a4d21a161a9698d7 Mon Sep 17 00:00:00 2001
From: Salomari1987 <ahasan@qrf.org>
Date: Wed, 30 Oct 2019 18:43:13 +0700
Subject: [PATCH 014/137] ports, provsion enhance

---
 docker-compose.yml            | 31 +++++++++++++++----------------
 provision-edraak-marketing.sh |  1 +
 provision-edraak-programs.sh  |  3 ++-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ba548c4936..a14bd48025 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,10 +25,9 @@ services:
   elasticsearch:
     container_name: edx.devstack.elasticsearch
     image: edxops/elasticsearch:devstack
-    # TODO: What to do about these forwarded ports? They'll conflict with ports forwarded by the Vagrant VM.
-    # ports:
-    #   - "9200:9200"
-    #   - "9300:9300"
+    ports:
+       - "9200:9200"
+       - "9300:9300"
     volumes:
       - elasticsearch_data:/usr/share/elasticsearch/data
       - elasticsearch_data:/usr/share/elasticsearch/logs
@@ -46,8 +45,8 @@ services:
   memcached:
     container_name: edx.devstack.memcached
     image: memcached:1.4.24
-    # ports:
-    #   - "11211:11211"
+    ports:
+       - "11211:11211"
 
   mongo:
     # We use WiredTiger in all environments. In development environments we use small files
@@ -56,8 +55,8 @@ services:
     command: mongod --smallfiles --nojournal --storageEngine wiredTiger
     container_name: edx.devstack.mongo
     image: mongo:3.2.16
-    # ports:
-    #  - "27017:27017"
+    ports:
+      - "27017:27017"
     volumes:
       - mongo_data:/data/db
 
@@ -68,8 +67,8 @@ services:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     image: mysql:5.6
-    # ports:
-    #   - "3306:3306"
+    ports:
+       - "3306:3306"
     volumes:
       - mysql_data:/var/lib/mysql
 
@@ -147,8 +146,8 @@ services:
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
-      # - "18003:18003"
-      # - "18031:18031"
+      - "18003:18003"
+      - "18031:18031"
     volumes:
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
 
@@ -193,8 +192,8 @@ services:
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging
-      # - "18103:18103"
-      # - "18131:18131"
+      - "18103:18103"
+      - "18131:18131"
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
 
@@ -226,7 +225,7 @@ services:
     container_name: edraak.devstack.programs
     working_dir: /app
     ports:
-      - "18901:8800" # TODO: change to "18800:8800"
+      - "18800:8800"
     depends_on:
       - mysql
       - mongo
@@ -240,7 +239,7 @@ services:
     container_name: edraak.devstack.marketing
     working_dir: /app
     ports:
-      - "18902:8800" # TODO: change to "18500:8500"
+      - "18500:8500"
     depends_on:
       - mysql
       - memcached
diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
index 7fc52485e7..b49ed6d26a 100755
--- a/provision-edraak-marketing.sh
+++ b/provision-edraak-marketing.sh
@@ -4,6 +4,7 @@ echo "** Restarting **"
 docker-compose restart edraak_marketing
 
 echo "** Migrating databases **"
+docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/* /app/.'
 docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Compiling assets **"
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index 500c75dd80..8a42dc70bf 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -7,8 +7,9 @@ echo "** Migrating databases **"
 docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
 echo "** Compiling assets **"
-docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/node_modules /cache/.compiled /app'
+docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/* /app/.'
 docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
+docker-compose exec edraak_programs bash -c 'npm install'
 docker-compose exec edraak_programs bash -c 'gulp'
 docker-compose exec edraak_programs bash -c 'python manage.py compilestatic --settings=edraakprograms.static'
 docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'

From 5e0fb5a82ea829f2f321dbf913903d6fab09cdc5 Mon Sep 17 00:00:00 2001
From: Salomari1987 <ahasan@qrf.org>
Date: Wed, 30 Oct 2019 18:44:37 +0700
Subject: [PATCH 015/137] build images, then provsion all

---
 README.rst | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/README.rst b/README.rst
index 9f230c301f..0206dff72b 100644
--- a/README.rst
+++ b/README.rst
@@ -96,6 +96,12 @@ a minimum of 2 CPUs and 6GB of memory works well.
    Be sure to share the cloned directories in the Docker -> Preferences... ->
    File Sharing box.
 
+3. Build edraak images
+
+   .. code:: sh
+
+       edraak.build.all
+
 3. Run the provision command, if you haven't already, to configure the various
    services with superusers (for development without the auth service) and
    tenants (for multi-tenancy).
@@ -119,14 +125,6 @@ a minimum of 2 CPUs and 6GB of memory works well.
 
        make dev.sync.provision
 
-
-4. Build edraak images
-
-   .. code:: sh
-
-       edraak.build.all
-
-
 4. Start the services. This command will mount the repositories under the
    DEVSTACK\_WORKSPACE directory.
 

From e1b6e952dcd59548fbaf675b14c7099ec735247a Mon Sep 17 00:00:00 2001
From: Salomari1987 <ahasan@qrf.org>
Date: Thu, 31 Oct 2019 00:37:26 +0700
Subject: [PATCH 016/137] marketing port

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index a14bd48025..fd26de3bd9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -235,7 +235,7 @@ services:
     image: edraak-devstack-marketing
     environment:
       NODE_ENV: development
-    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=marketingsite.envs.dev; sleep 2; done'
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done'
     container_name: edraak.devstack.marketing
     working_dir: /app
     ports:

From 0fe112e02b44fcfe8557a3ed0df37ffacd104642 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Thu, 31 Oct 2019 14:51:38 +0300
Subject: [PATCH 017/137] Use Hawthorn branches for marketing and progs

---
 repo.sh | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/repo.sh b/repo.sh
index 11da41fd1c..ffc96559c6 100755
--- a/repo.sh
+++ b/repo.sh
@@ -60,6 +60,14 @@ _get_name()
 	echo "${BASH_REMATCH[1]}"
 }
 
+_get_edraak_repo_branch() {
+  if [ "$1" == "marketing-site" ] || [ "$1" == "edraak-programs" ]; then
+    echo "hawthorn"  # TODO: Switch to `master` once the Hawthorn upgrade is complete.
+  else
+    echo "master"  # Edraak: Use master, because it's pinned to Hawthorn.
+  fi
+}
+
 _checkout ()
 {
     repos_to_checkout=("$@")
@@ -70,7 +78,6 @@ _checkout ()
         branch="open-release/${OPENEDX_RELEASE}"
     fi
 
-    branch="master"  # Edraak: Use master, because it's pinned to Hawthorn.
 
     for repo in "${repos_to_checkout[@]}"
     do
@@ -79,6 +86,8 @@ _checkout ()
         # If a directory exists and it is nonempty, assume the repo has been cloned.
         if [ -d "$name" -a -n "$(ls -A "$name" 2>/dev/null)" ]; then
             cd $name
+
+            branch=$(_get_edraak_repo_branch "$name")
             echo "Checking out branch $branch of $name"
             git pull
             git checkout "$branch"
@@ -110,9 +119,9 @@ _clone ()
             else
                 git clone $repo $name
             fi
-            if [ -n "${OPENEDX_RELEASE}" ]; then
-                git checkout open-release/${OPENEDX_RELEASE}
-            fi
+
+            branch=$(_get_edraak_repo_branch "$name")
+            git checkout "$branch"
         fi
     done
     cd - &> /dev/null
@@ -135,8 +144,9 @@ reset ()
     do
         name=$(_get_name $repo)
 
+        branch=$(_get_edraak_repo_branch "$name")
         if [ -d "$name" ]; then
-            cd $name;git reset --hard HEAD;git checkout master;git reset --hard origin/master;git pull;cd "$currDir"
+            cd $name;git reset --hard HEAD;git checkout "$branch";git reset --hard "origin/$branch";git pull;cd "$currDir"
         else
             printf "The [%s] repo is not cloned. Continuing.\n" $name
         fi

From b2748b43ec46caba94abfa0294f488292051ac78 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Thu, 31 Oct 2019 14:57:59 +0300
Subject: [PATCH 018/137] Build edraak images with every pull

---
 Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 954dbb5bce..c8af2c07e5 100644
--- a/Makefile
+++ b/Makefile
@@ -140,8 +140,11 @@ xqueue-logs: ## View logs from containers running in detached mode
 xqueue_consumer-logs: ## View logs from containers running in detached mode
 	docker-compose -f docker-compose-xqueue.yml logs -f xqueue_consumer
 
-pull: ## Update Docker images
-	docker-compose pull --parallel
+pull: edraak.build.all ## Update Docker images
+	@echo "The progs and marketing images are only built"
+	@echo "locally, so 'pull' will fail and that's okay."
+	docker-compose pull --parallel --ignore-pull-failures
+	@echo "Once again ^^^ please ignore the errors above ^^^."
 
 pull.xqueue: ## Update XQueue Docker images
 	docker-compose -f docker-compose-xqueue.yml pull --parallel

From 8ff148271c1747a8f105050b39928ebe672b51d1 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Thu, 31 Oct 2019 15:41:21 +0300
Subject: [PATCH 019/137] Standarize devstack ports

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ba548c4936..575f42dfff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -226,7 +226,7 @@ services:
     container_name: edraak.devstack.programs
     working_dir: /app
     ports:
-      - "18901:8800" # TODO: change to "18800:8800"
+      - "18800:8800"
     depends_on:
       - mysql
       - mongo
@@ -240,7 +240,7 @@ services:
     container_name: edraak.devstack.marketing
     working_dir: /app
     ports:
-      - "18902:8800" # TODO: change to "18500:8500"
+      - "18500:8800"
     depends_on:
       - mysql
       - memcached

From dca415beb6cd855789e13deecb340a658ec46c20 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Fri, 1 Nov 2019 07:58:56 +0300
Subject: [PATCH 020/137] Add gulp watch for progs

---
 docker-compose-host.yml |  3 +++
 docker-compose.yml      | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index 66ffb7668e..35bcb1102b 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -36,6 +36,9 @@ services:
   edraak_programs:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+  edraak_programs_gulp:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
   edraak_marketing:
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
diff --git a/docker-compose.yml b/docker-compose.yml
index 575f42dfff..1e3a17b751 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -232,6 +232,17 @@ services:
       - mongo
       - memcached
 
+  edraak_programs_gulp:
+    image: edraak-devstack-programs
+    environment:
+      NODE_ENV: development
+    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
+    container_name: edraak.devstack.programs-gulp
+    working_dir: /app
+    depends_on:
+      - mysql
+      - memcached
+
   edraak_marketing:
     image: edraak-devstack-marketing
     environment:

From ae15ece38797fcd3035a16aad9fcdde537b6dc6a Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Tue, 5 Nov 2019 10:15:22 +0300
Subject: [PATCH 021/137] Watch theme assets always

---
 Makefile                    | 4 ++--
 docker-compose-watchers.yml | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index c8af2c07e5..a4317f9a2e 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 	@make studio-restart
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-watchers.yml up -d
 	@make edraak.dev.up.hacks
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
@@ -132,7 +132,7 @@ logs: ## View logs from containers running in detached mode
 	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml logs -f
 
 %-logs: ## View the logs of the specified service container
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml logs -f --tail=500 $*
+	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-watchers.yml logs -f --tail=500 $*
 
 xqueue-logs: ## View logs from containers running in detached mode
 	docker-compose -f docker-compose-xqueue.yml logs -f xqueue
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 85cd39bcbe..d3e6191836 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -2,28 +2,32 @@ version: "2.1"
 
 services:
   lms_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
+    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
     container_name: edx.devstack.lms_watcher
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
+      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
     image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
 
   studio_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
+    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
     container_name: edx.devstack.studio_watcher
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
+      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
     image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
 
 volumes:
   edxapp_lms_assets:

From e13e94f1552e88fc44247937c6c3dfd1b79c271f Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 5 Nov 2019 11:21:39 +0200
Subject: [PATCH 022/137] progs marketing to GCR, clone theme and envs repos,
 bower install provsion output

---
 README.rst                    | 17 +++++++--
 docker-compose.yml            | 23 ++++++++++--
 edraak.mk                     |  4 +-
 nginx/default.conf            | 71 +++++++++++++++++++++++++++++++++++
 nginx/ssl/ca_bundle.crt       | 27 +++++++++++++
 nginx/ssl/certificate.crt     | 31 +++++++++++++++
 nginx/ssl/private.key         | 28 ++++++++++++++
 provision-edraak-marketing.sh | 12 +++---
 provision-edraak-programs.sh  | 13 ++++---
 provision-edraak.sql          |  1 +
 repo.sh                       |  4 ++
 11 files changed, 212 insertions(+), 19 deletions(-)
 create mode 100644 nginx/default.conf
 create mode 100755 nginx/ssl/ca_bundle.crt
 create mode 100755 nginx/ssl/certificate.crt
 create mode 100755 nginx/ssl/private.key

diff --git a/README.rst b/README.rst
index 0206dff72b..5a3ce91885 100644
--- a/README.rst
+++ b/README.rst
@@ -96,11 +96,12 @@ a minimum of 2 CPUs and 6GB of memory works well.
    Be sure to share the cloned directories in the Docker -> Preferences... ->
    File Sharing box.
 
-3. Build edraak images
+2. 2 options here you can either build the images your self (check the build section below) or use gcloud to configure docker access to GCR
 
    .. code:: sh
 
-       edraak.build.all
+       gcloud auth configure-docker
+
 
 3. Run the provision command, if you haven't already, to configure the various
    services with superusers (for development without the auth service) and
@@ -303,7 +304,7 @@ meant to be user-facing, the "homepage" may be the API root.
 +---------------------+-------------------------------------+
 | Notes/edx-notes-api | http://localhost:18120/api/v1/      |
 +---------------------+-------------------------------------+
-| Studio/CMS          | http://localhost:18010/             |
+| Studio/CMS          | http://studio.edraak.dev/             |
 +---------------------+-------------------------------------+
 
 Useful Commands
@@ -382,6 +383,16 @@ BUILD COMMANDS:
     git pull
     docker build -f docker/build/ecommerce/Dockerfile . -t edxops/ecommerce:devstack
 
+For both progs and marketing do
+.. code:: sh
+    make edraak.build.all
+
+OR for each
+.. code:: sh
+    make edraak.build.programs
+    make edraak.build.marketing
+
+
 The build commands above will use your local configuration, but will pull
 application code from the master branch of the application's repository. If you
 would like to use code from another branch/tag/hash, modify the ``*_VERSION``
diff --git a/docker-compose.yml b/docker-compose.yml
index f39e6ca31e..377cce9df0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -217,7 +217,7 @@ services:
       - devpi_data:/data
 
   edraak_programs:
-    image: edraak-devstack-programs
+    image: eu.gcr.io/openedx-231314/edraak/progs
     environment:
       PROGS_CFG: '/app/docker.json'
       NODE_ENV: development
@@ -232,7 +232,7 @@ services:
       - memcached
 
   edraak_programs_gulp:
-    image: edraak-devstack-programs
+    image: eu.gcr.io/openedx-231314/edraak/progs
     environment:
       NODE_ENV: development
     command: bash -c 'while true; do npx gulp watch; sleep 2; done'
@@ -243,7 +243,7 @@ services:
       - memcached
 
   edraak_marketing:
-    image: edraak-devstack-marketing
+    image: eu.gcr.io/openedx-231314/edraak/marketing
     environment:
       NODE_ENV: development
     command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done'
@@ -256,7 +256,7 @@ services:
       - memcached
 
   edraak_marketing_gulp:
-    image: edraak-devstack-marketing
+    image: eu.gcr.io/openedx-231314/edraak/marketing
     environment:
       NODE_ENV: development
     command: bash -c 'while true; do npx gulp watch; sleep 2; done'
@@ -266,6 +266,21 @@ services:
       - mysql
       - memcached
 
+  edraak_dev_router:
+    image: nginx
+    container_name: edraak_dev_router
+    volumes:
+      - ./nginx:/etc/nginx/conf.d
+    command: bash -c 'while true; do nginx -g "daemon off;"; sleep 2; done'
+    ports:
+      - "80:80"
+      - "443:443"
+    depends_on:
+      - lms
+      - studio
+      - edraak_marketing
+      - edraak_programs
+
 volumes:
 #  discovery_assets:
   edxapp_lms_assets:
diff --git a/edraak.mk b/edraak.mk
index 8856ac7cf2..4455e2cfc1 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -9,10 +9,10 @@ edraak.build.all:
 	$(MAKE) edraak.build.marketing
 
 edraak.build.programs:
-	docker build -t edraak-devstack-programs -f ../edraak-programs/Dockerfile ../edraak-programs
+	docker build -t eu.gcr.io/openedx-231314/edraak/progs -f ../edraak-programs/Dockerfile ../edraak-programs
 
 edraak.build.marketing:
-	docker build -t edraak-devstack-marketing -f ../marketing-site/Dockerfile ../marketing-site
+	docker build -t eu.gcr.io/openedx-231314/edraak/marketing -f ../marketing-site/Dockerfile ../marketing-site
 
 edraak.programs.help:
 	echo ""
diff --git a/nginx/default.conf b/nginx/default.conf
new file mode 100644
index 0000000000..d0fdaf19d3
--- /dev/null
+++ b/nginx/default.conf
@@ -0,0 +1,71 @@
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server;
+	server_name _;
+	return 301 https://$host$request_uri;
+}
+
+server {
+    listen              443 ssl;
+    ssl_certificate     conf.d/ssl/certificate.crt;
+    ssl_certificate_key conf.d/ssl/private.key;
+    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+
+    server_name www.edraak.dev edraak.dev;
+
+    location / {
+        proxy_pass http://edraak.devstack.marketing:8500;
+        proxy_connect_timeout   100m;
+        proxy_send_timeout      100m;
+        proxy_read_timeout      100m;
+    }
+}
+
+server {
+    listen              443 ssl;
+    ssl_certificate     conf.d/ssl/certificate.crt;
+    ssl_certificate_key conf.d/ssl/private.key;
+    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+
+    server_name programs.edraak.dev;
+
+    location / {
+        proxy_pass http://edraak.devstack.programs:8800;
+        proxy_connect_timeout   100m;
+        proxy_send_timeout      100m;
+        proxy_read_timeout      100m;
+
+    }
+}
+
+server {
+    listen              443 ssl;
+    ssl_certificate     conf.d/ssl/certificate.crt;
+    ssl_certificate_key conf.d/ssl/private.key;
+    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+
+    server_name courses.edraak.dev;
+
+    location / {
+        proxy_pass http://edx.devstack.lms:18000;
+        proxy_connect_timeout   100m;
+        proxy_send_timeout      100m;
+        proxy_read_timeout      100m;
+    }
+}
+
+server {
+    listen              443 ssl;
+    ssl_certificate     conf.d/ssl/certificate.crt;
+    ssl_certificate_key conf.d/ssl/private.key;
+    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+
+    server_name studio.edraak.dev;
+
+    location / {
+        proxy_pass http://edx.devstack.studio:18010;
+        proxy_connect_timeout   100m;
+        proxy_send_timeout      100m;
+        proxy_read_timeout      100m;
+    }
+}
diff --git a/nginx/ssl/ca_bundle.crt b/nginx/ssl/ca_bundle.crt
new file mode 100755
index 0000000000..edb593bcf6
--- /dev/null
+++ b/nginx/ssl/ca_bundle.crt
@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
new file mode 100755
index 0000000000..2ec2597c08
--- /dev/null
+++ b/nginx/ssl/certificate.crt
@@ -0,0 +1,31 @@
+-----BEGIN CERTIFICATE-----
+MIIFWjCCBEKgAwIBAgISAx2QUn5q6XV/NSR23efx7ZjOMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTExMDQwNzMxMDdaFw0y
+MDAyMDIwNzMxMDdaMBUxEzARBgNVBAMTCmVkcmFhay5kZXYwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqicRx0iIJqQrY1QRAwjJHmw2qVNzVfEpE3C59
+kmsyqzdxZDwlu6cGYOXqGBXDK2Gb2FnsXB/hS0UL1yNrI7Bx3aTwvCmIuIyf1DMV
+S69IPdi5OIZ6SspQNUoWM62bHfNqGwObfVkDOSPcGsNOlMQHPlq4k1gv/EkOyY6J
+yYIxV6AG3KU3Afd4hmLPExw3tvMBKJLegifI847ymLSsHXrMFhQKkNjZ8i74jOs9
+rH4vEjWFxML3LDUvPY6YJ0zGYqNr6do/iySWxieJi+er8t94fHCDN5Hxu/I3RViS
+O2JE3/R6pAeSMKYyfLgAmL2U8mTwzLLmH7mwPe4wVJbP2om3AgMBAAGjggJtMIIC
+aTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFF0HoG/CFzzdkRVhlaNKhx+ktA85MB8G
+A1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAu
+BggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAv
+BggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8w
+IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
+CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
+cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUAXqdz
++d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFuNYoDTgAABAMARjBEAiBP
+nGy0+2g/IPurty7abXHv7DCNQEiXboVEQSX3TJmxMwIgfXlb/Obr0c2gaAXx4Tjy
+60DdFeSxvHnCFnOt73U5znQAdwAHt1wb5X1o//Gwxh0jFce65ld8V5S3au68YToa
+adOiHAAAAW41igN8AAAEAwBIMEYCIQD75a2/TS6tbnk54RCOhhhtBP4HTkH0Vmga
+r0DOEyiK2gIhALN+7PF9vGwuKJRllFPPi4ByCpQFzpIRs4P3YUWdzaLgMA0GCSqG
+SIb3DQEBCwUAA4IBAQAiWcyyNYavjfqAPxcbml8eHvIJSHRG4yuGZvWQUT8dqAMq
+HFY7UPmz6sU+7f3BncxNT/p2muCTC2wLUj7gWOlqFT/1ZeUpp0ZI9e53V/l7/7gk
+7ax7FkdcgDpuk5dNKxkbs28i9J9rM9He4QGIM+2jMbELHw/BjEppZx8T9zXLU0QT
+DX5IlmzRuC/HlnYCcarn64bbvkBVi+5PyqpVJ17iGpPQOaqgbRgZRtdwSnzqUzEP
+bi1vpj51/w2uHW6pevMmDn3F6Mww9rou8NhWdl+1gAJkXdxY+2c4IlOk4dcaDqmJ
+kPr4ysrSdg0vSYyHe6UxbbcRcuPyAhbpz5zjdd9b
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
new file mode 100755
index 0000000000..b9152d6603
--- /dev/null
+++ b/nginx/ssl/private.key
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCqicRx0iIJqQrY
+1QRAwjJHmw2qVNzVfEpE3C59kmsyqzdxZDwlu6cGYOXqGBXDK2Gb2FnsXB/hS0UL
+1yNrI7Bx3aTwvCmIuIyf1DMVS69IPdi5OIZ6SspQNUoWM62bHfNqGwObfVkDOSPc
+GsNOlMQHPlq4k1gv/EkOyY6JyYIxV6AG3KU3Afd4hmLPExw3tvMBKJLegifI847y
+mLSsHXrMFhQKkNjZ8i74jOs9rH4vEjWFxML3LDUvPY6YJ0zGYqNr6do/iySWxieJ
+i+er8t94fHCDN5Hxu/I3RViSO2JE3/R6pAeSMKYyfLgAmL2U8mTwzLLmH7mwPe4w
+VJbP2om3AgMBAAECggEAHsqbLpXrUWU1MStdBjhKDcXANOX3rZAwdLhwqHmcY1yo
+uQ+JEKMOKEesm5TXsRKPIC1zJwsHMo19nQKuQXUDMbv8QP8oXKg9s8oDoy+0KU4J
+aH/9P+1rFApbIyEXkm9Y+OqBvzxlqwBRKjem1fRkZI5soPDxtlBN/J6F3vkESdYl
+hmJaokATF/vCSpM/mx6wWWwq50WTEKP1276bE7Jvxdbocn4N3gXy34HLdR1DgLCl
+Ydvth5D3AKaJobix+HeAl9sgUPRzCED+jdUIoO8E2t9SUwPPA+yZUvLvQhb3O3MG
+ogWekdtkpXHefPi7pgOAQFePn6bDPVPmX9CxJ7FfKQKBgQDpERRjAFO7qsRtmTQf
+brOhfBYUr8sgHbam93h+nSyL3LiYsVKnb8HWE5Rne1ZD5anUmY9jbkHqzlpfp8aS
+DSjGCsZeiSttfmxShOyrclDlxuxVxJQyq4khpSAMjO1cXan9a1U/HzDmyw/xlfcL
+87uZ0+KLQKt01jj5pslJjgCRawKBgQC7UZnwYRGX0ErElzbXQ17uFezSAZ5Wenkw
+w/g8EPEpQWNcNUEKfilRfE+HcF69ALwJjVAxApkbHZe88RAl2ohleUnm+Vvt8dza
+sKVpqHky9lW7BtnY0nZ1zXu40dToGoWkkRZN7FjkZwCw5MveGAxy+k29Iq/7dzvO
+Dkqdk9Wf5QKBgQCTKzTLWv6Ep01Hw5D1NCr7kmZDA8po6jpW7jdJBCiH3IU37ei6
+T8h/THfObERJtXDrDVhMueenxEuu0TuDKAoSG+Ws9kLU7hqqdMMZc6L/pP/BHNNT
+t5ttAl7dbfPH+mEH48m9hQ2U/q5/p2mLQ4m3leMceWaK7Wamxhmed6uGJwKBgD4s
+urTf80/5sieIrYpL8WGDY4TdRqobosg989I0KWfxLUK45mrOL3a9lUQ2VyvS55cg
+EaMC4sDuVKRBO4PlAmr0FESXNh1Hr2/jPDRS2E/DFferMXnXebxmRQ+2jj2wN/XE
+tquMrIC7c65Dcyu3vcIYNN93eQQ1smMVuUyOelTFAoGBAOFW14UVVO9EAchJLOdz
+cGXGy4dst96gDSvsqH5+ERJzUBv8tlvNyHXkdtn8CWNEGTHxUfGBqu/YHUaqTMCP
+RYzTuX907uqDRm1Sjnuehj+4/5e9BMpLSiQNYsdW8a1jhExvx5YNaVhGr43tsUx+
++qmIP2VbEf1gcNoRdBJvdylZ
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
index b49ed6d26a..170bdb1814 100755
--- a/provision-edraak-marketing.sh
+++ b/provision-edraak-marketing.sh
@@ -1,15 +1,17 @@
 set -e
 
-echo "** Restarting **"
+echo "** Marketing: Restarting **"
 docker-compose restart edraak_marketing
 
-echo "** Migrating databases **"
-docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/* /app/.'
+echo "** Marketing: Copy cacheed files to code dir **"
+docker-compose exec edraak_marketing bash -c 'cp -Rn /cache/* /app/.'
+
+echo "** Marketing: Migrating databases **"
 docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
-echo "** Compiling assets **"
+echo "** Marketing: Compiling assets **"
 docker-compose exec edraak_marketing bash -c 'yarn'
 docker-compose exec edraak_marketing bash -c 'npx gulp'
 
-echo "** Restarting **"
+echo "** Marketing: Restarting **"
 docker-compose restart edraak_marketing
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index 8a42dc70bf..4a63a4de60 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -1,18 +1,21 @@
 set -e
 
-echo "** Restarting **"
+echo "** Progs: Restarting **"
 docker-compose restart edraak_programs
 
-echo "** Migrating databases **"
+echo "** Progs: Copy cacheed files to code dir **"
+docker-compose exec edraak_programs bash -c 'cp -Rn /cache/* /app/.'
+
+echo "** Progs: Migrating databases **"
 docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
-echo "** Compiling assets **"
-docker-compose exec edraak_programs bash -c 'cp -Rnv /cache/* /app/.'
+echo "** Progs: Compiling assets **"
 docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
 docker-compose exec edraak_programs bash -c 'npm install'
+docker-compose exec edraak_programs bash -c 'bower install'
 docker-compose exec edraak_programs bash -c 'gulp'
 docker-compose exec edraak_programs bash -c 'python manage.py compilestatic --settings=edraakprograms.static'
 docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
-echo "** Restarting **"
+echo "** Progs: Restarting **"
 docker-compose restart edraak_programs
diff --git a/provision-edraak.sql b/provision-edraak.sql
index 855aa29418..66f87d54a6 100644
--- a/provision-edraak.sql
+++ b/provision-edraak.sql
@@ -1,2 +1,3 @@
 CREATE DATABASE IF NOT EXISTS edraakprograms;
 CREATE DATABASE IF NOT EXISTS marketingsite;
+-- TODO add some edraak fixtures
diff --git a/repo.sh b/repo.sh
index ffc96559c6..8375ddd55b 100755
--- a/repo.sh
+++ b/repo.sh
@@ -29,10 +29,14 @@ repos=(
 #    "https://github.com/Edraak/edx-analytics-pipeline.git"
     "git@github.com:Edraak/marketing-site.git"
     "git@github.com:Edraak/edraak-programs.git"
+    "git@github.com:Edraak/edraak-2019-theme.git"
+    "git@github.com:Edraak/shared-devstack-configs.git"
 )
 
 repo_alternative_directory=(
 	"https://github.com/Edraak/edraak-platform.git,edx-platform"
+	"git@github.com:Edraak/edraak-2019-theme.git,edx-themes/edraak-2019-theme"
+      "git@github.com:Edraak/shared-devstack-configs.git,src/edxapp-envs"
 )
 
 private_repos=(

From a920f5aaa2f52db1864b061070712ebcdacc8aed Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Thu, 7 Nov 2019 09:45:09 +0300
Subject: [PATCH 023/137] Increase upload size

---
 nginx/default.conf | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nginx/default.conf b/nginx/default.conf
index d0fdaf19d3..5ed650e8a4 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -3,6 +3,7 @@ server {
 	listen [::]:80 default_server;
 	server_name _;
 	return 301 https://$host$request_uri;
+    client_max_body_size 100M;
 }
 
 server {
@@ -12,6 +13,7 @@ server {
     ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
     server_name www.edraak.dev edraak.dev;
+    client_max_body_size 100M;
 
     location / {
         proxy_pass http://edraak.devstack.marketing:8500;
@@ -28,6 +30,7 @@ server {
     ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
     server_name programs.edraak.dev;
+    client_max_body_size 100M;
 
     location / {
         proxy_pass http://edraak.devstack.programs:8800;
@@ -45,6 +48,7 @@ server {
     ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
     server_name courses.edraak.dev;
+    client_max_body_size 100M;
 
     location / {
         proxy_pass http://edx.devstack.lms:18000;
@@ -61,6 +65,7 @@ server {
     ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 
     server_name studio.edraak.dev;
+    client_max_body_size 100M;
 
     location / {
         proxy_pass http://edx.devstack.studio:18010;

From ca179dbdb4cc7e8f6ec3aea0100cae080ccf58f9 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Thu, 7 Nov 2019 09:45:24 +0300
Subject: [PATCH 024/137] Cleanup for `pull`; Ensure all edxapp images have the
 latest prereqs.

---
 Makefile | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index a4317f9a2e..855bb2e1ab 100644
--- a/Makefile
+++ b/Makefile
@@ -99,10 +99,11 @@ dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync ena
 edraak.dev.up.hacks:
 	@# Start: Edraak hacks
 	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
-	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'
-	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'
-	@docker exec -it edx.devstack.lms bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
-	@docker exec -it edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'
+	@for container in lms studio lms_watcher studio_watcher; do \
+		 docker exec -it edx.devstack.$$container bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'; \
+		 docker exec -it edx.devstack.$$container bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'; \
+		 docker exec -it edx.devstack.$$container bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'; \
+    done;
 	@make dev.editable-envs
 	@# End: Edraak hacks
 
@@ -140,11 +141,8 @@ xqueue-logs: ## View logs from containers running in detached mode
 xqueue_consumer-logs: ## View logs from containers running in detached mode
 	docker-compose -f docker-compose-xqueue.yml logs -f xqueue_consumer
 
-pull: edraak.build.all ## Update Docker images
-	@echo "The progs and marketing images are only built"
-	@echo "locally, so 'pull' will fail and that's okay."
-	docker-compose pull --parallel --ignore-pull-failures
-	@echo "Once again ^^^ please ignore the errors above ^^^."
+pull:
+	docker-compose pull --parallel
 
 pull.xqueue: ## Update XQueue Docker images
 	docker-compose -f docker-compose-xqueue.yml pull --parallel

From c6029ba4ec69829f90cecd961d3b31e3a241fd2c Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 10 Nov 2019 17:00:07 +0200
Subject: [PATCH 025/137] No need to do sudo.

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index a4317f9a2e..9569df5de6 100644
--- a/Makefile
+++ b/Makefile
@@ -59,12 +59,12 @@ dev.repo.reset: ## Attempts to reset the local repo checkouts to the master work
 	./repo.sh reset
 
 dev.editable-envs:  ## Copy env files outside the docker containers so it's editable by the developer
-	sudo mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
+	mkdir -p $(DEVSTACK_WORKSPACE)/src/edxapp-envs/
 	@docker exec -it edx.devstack.lms bash -c 'test -f /edx/src/edxapp-envs/lms.env.json || mv /edx/app/edxapp/lms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.lms bash -c 'ln -sf /edx/src/edxapp-envs/lms.{env,auth}.json /edx/app/edxapp/'
 	@docker exec -it edx.devstack.studio bash -c 'test -f /edx/src/edxapp-envs/cms.env.json || mv /edx/app/edxapp/cms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.studio bash -c 'ln -sf /edx/src/edxapp-envs/cms.{env,auth}.json /edx/app/edxapp/'
-	@sudo chown -R $(USER) $(DEVSTACK_WORKSPACE)/src
+	chown -R $(USER) $(DEVSTACK_WORKSPACE)/src
 	@make lms-restart
 	@make studio-restart
 

From 34bd7be0dd0a3b0edb7d0820a1b9bf49c9bd8f1d Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Mon, 11 Nov 2019 08:07:53 +0300
Subject: [PATCH 026/137] Hack: Drop nginx cookies to ensure only `.edraak.dev`
 cookies are kept

---
 nginx/default.conf         | 47 ++++++++------------------------------
 nginx/includes/proxy.conf  |  7 ++++++
 nginx/includes/server.conf |  5 ++++
 3 files changed, 21 insertions(+), 38 deletions(-)
 create mode 100644 nginx/includes/proxy.conf
 create mode 100644 nginx/includes/server.conf

diff --git a/nginx/default.conf b/nginx/default.conf
index 5ed650e8a4..94e78f9c94 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -7,70 +7,41 @@ server {
 }
 
 server {
-    listen              443 ssl;
-    ssl_certificate     conf.d/ssl/certificate.crt;
-    ssl_certificate_key conf.d/ssl/private.key;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-
-    server_name www.edraak.dev edraak.dev;
-    client_max_body_size 100M;
+    server_name edraak.dev www.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
         proxy_pass http://edraak.devstack.marketing:8500;
-        proxy_connect_timeout   100m;
-        proxy_send_timeout      100m;
-        proxy_read_timeout      100m;
+        include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
 
 server {
-    listen              443 ssl;
-    ssl_certificate     conf.d/ssl/certificate.crt;
-    ssl_certificate_key conf.d/ssl/private.key;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-
     server_name programs.edraak.dev;
-    client_max_body_size 100M;
+    include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
         proxy_pass http://edraak.devstack.programs:8800;
-        proxy_connect_timeout   100m;
-        proxy_send_timeout      100m;
-        proxy_read_timeout      100m;
-
+        include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
 
 server {
-    listen              443 ssl;
-    ssl_certificate     conf.d/ssl/certificate.crt;
-    ssl_certificate_key conf.d/ssl/private.key;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-
     server_name courses.edraak.dev;
-    client_max_body_size 100M;
+    include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
         proxy_pass http://edx.devstack.lms:18000;
-        proxy_connect_timeout   100m;
-        proxy_send_timeout      100m;
-        proxy_read_timeout      100m;
+        include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
 
 server {
-    listen              443 ssl;
-    ssl_certificate     conf.d/ssl/certificate.crt;
-    ssl_certificate_key conf.d/ssl/private.key;
-    ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
-
     server_name studio.edraak.dev;
-    client_max_body_size 100M;
+    include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
         proxy_pass http://edx.devstack.studio:18010;
-        proxy_connect_timeout   100m;
-        proxy_send_timeout      100m;
-        proxy_read_timeout      100m;
+        include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/nginx/includes/proxy.conf b/nginx/includes/proxy.conf
new file mode 100644
index 0000000000..a0155691ed
--- /dev/null
+++ b/nginx/includes/proxy.conf
@@ -0,0 +1,7 @@
+proxy_connect_timeout   100m;
+proxy_send_timeout      100m;
+proxy_read_timeout      100m;
+
+add_header Set-Cookie "csrftoken=deleted; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/;";
+add_header Set-Cookie "sessionid=deleted; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/;";
+add_header Set-Cookie "openedx-language-preference=deleted; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/;";
diff --git a/nginx/includes/server.conf b/nginx/includes/server.conf
new file mode 100644
index 0000000000..99d72e265b
--- /dev/null
+++ b/nginx/includes/server.conf
@@ -0,0 +1,5 @@
+listen              443 ssl;
+ssl_certificate     conf.d/ssl/certificate.crt;
+ssl_certificate_key conf.d/ssl/private.key;
+ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
+client_max_body_size 100M;

From 067da5fb1e5a1c9cacb0f53cc5057849a741264d Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Mon, 11 Nov 2019 08:20:32 +0300
Subject: [PATCH 027/137] Redirect edraak.dev to www to reduce cookie mess

---
 nginx/default.conf | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nginx/default.conf b/nginx/default.conf
index 94e78f9c94..e19010cac0 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -7,7 +7,16 @@ server {
 }
 
 server {
-    server_name edraak.dev www.edraak.dev;
+    server_name edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        return 301 http://www.edraak.dev$request_uri;
+    }
+}
+
+server {
+    server_name www.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {

From a4dec52e11512930b753c8bbadeb6bac90bacc92 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Mon, 11 Nov 2019 08:31:22 +0300
Subject: [PATCH 028/137] Link envs before installing prereqs

---
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f0d935ddc3..f9e4ea9442 100644
--- a/Makefile
+++ b/Makefile
@@ -99,12 +99,14 @@ dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync ena
 edraak.dev.up.hacks:
 	@# Start: Edraak hacks
 	@# TODO: Add this to `base.in` (thus `development.txt`) and rebuild the docker image
+	@make dev.editable-envs
 	@for container in lms studio lms_watcher studio_watcher; do \
 		 docker exec -it edx.devstack.$$container bash -c 'source /edx/app/edxapp/edxapp_env && pip install python-bidi==0.4.0'; \
 		 docker exec -it edx.devstack.$$container bash -c 'source /edx/app/edxapp/edxapp_env && pip install wand==0.5.1'; \
 		 docker exec -it edx.devstack.$$container bash -c 'source /edx/app/edxapp/edxapp_env && pip install -e /edx/app/edxapp/edx-platform'; \
     done;
-	@make dev.editable-envs
+	@make lms-restart
+	@make studio-restart
 	@# End: Edraak hacks
 
 provision: | dev.provision ## This command will be deprecated in a future release, use dev.provision

From c40c02f0b1afc3d6274c3689065364125aeee78b Mon Sep 17 00:00:00 2001
From: Ali <devalih@gmail.com>
Date: Mon, 11 Nov 2019 09:37:06 +0200
Subject: [PATCH 029/137] Update default.conf

---
 nginx/default.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nginx/default.conf b/nginx/default.conf
index e19010cac0..8b0b909628 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -11,7 +11,7 @@ server {
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
-        return 301 http://www.edraak.dev$request_uri;
+        return 301 https://www.edraak.dev$request_uri;
     }
 }
 

From f3e860fef9baf4a7f637bbb3efe8e46e2a7f9486 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Tue, 12 Nov 2019 12:26:28 +0300
Subject: [PATCH 030/137] Clean up the cookie hack

---
 nginx/includes/proxy.conf | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nginx/includes/proxy.conf b/nginx/includes/proxy.conf
index a0155691ed..496813cef4 100644
--- a/nginx/includes/proxy.conf
+++ b/nginx/includes/proxy.conf
@@ -1,7 +1,3 @@
 proxy_connect_timeout   100m;
 proxy_send_timeout      100m;
 proxy_read_timeout      100m;
-
-add_header Set-Cookie "csrftoken=deleted; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/;";
-add_header Set-Cookie "sessionid=deleted; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/;";
-add_header Set-Cookie "openedx-language-preference=deleted; expires=Thu, 01 Jan 1970 00:00:01 GMT; path=/;";

From 59ec83fe5435d126c827fe14e6ab0f64f8431da2 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 24 Nov 2019 14:36:58 +0200
Subject: [PATCH 031/137] Pushed new openedx image, no need for the hacks

---
 Makefile           | 2 --
 docker-compose.yml | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f9e4ea9442..56594f068c 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,6 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 
 dev.up: | check-memory ## Bring up all services with host volumes
 	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-watchers.yml up -d
-	@make edraak.dev.up.hacks
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
@@ -92,7 +91,6 @@ dev.sync.requirements: ## Install requirements
 
 dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync enabled
 	docker-compose -f docker-compose.yml -f docker-compose-sync.yml up -d
-	@make edraak.dev.up.hacks
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 377cce9df0..bda5354e01 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,7 +142,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
@@ -188,7 +188,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging

From 86fe2de4b762dc5150ba830155db9dd561adee44 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 26 Nov 2019 14:04:37 +0200
Subject: [PATCH 032/137] new edxapp image

---
 README.rst                  | 2 +-
 docker-compose-watchers.yml | 4 ++--
 docker-compose.yml          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 5a3ce91885..cc4e3fd457 100644
--- a/README.rst
+++ b/README.rst
@@ -375,7 +375,7 @@ BUILD COMMANDS:
 
     git checkout master
     git pull
-    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:latest
+    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
 
 .. code:: sh
 
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index d3e6191836..038ba440a1 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -8,7 +8,7 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
       EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -22,7 +22,7 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
       EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
diff --git a/docker-compose.yml b/docker-compose.yml
index bda5354e01..00bf64f746 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,7 +142,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
@@ -188,7 +188,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging

From 3fe973627e0ba6c93e00bb2a7e19799f2d35f123 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 3 Dec 2019 17:03:04 +0200
Subject: [PATCH 033/137] add src to docker-sync

---
 docker-compose-sync.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml
index ae792fb9fd..82c0b00be4 100644
--- a/docker-compose-sync.yml
+++ b/docker-compose-sync.yml
@@ -13,9 +13,11 @@ services:
   lms:
     volumes:
       - edxapp-sync:/edx/app/edxapp/edx-platform:nocopy
+      - src-sync:/edx/src:nocopy
   studio:
     volumes:
       - edxapp-sync:/edx/app/edxapp/edx-platform:nocopy
+      - src-sync:/edx/src:nocopy
   forum:
     volumes:
       - forum-sync:/edx/app/forum/cs_comments_service:nocopy
@@ -44,3 +46,5 @@ volumes:
     external: true
   edraak-programs-sync:
     external: true
+  src-sync:
+    external: true

From 5995a4c6aa4e5aeae0a1b447f43a485257e7e7e1 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 4 Dec 2019 12:44:50 +0200
Subject: [PATCH 034/137] Add NFS support for mac

---
 Makefile                        | 27 ++++++++++--
 README.rst                      | 16 +++++++
 docker-compose-host-nfs.yml     | 74 +++++++++++++++++++++++++++++++++
 docker-compose-watchers-nfs.yml | 32 ++++++++++++++
 setup_native_nfs_docker_osx.sh  | 71 +++++++++++++++++++++++++++++++
 5 files changed, 217 insertions(+), 3 deletions(-)
 create mode 100644 docker-compose-host-nfs.yml
 create mode 100644 docker-compose-watchers-nfs.yml
 create mode 100755 setup_native_nfs_docker_osx.sh

diff --git a/Makefile b/Makefile
index 56594f068c..923a5da01b 100644
--- a/Makefile
+++ b/Makefile
@@ -43,6 +43,9 @@ dev.clone: ## Clone service repos to the parent directory
 dev.provision.run: ## Provision all services with local mounted directories
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision.sh
 
+dev.provision.sync.run: ## Provision all services with local mounted directories
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-sync.yml" ./provision.sh
+
 dev.provision: | check-memory dev.clone dev.provision.run stop ## Provision dev environment with all services stopped
 
 dev.provision.xqueue: | check-memory dev.provision.xqueue.run stop stop.xqueue
@@ -69,22 +72,40 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 	@make studio-restart
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f docker-compose-watchers.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
+dev.nfs.setup:  ## set's up an nfs server on the /Users folder, allowing nfs mounting on docker
+	./setup_native_nfs_docker_osx.sh
+
+dev.nfs.up.watchers: | check-memory ## Bring up asset watcher containers
+	docker-compose -f docker-compose-watchers-nfs.yml up -d
+
+dev.nfs.up: | check-memory ## Bring up all services with host volumes
+	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml up -d
+	@# Comment out this next line if you want to save some time and don't care about catalog programs
+	#./programs/provision.sh cache >/dev/null
+
+dev.nfs.up.all: | dev.nfs.up dev.nfs.up.watchers ## Bring up all services with host volumes, including watchers
+
+dev.nfs.provision: | check-memory dev.clone dev.provision.nfs.run stop ## Provision dev environment with all services stopped
+
+dev.provision.nfs.run: ## Provision all services with local mounted directories
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host-nfs.yml" ./provision.sh
+
 dev.up.watchers: | check-memory ## Bring up asset watcher containers
 	docker-compose -f docker-compose-watchers.yml up -d
 
 dev.up.xqueue: | check-memory ## Bring up xqueue, assumes you already have lms running
-	docker-compose -f docker-compose.yml -f docker-compose-xqueue.yml -f docker-compose-host.yml up -d
+	docker-compose -f docker-compose.yml -f  docker-compose-xqueue.yml -f docker-compose-host.yml up -d
 
 dev.up.all: | dev.up dev.up.watchers ## Bring up all services with host volumes, including watchers
 
 dev.sync.daemon.start: ## Start the docker-sycn daemon
 	docker-sync start
 
-dev.sync.provision: | dev.sync.daemon.start dev.provision ## Provision with docker-sync enabled
+dev.sync.provision: | dev.sync.daemon.start check-memory dev.clone dev.provision.sync.run stop ## Provision dev environment with all services stopped
 
 dev.sync.requirements: ## Install requirements
 	gem install docker-sync
diff --git a/README.rst b/README.rst
index cc4e3fd457..3e7513442c 100644
--- a/README.rst
+++ b/README.rst
@@ -102,6 +102,10 @@ a minimum of 2 CPUs and 6GB of memory works well.
 
        gcloud auth configure-docker
 
+3. You have an option to use nfs on MacOS which will improve the performance significantly, to set it up ONLY ON MAC, do
+    .. code:: sh
+
+        make dev.nfs.setup
 
 3. Run the provision command, if you haven't already, to configure the various
    services with superusers (for development without the auth service) and
@@ -126,6 +130,12 @@ a minimum of 2 CPUs and 6GB of memory works well.
 
        make dev.sync.provision
 
+   Provision using `nfs`_:
+
+   .. code:: sh
+
+       make dev.nfs.provision
+
 4. Start the services. This command will mount the repositories under the
    DEVSTACK\_WORKSPACE directory.
 
@@ -143,6 +153,12 @@ a minimum of 2 CPUs and 6GB of memory works well.
 
        make dev.sync.up
 
+   Start using `nfs`_:
+
+   .. code:: sh
+
+       make dev.nfs.up
+
 
 After the services have started, if you need shell access to one of the
 services, run ``make <service>-shell``. For example to access the
diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
new file mode 100644
index 0000000000..c9a46b4b80
--- /dev/null
+++ b/docker-compose-host-nfs.yml
@@ -0,0 +1,74 @@
+version: "2.1"
+
+services:
+#  credentials:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/credentials:/edx/app/credentials/credentials:cached
+#      - credentials_node_modules:/edx/app/credentials/credentials/node_modules
+#      - src-nfs:/edx/src:cached
+#  discovery:
+#      volumes:
+#      - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:cached
+#      - discovery_node_modules:/edx/app/discovery/discovery/node_modules
+#      - src-nfs:/edx/src:cached
+#  ecommerce:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/ecommerce:/edx/app/ecommerce/ecommerce:cached
+#      - ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
+#      - src-nfs:/edx/src:cached
+  lms:
+    volumes:
+      - edx-nfs:/edx/app/edxapp/edx-platform
+      - src-nfs:/edx/src:cached
+#  edx_notes_api:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
+#      - src-nfs:/edx/src:cached
+  studio:
+    volumes:
+      - edx-nfs:/edx/app/edxapp/edx-platform
+      - src-nfs:/edx/src:cached
+  forum:
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
+  edraak_programs:
+    volumes:
+      - progs-nfs:/app:cached
+  edraak_programs_gulp:
+    volumes:
+      - progs-nfs:/app:cached
+  edraak_marketing:
+    volumes:
+      - marketing-nfs:/app:cached
+  edraak_marketing_gulp:
+    volumes:
+      - marketing-nfs:/app:cached
+
+volumes:
+#  credentials_node_modules:
+#  discovery_node_modules:
+#  ecommerce_node_modules:
+  edx-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/edx-platform
+  src-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/src
+  marketing-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/marketing-site
+  progs-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/edraak-programs
diff --git a/docker-compose-watchers-nfs.yml b/docker-compose-watchers-nfs.yml
new file mode 100644
index 0000000000..a895436f51
--- /dev/null
+++ b/docker-compose-watchers-nfs.yml
@@ -0,0 +1,32 @@
+version: "2.1"
+
+services:
+  lms_watcher:
+    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
+    container_name: edx.devstack.lms_watcher
+    environment:
+      BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
+      ASSET_WATCHER_TIMEOUT: 12
+      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    volumes:
+      - edx-nfs:/edx/app/edxapp/edx-platform
+      - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
+      - src-nfs:/edx/src:cached
+
+  studio_watcher:
+    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
+    container_name: edx.devstack.studio_watcher
+    environment:
+      BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
+      ASSET_WATCHER_TIMEOUT: 12
+      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    volumes:
+      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
+      - edx-nfs:/edx/app/edxapp/edx-platform
+      - src-nfs:/edx/src:cached
+
+volumes:
+  edxapp_lms_assets:
+  edxapp_studio_assets:
diff --git a/setup_native_nfs_docker_osx.sh b/setup_native_nfs_docker_osx.sh
new file mode 100755
index 0000000000..a74a2012fc
--- /dev/null
+++ b/setup_native_nfs_docker_osx.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+
+OS=`uname -s`
+
+if [ $OS != "Darwin" ]; then
+  echo "This script is OSX-only. Please do not run it on any other Unix."
+  exit 1
+fi
+
+if [[ $EUID -eq 0 ]]; then
+  echo "This script must NOT be run with sudo/root. Please re-run without sudo." 1>&2
+  exit 1
+fi
+
+echo ""
+echo " +-----------------------------+"
+echo " | Setup native NFS for Docker |"
+echo " +-----------------------------+"
+echo ""
+
+echo "WARNING: This script will shut down running containers."
+echo ""
+echo -n "Do you wish to proceed? [y]: "
+read decision
+
+if [ "$decision" != "y" ]; then
+  echo "Exiting. No changes made."
+  exit 1
+fi
+
+echo ""
+
+if ! docker ps > /dev/null 2>&1 ; then
+  echo "== Waiting for docker to start..."
+fi
+
+open -a Docker
+
+while ! docker ps > /dev/null 2>&1 ; do sleep 2; done
+
+echo "== Stopping running docker containers..."
+docker-compose down > /dev/null 2>&1
+docker volume prune -f > /dev/null
+
+osascript -e 'quit app "Docker"'
+
+echo "== Resetting folder permissions..."
+U=`id -u`
+G=`id -g`
+sudo chown -R "$U":"$G" .
+
+echo "== Setting up nfs..."
+LINE="/Users -alldirs -mapall=$U:$G localhost"
+FILE=/etc/exports
+sudo cp /dev/null $FILE
+grep -qF -- "$LINE" "$FILE" || sudo echo "$LINE" | sudo tee -a $FILE > /dev/null
+
+LINE="nfs.server.mount.require_resv_port = 0"
+FILE=/etc/nfs.conf
+grep -qF -- "$LINE" "$FILE" || sudo echo "$LINE" | sudo tee -a $FILE > /dev/null
+
+echo "== Restarting nfsd..."
+sudo nfsd restart
+
+echo "== Restarting docker..."
+open -a Docker
+
+while ! docker ps > /dev/null 2>&1 ; do sleep 2; done
+
+echo ""
+echo "SUCCESS! Now go run your containers 🐳"

From 9ad97bd38f79c2a6e61ad464c57d3ffb48172cbb Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 4 Dec 2019 14:26:19 +0200
Subject: [PATCH 035/137] cleaner image

---
 README.rst                      |  2 +-
 docker-compose-host-nfs.yml     | 12 ++++++------
 docker-compose-watchers-nfs.yml |  4 ++--
 docker-compose-watchers.yml     |  4 ++--
 docker-compose.yml              |  4 ++--
 provision-lms.sh                |  2 ++
 6 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index 3e7513442c..e306f4db6c 100644
--- a/README.rst
+++ b/README.rst
@@ -391,7 +391,7 @@ BUILD COMMANDS:
 
     git checkout master
     git pull
-    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
 
 .. code:: sh
 
diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
index c9a46b4b80..a69abbfe5f 100644
--- a/docker-compose-host-nfs.yml
+++ b/docker-compose-host-nfs.yml
@@ -19,7 +19,7 @@ services:
   lms:
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
-      - src-nfs:/edx/src:cached
+      - src-nfs:/edx/src
 #  edx_notes_api:
 #    volumes:
 #      - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
@@ -27,22 +27,22 @@ services:
   studio:
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
-      - src-nfs:/edx/src:cached
+      - src-nfs:/edx/src
   forum:
     volumes:
       - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
   edraak_programs:
     volumes:
-      - progs-nfs:/app:cached
+      - progs-nfs:/app
   edraak_programs_gulp:
     volumes:
-      - progs-nfs:/app:cached
+      - progs-nfs:/app
   edraak_marketing:
     volumes:
-      - marketing-nfs:/app:cached
+      - marketing-nfs:/app
   edraak_marketing_gulp:
     volumes:
-      - marketing-nfs:/app:cached
+      - marketing-nfs:/app
 
 volumes:
 #  credentials_node_modules:
diff --git a/docker-compose-watchers-nfs.yml b/docker-compose-watchers-nfs.yml
index a895436f51..3dd70be1e4 100644
--- a/docker-compose-watchers-nfs.yml
+++ b/docker-compose-watchers-nfs.yml
@@ -8,7 +8,7 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
       EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -21,7 +21,7 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
       EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - edx-nfs:/edx/app/edxapp/edx-platform
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
index 038ba440a1..4b80c03a31 100644
--- a/docker-compose-watchers.yml
+++ b/docker-compose-watchers.yml
@@ -8,7 +8,7 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
       EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
@@ -22,7 +22,7 @@ services:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
       EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
diff --git a/docker-compose.yml b/docker-compose.yml
index 00bf64f746..2e34a8bba1 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,7 +142,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
@@ -188,7 +188,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v2
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging
diff --git a/provision-lms.sh b/provision-lms.sh
index 3b7439a06d..e3d64c13e9 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -10,9 +10,11 @@ apps=( lms studio )
 
 # Bring edxapp containers online
 for app in "${apps[@]}"; do
+    echo $DOCKER_COMPOSE_FILES
     docker-compose $DOCKER_COMPOSE_FILES up -d $app
 done
 
+echo $DOCKER_COMPOSE_FILES
 docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
 
 #Installing prereqs crashes the process

From 42ae10476d7496f4c532d126d297e2ab497ead61 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 4 Dec 2019 15:30:36 +0200
Subject: [PATCH 036/137] fixes

---
 Makefile                        | 10 +++-------
 docker-compose-watchers-nfs.yml |  4 ++--
 docker-compose.yml              |  2 ++
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 923a5da01b..ef0a52e104 100644
--- a/Makefile
+++ b/Makefile
@@ -73,21 +73,17 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 
 dev.up: | check-memory ## Bring up all services with host volumes
 	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
-	@# Comment out this next line if you want to save some time and don't care about catalog programs
-	#./programs/provision.sh cache >/dev/null
 
 dev.nfs.setup:  ## set's up an nfs server on the /Users folder, allowing nfs mounting on docker
 	./setup_native_nfs_docker_osx.sh
 
-dev.nfs.up.watchers: | check-memory ## Bring up asset watcher containers
-	docker-compose -f docker-compose-watchers-nfs.yml up -d
-
 dev.nfs.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml up -d
+	docker-compose -f docker-composedraak_dev_routere.yml -f docker-compose-host-nfs.yml up -d
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
-dev.nfs.up.all: | dev.nfs.up dev.nfs.up.watchers ## Bring up all services with host volumes, including watchers
+dev.nfs.up.all: ## Bring up all services with host volumes, including watchers
+	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-watchers-nfs.yml up -d
 
 dev.nfs.provision: | check-memory dev.clone dev.provision.nfs.run stop ## Provision dev environment with all services stopped
 
diff --git a/docker-compose-watchers-nfs.yml b/docker-compose-watchers-nfs.yml
index 3dd70be1e4..4c08af44b7 100644
--- a/docker-compose-watchers-nfs.yml
+++ b/docker-compose-watchers-nfs.yml
@@ -7,7 +7,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
       ASSET_WATCHER_TIMEOUT: 12
-      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
+      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/src'
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
@@ -20,7 +20,7 @@ services:
     environment:
       BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
       ASSET_WATCHER_TIMEOUT: 12
-      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
+      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/src'
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     volumes:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e34a8bba1..52d25f42a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -269,6 +269,8 @@ services:
   edraak_dev_router:
     image: nginx
     container_name: edraak_dev_router
+    logging:
+      driver: none
     volumes:
       - ./nginx:/etc/nginx/conf.d
     command: bash -c 'while true; do nginx -g "daemon off;"; sleep 2; done'

From 187e1f4a7c1840adce2b785f87daf3b083fa7b05 Mon Sep 17 00:00:00 2001
From: Ali <devalih@gmail.com>
Date: Sun, 8 Dec 2019 10:14:40 +0200
Subject: [PATCH 037/137] Update Makefile

Co-Authored-By: Omar <47500477+OmarEdraak@users.noreply.github.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index ef0a52e104..551f74d683 100644
--- a/Makefile
+++ b/Makefile
@@ -78,7 +78,7 @@ dev.nfs.setup:  ## set's up an nfs server on the /Users folder, allowing nfs mou
 	./setup_native_nfs_docker_osx.sh
 
 dev.nfs.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-composedraak_dev_routere.yml -f docker-compose-host-nfs.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml up -d
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 

From cda81d663fce3649e47f00a9f82ce574463a5514 Mon Sep 17 00:00:00 2001
From: Ali <devalih@gmail.com>
Date: Sun, 8 Dec 2019 10:15:13 +0200
Subject: [PATCH 038/137] Update Makefile

Co-Authored-By: Omar <47500477+OmarEdraak@users.noreply.github.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 551f74d683..726d70a29f 100644
--- a/Makefile
+++ b/Makefile
@@ -101,7 +101,7 @@ dev.up.all: | dev.up dev.up.watchers ## Bring up all services with host volumes,
 dev.sync.daemon.start: ## Start the docker-sycn daemon
 	docker-sync start
 
-dev.sync.provision: | dev.sync.daemon.start check-memory dev.clone dev.provision.sync.run stop ## Provision dev environment with all services stopped
+dev.sync.provision: | dev.sync.daemon.start dev.provision ## Provision with docker-sync enabled
 
 dev.sync.requirements: ## Install requirements
 	gem install docker-sync

From e14908169dd36b47b6e3621869b4592083043a4f Mon Sep 17 00:00:00 2001
From: Ali <devalih@gmail.com>
Date: Sun, 8 Dec 2019 10:15:53 +0200
Subject: [PATCH 039/137] Update docker-compose.yml

Co-Authored-By: Omar <47500477+OmarEdraak@users.noreply.github.com>
---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 52d25f42a5..c7fba26a2f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -188,7 +188,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:${OPENEDX_RELEASE:-latest}
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging

From 07afff489fe80e196ef420d5edba1269d797a51d Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 10 Dec 2019 14:24:04 +0200
Subject: [PATCH 040/137] new theme path

---
 ingress.yaml     | 30 ++++++++++++++++++++++++++++++
 new_ingress.yaml | 32 ++++++++++++++++++++++++++++++++
 repo.sh          |  2 +-
 3 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 ingress.yaml
 create mode 100644 new_ingress.yaml

diff --git a/ingress.yaml b/ingress.yaml
new file mode 100644
index 0000000000..a58a26b206
--- /dev/null
+++ b/ingress.yaml
@@ -0,0 +1,30 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.gcp.kubernetes.io/pre-shared-cert: mcrt-238e7ad1-c504-406a-a02c-30ad165b3769
+    ingress.kubernetes.io/backends: '{"k8s-be-31006--01cf32500b55490f":"HEALTHY"}'
+    ingress.kubernetes.io/forwarding-rule: k8s-fw-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/https-forwarding-rule: k8s-fws-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/https-target-proxy: k8s-tps-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/ssl-cert: mcrt-238e7ad1-c504-406a-a02c-30ad165b3769
+    ingress.kubernetes.io/static-ip: k8s-fw-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/target-proxy: k8s-tp-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/url-map: k8s-um-default-edraak-recommendation-https--01cf32500b55490f
+    networking.gke.io/managed-certificates: recommender-edraakbeta-org
+  creationTimestamp: "2019-12-10T10:30:23Z"
+  generation: 1
+  name: edraak-recommendation-https
+  namespace: default
+  resourceVersion: "16372959"
+  selfLink: /apis/extensions/v1beta1/namespaces/default/ingresses/edraak-recommendation-https
+  uid: 1294aaa7-1b38-11ea-8555-42010a9a002b
+spec:
+  backend:
+    serviceName: edraak-recommendation-api
+    servicePort: 80
+status:
+  loadBalancer:
+    ingress:
+    - ip: 107.178.246.246
+
diff --git a/new_ingress.yaml b/new_ingress.yaml
new file mode 100644
index 0000000000..0c57b97f88
--- /dev/null
+++ b/new_ingress.yaml
@@ -0,0 +1,32 @@
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  annotations:
+    ingress.gcp.kubernetes.io/pre-shared-cert: mcrt-238e7ad1-c504-406a-a02c-30ad165b3769
+    ingress.kubernetes.io/backends: '{"k8s-be-31006--01cf32500b55490f":"HEALTHY"}'
+    ingress.kubernetes.io/forwarding-rule: k8s-fw-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/https-forwarding-rule: k8s-fws-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/https-target-proxy: k8s-tps-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/ssl-cert: mcrt-238e7ad1-c504-406a-a02c-30ad165b3769
+    ingress.kubernetes.io/static-ip: k8s-fw-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/target-proxy: k8s-tp-default-edraak-recommendation-https--01cf32500b55490f
+    ingress.kubernetes.io/url-map: k8s-um-default-edraak-recommendation-https--01cf32500b55490f
+    kubectl.kubernetes.io/last-applied-configuration: |
+      {"apiVersion":"extensions/v1beta1","kind":"Ingress","metadata":{"annotations":{"networking.gke.io/managed-certificates":"recommender-edraakbeta-org"},"name":"edraak-recommendation-https","namespace":"default"},"spec":{"backend":{"serviceName":"edraak-recommendation-api","servicePort":80}}}
+    networking.gke.io/managed-certificates: recommender-edraakbeta-org
+  creationTimestamp: "2019-12-10T10:30:23Z"
+  generation: 1
+  name: edraak-recommendation-https
+  namespace: default
+  resourceVersion: "16375805"
+  selfLink: /apis/extensions/v1beta1/namespaces/default/ingresses/edraak-recommendation-https
+  uid: 1294aaa7-1b38-11ea-8555-42010a9a002b
+spec:
+  backend:
+    serviceName: edraak-recommendation-api
+    servicePort: 80
+status:
+  loadBalancer:
+    ingress:
+    - ip: 107.178.246.246
+
diff --git a/repo.sh b/repo.sh
index 8375ddd55b..8d28c1951b 100755
--- a/repo.sh
+++ b/repo.sh
@@ -35,7 +35,7 @@ repos=(
 
 repo_alternative_directory=(
 	"https://github.com/Edraak/edraak-platform.git,edx-platform"
-	"git@github.com:Edraak/edraak-2019-theme.git,edx-themes/edraak-2019-theme"
+	"git@github.com:Edraak/edraak-2019-theme.git,src/edraak-2019-theme"
       "git@github.com:Edraak/shared-devstack-configs.git,src/edxapp-envs"
 )
 

From 16ff6a250c533d6c940c52b0b6f766584c6e4a58 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 26 Jan 2020 10:51:05 +0200
Subject: [PATCH 041/137] devstack cert update

---
 nginx/ssl/certificate.crt | 46 +++++++++++++++++-----------------
 nginx/ssl/private.key     | 52 +++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
index 2ec2597c08..73f08a0762 100755
--- a/nginx/ssl/certificate.crt
+++ b/nginx/ssl/certificate.crt
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFWjCCBEKgAwIBAgISAx2QUn5q6XV/NSR23efx7ZjOMA0GCSqGSIb3DQEBCwUA
+MIIFWTCCBEGgAwIBAgISBJBdZlWSz9aos+eo9CuDN+gFMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0xOTExMDQwNzMxMDdaFw0y
-MDAyMDIwNzMxMDdaMBUxEzARBgNVBAMTCmVkcmFhay5kZXYwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQCqicRx0iIJqQrY1QRAwjJHmw2qVNzVfEpE3C59
-kmsyqzdxZDwlu6cGYOXqGBXDK2Gb2FnsXB/hS0UL1yNrI7Bx3aTwvCmIuIyf1DMV
-S69IPdi5OIZ6SspQNUoWM62bHfNqGwObfVkDOSPcGsNOlMQHPlq4k1gv/EkOyY6J
-yYIxV6AG3KU3Afd4hmLPExw3tvMBKJLegifI847ymLSsHXrMFhQKkNjZ8i74jOs9
-rH4vEjWFxML3LDUvPY6YJ0zGYqNr6do/iySWxieJi+er8t94fHCDN5Hxu/I3RViS
-O2JE3/R6pAeSMKYyfLgAmL2U8mTwzLLmH7mwPe4wVJbP2om3AgMBAAGjggJtMIIC
-aTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFF0HoG/CFzzdkRVhlaNKhx+ktA85MB8G
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDAxMjYwNzQ5MTNaFw0y
+MDA0MjUwNzQ5MTNaMBUxEzARBgNVBAMTCmVkcmFhay5kZXYwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDC8znlPIUDEBFbll4ElFwKCOt5iarfYTl3vX1b
+k1fT2Mge1cY49sh0XiGsZvf2EOKtdf+cwWeT/+/ixUdcrR8bHKRN9MyUMCB4cmWz
+YPE5iAYHNpRH91D23VbHNCP2iSiID6MlByJcUmDmQoxrvPj/CDLFxLmPwe8KMxRu
+X2PjxaeO15Dmswqw1pmaSmuvYwACPl8Ja6/6Rl1AfR2fksoH27vNN9Hod5ff3yh8
+BWWiz9Sfo5gtcknUJtNYbzZy4wHDyxCcia2qbjYtGB5eJI3bjqASBwF6OM2aXXGP
+qmRkX25SuPIOWKCoMjblbDnFRHLQRLg05HN2MzTBAYJWUW7rAgMBAAGjggJsMIIC
+aDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC+UtZ6XpPVyKc4BiOMqQRY7ylR3MB8G
 A1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAu
 BggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAv
 BggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8w
 IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
 CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUAXqdz
-+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFuNYoDTgAABAMARjBEAiBP
-nGy0+2g/IPurty7abXHv7DCNQEiXboVEQSX3TJmxMwIgfXlb/Obr0c2gaAXx4Tjy
-60DdFeSxvHnCFnOt73U5znQAdwAHt1wb5X1o//Gwxh0jFce65ld8V5S3au68YToa
-adOiHAAAAW41igN8AAAEAwBIMEYCIQD75a2/TS6tbnk54RCOhhhtBP4HTkH0Vmga
-r0DOEyiK2gIhALN+7PF9vGwuKJRllFPPi4ByCpQFzpIRs4P3YUWdzaLgMA0GCSqG
-SIb3DQEBCwUAA4IBAQAiWcyyNYavjfqAPxcbml8eHvIJSHRG4yuGZvWQUT8dqAMq
-HFY7UPmz6sU+7f3BncxNT/p2muCTC2wLUj7gWOlqFT/1ZeUpp0ZI9e53V/l7/7gk
-7ax7FkdcgDpuk5dNKxkbs28i9J9rM9He4QGIM+2jMbELHw/BjEppZx8T9zXLU0QT
-DX5IlmzRuC/HlnYCcarn64bbvkBVi+5PyqpVJ17iGpPQOaqgbRgZRtdwSnzqUzEP
-bi1vpj51/w2uHW6pevMmDn3F6Mww9rou8NhWdl+1gAJkXdxY+2c4IlOk4dcaDqmJ
-kPr4ysrSdg0vSYyHe6UxbbcRcuPyAhbpz5zjdd9b
+cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYA8JWk
+WfIA0YJAEC0vk4iOrUv+HUfjmeHQNKawqKqOsnMAAAFv4Qpp8wAABAMARzBFAiAm
+b+nnO3c86U27bKagmbwHb0bZi6d1Y4tX3nfrptLL5wIhALP6USXi2g3S6oF8v6H8
+oFQvF3GyjXacofcPfjv9naQaAHUAsh4FzIuizYogTodm+Su5iiUgZ2va+nDnsklT
+Le+LkF4AAAFv4Qpp8wAABAMARjBEAiA9SMa460OsSWtQugIpvwcwyDf6zhuVzrw7
+u5GypDl5EQIgaukLULm9388d73MbJTkYL8HR0xcrfDqN9IV4DOju2nQwDQYJKoZI
+hvcNAQELBQADggEBAADm0+8V51l8jbmCF7Uw/Ci3lbS9aew5CNnCZEI8hFQaNClO
+VC8o/L8O9KRGxPBwm9wDnPRVahA0jxzmrrgU02gtgsPqkf/JBHsW0pmd/S56tB+5
+Rtq+l0PRNeSj/KsAVX/YbxvKfw5P7xYqQ2+DptEiZFQsP3XucSBIY/CKNsH2zICr
+/NFowXej7TgbHz92GoCf/ZqDpQcjdEzQiRADzv9Gj5rxtg+86TdGjNN48vWLQOpd
+X3pqW8XGCAxF2aZrmnvvKrTAf4ZsjoCc+wwCq9W/+YIM3cTAlRs0EKBCmXRES7tr
+X2nSuuX7IdMmXOrUmrWLck6vbWYJ1TdjAeQ4WG8=
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index b9152d6603..f7417023f8 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCqicRx0iIJqQrY
-1QRAwjJHmw2qVNzVfEpE3C59kmsyqzdxZDwlu6cGYOXqGBXDK2Gb2FnsXB/hS0UL
-1yNrI7Bx3aTwvCmIuIyf1DMVS69IPdi5OIZ6SspQNUoWM62bHfNqGwObfVkDOSPc
-GsNOlMQHPlq4k1gv/EkOyY6JyYIxV6AG3KU3Afd4hmLPExw3tvMBKJLegifI847y
-mLSsHXrMFhQKkNjZ8i74jOs9rH4vEjWFxML3LDUvPY6YJ0zGYqNr6do/iySWxieJ
-i+er8t94fHCDN5Hxu/I3RViSO2JE3/R6pAeSMKYyfLgAmL2U8mTwzLLmH7mwPe4w
-VJbP2om3AgMBAAECggEAHsqbLpXrUWU1MStdBjhKDcXANOX3rZAwdLhwqHmcY1yo
-uQ+JEKMOKEesm5TXsRKPIC1zJwsHMo19nQKuQXUDMbv8QP8oXKg9s8oDoy+0KU4J
-aH/9P+1rFApbIyEXkm9Y+OqBvzxlqwBRKjem1fRkZI5soPDxtlBN/J6F3vkESdYl
-hmJaokATF/vCSpM/mx6wWWwq50WTEKP1276bE7Jvxdbocn4N3gXy34HLdR1DgLCl
-Ydvth5D3AKaJobix+HeAl9sgUPRzCED+jdUIoO8E2t9SUwPPA+yZUvLvQhb3O3MG
-ogWekdtkpXHefPi7pgOAQFePn6bDPVPmX9CxJ7FfKQKBgQDpERRjAFO7qsRtmTQf
-brOhfBYUr8sgHbam93h+nSyL3LiYsVKnb8HWE5Rne1ZD5anUmY9jbkHqzlpfp8aS
-DSjGCsZeiSttfmxShOyrclDlxuxVxJQyq4khpSAMjO1cXan9a1U/HzDmyw/xlfcL
-87uZ0+KLQKt01jj5pslJjgCRawKBgQC7UZnwYRGX0ErElzbXQ17uFezSAZ5Wenkw
-w/g8EPEpQWNcNUEKfilRfE+HcF69ALwJjVAxApkbHZe88RAl2ohleUnm+Vvt8dza
-sKVpqHky9lW7BtnY0nZ1zXu40dToGoWkkRZN7FjkZwCw5MveGAxy+k29Iq/7dzvO
-Dkqdk9Wf5QKBgQCTKzTLWv6Ep01Hw5D1NCr7kmZDA8po6jpW7jdJBCiH3IU37ei6
-T8h/THfObERJtXDrDVhMueenxEuu0TuDKAoSG+Ws9kLU7hqqdMMZc6L/pP/BHNNT
-t5ttAl7dbfPH+mEH48m9hQ2U/q5/p2mLQ4m3leMceWaK7Wamxhmed6uGJwKBgD4s
-urTf80/5sieIrYpL8WGDY4TdRqobosg989I0KWfxLUK45mrOL3a9lUQ2VyvS55cg
-EaMC4sDuVKRBO4PlAmr0FESXNh1Hr2/jPDRS2E/DFferMXnXebxmRQ+2jj2wN/XE
-tquMrIC7c65Dcyu3vcIYNN93eQQ1smMVuUyOelTFAoGBAOFW14UVVO9EAchJLOdz
-cGXGy4dst96gDSvsqH5+ERJzUBv8tlvNyHXkdtn8CWNEGTHxUfGBqu/YHUaqTMCP
-RYzTuX907uqDRm1Sjnuehj+4/5e9BMpLSiQNYsdW8a1jhExvx5YNaVhGr43tsUx+
-+qmIP2VbEf1gcNoRdBJvdylZ
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDC8znlPIUDEBFb
+ll4ElFwKCOt5iarfYTl3vX1bk1fT2Mge1cY49sh0XiGsZvf2EOKtdf+cwWeT/+/i
+xUdcrR8bHKRN9MyUMCB4cmWzYPE5iAYHNpRH91D23VbHNCP2iSiID6MlByJcUmDm
+QoxrvPj/CDLFxLmPwe8KMxRuX2PjxaeO15Dmswqw1pmaSmuvYwACPl8Ja6/6Rl1A
+fR2fksoH27vNN9Hod5ff3yh8BWWiz9Sfo5gtcknUJtNYbzZy4wHDyxCcia2qbjYt
+GB5eJI3bjqASBwF6OM2aXXGPqmRkX25SuPIOWKCoMjblbDnFRHLQRLg05HN2MzTB
+AYJWUW7rAgMBAAECggEAD2aaQvB5AY5Eu3DcPzheh7G/XdFGXRyX0aHNRBgWbsyd
+Ypzjap9JpAfGWTxOh8iQX8EGpHeS8ITeNT1TLzsYo1JWmIynl2gF6KirksmBxQMT
+QYFKTYp4LEhoEUHz5VyzMFcr6EJGsKHBY0S2mybz9Lx3u6/tiNx6lIUHLtZSVIKm
+2HNoWoW4QYXIrdprjxcQP0sVFrueFllo660+JM1hFup23CvbfKbYhZfCAJsueC13
+mSNcyH5S3NztDRO8YSlhI4Dev38ON0JYSwi4NMl38Jth2ZRIY4m6lfZsuSTcN5wc
+zYsjGxnl+9FXlH4LTVqAuBa9LC1GOC4U1UV3JDtIoQKBgQDp6IFOlbaOJJu99rOX
+NPLmgyCsrktP3DOTx/yXFa3iY/6lYaaNlpMA0MbqVXhrw8Bu24AMc262MWR70EK6
+d1Pw3xU6RHzGQL8EsuB5act00sPCxxknfhtiUiLvRU3hdqd9xoUkWXKDGh4maOi/
+HhUrK9lXAuZH8kHMUJ3yEnmbxwKBgQDVXMgC/t5q6pq9qNeRWrp/5hA6eWsp5JvS
+g93bJ9D3g6WN0WygqREZgnSg5LIS0u61R2NE/hijwzTUsmUcV5Lob4WqBZ3cnjOZ
+gpsq+nZmZcj2fug3WSrDcZTlVhWSM2N3BpGFiUVDLmI4JodQKLXvXiqkO251nOo8
+05A+GakrvQKBgGScAkpn8P7Q1kBuRa8LMlNeIYbE7VXrVDADfC0MQR+4fQZrqzUJ
+iC94naabntFTgIjuVvSEDiHFuv/ag2kq/GsFuV63qKepn8AIpK70h3O3WEaGVtZ6
+0pKG28npGGebHs3lvsz0wGGNsVw6Eapq6RYJpVFcyOo3VH/qSRWfRrlvAoGBANJm
+WypxEP4X+Z47yNAiyzTit3AiWeYG9Q5EUVwTSIM8Q960/Uz1S9J/Dem3fE8JyLHl
+AuR/OecL0aZJgWHQjiM+Dm5aeZCcRUAFRmS8dlOF3gYNoYsrF/uBnxYErOLuYBB4
+3rnzYuTb8alzfQ40By1UC/LGVKgQpAB1lJFYlrV1AoGAMWM7ZuDY+IKSH9NOLjSZ
+rVTTI9/8Ztr0Jpcv+XgNqdV/sL1sO3qlwUz+peRzz0xod/Oz7x0I24jOH14+gfe1
+27lzEvMUYfsMSBFb39Ow0hLB4V6TWy2HWsF7CQWP0PcvEAoaO0KWTZhNIak3fbZR
+YJSfDdtWgR3ODyAE/qowOHE=
 -----END PRIVATE KEY-----
\ No newline at end of file

From 94cc163954139b12450f44fd3291a349da18b81b Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 25 Feb 2020 12:30:05 +0200
Subject: [PATCH 042/137] pip req

---
 provision-edraak-marketing.sh | 1 +
 provision-edraak-programs.sh  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
index 170bdb1814..f51358f635 100755
--- a/provision-edraak-marketing.sh
+++ b/provision-edraak-marketing.sh
@@ -5,6 +5,7 @@ docker-compose restart edraak_marketing
 
 echo "** Marketing: Copy cacheed files to code dir **"
 docker-compose exec edraak_marketing bash -c 'cp -Rn /cache/* /app/.'
+docker-compose exec edraak_marketing bash -c 'pip install -r requirements.txt'
 
 echo "** Marketing: Migrating databases **"
 docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index 4a63a4de60..6b99fa8ed0 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -5,6 +5,7 @@ docker-compose restart edraak_programs
 
 echo "** Progs: Copy cacheed files to code dir **"
 docker-compose exec edraak_programs bash -c 'cp -Rn /cache/* /app/.'
+docker-compose exec edraak_programs bash -c 'pip install -r requirements.txt'
 
 echo "** Progs: Migrating databases **"
 docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'

From 71b1d54664ab928d064dc57ab5e7ecc5e1598be1 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 8 Mar 2020 10:23:52 +0200
Subject: [PATCH 043/137] checkout change dir

---
 repo.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/repo.sh b/repo.sh
index 8d28c1951b..6df77c5591 100755
--- a/repo.sh
+++ b/repo.sh
@@ -95,7 +95,7 @@ _checkout ()
             echo "Checking out branch $branch of $name"
             git pull
             git checkout "$branch"
-            cd ..
+            cd -
         fi
     done
 }
@@ -123,9 +123,10 @@ _clone ()
             else
                 git clone $repo $name
             fi
-
+            cd $name
             branch=$(_get_edraak_repo_branch "$name")
             git checkout "$branch"
+            cd -
         fi
     done
     cd - &> /dev/null

From 1f39a723ff901641d11a8ccca3914a59aa6de1e4 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 10 Mar 2020 13:43:30 +0200
Subject: [PATCH 044/137] SSL use chained crt logs show only new logs resolve
 edraak.dev domains to the router internally

---
 Makefile                   |  2 +-
 docker-compose.yml         |  8 ++++++
 nginx/includes/server.conf |  4 ++-
 nginx/ssl/chained.crt      | 58 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 nginx/ssl/chained.crt

diff --git a/Makefile b/Makefile
index 726d70a29f..4abf7a3f46 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ destroy: ## Remove all devstack-related containers, networks, and volumes
 	./destroy.sh
 
 logs: ## View logs from containers running in detached mode
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml logs -f
+	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml logs -f --tail 0
 
 %-logs: ## View the logs of the specified service container
 	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-watchers.yml logs -f --tail=500 $*
diff --git a/docker-compose.yml b/docker-compose.yml
index c7fba26a2f..7ac3dca4c9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -282,6 +282,14 @@ services:
       - studio
       - edraak_marketing
       - edraak_programs
+    networks:
+      default:
+        aliases:
+          - www.edraak.dev
+          - courses.edraak.dev
+          - programs.edraak.dev
+          - edraak.dev
+
 
 volumes:
 #  discovery_assets:
diff --git a/nginx/includes/server.conf b/nginx/includes/server.conf
index 99d72e265b..0e0e5b2b38 100644
--- a/nginx/includes/server.conf
+++ b/nginx/includes/server.conf
@@ -1,5 +1,7 @@
 listen              443 ssl;
-ssl_certificate     conf.d/ssl/certificate.crt;
+ssl_certificate     conf.d/ssl/chained.crt;
 ssl_certificate_key conf.d/ssl/private.key;
 ssl_protocols       TLSv1 TLSv1.1 TLSv1.2;
 client_max_body_size 100M;
+keepalive_timeout   70;
+ssl_ciphers         HIGH:!aNULL:!MD5;
\ No newline at end of file
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
new file mode 100644
index 0000000000..fb3e928f81
--- /dev/null
+++ b/nginx/ssl/chained.crt
@@ -0,0 +1,58 @@
+-----BEGIN CERTIFICATE-----
+MIIFWTCCBEGgAwIBAgISBJBdZlWSz9aos+eo9CuDN+gFMA0GCSqGSIb3DQEBCwUA
+MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDAxMjYwNzQ5MTNaFw0y
+MDA0MjUwNzQ5MTNaMBUxEzARBgNVBAMTCmVkcmFhay5kZXYwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDC8znlPIUDEBFbll4ElFwKCOt5iarfYTl3vX1b
+k1fT2Mge1cY49sh0XiGsZvf2EOKtdf+cwWeT/+/ixUdcrR8bHKRN9MyUMCB4cmWz
+YPE5iAYHNpRH91D23VbHNCP2iSiID6MlByJcUmDmQoxrvPj/CDLFxLmPwe8KMxRu
+X2PjxaeO15Dmswqw1pmaSmuvYwACPl8Ja6/6Rl1AfR2fksoH27vNN9Hod5ff3yh8
+BWWiz9Sfo5gtcknUJtNYbzZy4wHDyxCcia2qbjYtGB5eJI3bjqASBwF6OM2aXXGP
+qmRkX25SuPIOWKCoMjblbDnFRHLQRLg05HN2MzTBAYJWUW7rAgMBAAGjggJsMIIC
+aDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC+UtZ6XpPVyKc4BiOMqQRY7ylR3MB8G
+A1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAu
+BggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAv
+BggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8w
+IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
+CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
+cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYA8JWk
+WfIA0YJAEC0vk4iOrUv+HUfjmeHQNKawqKqOsnMAAAFv4Qpp8wAABAMARzBFAiAm
+b+nnO3c86U27bKagmbwHb0bZi6d1Y4tX3nfrptLL5wIhALP6USXi2g3S6oF8v6H8
+oFQvF3GyjXacofcPfjv9naQaAHUAsh4FzIuizYogTodm+Su5iiUgZ2va+nDnsklT
+Le+LkF4AAAFv4Qpp8wAABAMARjBEAiA9SMa460OsSWtQugIpvwcwyDf6zhuVzrw7
+u5GypDl5EQIgaukLULm9388d73MbJTkYL8HR0xcrfDqN9IV4DOju2nQwDQYJKoZI
+hvcNAQELBQADggEBAADm0+8V51l8jbmCF7Uw/Ci3lbS9aew5CNnCZEI8hFQaNClO
+VC8o/L8O9KRGxPBwm9wDnPRVahA0jxzmrrgU02gtgsPqkf/JBHsW0pmd/S56tB+5
+Rtq+l0PRNeSj/KsAVX/YbxvKfw5P7xYqQ2+DptEiZFQsP3XucSBIY/CKNsH2zICr
+/NFowXej7TgbHz92GoCf/ZqDpQcjdEzQiRADzv9Gj5rxtg+86TdGjNN48vWLQOpd
+X3pqW8XGCAxF2aZrmnvvKrTAf4ZsjoCc+wwCq9W/+YIM3cTAlRs0EKBCmXRES7tr
+X2nSuuX7IdMmXOrUmrWLck6vbWYJ1TdjAeQ4WG8=
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
+DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
+SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
+GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
+q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
+SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
+Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
+a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
+/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
+AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
+CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
+bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
+c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
+VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
+ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
+MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
+Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
+AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
+uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
+wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
+X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
+PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
+KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+-----END CERTIFICATE-----
\ No newline at end of file

From 87fb9d1c3f1213bd188bcf3ac3e22aecb76599bf Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Tue, 31 Mar 2020 13:53:19 +0300
Subject: [PATCH 045/137] permission fixes for dev.up

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 4abf7a3f46..3a6ed7dfc6 100644
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 	@docker exec -it edx.devstack.lms bash -c 'ln -sf /edx/src/edxapp-envs/lms.{env,auth}.json /edx/app/edxapp/'
 	@docker exec -it edx.devstack.studio bash -c 'test -f /edx/src/edxapp-envs/cms.env.json || mv /edx/app/edxapp/cms.{env,auth}.json /edx/src/edxapp-envs/'
 	@docker exec -it edx.devstack.studio bash -c 'ln -sf /edx/src/edxapp-envs/cms.{env,auth}.json /edx/app/edxapp/'
-	chown -R $(USER) $(DEVSTACK_WORKSPACE)/src
+	@sudo chown -R $(USER) $(DEVSTACK_WORKSPACE)/src
 	@make lms-restart
 	@make studio-restart
 

From bba3c379155b7ba6926828e5bbd30b61d36d8d01 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Tue, 31 Mar 2020 13:53:30 +0300
Subject: [PATCH 046/137] bump mongo to 3.6.17 to match Atlas' version

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7ac3dca4c9..3805aee5f9 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,7 +54,7 @@ services:
     # See https://docs.mongodb.com/v3.0/reference/program/mongod/#options for complete details.
     command: mongod --smallfiles --nojournal --storageEngine wiredTiger
     container_name: edx.devstack.mongo
-    image: mongo:3.2.16
+    image: mongo:3.6.17
     ports:
       - "27017:27017"
     volumes:

From 5b0550abcd48c9b7f0c896a8710629d3dcb7e3aa Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Tue, 31 Mar 2020 14:20:06 +0300
Subject: [PATCH 047/137] Use marketing/progs `master` branches

Hawthorn is now merged into master
---
 repo.sh | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/repo.sh b/repo.sh
index 6df77c5591..87a16d599e 100755
--- a/repo.sh
+++ b/repo.sh
@@ -64,14 +64,6 @@ _get_name()
 	echo "${BASH_REMATCH[1]}"
 }
 
-_get_edraak_repo_branch() {
-  if [ "$1" == "marketing-site" ] || [ "$1" == "edraak-programs" ]; then
-    echo "hawthorn"  # TODO: Switch to `master` once the Hawthorn upgrade is complete.
-  else
-    echo "master"  # Edraak: Use master, because it's pinned to Hawthorn.
-  fi
-}
-
 _checkout ()
 {
     repos_to_checkout=("$@")
@@ -91,7 +83,7 @@ _checkout ()
         if [ -d "$name" -a -n "$(ls -A "$name" 2>/dev/null)" ]; then
             cd $name
 
-            branch=$(_get_edraak_repo_branch "$name")
+            branch=master
             echo "Checking out branch $branch of $name"
             git pull
             git checkout "$branch"
@@ -124,7 +116,7 @@ _clone ()
                 git clone $repo $name
             fi
             cd $name
-            branch=$(_get_edraak_repo_branch "$name")
+            branch=master
             git checkout "$branch"
             cd -
         fi
@@ -149,7 +141,7 @@ reset ()
     do
         name=$(_get_name $repo)
 
-        branch=$(_get_edraak_repo_branch "$name")
+        branch=master
         if [ -d "$name" ]; then
             cd $name;git reset --hard HEAD;git checkout "$branch";git reset --hard "origin/$branch";git pull;cd "$currDir"
         else

From 1ca0133df2abd057b17598e10bfff2d0ec997380 Mon Sep 17 00:00:00 2001
From: Salah Alomari <s.z.alomari.1987@gmail.com>
Date: Wed, 1 Apr 2020 11:22:18 +0300
Subject: [PATCH 048/137] Add make command for edraak container shell

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index 4abf7a3f46..ce93399199 100644
--- a/Makefile
+++ b/Makefile
@@ -177,11 +177,16 @@ restore:  ## Restore all data volumes from the host. WARNING: THIS WILL OVERWRIT
 	docker run --rm --volumes-from edx.devstack.mongo -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/mongo.tar.gz
 	docker run --rm --volumes-from edx.devstack.elasticsearch -v $$(pwd)/.dev/backups:/backup debian:jessie tar zxvf /backup/elasticsearch.tar.gz
 
+%-edbash: ## Run a shell on the specified service container
+	docker exec -it edraak.devstack.$* /bin/bash
+
+
 # TODO: Print out help for this target. Even better if we can iterate over the
 # services in docker-compose.yml, and print the actual service names.
 %-shell: ## Run a shell on the specified service container
 	docker exec -it edx.devstack.$* /bin/bash
 
+
 credentials-shell:
 	docker exec -it edx.devstack.credentials env TERM=$(TERM) bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials && /bin/bash'
 

From f0a82061e3fdeb1c7f73b80a784d894fb8ae9ab0 Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Wed, 1 Apr 2020 12:21:58 +0300
Subject: [PATCH 049/137] Add programs gulp restart to make commands

---
 edraak.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/edraak.mk b/edraak.mk
index 4455e2cfc1..aa5dc2dd53 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -83,6 +83,10 @@ marketing-restart: ## Kill the Marketing Django development server. The watcher
 programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.programs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
+programs_gulp-restart:
+	docker exec -t edraak.devstack.programs-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
+
+
 edraak.restart:  ## Restart all of the lms, studio, marketing and progs
 	make marketing-restart
 	make programs-restart

From 2924bb72189d8aee52645833181f241caa3f1283 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Mon, 20 Apr 2020 18:49:10 +0300
Subject: [PATCH 050/137] Rename devstack project name to ensure no data clash

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 75dd8b9a25..a1640dcd2c 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ DEVSTACK_WORKSPACE ?= $(shell pwd)/..
 
 OS := $(shell uname)
 
-COMPOSE_PROJECT_NAME=devstack
+COMPOSE_PROJECT_NAME=edraak_devstack
 
 export DEVSTACK_WORKSPACE
 export COMPOSE_PROJECT_NAME

From 26c5e92c1bef21773b60735ea0637cda3b03d0cb Mon Sep 17 00:00:00 2001
From: Ali <devalih@gmail.com>
Date: Sun, 26 Apr 2020 12:19:38 +0300
Subject: [PATCH 051/137] Revert "Rename devstack volumes to ensure no data
 clash"

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index a1640dcd2c..75dd8b9a25 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ DEVSTACK_WORKSPACE ?= $(shell pwd)/..
 
 OS := $(shell uname)
 
-COMPOSE_PROJECT_NAME=edraak_devstack
+COMPOSE_PROJECT_NAME=devstack
 
 export DEVSTACK_WORKSPACE
 export COMPOSE_PROJECT_NAME

From 4d36db16e230e8cd5de9886561ad54c2dbce5515 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 26 Apr 2020 12:14:43 +0300
Subject: [PATCH 052/137] new ssl certs

---
 nginx/ssl/certificate.crt | 46 +++++++++++++++++-----------------
 nginx/ssl/chained.crt     | 48 ++++++++++++++++++------------------
 nginx/ssl/private.key     | 52 +++++++++++++++++++--------------------
 3 files changed, 73 insertions(+), 73 deletions(-)

diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
index 73f08a0762..fd14a00feb 100755
--- a/nginx/ssl/certificate.crt
+++ b/nginx/ssl/certificate.crt
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-X2nSuuX7IdMmXOrUmrWLck6vbWYJ1TdjAeQ4WG8=
+cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHcAXqdz
++d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFxtby8YgAABAMASDBGAiEA
+90smzIy9Dzjo2QLV9s1zC0+/H1xN+lDcIU2oU+vGooICIQDOUh9nfwhJMvRkk0Jj
+lfzF12cUuLoMhdGhle35rSnkqwB1AAe3XBvlfWj/8bDGHSMVx7rmV3xXlLdq7rxh
+Ohpp06IcAAABcbW8vIYAAAQDAEYwRAIgY+Pes7aGxAFjwHaemSDIraaxp8lkR8z3
+WOpiqJBSGe8CIEfQTaPbyoUsFcv0TM8Rk3Lx45UiIZZV4nntoRmr/9JZMA0GCSqG
+SIb3DQEBCwUAA4IBAQB3n1BltV5iB2ggA47T+IBUC7NKPKHpym0Pi4qtjuAs4MCO
+FomhnhYZpOf3oZA8JDBLE08F/oXynlQC4CdpVa8u43pMOZjQLb46U3cjyxOIuxFL
+VXXw2q1Al5gODxeWQ2HyZuQ7FtLGKe5WBWOxUlS5qi5UOc9xHebS3azLg7NLpWnS
+kdEh/z04SsaWwqQukLvf2OSI4UiePzZRYEOPCpktphBczZaEPyfHPwLLS3pLJbH2
+nz6/ZKEELJsC/iXRxeuuktsKbTxEKBGXEkgkH/WT7DxIss6J6411N3QnbL7nwi7F
+XlbqquBJOyNnD/5o4Dj+QPuPetnSci/m5nQsjaKN
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index fb3e928f81..b2a7f083e7 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
-X2nSuuX7IdMmXOrUmrWLck6vbWYJ1TdjAeQ4WG8=
+cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHcAXqdz
++d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFxtby8YgAABAMASDBGAiEA
+90smzIy9Dzjo2QLV9s1zC0+/H1xN+lDcIU2oU+vGooICIQDOUh9nfwhJMvRkk0Jj
+lfzF12cUuLoMhdGhle35rSnkqwB1AAe3XBvlfWj/8bDGHSMVx7rmV3xXlLdq7rxh
+Ohpp06IcAAABcbW8vIYAAAQDAEYwRAIgY+Pes7aGxAFjwHaemSDIraaxp8lkR8z3
+WOpiqJBSGe8CIEfQTaPbyoUsFcv0TM8Rk3Lx45UiIZZV4nntoRmr/9JZMA0GCSqG
+SIb3DQEBCwUAA4IBAQB3n1BltV5iB2ggA47T+IBUC7NKPKHpym0Pi4qtjuAs4MCO
+FomhnhYZpOf3oZA8JDBLE08F/oXynlQC4CdpVa8u43pMOZjQLb46U3cjyxOIuxFL
+VXXw2q1Al5gODxeWQ2HyZuQ7FtLGKe5WBWOxUlS5qi5UOc9xHebS3azLg7NLpWnS
+kdEh/z04SsaWwqQukLvf2OSI4UiePzZRYEOPCpktphBczZaEPyfHPwLLS3pLJbH2
+nz6/ZKEELJsC/iXRxeuuktsKbTxEKBGXEkgkH/WT7DxIss6J6411N3QnbL7nwi7F
+XlbqquBJOyNnD/5o4Dj+QPuPetnSci/m5nQsjaKN
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
@@ -55,4 +55,4 @@ wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
 X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
 PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
 KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
------END CERTIFICATE-----
\ No newline at end of file
+-----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index f7417023f8..ba69ae200b 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDC8znlPIUDEBFb
-ll4ElFwKCOt5iarfYTl3vX1bk1fT2Mge1cY49sh0XiGsZvf2EOKtdf+cwWeT/+/i
-xUdcrR8bHKRN9MyUMCB4cmWzYPE5iAYHNpRH91D23VbHNCP2iSiID6MlByJcUmDm
-QoxrvPj/CDLFxLmPwe8KMxRuX2PjxaeO15Dmswqw1pmaSmuvYwACPl8Ja6/6Rl1A
-fR2fksoH27vNN9Hod5ff3yh8BWWiz9Sfo5gtcknUJtNYbzZy4wHDyxCcia2qbjYt
-GB5eJI3bjqASBwF6OM2aXXGPqmRkX25SuPIOWKCoMjblbDnFRHLQRLg05HN2MzTB
-AYJWUW7rAgMBAAECggEAD2aaQvB5AY5Eu3DcPzheh7G/XdFGXRyX0aHNRBgWbsyd
-Ypzjap9JpAfGWTxOh8iQX8EGpHeS8ITeNT1TLzsYo1JWmIynl2gF6KirksmBxQMT
-QYFKTYp4LEhoEUHz5VyzMFcr6EJGsKHBY0S2mybz9Lx3u6/tiNx6lIUHLtZSVIKm
-2HNoWoW4QYXIrdprjxcQP0sVFrueFllo660+JM1hFup23CvbfKbYhZfCAJsueC13
-mSNcyH5S3NztDRO8YSlhI4Dev38ON0JYSwi4NMl38Jth2ZRIY4m6lfZsuSTcN5wc
-zYsjGxnl+9FXlH4LTVqAuBa9LC1GOC4U1UV3JDtIoQKBgQDp6IFOlbaOJJu99rOX
-NPLmgyCsrktP3DOTx/yXFa3iY/6lYaaNlpMA0MbqVXhrw8Bu24AMc262MWR70EK6
-d1Pw3xU6RHzGQL8EsuB5act00sPCxxknfhtiUiLvRU3hdqd9xoUkWXKDGh4maOi/
-HhUrK9lXAuZH8kHMUJ3yEnmbxwKBgQDVXMgC/t5q6pq9qNeRWrp/5hA6eWsp5JvS
-g93bJ9D3g6WN0WygqREZgnSg5LIS0u61R2NE/hijwzTUsmUcV5Lob4WqBZ3cnjOZ
-gpsq+nZmZcj2fug3WSrDcZTlVhWSM2N3BpGFiUVDLmI4JodQKLXvXiqkO251nOo8
-05A+GakrvQKBgGScAkpn8P7Q1kBuRa8LMlNeIYbE7VXrVDADfC0MQR+4fQZrqzUJ
-iC94naabntFTgIjuVvSEDiHFuv/ag2kq/GsFuV63qKepn8AIpK70h3O3WEaGVtZ6
-0pKG28npGGebHs3lvsz0wGGNsVw6Eapq6RYJpVFcyOo3VH/qSRWfRrlvAoGBANJm
-WypxEP4X+Z47yNAiyzTit3AiWeYG9Q5EUVwTSIM8Q960/Uz1S9J/Dem3fE8JyLHl
-AuR/OecL0aZJgWHQjiM+Dm5aeZCcRUAFRmS8dlOF3gYNoYsrF/uBnxYErOLuYBB4
-3rnzYuTb8alzfQ40By1UC/LGVKgQpAB1lJFYlrV1AoGAMWM7ZuDY+IKSH9NOLjSZ
-rVTTI9/8Ztr0Jpcv+XgNqdV/sL1sO3qlwUz+peRzz0xod/Oz7x0I24jOH14+gfe1
-27lzEvMUYfsMSBFb39Ow0hLB4V6TWy2HWsF7CQWP0PcvEAoaO0KWTZhNIak3fbZR
-YJSfDdtWgR3ODyAE/qowOHE=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDdvU/NU2rCU6X1
+Ztgpg+lvVuZSFsOge1/vRGsB+azg+bxAaRfJhUUKLuzU73bcOEb6vakXW81ypDJ1
+4i3y0tG2ABKtareA9ieM1hXK5Q+fq7UvtRJIG0vOnEmxpJr3THCK+dSE7KW95cCH
+cJfyaESJGiFBlGvfqXYx9bMmPHQXDGJyHSQTq81ev/Z2lH1U0JRefEh2Ph4gUAX6
+0PEMJ6wlLhjFEQ4+OwfYmlqNilchIxGCeWzxnBGCrRqELBz3t6GhXAtCYi7eWSi+
+SquhVZtdCfmgcg5nZtJQ7aHJ5hHCXt9mER6LzGP8hmZMqm6s/dVDxtW3y2Bx3SqG
+1/p+OkN7AgMBAAECggEAOEv7Odcm8MWKCh8dXJT4LGN0wHy1GEaamcXWIT9BrDDb
+ocLM3kYuvCIj0QAnPkwvgTOr/Zk6NRQJF7LgFZl+0uV72HmSs3RLoE8uYz/60oAm
+1UD0rkf33DID580x5v2KSU6arVDj163ATuLAQTRFykVPEjZbmQKOVqrZ3ChXFQ5/
+5zVGDjofb4R+USTuKddBHOECEEw14W4JKCs4azYnPSshsOmjMtf2HnI+LuVOmR2/
+LB7+hUXntV5NgiTmtBp7N+XrsFx6w868gHz11ZkLChI4JNXeQphHN9edH5yXn1GC
+h6mYmMVjbYADAd7irHn2UjlSYgIoMUdNTFFFuW5RgQKBgQDwtiCREmgB9u4xHWAL
+Sc0Rtot/vkH6rDQVvryBFyrkPQOn+JRUfHHKPmW8NDeqsGX3mjT+YQuaf9YKh35S
+kgLX8KJ1XhKABGeO/ebjeqNw64pI4YCJwFqaGtSxMllY9hbucZb/8+KsoNqX7Ub+
+0ac38VXDE514XkNwx7JTmJEAQQKBgQDr0rVVyyawt5gzZDOkBM6RxyftPUAQGqS8
+1BVKNajQqASMVpUv2VbB5XdOIGd/fiJZWAprJR7bvGuYqlBTZ8u5BZ7GXgn//YHl
+lVlsIxUN4tMfdZmyL8VPfN+dIymW1+0D2IUCK7D4p/IkGkc6FCmpPjMm7gWIJBoA
+V2TDRcoUuwKBgC3HdYohpgY5oDNXEt0SvB2SShWRaZrzBTTdgZxLe6zMrdVUQWGQ
+CVQdadvRUoTz53Cfs1RtwHcxuNNn0W6Ctme7LCqGKZ6PN+LKBw9cU5k2MqaJvJh2
+LMUCNVE98iApLVNL5xvmlkWekfQy/D2aQeMx0s22/UvXIZxhXljnuywBAoGABgfh
+c0w6tRI85jONzogA8GFzd/G1DbRguiOCV99/bbaeRyh/sDWSrmq73ledzfjf0AEc
+YxkT7PKoncLdQwTIhPbL1K7a+pz1EXX8T3OmOjCuzYMoZxIprZq37UDU83KaMRr8
+a83KPNGus5WodKfHWPiqPjigE5c4wwF5JjVGsbkCgYBzywvNbSjiYUidwBqrk/gY
+l2S5XaFP11oVj5NbpsM0kxnRkAEvjRMjMn0FcshxDItiXxPQsnCxumKPCk3Ypnzk
+PAroUtCMwN90ETkE6NIWtOAQr4njBdxfmoMKizDAZo5W1OrNwOZgvnx0iXmNLSJb
+2JQrT+i11D+dO3uIOypVQw==
 -----END PRIVATE KEY-----
\ No newline at end of file

From 0190535b3bd5320c8affed66b9b3347d377cea70 Mon Sep 17 00:00:00 2001
From: OmarEdraak <47500477+OmarEdraak@users.noreply.github.com>
Date: Wed, 29 Apr 2020 15:07:31 +0300
Subject: [PATCH 053/137] Make the compose project name configurable

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 75dd8b9a25..7ed7add432 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ DEVSTACK_WORKSPACE ?= $(shell pwd)/..
 
 OS := $(shell uname)
 
-COMPOSE_PROJECT_NAME=devstack
+COMPOSE_PROJECT_NAME=${EDRAAK_COMPOSE_PROJECT_NAME:-devstack}
 
 export DEVSTACK_WORKSPACE
 export COMPOSE_PROJECT_NAME

From 42e6363368f3859e6ac940d719fb31bdd32ad94d Mon Sep 17 00:00:00 2001
From: qutaiba <qutaiba.rawashdeh@gmail.com>
Date: Mon, 6 Jul 2020 12:31:17 +0300
Subject: [PATCH 054/137] Remove provision-forum

---
 provision.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision.sh b/provision.sh
index 9867e67199..7488e90d02 100755
--- a/provision.sh
+++ b/provision.sh
@@ -46,7 +46,7 @@ docker-compose $DOCKER_COMPOSE_FILES up -d studio
 #./provision-discovery.sh
 #./provision-credentials.sh
 #./provision-e2e.sh
-./provision-forum.sh
+#./provision-forum.sh
 #./provision-notes.sh
 ./provision-edraak.sh
 

From 7dbbdda73d3f949ac239062fbc1f31a6f0ab01b2 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Mon, 6 Jul 2020 21:42:09 +0300
Subject: [PATCH 055/137] Edraak make commands

---
 edraak.mk | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/edraak.mk b/edraak.mk
index aa5dc2dd53..89d495da25 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -38,6 +38,12 @@ edraak.programs.help:
 edraak.programs.migrate:
 	docker-compose exec edraak_programs python manage.py migrate --settings=edraakprograms.dev
 
+edraak.programs.langs_push:
+	docker-compose exec edraak_programs python manage.py langs_push --settings=edraakprograms.dev
+
+edraak.programs.langs_pull:
+	docker-compose exec edraak_programs python manage.py langs_pull --settings=edraakprograms.dev
+
 edraak.programs.compile_static:
 	docker-compose exec edraak_programs python manage.py compilestatic --settings=edraakprograms.static
 
@@ -80,6 +86,16 @@ edraak.marketing.provision:
 marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
+edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
+	docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+
+edraak.marketing.langs_push:
+	docker-compose exec edraak_marketing python manage.transifex-clientpy langs_push --settings=marketingsite.envs.dev
+
+edraak.marketing.langs_push:
+	docker-compose exec edraak_marketing python manage.py langs_pull --settings=marketingsite.envs.dev
+
+
 programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.programs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 

From 3a13a6a1a34ec6b02e7f8fed18d98b2694c1a193 Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Thu, 23 Jul 2020 14:40:23 +0300
Subject: [PATCH 056/137] Mount SSH keys

---
 docker-compose-host.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index 35bcb1102b..c2e1e5691a 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -36,9 +36,11 @@ services:
   edraak_programs:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+      - ~/.ssh/:/root/.ssh
   edraak_programs_gulp:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+      - ~/.ssh/:/root/.ssh
   edraak_marketing:
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached

From 30b612f99fcda754a4b0b5d9302e927774afd260 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 26 Jul 2020 11:57:27 +0300
Subject: [PATCH 057/137] update .dev ssl cert

---
 edraak.mk                 |  3 --
 nginx/ssl/ca_bundle.crt   |  2 +-
 nginx/ssl/certificate.crt | 58 +++++++++++++++++++--------------------
 nginx/ssl/chained.crt     | 56 ++++++++++++++++++-------------------
 nginx/ssl/private.key     | 54 ++++++++++++++++++------------------
 5 files changed, 85 insertions(+), 88 deletions(-)

diff --git a/edraak.mk b/edraak.mk
index 89d495da25..9d3b44366b 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -89,9 +89,6 @@ marketing-restart: ## Kill the Marketing Django development server. The watcher
 edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
-edraak.marketing.langs_push:
-	docker-compose exec edraak_marketing python manage.transifex-clientpy langs_push --settings=marketingsite.envs.dev
-
 edraak.marketing.langs_push:
 	docker-compose exec edraak_marketing python manage.py langs_pull --settings=marketingsite.envs.dev
 
diff --git a/nginx/ssl/ca_bundle.crt b/nginx/ssl/ca_bundle.crt
index edb593bcf6..0002462ce8 100755
--- a/nginx/ssl/ca_bundle.crt
+++ b/nginx/ssl/ca_bundle.crt
@@ -24,4 +24,4 @@ wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
 X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
 PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
 KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
------END CERTIFICATE-----
\ No newline at end of file
+-----END CERTIFICATE-----
diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
index fd14a00feb..c3eda6b48f 100755
--- a/nginx/ssl/certificate.crt
+++ b/nginx/ssl/certificate.crt
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFWjCCBEKgAwIBAgISA9ZuuyaQlyGf936xDmBQ+xUfMA0GCSqGSIb3DQEBCwUA
+MIIFXTCCBEWgAwIBAgISA5Ia0C99GIY36CTfVd+uqpGSMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA0MjYwODA2MTdaFw0y
-MDA3MjUwODA2MTdaMBUxEzARBgNVBAMTCmVkcmFhay5kZXYwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDdvU/NU2rCU6X1Ztgpg+lvVuZSFsOge1/vRGsB
-+azg+bxAaRfJhUUKLuzU73bcOEb6vakXW81ypDJ14i3y0tG2ABKtareA9ieM1hXK
-5Q+fq7UvtRJIG0vOnEmxpJr3THCK+dSE7KW95cCHcJfyaESJGiFBlGvfqXYx9bMm
-PHQXDGJyHSQTq81ev/Z2lH1U0JRefEh2Ph4gUAX60PEMJ6wlLhjFEQ4+OwfYmlqN
-ilchIxGCeWzxnBGCrRqELBz3t6GhXAtCYi7eWSi+SquhVZtdCfmgcg5nZtJQ7aHJ
-5hHCXt9mER6LzGP8hmZMqm6s/dVDxtW3y2Bx3SqG1/p+OkN7AgMBAAGjggJtMIIC
-aTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPB67Nwkp+FNT5ZEAL0yOJoJmUsjMB8G
-A1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAu
-BggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAv
-BggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8w
-IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
-CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHcAXqdz
-+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFxtby8YgAABAMASDBGAiEA
-90smzIy9Dzjo2QLV9s1zC0+/H1xN+lDcIU2oU+vGooICIQDOUh9nfwhJMvRkk0Jj
-lfzF12cUuLoMhdGhle35rSnkqwB1AAe3XBvlfWj/8bDGHSMVx7rmV3xXlLdq7rxh
-Ohpp06IcAAABcbW8vIYAAAQDAEYwRAIgY+Pes7aGxAFjwHaemSDIraaxp8lkR8z3
-WOpiqJBSGe8CIEfQTaPbyoUsFcv0TM8Rk3Lx45UiIZZV4nntoRmr/9JZMA0GCSqG
-SIb3DQEBCwUAA4IBAQB3n1BltV5iB2ggA47T+IBUC7NKPKHpym0Pi4qtjuAs4MCO
-FomhnhYZpOf3oZA8JDBLE08F/oXynlQC4CdpVa8u43pMOZjQLb46U3cjyxOIuxFL
-VXXw2q1Al5gODxeWQ2HyZuQ7FtLGKe5WBWOxUlS5qi5UOc9xHebS3azLg7NLpWnS
-kdEh/z04SsaWwqQukLvf2OSI4UiePzZRYEOPCpktphBczZaEPyfHPwLLS3pLJbH2
-nz6/ZKEELJsC/iXRxeuuktsKbTxEKBGXEkgkH/WT7DxIss6J6411N3QnbL7nwi7F
-XlbqquBJOyNnD/5o4Dj+QPuPetnSci/m5nQsjaKN
------END CERTIFICATE-----
\ No newline at end of file
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA3MjYwNzQ2MzFaFw0y
+MDEwMjQwNzQ2MzFaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOI5aZjIGbzD6Lkp8aLU1Jy/nD50w1Igv92Y
+Q7rti9TGnDDuwZZYY7g4Nix3kqAQ+jypUWO+FTPnyxgGQCajFkiZ8P2lhz4XcC7j
+JaAnB6GAbOKijmNbTz6l6wrBDoUIrpsAxH7bSv5/RW+mmT5UZsk51E1p47959h4j
+YrpzAOeV01KIMxvtJnUzW6A4jcvW8TtbRF3X2LEB2M+nCSPy0AlevTrbDxZ6yHwZ
+XQjZc4FlqhaooYsL1HnK1gddzB0M1T6XaeHNVgctXXNicGZkZyeKPGhPDYOA+JqF
+pc/koWNUyB6LkLqGy82ZOGFDSwEjrrThKyLXNuSCgETpOYcOL0ECAwEAAaOCAm4w
+ggJqMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUb5+gFf+Yn7ccCVMlgGLL0lQzLeEw
+HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
+MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
+MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
+LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
+QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
+L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwAH
+t1wb5X1o//Gwxh0jFce65ld8V5S3au68YToaadOiHAAAAXOKTVbhAAAEAwBIMEYC
+IQCc0LmTZVX5r0sFTieJN8tgM3f+H+t62q1daLKAYGzj8wIhAMyT1I9PPjBz/5XX
+F3FM1PcJ1TzoE+lQWEqUuXFxNLuRAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQAp
+Bo2yCJo32RMAAAFzik1XPAAABAMARzBFAiBnVi+yZnrx/VVG6/oBQO4REZ9m91Kf
+EtNlqXjNwMeOSAIhAO5WLT9pX6VGgXD0AqQcLkpwMVkwF8alpVJmX0kNObpGMA0G
+CSqGSIb3DQEBCwUAA4IBAQAAxssXN/99S+BEeR2c/I59j4eOBl5aWUjfVEy+nSoR
+xbnVNK7zQi9V/M4SWUBlD0VrdO+7ugbYUrIs9B5xlPhqDspbhx/V4BQl2ukbbvH8
+SPdx1vs/trqIrbLMEvaMoY99EbqFus58Df5BAaDBTaqcVauV2u32Ht7WF2wVUeLB
+D3sGnp4SQes1h+SkOXK3klkNcXRESgD8lhpaJe1RiaQ2unPc677KvBlXzbuY3WOS
+X96K2eD92kebpCbZpofYWNamj1hd2dBtobIpAf9rQdbE/4hYZzNPEonU2KDozo7x
+UmVJ+44ghI6KQIrWBiw4nXtUmP9XLSkFdGJAgzidisMj
+-----END CERTIFICATE-----
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index b2a7f083e7..392cbf7a01 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFWjCCBEKgAwIBAgISA9ZuuyaQlyGf936xDmBQ+xUfMA0GCSqGSIb3DQEBCwUA
+MIIFXTCCBEWgAwIBAgISA5Ia0C99GIY36CTfVd+uqpGSMA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA0MjYwODA2MTdaFw0y
-MDA3MjUwODA2MTdaMBUxEzARBgNVBAMTCmVkcmFhay5kZXYwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDdvU/NU2rCU6X1Ztgpg+lvVuZSFsOge1/vRGsB
-+azg+bxAaRfJhUUKLuzU73bcOEb6vakXW81ypDJ14i3y0tG2ABKtareA9ieM1hXK
-5Q+fq7UvtRJIG0vOnEmxpJr3THCK+dSE7KW95cCHcJfyaESJGiFBlGvfqXYx9bMm
-PHQXDGJyHSQTq81ev/Z2lH1U0JRefEh2Ph4gUAX60PEMJ6wlLhjFEQ4+OwfYmlqN
-ilchIxGCeWzxnBGCrRqELBz3t6GhXAtCYi7eWSi+SquhVZtdCfmgcg5nZtJQ7aHJ
-5hHCXt9mER6LzGP8hmZMqm6s/dVDxtW3y2Bx3SqG1/p+OkN7AgMBAAGjggJtMIIC
-aTAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
-MAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPB67Nwkp+FNT5ZEAL0yOJoJmUsjMB8G
-A1UdIwQYMBaAFKhKamMEfd265tE5t6ZFZe/zqOyhMG8GCCsGAQUFBwEBBGMwYTAu
-BggrBgEFBQcwAYYiaHR0cDovL29jc3AuaW50LXgzLmxldHNlbmNyeXB0Lm9yZzAv
-BggrBgEFBQcwAoYjaHR0cDovL2NlcnQuaW50LXgzLmxldHNlbmNyeXB0Lm9yZy8w
-IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
-CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHcAXqdz
-+d9WwOe1Nkh90EngMnqRmgyEoRIShBh1loFxRVgAAAFxtby8YgAABAMASDBGAiEA
-90smzIy9Dzjo2QLV9s1zC0+/H1xN+lDcIU2oU+vGooICIQDOUh9nfwhJMvRkk0Jj
-lfzF12cUuLoMhdGhle35rSnkqwB1AAe3XBvlfWj/8bDGHSMVx7rmV3xXlLdq7rxh
-Ohpp06IcAAABcbW8vIYAAAQDAEYwRAIgY+Pes7aGxAFjwHaemSDIraaxp8lkR8z3
-WOpiqJBSGe8CIEfQTaPbyoUsFcv0TM8Rk3Lx45UiIZZV4nntoRmr/9JZMA0GCSqG
-SIb3DQEBCwUAA4IBAQB3n1BltV5iB2ggA47T+IBUC7NKPKHpym0Pi4qtjuAs4MCO
-FomhnhYZpOf3oZA8JDBLE08F/oXynlQC4CdpVa8u43pMOZjQLb46U3cjyxOIuxFL
-VXXw2q1Al5gODxeWQ2HyZuQ7FtLGKe5WBWOxUlS5qi5UOc9xHebS3azLg7NLpWnS
-kdEh/z04SsaWwqQukLvf2OSI4UiePzZRYEOPCpktphBczZaEPyfHPwLLS3pLJbH2
-nz6/ZKEELJsC/iXRxeuuktsKbTxEKBGXEkgkH/WT7DxIss6J6411N3QnbL7nwi7F
-XlbqquBJOyNnD/5o4Dj+QPuPetnSci/m5nQsjaKN
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA3MjYwNzQ2MzFaFw0y
+MDEwMjQwNzQ2MzFaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOI5aZjIGbzD6Lkp8aLU1Jy/nD50w1Igv92Y
+Q7rti9TGnDDuwZZYY7g4Nix3kqAQ+jypUWO+FTPnyxgGQCajFkiZ8P2lhz4XcC7j
+JaAnB6GAbOKijmNbTz6l6wrBDoUIrpsAxH7bSv5/RW+mmT5UZsk51E1p47959h4j
+YrpzAOeV01KIMxvtJnUzW6A4jcvW8TtbRF3X2LEB2M+nCSPy0AlevTrbDxZ6yHwZ
+XQjZc4FlqhaooYsL1HnK1gddzB0M1T6XaeHNVgctXXNicGZkZyeKPGhPDYOA+JqF
+pc/koWNUyB6LkLqGy82ZOGFDSwEjrrThKyLXNuSCgETpOYcOL0ECAwEAAaOCAm4w
+ggJqMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUb5+gFf+Yn7ccCVMlgGLL0lQzLeEw
+HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
+MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
+MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
+LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
+QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
+L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwAH
+t1wb5X1o//Gwxh0jFce65ld8V5S3au68YToaadOiHAAAAXOKTVbhAAAEAwBIMEYC
+IQCc0LmTZVX5r0sFTieJN8tgM3f+H+t62q1daLKAYGzj8wIhAMyT1I9PPjBz/5XX
+F3FM1PcJ1TzoE+lQWEqUuXFxNLuRAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQAp
+Bo2yCJo32RMAAAFzik1XPAAABAMARzBFAiBnVi+yZnrx/VVG6/oBQO4REZ9m91Kf
+EtNlqXjNwMeOSAIhAO5WLT9pX6VGgXD0AqQcLkpwMVkwF8alpVJmX0kNObpGMA0G
+CSqGSIb3DQEBCwUAA4IBAQAAxssXN/99S+BEeR2c/I59j4eOBl5aWUjfVEy+nSoR
+xbnVNK7zQi9V/M4SWUBlD0VrdO+7ugbYUrIs9B5xlPhqDspbhx/V4BQl2ukbbvH8
+SPdx1vs/trqIrbLMEvaMoY99EbqFus58Df5BAaDBTaqcVauV2u32Ht7WF2wVUeLB
+D3sGnp4SQes1h+SkOXK3klkNcXRESgD8lhpaJe1RiaQ2unPc677KvBlXzbuY3WOS
+X96K2eD92kebpCbZpofYWNamj1hd2dBtobIpAf9rQdbE/4hYZzNPEonU2KDozo7x
+UmVJ+44ghI6KQIrWBiw4nXtUmP9XLSkFdGJAgzidisMj
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index ba69ae200b..bb444fe571 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDdvU/NU2rCU6X1
-Ztgpg+lvVuZSFsOge1/vRGsB+azg+bxAaRfJhUUKLuzU73bcOEb6vakXW81ypDJ1
-4i3y0tG2ABKtareA9ieM1hXK5Q+fq7UvtRJIG0vOnEmxpJr3THCK+dSE7KW95cCH
-cJfyaESJGiFBlGvfqXYx9bMmPHQXDGJyHSQTq81ev/Z2lH1U0JRefEh2Ph4gUAX6
-0PEMJ6wlLhjFEQ4+OwfYmlqNilchIxGCeWzxnBGCrRqELBz3t6GhXAtCYi7eWSi+
-SquhVZtdCfmgcg5nZtJQ7aHJ5hHCXt9mER6LzGP8hmZMqm6s/dVDxtW3y2Bx3SqG
-1/p+OkN7AgMBAAECggEAOEv7Odcm8MWKCh8dXJT4LGN0wHy1GEaamcXWIT9BrDDb
-ocLM3kYuvCIj0QAnPkwvgTOr/Zk6NRQJF7LgFZl+0uV72HmSs3RLoE8uYz/60oAm
-1UD0rkf33DID580x5v2KSU6arVDj163ATuLAQTRFykVPEjZbmQKOVqrZ3ChXFQ5/
-5zVGDjofb4R+USTuKddBHOECEEw14W4JKCs4azYnPSshsOmjMtf2HnI+LuVOmR2/
-LB7+hUXntV5NgiTmtBp7N+XrsFx6w868gHz11ZkLChI4JNXeQphHN9edH5yXn1GC
-h6mYmMVjbYADAd7irHn2UjlSYgIoMUdNTFFFuW5RgQKBgQDwtiCREmgB9u4xHWAL
-Sc0Rtot/vkH6rDQVvryBFyrkPQOn+JRUfHHKPmW8NDeqsGX3mjT+YQuaf9YKh35S
-kgLX8KJ1XhKABGeO/ebjeqNw64pI4YCJwFqaGtSxMllY9hbucZb/8+KsoNqX7Ub+
-0ac38VXDE514XkNwx7JTmJEAQQKBgQDr0rVVyyawt5gzZDOkBM6RxyftPUAQGqS8
-1BVKNajQqASMVpUv2VbB5XdOIGd/fiJZWAprJR7bvGuYqlBTZ8u5BZ7GXgn//YHl
-lVlsIxUN4tMfdZmyL8VPfN+dIymW1+0D2IUCK7D4p/IkGkc6FCmpPjMm7gWIJBoA
-V2TDRcoUuwKBgC3HdYohpgY5oDNXEt0SvB2SShWRaZrzBTTdgZxLe6zMrdVUQWGQ
-CVQdadvRUoTz53Cfs1RtwHcxuNNn0W6Ctme7LCqGKZ6PN+LKBw9cU5k2MqaJvJh2
-LMUCNVE98iApLVNL5xvmlkWekfQy/D2aQeMx0s22/UvXIZxhXljnuywBAoGABgfh
-c0w6tRI85jONzogA8GFzd/G1DbRguiOCV99/bbaeRyh/sDWSrmq73ledzfjf0AEc
-YxkT7PKoncLdQwTIhPbL1K7a+pz1EXX8T3OmOjCuzYMoZxIprZq37UDU83KaMRr8
-a83KPNGus5WodKfHWPiqPjigE5c4wwF5JjVGsbkCgYBzywvNbSjiYUidwBqrk/gY
-l2S5XaFP11oVj5NbpsM0kxnRkAEvjRMjMn0FcshxDItiXxPQsnCxumKPCk3Ypnzk
-PAroUtCMwN90ETkE6NIWtOAQr4njBdxfmoMKizDAZo5W1OrNwOZgvnx0iXmNLSJb
-2JQrT+i11D+dO3uIOypVQw==
------END PRIVATE KEY-----
\ No newline at end of file
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiOWmYyBm8w+i5
+KfGi1NScv5w+dMNSIL/dmEO67YvUxpww7sGWWGO4ODYsd5KgEPo8qVFjvhUz58sY
+BkAmoxZImfD9pYc+F3Au4yWgJwehgGzioo5jW08+pesKwQ6FCK6bAMR+20r+f0Vv
+ppk+VGbJOdRNaeO/efYeI2K6cwDnldNSiDMb7SZ1M1ugOI3L1vE7W0Rd19ixAdjP
+pwkj8tAJXr062w8Wesh8GV0I2XOBZaoWqKGLC9R5ytYHXcwdDNU+l2nhzVYHLV1z
+YnBmZGcnijxoTw2DgPiahaXP5KFjVMgei5C6hsvNmThhQ0sBI6604Ssi1zbkgoBE
+6TmHDi9BAgMBAAECggEBAIJb/RqaLCKXbdLNdb2UERRmYd2noSoBTy6dYGImIo6x
+CC42Vv2Q3523XphPKwHr5pbwJsNoNIWdi23DpFHfZqbddn5jVUSVcwLBx9u6we3x
+uEz8yTo90rNSHtgqmXhVoXAWiCRlr5hptJR7FxFQx44rMciOPTwIRqflUi4IuTu5
+B5omK9kH1uNPZLt/gemQ8PBvSk9adRfg8M6rPf3YeZDist8biMG2QbU26ZLq8nVe
+AHq6xCfMsuUHlCRN4exg+3VpknqPMpnl+CMW+TYRl8c8gt6iAVvXkqqoI7y2x+8o
+OFjmz3r7qsZVSe4SW/EVoGf0q0OrSSHV3udk5ZN0syUCgYEA/60xmkdVfUPuF85s
+35E1kBOp6en4SM57xS/vcFmMpq5REh2d+ynf4UJk+/1oAlroYZHtBsppRUMVFCY4
+FHi5iaFSSeSi1MZ4HZ/1Lsh4mUUWl6bKwMjRXxUr4eBD7W+USSkRZrB3zu7xvokn
+Jo/aArOEmKmYZaao0S6mZARRrQsCgYEA4oKuE7Nwio0rGT4qhPyNLOUfr6u+1MZw
+aDZCdky3tsyFdSSccvzqKhn7iYWXyXLJvDalht+RRpFKmPT2JHdleGfd4Nt/hCq/
+as9DjSOIKE7CxzRiQANosnjTJmfFYp07yN+rOe/YFNiiXOxshlvXuypb638vxtCm
+tZs4mSnrTGMCgYAH+WLeqPLloUS/wVRr9J9zCun1vbJcsvPxRnl1S5WzbSRiKEJR
+HxE4eVWk9lZUHHm68U4vNAjsfBcgNcDyAoHm5P0oCNV7RWVhpyeCegYo4Zq+yBjy
+wlClYoen19LGiQBa98jvJvnVnmYzxxtNfJcUFn1ANannIbeKLqZJ4Eib2QKBgHgs
+QNLu9pxrfRwtYT2hB/1zqjX3do1IosaHUweUeDuhkoSt4dsX19xyYIN7vyX/oowa
+qgM+hcLcvqkb/aMnPUx+PrdXfPXQADJYuEwfN9O6xZgOcLnplRhrBgtwLsa9CMTv
+9dYNK6UTskB+pq05+OCx/oaYue5PMMNVENgh51ZlAoGAIgcgNkf5XNwiNb+fa5Hv
+6lw+TAlUZgUuyit0XYkPBPOOB9zsifjz8e6S7YuNNB9LItnhcuAzNVOVuiqDb2hF
+l641ZYktJaGeNDsrlQDfT7ZFFIjF/R8GVJg0GeK5vMhVl0lXFzymH/nc+OiiwytC
+u9R2p5u9oJJmaASj7kFOcl0=
+-----END PRIVATE KEY-----

From 90cad692bf2f12aebf01586e8809965017c1e8e1 Mon Sep 17 00:00:00 2001
From: Salah Alomari <s.z.alomari.1987@gmail.com>
Date: Wed, 12 Aug 2020 13:54:49 +0300
Subject: [PATCH 058/137] Fix npm install permissions (nfs)

---
 docker-compose-host-nfs.yml  | 2 ++
 edraak.mk                    | 2 ++
 provision-edraak-programs.sh | 1 +
 3 files changed, 5 insertions(+)

diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
index a69abbfe5f..a44cce0cfe 100644
--- a/docker-compose-host-nfs.yml
+++ b/docker-compose-host-nfs.yml
@@ -34,9 +34,11 @@ services:
   edraak_programs:
     volumes:
       - progs-nfs:/app
+      - ~/.ssh/:/root/.ssh
   edraak_programs_gulp:
     volumes:
       - progs-nfs:/app
+      - ~/.ssh/:/root/.ssh
   edraak_marketing:
     volumes:
       - marketing-nfs:/app
diff --git a/edraak.mk b/edraak.mk
index 9d3b44366b..9f66a42310 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -99,6 +99,8 @@ programs-restart: ## Kill the Edraak Programs Django development server. The wat
 programs_gulp-restart:
 	docker exec -t edraak.devstack.programs-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
 
+programs-fix-npm-install-permissions:
+  docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
 
 edraak.restart:  ## Restart all of the lms, studio, marketing and progs
 	make marketing-restart
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index 6b99fa8ed0..fb063977ed 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -12,6 +12,7 @@ docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings
 
 echo "** Progs: Compiling assets **"
 docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
+docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
 docker-compose exec edraak_programs bash -c 'npm install'
 docker-compose exec edraak_programs bash -c 'bower install'
 docker-compose exec edraak_programs bash -c 'gulp'

From 6b272dbe44a69610edfe5aaa32b3eeb304e86812 Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Sun, 16 Aug 2020 11:19:08 +0300
Subject: [PATCH 059/137] Add restart marketing gulp command to Makefile

---
 edraak.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/edraak.mk b/edraak.mk
index 9f66a42310..87200e1740 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -102,6 +102,10 @@ programs_gulp-restart:
 programs-fix-npm-install-permissions:
   docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
 
+marketing_gulp-restart:
+	docker exec -t edraak.devstack.marketing-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
+
+
 edraak.restart:  ## Restart all of the lms, studio, marketing and progs
 	make marketing-restart
 	make programs-restart

From cc7d2790b88ae90e8234e2e851c701c42ef89381 Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Sun, 16 Aug 2020 14:07:37 +0300
Subject: [PATCH 060/137] Change spaces to tabs in the Makefile

---
 edraak.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edraak.mk b/edraak.mk
index 87200e1740..86b144ff86 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -100,7 +100,7 @@ programs_gulp-restart:
 	docker exec -t edraak.devstack.programs-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 programs-fix-npm-install-permissions:
-  docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
+	docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
 
 marketing_gulp-restart:
 	docker exec -t edraak.devstack.marketing-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'

From 2135dd7b097bd06edf8d858ac66958b5a698fdae Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 7 Oct 2020 13:46:26 +0300
Subject: [PATCH 061/137] Remove gulb containers, add watch make commands

---
 docker-compose-host-nfs.yml | 14 ++++++-------
 docker-compose-host.yml     | 14 ++++++-------
 docker-compose.yml          | 40 ++++++++++++++++++-------------------
 edraak.mk                   |  6 ++++++
 4 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
index a44cce0cfe..f57237d11f 100644
--- a/docker-compose-host-nfs.yml
+++ b/docker-compose-host-nfs.yml
@@ -35,16 +35,16 @@ services:
     volumes:
       - progs-nfs:/app
       - ~/.ssh/:/root/.ssh
-  edraak_programs_gulp:
-    volumes:
-      - progs-nfs:/app
-      - ~/.ssh/:/root/.ssh
+#  edraak_programs_gulp:
+#    volumes:
+#      - progs-nfs:/app
+#      - ~/.ssh/:/root/.ssh
   edraak_marketing:
     volumes:
       - marketing-nfs:/app
-  edraak_marketing_gulp:
-    volumes:
-      - marketing-nfs:/app
+#  edraak_marketing_gulp:
+#    volumes:
+#      - marketing-nfs:/app
 
 volumes:
 #  credentials_node_modules:
diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index c2e1e5691a..cd1a37d6ac 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -37,16 +37,16 @@ services:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
       - ~/.ssh/:/root/.ssh
-  edraak_programs_gulp:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
-      - ~/.ssh/:/root/.ssh
+#  edraak_programs_gulp:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+#      - ~/.ssh/:/root/.ssh
   edraak_marketing:
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
-  edraak_marketing_gulp:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
+#  edraak_marketing_gulp:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
 
 volumes:
 #  credentials_node_modules:
diff --git a/docker-compose.yml b/docker-compose.yml
index 3805aee5f9..7eef33dd78 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -231,16 +231,16 @@ services:
       - mongo
       - memcached
 
-  edraak_programs_gulp:
-    image: eu.gcr.io/openedx-231314/edraak/progs
-    environment:
-      NODE_ENV: development
-    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
-    container_name: edraak.devstack.programs-gulp
-    working_dir: /app
-    depends_on:
-      - mysql
-      - memcached
+#  edraak_programs_gulp:
+#    image: eu.gcr.io/openedx-231314/edraak/progs
+#    environment:
+#      NODE_ENV: development
+#    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
+#    container_name: edraak.devstack.programs-gulp
+#    working_dir: /app
+#    depends_on:
+#      - mysql
+#      - memcached
 
   edraak_marketing:
     image: eu.gcr.io/openedx-231314/edraak/marketing
@@ -255,16 +255,16 @@ services:
       - mysql
       - memcached
 
-  edraak_marketing_gulp:
-    image: eu.gcr.io/openedx-231314/edraak/marketing
-    environment:
-      NODE_ENV: development
-    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
-    container_name: edraak.devstack.marketing-gulp
-    working_dir: /app
-    depends_on:
-      - mysql
-      - memcached
+#  edraak_marketing_gulp:
+#    image: eu.gcr.io/openedx-231314/edraak/marketing
+#    environment:
+#      NODE_ENV: development
+#    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
+#    container_name: edraak.devstack.marketing-gulp
+#    working_dir: /app
+#    depends_on:
+#      - mysql
+#      - memcached
 
   edraak_dev_router:
     image: nginx
diff --git a/edraak.mk b/edraak.mk
index 86b144ff86..2bd3422d0d 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -59,6 +59,12 @@ edraak.programs.copy_cache:
 edraak.programs.gulp:
 	docker-compose exec edraak_programs gulp
 
+edraak.programs.watch:
+	docker exec -t edraak.devstack.programs bash -c 'while true; do npx gulp watch; sleep 2; done'
+
+edraak.marketing.watch:
+	docker exec -t edraak.devstack.marketing bash -c 'while true; do npx gulp watch; sleep 2; done'
+
 edraak.programs.install_all:
 	$(MAKE) edraak.programs.copy_cache
 	$(MAKE) edraak.programs.gulp

From a0ce19033672369cd75de19060986c42f73bdbd5 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 25 Oct 2020 01:14:01 +0300
Subject: [PATCH 062/137] ssl cert update

---
 nginx/ssl/certificate.crt | 46 +++++++++++++++++-----------------
 nginx/ssl/chained.crt     | 46 +++++++++++++++++-----------------
 nginx/ssl/private.key     | 52 +++++++++++++++++++--------------------
 3 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
index c3eda6b48f..c79df1e5a1 100755
--- a/nginx/ssl/certificate.crt
+++ b/nginx/ssl/certificate.crt
@@ -1,31 +1,31 @@
 -----BEGIN CERTIFICATE-----
-MIIFXTCCBEWgAwIBAgISA5Ia0C99GIY36CTfVd+uqpGSMA0GCSqGSIb3DQEBCwUA
+MIIFXDCCBESgAwIBAgISBOAzeVhFPhSTtbH0Es7uT+34MA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA3MjYwNzQ2MzFaFw0y
-MDEwMjQwNzQ2MzFaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOI5aZjIGbzD6Lkp8aLU1Jy/nD50w1Igv92Y
-Q7rti9TGnDDuwZZYY7g4Nix3kqAQ+jypUWO+FTPnyxgGQCajFkiZ8P2lhz4XcC7j
-JaAnB6GAbOKijmNbTz6l6wrBDoUIrpsAxH7bSv5/RW+mmT5UZsk51E1p47959h4j
-YrpzAOeV01KIMxvtJnUzW6A4jcvW8TtbRF3X2LEB2M+nCSPy0AlevTrbDxZ6yHwZ
-XQjZc4FlqhaooYsL1HnK1gddzB0M1T6XaeHNVgctXXNicGZkZyeKPGhPDYOA+JqF
-pc/koWNUyB6LkLqGy82ZOGFDSwEjrrThKyLXNuSCgETpOYcOL0ECAwEAAaOCAm4w
-ggJqMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUb5+gFf+Yn7ccCVMlgGLL0lQzLeEw
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjQyMTA3MjlaFw0y
+MTAxMjIyMTA3MjlaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALxaLBMGvZYG9gwUVgKVmxa59QcYLG0ETqqV
+IHYpxEMftw0ChcMooc2YxVIHxl9jUlU9USI1Tl7ABLNIZn9A/ldbVwF3I73RCHDX
+mDRpJJMv+h8veX5LXMiZHmlQ2sAY8jdajUQ3QmkV9q57K6fTgWo5Vnz0kjDUeuxc
+j9YJ/EztCw9OL1kAdGx6Z9Vhl0Azx2V0EiXWgRB5/0R78bZg5zrNqdl6ESy+gngp
+xFXimXai0l5p7WhZKRuNdnVzO3S4RpBvRAg26eom4NGOXAMMz8KLeyfPp7oPeicS
+GK9OK3a4jeGlfkOMFX0R2IoFBVipPMRHZnAc2ncReEfO0jOWMPkCAwEAAaOCAm0w
+ggJpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyFR9xgRXiuRUhRthBk4E3+q0y8Iw
 HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
 MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
 MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
 LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
 QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
-L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwAH
-t1wb5X1o//Gwxh0jFce65ld8V5S3au68YToaadOiHAAAAXOKTVbhAAAEAwBIMEYC
-IQCc0LmTZVX5r0sFTieJN8tgM3f+H+t62q1daLKAYGzj8wIhAMyT1I9PPjBz/5XX
-F3FM1PcJ1TzoE+lQWEqUuXFxNLuRAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQAp
-Bo2yCJo32RMAAAFzik1XPAAABAMARzBFAiBnVi+yZnrx/VVG6/oBQO4REZ9m91Kf
-EtNlqXjNwMeOSAIhAO5WLT9pX6VGgXD0AqQcLkpwMVkwF8alpVJmX0kNObpGMA0G
-CSqGSIb3DQEBCwUAA4IBAQAAxssXN/99S+BEeR2c/I59j4eOBl5aWUjfVEy+nSoR
-xbnVNK7zQi9V/M4SWUBlD0VrdO+7ugbYUrIs9B5xlPhqDspbhx/V4BQl2ukbbvH8
-SPdx1vs/trqIrbLMEvaMoY99EbqFus58Df5BAaDBTaqcVauV2u32Ht7WF2wVUeLB
-D3sGnp4SQes1h+SkOXK3klkNcXRESgD8lhpaJe1RiaQ2unPc677KvBlXzbuY3WOS
-X96K2eD92kebpCbZpofYWNamj1hd2dBtobIpAf9rQdbE/4hYZzNPEonU2KDozo7x
-UmVJ+44ghI6KQIrWBiw4nXtUmP9XLSkFdGJAgzidisMj
+L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQCU
+ILwejtWNbIhzH4KLIiwN0dpNXmxPlD1h204vWE2iwgAAAXVcpv1sAAAEAwBGMEQC
+IDEngOl4ZdKlSHbiO5/+aBn+G+/XUZCzwzWl+pVY8YSQAiBzqPuyp/CJ7W+5VQUW
+nZH5gXeIbyDOis8mBxuogIqrnAB3AH0+8viP/4hVaCTCwMqeUol5K8UOeAl/LmqX
+aJl+IvDXAAABdVym/Z0AAAQDAEgwRgIhAKwzd5TBS1/7h1NiDQ7boeur957ZlvNB
+vBndQiITiI2xAiEApFRdZ270gIGrn+0nWVytyhAGTv+eIL0IDOAKED9+i44wDQYJ
+KoZIhvcNAQELBQADggEBAG06suZtxpV1te7uEHsXj01WVLseLLjZ7coTteiQWYOr
+nnNWRVBbCl0lNWYiGMFgeJKQGPo6r4N1hZnA6OjanR101ZG+EPiOXEMoWEfz3e6E
+O4V8Tjuoa/RIjBcU6xIqQkIJ6BW0tg9JfctooqS+ucBS/dfi++nXyJyB3eHjiG57
+ZNLyxsRMygm3eMAeXkE+poMtlf0PzB8MZhmnNx3zgHE9ifakwEOOpdietlgkKFP9
+5ZGNQPX6neZ+iFEzwhnkrduKhFbclP+EAzhlmjIPruwNVs1s0Y/VDsnhMRhvSrTE
+htpKZZcpNnQLxlkpXLmY6SToSbUxWLFtWm2fKDyGGto=
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 392cbf7a01..d7efcd4ddf 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,33 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIFXTCCBEWgAwIBAgISA5Ia0C99GIY36CTfVd+uqpGSMA0GCSqGSIb3DQEBCwUA
+MIIFXDCCBESgAwIBAgISBOAzeVhFPhSTtbH0Es7uT+34MA0GCSqGSIb3DQEBCwUA
 MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDA3MjYwNzQ2MzFaFw0y
-MDEwMjQwNzQ2MzFaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBAOI5aZjIGbzD6Lkp8aLU1Jy/nD50w1Igv92Y
-Q7rti9TGnDDuwZZYY7g4Nix3kqAQ+jypUWO+FTPnyxgGQCajFkiZ8P2lhz4XcC7j
-JaAnB6GAbOKijmNbTz6l6wrBDoUIrpsAxH7bSv5/RW+mmT5UZsk51E1p47959h4j
-YrpzAOeV01KIMxvtJnUzW6A4jcvW8TtbRF3X2LEB2M+nCSPy0AlevTrbDxZ6yHwZ
-XQjZc4FlqhaooYsL1HnK1gddzB0M1T6XaeHNVgctXXNicGZkZyeKPGhPDYOA+JqF
-pc/koWNUyB6LkLqGy82ZOGFDSwEjrrThKyLXNuSCgETpOYcOL0ECAwEAAaOCAm4w
-ggJqMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUb5+gFf+Yn7ccCVMlgGLL0lQzLeEw
+ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjQyMTA3MjlaFw0y
+MTAxMjIyMTA3MjlaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBALxaLBMGvZYG9gwUVgKVmxa59QcYLG0ETqqV
+IHYpxEMftw0ChcMooc2YxVIHxl9jUlU9USI1Tl7ABLNIZn9A/ldbVwF3I73RCHDX
+mDRpJJMv+h8veX5LXMiZHmlQ2sAY8jdajUQ3QmkV9q57K6fTgWo5Vnz0kjDUeuxc
+j9YJ/EztCw9OL1kAdGx6Z9Vhl0Azx2V0EiXWgRB5/0R78bZg5zrNqdl6ESy+gngp
+xFXimXai0l5p7WhZKRuNdnVzO3S4RpBvRAg26eom4NGOXAMMz8KLeyfPp7oPeicS
+GK9OK3a4jeGlfkOMFX0R2IoFBVipPMRHZnAc2ncReEfO0jOWMPkCAwEAAaOCAm0w
+ggJpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyFR9xgRXiuRUhRthBk4E3+q0y8Iw
 HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
 MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
 MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
 LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
 QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
-L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEFBgorBgEEAdZ5AgQCBIH2BIHzAPEAdwAH
-t1wb5X1o//Gwxh0jFce65ld8V5S3au68YToaadOiHAAAAXOKTVbhAAAEAwBIMEYC
-IQCc0LmTZVX5r0sFTieJN8tgM3f+H+t62q1daLKAYGzj8wIhAMyT1I9PPjBz/5XX
-F3FM1PcJ1TzoE+lQWEqUuXFxNLuRAHYAb1N2rDHwMRnYmQCkURX/dxUcEdkCwQAp
-Bo2yCJo32RMAAAFzik1XPAAABAMARzBFAiBnVi+yZnrx/VVG6/oBQO4REZ9m91Kf
-EtNlqXjNwMeOSAIhAO5WLT9pX6VGgXD0AqQcLkpwMVkwF8alpVJmX0kNObpGMA0G
-CSqGSIb3DQEBCwUAA4IBAQAAxssXN/99S+BEeR2c/I59j4eOBl5aWUjfVEy+nSoR
-xbnVNK7zQi9V/M4SWUBlD0VrdO+7ugbYUrIs9B5xlPhqDspbhx/V4BQl2ukbbvH8
-SPdx1vs/trqIrbLMEvaMoY99EbqFus58Df5BAaDBTaqcVauV2u32Ht7WF2wVUeLB
-D3sGnp4SQes1h+SkOXK3klkNcXRESgD8lhpaJe1RiaQ2unPc677KvBlXzbuY3WOS
-X96K2eD92kebpCbZpofYWNamj1hd2dBtobIpAf9rQdbE/4hYZzNPEonU2KDozo7x
-UmVJ+44ghI6KQIrWBiw4nXtUmP9XLSkFdGJAgzidisMj
+L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQCU
+ILwejtWNbIhzH4KLIiwN0dpNXmxPlD1h204vWE2iwgAAAXVcpv1sAAAEAwBGMEQC
+IDEngOl4ZdKlSHbiO5/+aBn+G+/XUZCzwzWl+pVY8YSQAiBzqPuyp/CJ7W+5VQUW
+nZH5gXeIbyDOis8mBxuogIqrnAB3AH0+8viP/4hVaCTCwMqeUol5K8UOeAl/LmqX
+aJl+IvDXAAABdVym/Z0AAAQDAEgwRgIhAKwzd5TBS1/7h1NiDQ7boeur957ZlvNB
+vBndQiITiI2xAiEApFRdZ270gIGrn+0nWVytyhAGTv+eIL0IDOAKED9+i44wDQYJ
+KoZIhvcNAQELBQADggEBAG06suZtxpV1te7uEHsXj01WVLseLLjZ7coTteiQWYOr
+nnNWRVBbCl0lNWYiGMFgeJKQGPo6r4N1hZnA6OjanR101ZG+EPiOXEMoWEfz3e6E
+O4V8Tjuoa/RIjBcU6xIqQkIJ6BW0tg9JfctooqS+ucBS/dfi++nXyJyB3eHjiG57
+ZNLyxsRMygm3eMAeXkE+poMtlf0PzB8MZhmnNx3zgHE9ifakwEOOpdietlgkKFP9
+5ZGNQPX6neZ+iFEzwhnkrduKhFbclP+EAzhlmjIPruwNVs1s0Y/VDsnhMRhvSrTE
+htpKZZcpNnQLxlkpXLmY6SToSbUxWLFtWm2fKDyGGto=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index bb444fe571..c67f0b34a0 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDiOWmYyBm8w+i5
-KfGi1NScv5w+dMNSIL/dmEO67YvUxpww7sGWWGO4ODYsd5KgEPo8qVFjvhUz58sY
-BkAmoxZImfD9pYc+F3Au4yWgJwehgGzioo5jW08+pesKwQ6FCK6bAMR+20r+f0Vv
-ppk+VGbJOdRNaeO/efYeI2K6cwDnldNSiDMb7SZ1M1ugOI3L1vE7W0Rd19ixAdjP
-pwkj8tAJXr062w8Wesh8GV0I2XOBZaoWqKGLC9R5ytYHXcwdDNU+l2nhzVYHLV1z
-YnBmZGcnijxoTw2DgPiahaXP5KFjVMgei5C6hsvNmThhQ0sBI6604Ssi1zbkgoBE
-6TmHDi9BAgMBAAECggEBAIJb/RqaLCKXbdLNdb2UERRmYd2noSoBTy6dYGImIo6x
-CC42Vv2Q3523XphPKwHr5pbwJsNoNIWdi23DpFHfZqbddn5jVUSVcwLBx9u6we3x
-uEz8yTo90rNSHtgqmXhVoXAWiCRlr5hptJR7FxFQx44rMciOPTwIRqflUi4IuTu5
-B5omK9kH1uNPZLt/gemQ8PBvSk9adRfg8M6rPf3YeZDist8biMG2QbU26ZLq8nVe
-AHq6xCfMsuUHlCRN4exg+3VpknqPMpnl+CMW+TYRl8c8gt6iAVvXkqqoI7y2x+8o
-OFjmz3r7qsZVSe4SW/EVoGf0q0OrSSHV3udk5ZN0syUCgYEA/60xmkdVfUPuF85s
-35E1kBOp6en4SM57xS/vcFmMpq5REh2d+ynf4UJk+/1oAlroYZHtBsppRUMVFCY4
-FHi5iaFSSeSi1MZ4HZ/1Lsh4mUUWl6bKwMjRXxUr4eBD7W+USSkRZrB3zu7xvokn
-Jo/aArOEmKmYZaao0S6mZARRrQsCgYEA4oKuE7Nwio0rGT4qhPyNLOUfr6u+1MZw
-aDZCdky3tsyFdSSccvzqKhn7iYWXyXLJvDalht+RRpFKmPT2JHdleGfd4Nt/hCq/
-as9DjSOIKE7CxzRiQANosnjTJmfFYp07yN+rOe/YFNiiXOxshlvXuypb638vxtCm
-tZs4mSnrTGMCgYAH+WLeqPLloUS/wVRr9J9zCun1vbJcsvPxRnl1S5WzbSRiKEJR
-HxE4eVWk9lZUHHm68U4vNAjsfBcgNcDyAoHm5P0oCNV7RWVhpyeCegYo4Zq+yBjy
-wlClYoen19LGiQBa98jvJvnVnmYzxxtNfJcUFn1ANannIbeKLqZJ4Eib2QKBgHgs
-QNLu9pxrfRwtYT2hB/1zqjX3do1IosaHUweUeDuhkoSt4dsX19xyYIN7vyX/oowa
-qgM+hcLcvqkb/aMnPUx+PrdXfPXQADJYuEwfN9O6xZgOcLnplRhrBgtwLsa9CMTv
-9dYNK6UTskB+pq05+OCx/oaYue5PMMNVENgh51ZlAoGAIgcgNkf5XNwiNb+fa5Hv
-6lw+TAlUZgUuyit0XYkPBPOOB9zsifjz8e6S7YuNNB9LItnhcuAzNVOVuiqDb2hF
-l641ZYktJaGeNDsrlQDfT7ZFFIjF/R8GVJg0GeK5vMhVl0lXFzymH/nc+OiiwytC
-u9R2p5u9oJJmaASj7kFOcl0=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8WiwTBr2WBvYM
+FFYClZsWufUHGCxtBE6qlSB2KcRDH7cNAoXDKKHNmMVSB8ZfY1JVPVEiNU5ewASz
+SGZ/QP5XW1cBdyO90Qhw15g0aSSTL/ofL3l+S1zImR5pUNrAGPI3Wo1EN0JpFfau
+eyun04FqOVZ89JIw1HrsXI/WCfxM7QsPTi9ZAHRsemfVYZdAM8dldBIl1oEQef9E
+e/G2YOc6zanZehEsvoJ4KcRV4pl2otJeae1oWSkbjXZ1czt0uEaQb0QINunqJuDR
+jlwDDM/Ci3snz6e6D3onEhivTit2uI3hpX5DjBV9EdiKBQVYqTzER2ZwHNp3EXhH
+ztIzljD5AgMBAAECggEAYkmPzFHtJtf1F3KZO3oEV0Sst4oGzNC9mEh/iwnaj8iC
+Bjj1wlR2ssnw1hCWlPpIYZDAwOAeSFVdXoz+Z5Nr5fwVF/+q2Ae3puLqWxcu7dvQ
+YuusM5pyDX/RndWCgVHDO9118E4BysKaWoyNyGMXmm3XUxdxHigTCTp4GJJXZXA6
+lpOfSnGVMjO9RxM5czytkdsZrIzzVY/A+FRYBPc0HVidd1r9Z5phanigX3MDgxu5
+WevzY/EVUBERnwVD1IfHhilXIPaBIwLqU0mH3y4hfXNefSU1/bjheTb+W1rrxE8i
+UQhBXwLFEgWU5lwlucGPwLnsxdiUY/QlzeFR2Dx+7QKBgQD03cAOIavy1RCkgLjI
+sPXQ1eRLZIrqVzXjt7Z7nAzeRqV261ynbq7xi9wS1iRBD0fcQbQox/cWuz/bOHj5
+aFyYGm0Z/ldtDvBhl6xNgbKgtWVCYUIXpXBiqayXOZXP9CCfxsWhtTrVYBinm7l0
+r3xHibpkHF75KBOQZgf4ntwSfwKBgQDE6pj+CnKInVPGMvaEt9fNFimjj3V+d232
+jjD1nDd6EIO2OGQdyBfWablxNkyngriM5bBJSX6D4RM2rQ2FAixTwicp0bgCB1rl
+nNQpheGMYKE31gcoabnnWWb54Mja1Lno9/b/G4J7jOaTNa9a3ruhL4ylYzv5J1gU
+QaEBOl+QhwKBgFaYqZgVzmKVeUpD/5VyB6zwR8ll6D7R0swSp2V1nZNqNpAk0mKg
+IRxpUs4Sj0W26rn5PoaBmV+fnwifIyFJCB3+koDz0uVNuDM7WYMbkBmHrSTZkm8c
+Ye9yhAgDJHkjo/n9aN00Y3ccgfucdezPNstx6MoIwomo46pYew8w1zFvAoGBAJwq
+CKb/lhFt47A9Xm+mdMg6mU8TSHTBNj3gSkeeWgi97Bao5g0QUIdEVULJc0UtUDq9
+NW8JkAH6j4g++YfQT2MliHWL0kgZmSabl05O1K7FO1XSsN6F6l7k8dudPuz842s0
+q3dpU7Oz7HA2lRiVp2uPEBVhe4B+iUWXPp6AsqUlAoGBAIuLxMsLxEFlBOTZmaRu
+TkKpLbhkeKH46rC+8hWKUPEN6JW22y0uBjOW4+FzpWMuuAyZTxLbsJvfNQXBfV7M
+byxMq2CV371aky/CAW7mqidoioxbzZEsCilIGl9XG/YTv9VSMhDaTV4FtVfxvY2I
+crVZihkbd2H0tE3DBsrTb6EK
 -----END PRIVATE KEY-----

From 5888760bd7591038e2498bed1af4dba4a6ce889e Mon Sep 17 00:00:00 2001
From: MohammedAl-rowad <rowadwo@gmail.com>
Date: Sun, 20 Sep 2020 12:32:51 +0300
Subject: [PATCH 063/137] remove compilestatic

---
 edraak.mk                     | 19 ++++++-------------
 provision-edraak-marketing.sh |  2 +-
 provision-edraak-programs.sh  |  3 +--
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/edraak.mk b/edraak.mk
index 2bd3422d0d..64a677d790 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -22,11 +22,10 @@ edraak.programs.help:
 	echo "Commands:"
 	echo ""
 	echo "migrate:              Run django migrations i.e. python manage.py migrate"
-	echo "compile_static:       Run python manage.py compilestatic --settings=edraakprograms.static"
 	echo "install_pip:          Install python dependencies in 'requirements.txt' file"
 	echo "install_npm:          Install npm dependencies in 'package.json' file"
-	echo "gulp:                 Run gulp command"
-	echo "install_all:          Runs install_pip, install_npm, migrate, compilestatic"
+	echo "dev:                  Run npm run dev command"
+	echo "install_all:          Runs install_pip, install_npm, migrate"
 	echo "watch_js:             Run watcher to watch JavaScript changes"
 	echo "watch_css:            Run watcher to watch and compile scss changes"
 	echo "manage:               Run any manage.py command"
@@ -44,9 +43,6 @@ edraak.programs.langs_push:
 edraak.programs.langs_pull:
 	docker-compose exec edraak_programs python manage.py langs_pull --settings=edraakprograms.dev
 
-edraak.programs.compile_static:
-	docker-compose exec edraak_programs python manage.py compilestatic --settings=edraakprograms.static
-
 edraak.programs.install_pip:
 	docker-compose exec edraak_programs pip install -r requirements.txt
 
@@ -56,8 +52,8 @@ edraak.programs.install_npm:
 edraak.programs.copy_cache:
 	docker-compose exec edraak_programs cp -Rnv /cache/node_modules /cache/.compiled /app
 
-edraak.programs.gulp:
-	docker-compose exec edraak_programs gulp
+edraak.programs.dev:
+	docker-compose exec edraak_programs npm run dev
 
 edraak.programs.watch:
 	docker exec -t edraak.devstack.programs bash -c 'while true; do npx gulp watch; sleep 2; done'
@@ -67,12 +63,11 @@ edraak.marketing.watch:
 
 edraak.programs.install_all:
 	$(MAKE) edraak.programs.copy_cache
-	$(MAKE) edraak.programs.gulp
+	$(MAKE) edraak.programs.dev
 	$(MAKE) edraak.programs.migrate
-	$(MAKE) edraak.programs.compilestatic
 
 edraak.programs.watch_js:
-	docker-compose exec edraak_programs gulp watch
+	docker-compose exec edraak_programs npm run dev:watch
 
 edraak.programs.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-programs.sh
@@ -102,8 +97,6 @@ edraak.marketing.langs_push:
 programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.programs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
-programs_gulp-restart:
-	docker exec -t edraak.devstack.programs-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 programs-fix-npm-install-permissions:
 	docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
index f51358f635..c167c9273e 100755
--- a/provision-edraak-marketing.sh
+++ b/provision-edraak-marketing.sh
@@ -12,7 +12,7 @@ docker-compose exec edraak_marketing bash -c 'python manage.py migrate --setting
 
 echo "** Marketing: Compiling assets **"
 docker-compose exec edraak_marketing bash -c 'yarn'
-docker-compose exec edraak_marketing bash -c 'npx gulp'
+docker-compose exec edraak_marketing bash -c 'npm run dev'
 
 echo "** Marketing: Restarting **"
 docker-compose restart edraak_marketing
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index fb063977ed..8d6205008c 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -15,8 +15,7 @@ docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
 docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
 docker-compose exec edraak_programs bash -c 'npm install'
 docker-compose exec edraak_programs bash -c 'bower install'
-docker-compose exec edraak_programs bash -c 'gulp'
-docker-compose exec edraak_programs bash -c 'python manage.py compilestatic --settings=edraakprograms.static'
+docker-compose exec edraak_programs bash -c 'npm run dev'
 docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
 echo "** Progs: Restarting **"

From ea2267cd599d9d7f0a28b448b1837ab184ea95da Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Mon, 2 Nov 2020 11:38:24 +0200
Subject: [PATCH 064/137] edraak judge

---
 Makefile                        | 15 +++++++--
 docker-compose-edraak-judge.yml | 57 +++++++++++++++++++++++++++++++++
 docker-compose.yml              |  4 +--
 nginx/default.conf              |  8 +++++
 4 files changed, 80 insertions(+), 4 deletions(-)
 create mode 100644 docker-compose-edraak-judge.yml

diff --git a/Makefile b/Makefile
index 7ed7add432..610a56c45c 100644
--- a/Makefile
+++ b/Makefile
@@ -74,6 +74,9 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 dev.up: | check-memory ## Bring up all services with host volumes
 	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
 
+dev.judge.up: | check-memory ## Bring up all services with host volumes
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-edraak-judge.yml up -d
+
 dev.nfs.setup:  ## set's up an nfs server on the /Users folder, allowing nfs mounting on docker
 	./setup_native_nfs_docker_osx.sh
 
@@ -82,6 +85,11 @@ dev.nfs.up: | check-memory ## Bring up all services with host volumes
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
+dev.nfs.judge.up: | check-memory ## Bring up all services with host volumes
+	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-edraak-judge.yml up -d
+	@# Comment out this next line if you want to save some time and don't care about catalog programs
+	#./programs/provision.sh cache >/dev/null
+
 dev.nfs.up.all: ## Bring up all services with host volumes, including watchers
 	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-watchers-nfs.yml up -d
 
@@ -134,7 +142,10 @@ stop: ## Stop all services
 stop.watchers: ## Stop asset watchers
 	docker-compose -f docker-compose-watchers.yml stop
 
-stop.all: | stop.analytics_pipeline stop stop.watchers ## Stop all containers, including asset watchers
+stop.judge: ## Stop edraak judge
+	docker-compose -f docker-compose.yml -f docker-compose-edraak-judge.yml stop
+
+stop.all: | stop.analytics_pipeline stop stop.watchers stop.judge ## Stop all containers, including asset watchers
 
 stop.xqueue:
 	docker-compose -f docker-compose-xqueue.yml stop
@@ -147,7 +158,7 @@ destroy: ## Remove all devstack-related containers, networks, and volumes
 	./destroy.sh
 
 logs: ## View logs from containers running in detached mode
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml logs -f --tail 0
+	docker-compose -f docker-compose.yml -f docker-compose-edraak-judge.yml logs -f --tail 0
 
 %-logs: ## View the logs of the specified service container
 	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-watchers.yml logs -f --tail=500 $*
diff --git a/docker-compose-edraak-judge.yml b/docker-compose-edraak-judge.yml
new file mode 100644
index 0000000000..aed5becd3a
--- /dev/null
+++ b/docker-compose-edraak-judge.yml
@@ -0,0 +1,57 @@
+version: "3"
+services:
+  edraak-judge-api:
+    build:
+      context: ${DEVSTACK_WORKSPACE}/edraak-judge/.
+      dockerfile: ${DEVSTACK_WORKSPACE}/edraak-judge/Dockerfile
+    ports:
+      - "5000:80"
+    env_file:
+      - ${DEVSTACK_WORKSPACE}/edraak-judge/.env
+    container_name: edraak.devstack.judge
+    depends_on:
+      - edraak-judge-redis
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/edraak-judge:/app
+
+  edraak-judge-worker:
+    build:
+      context: ${DEVSTACK_WORKSPACE}/edraak-judge/.
+      dockerfile: ${DEVSTACK_WORKSPACE}/edraak-judge/Dockerfile
+    env_file:
+      - ${DEVSTACK_WORKSPACE}/edraak-judge/.env
+    command: rq worker --url redis://edraak-judge-redis:6379/0
+    depends_on:
+      - edraak-judge-redis
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/edraak-judge:/app
+
+  edraak-judge-redis:
+    image: "redis:alpine"
+    ports:
+      - "6379:6379"
+    expose:
+      - "6379"
+
+  edraak_programs:
+    depends_on:
+      - mysql
+      - mongo
+      - memcached
+      - edraak-judge-api
+
+  edraak_dev_router:
+    depends_on:
+      - lms
+      - studio
+      - edraak_marketing
+      - edraak_programs
+      - edraak-judge-api
+    networks:
+      default:
+        aliases:
+          - www.edraak.dev
+          - courses.edraak.dev
+          - programs.edraak.dev
+          - edraak.dev
+          - judge.edraak.dev
diff --git a/docker-compose.yml b/docker-compose.yml
index 7eef33dd78..3548ca8c9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -269,8 +269,8 @@ services:
   edraak_dev_router:
     image: nginx
     container_name: edraak_dev_router
-    logging:
-      driver: none
+#    logging:
+#      driver: none
     volumes:
       - ./nginx:/etc/nginx/conf.d
     command: bash -c 'while true; do nginx -g "daemon off;"; sleep 2; done'
diff --git a/nginx/default.conf b/nginx/default.conf
index 8b0b909628..93b641fa52 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -15,6 +15,14 @@ server {
     }
 }
 
+server {
+    server_name judge.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+    location / {
+        proxy_pass http://edraak.devstack.judge;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
 server {
     server_name www.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;

From c8673e355a59acc718934533adf1abad2a36cde8 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Mon, 2 Nov 2020 12:57:20 +0200
Subject: [PATCH 065/137] Use gunicorn auto reload feature to automaticly
 restart the app on code change

---
 docker-compose-edraak-judge.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose-edraak-judge.yml b/docker-compose-edraak-judge.yml
index aed5becd3a..db96a7cba5 100644
--- a/docker-compose-edraak-judge.yml
+++ b/docker-compose-edraak-judge.yml
@@ -9,6 +9,7 @@ services:
     env_file:
       - ${DEVSTACK_WORKSPACE}/edraak-judge/.env
     container_name: edraak.devstack.judge
+    command: gunicorn --worker-class gevent --workers 2 --bind "0.0.0.0":"80" wsgi:app --max-requests 10000 --timeout 5 --reload --keep-alive 5 --log-level info
     depends_on:
       - edraak-judge-redis
     volumes:

From 0e9bf6456b63f1641f18b629dd483f1cf1432d6b Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 4 Nov 2020 10:56:16 +0200
Subject: [PATCH 066/137] restart command, nginx headers

---
 docker-compose-edraak-judge.yml | 2 +-
 docker-compose.yml              | 4 ++--
 edraak.mk                       | 3 +++
 nginx/default.conf              | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docker-compose-edraak-judge.yml b/docker-compose-edraak-judge.yml
index db96a7cba5..290a440263 100644
--- a/docker-compose-edraak-judge.yml
+++ b/docker-compose-edraak-judge.yml
@@ -9,7 +9,7 @@ services:
     env_file:
       - ${DEVSTACK_WORKSPACE}/edraak-judge/.env
     container_name: edraak.devstack.judge
-    command: gunicorn --worker-class gevent --workers 2 --bind "0.0.0.0":"80" wsgi:app --max-requests 10000 --timeout 5 --reload --keep-alive 5 --log-level info
+    command: bash -c 'while true; do gunicorn --worker-class gevent --workers 2 --bind "0.0.0.0":"80" wsgi:app --max-requests 10000 --timeout 5 --reload --keep-alive 5 --log-level info; sleep 2; done'
     depends_on:
       - edraak-judge-redis
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 3548ca8c9a..8b8e3debb4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -172,7 +172,7 @@ services:
 #      ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
 
   studio:
-    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 2; done'
+    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
     container_name: edx.devstack.studio
     depends_on:
       - devpi
@@ -198,7 +198,7 @@ services:
       - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
 
   forum:
-    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 2; done'
+    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
     container_name: edx.devstack.forum
     depends_on:
       - mongo
diff --git a/edraak.mk b/edraak.mk
index 2bd3422d0d..7508dbe57b 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -92,6 +92,9 @@ edraak.marketing.provision:
 marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
+judge-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
+	docker exec -t edraak.devstack.judge bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
+
 edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
diff --git a/nginx/default.conf b/nginx/default.conf
index 93b641fa52..3aeaf65238 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -19,6 +19,8 @@ server {
     server_name judge.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
     location / {
+        add_header 'Access-Control-Allow-Origin' '*';
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
         proxy_pass http://edraak.devstack.judge;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }

From e31cc56cd32950e0ccacc15a9939808c12373e08 Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Wed, 4 Nov 2020 15:16:55 +0200
Subject: [PATCH 067/137] Remove Edraak Judge HEADERS from Nginx

---
 nginx/default.conf | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nginx/default.conf b/nginx/default.conf
index 3aeaf65238..93b641fa52 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -19,8 +19,6 @@ server {
     server_name judge.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
     location / {
-        add_header 'Access-Control-Allow-Origin' '*';
-        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
         proxy_pass http://edraak.devstack.judge;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }

From e49b7fc64bcee0d033a591c675e3cb99cb70d1f4 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 24 Jan 2021 10:04:34 +0200
Subject: [PATCH 068/137] cert and other enhancment

---
 Makefile                  |   2 +-
 docker-compose.yml        |   2 +
 nginx/ssl/ca_bundle.crt   |  47 +++++++++--------
 nginx/ssl/certificate.crt |  57 ++++++++++-----------
 nginx/ssl/chained.crt     | 104 +++++++++++++++++++-------------------
 nginx/ssl/private.key     |  52 +++++++++----------
 6 files changed, 131 insertions(+), 133 deletions(-)

diff --git a/Makefile b/Makefile
index 7ed7add432..912e3f164a 100644
--- a/Makefile
+++ b/Makefile
@@ -252,7 +252,7 @@ lms-static: ## Rebuild static assets for the LMS container
 studio-static: ## Rebuild static assets for the Studio container
 	docker exec -t edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets'
 
-static: | credentials-static discovery-static ecommerce-static lms-static studio-static ## Rebuild static assets for all service containers
+static: | lms-static studio-static ## Rebuild static assets for all service containers
 
 healthchecks: ## Run a curl against all services' healthcheck endpoints to make sure they are up. This will eventually be parameterized
 	./healthchecks.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 7eef33dd78..a277d19536 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,6 +142,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
+      NO_PREREQ_INSTALL: 1
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18000:18000"
@@ -188,6 +189,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
+      NO_PREREQ_INSTALL: 1
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18010:18010"
diff --git a/nginx/ssl/ca_bundle.crt b/nginx/ssl/ca_bundle.crt
index 0002462ce8..1d82449ab8 100755
--- a/nginx/ssl/ca_bundle.crt
+++ b/nginx/ssl/ca_bundle.crt
@@ -1,27 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
 MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
+MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
+AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
+jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
+Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
+U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
+gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
+/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
+oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
+BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
+ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
+p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
+AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
+Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
+LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
+r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
+ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
+S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
+qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
+O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
+UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
index c79df1e5a1..d437dce3b5 100755
--- a/nginx/ssl/certificate.crt
+++ b/nginx/ssl/certificate.crt
@@ -1,31 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFXDCCBESgAwIBAgISBOAzeVhFPhSTtbH0Es7uT+34MA0GCSqGSIb3DQEBCwUA
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjQyMTA3MjlaFw0y
-MTAxMjIyMTA3MjlaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALxaLBMGvZYG9gwUVgKVmxa59QcYLG0ETqqV
-IHYpxEMftw0ChcMooc2YxVIHxl9jUlU9USI1Tl7ABLNIZn9A/ldbVwF3I73RCHDX
-mDRpJJMv+h8veX5LXMiZHmlQ2sAY8jdajUQ3QmkV9q57K6fTgWo5Vnz0kjDUeuxc
-j9YJ/EztCw9OL1kAdGx6Z9Vhl0Azx2V0EiXWgRB5/0R78bZg5zrNqdl6ESy+gngp
-xFXimXai0l5p7WhZKRuNdnVzO3S4RpBvRAg26eom4NGOXAMMz8KLeyfPp7oPeicS
-GK9OK3a4jeGlfkOMFX0R2IoFBVipPMRHZnAc2ncReEfO0jOWMPkCAwEAAaOCAm0w
-ggJpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyFR9xgRXiuRUhRthBk4E3+q0y8Iw
-HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
-MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
-QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
-L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQCU
-ILwejtWNbIhzH4KLIiwN0dpNXmxPlD1h204vWE2iwgAAAXVcpv1sAAAEAwBGMEQC
-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
+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
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index d7efcd4ddf..4cc957a6b0 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,58 +1,56 @@
 -----BEGIN CERTIFICATE-----
-MIIFXDCCBESgAwIBAgISBOAzeVhFPhSTtbH0Es7uT+34MA0GCSqGSIb3DQEBCwUA
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjQyMTA3MjlaFw0y
-MTAxMjIyMTA3MjlaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALxaLBMGvZYG9gwUVgKVmxa59QcYLG0ETqqV
-IHYpxEMftw0ChcMooc2YxVIHxl9jUlU9USI1Tl7ABLNIZn9A/ldbVwF3I73RCHDX
-mDRpJJMv+h8veX5LXMiZHmlQ2sAY8jdajUQ3QmkV9q57K6fTgWo5Vnz0kjDUeuxc
-j9YJ/EztCw9OL1kAdGx6Z9Vhl0Azx2V0EiXWgRB5/0R78bZg5zrNqdl6ESy+gngp
-xFXimXai0l5p7WhZKRuNdnVzO3S4RpBvRAg26eom4NGOXAMMz8KLeyfPp7oPeicS
-GK9OK3a4jeGlfkOMFX0R2IoFBVipPMRHZnAc2ncReEfO0jOWMPkCAwEAAaOCAm0w
-ggJpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyFR9xgRXiuRUhRthBk4E3+q0y8Iw
-HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
-MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
-QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
-L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQCU
-ILwejtWNbIhzH4KLIiwN0dpNXmxPlD1h204vWE2iwgAAAXVcpv1sAAAEAwBGMEQC
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
 MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
+MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
+AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
+jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
+Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
+U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
+gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
+/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
+oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
+BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
+ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
+p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
+AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
+Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
+LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
+r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
+ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
+S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
+qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
+O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
+UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index c67f0b34a0..2716706e16 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8WiwTBr2WBvYM
-FFYClZsWufUHGCxtBE6qlSB2KcRDH7cNAoXDKKHNmMVSB8ZfY1JVPVEiNU5ewASz
-SGZ/QP5XW1cBdyO90Qhw15g0aSSTL/ofL3l+S1zImR5pUNrAGPI3Wo1EN0JpFfau
-eyun04FqOVZ89JIw1HrsXI/WCfxM7QsPTi9ZAHRsemfVYZdAM8dldBIl1oEQef9E
-e/G2YOc6zanZehEsvoJ4KcRV4pl2otJeae1oWSkbjXZ1czt0uEaQb0QINunqJuDR
-jlwDDM/Ci3snz6e6D3onEhivTit2uI3hpX5DjBV9EdiKBQVYqTzER2ZwHNp3EXhH
-ztIzljD5AgMBAAECggEAYkmPzFHtJtf1F3KZO3oEV0Sst4oGzNC9mEh/iwnaj8iC
-Bjj1wlR2ssnw1hCWlPpIYZDAwOAeSFVdXoz+Z5Nr5fwVF/+q2Ae3puLqWxcu7dvQ
-YuusM5pyDX/RndWCgVHDO9118E4BysKaWoyNyGMXmm3XUxdxHigTCTp4GJJXZXA6
-lpOfSnGVMjO9RxM5czytkdsZrIzzVY/A+FRYBPc0HVidd1r9Z5phanigX3MDgxu5
-WevzY/EVUBERnwVD1IfHhilXIPaBIwLqU0mH3y4hfXNefSU1/bjheTb+W1rrxE8i
-UQhBXwLFEgWU5lwlucGPwLnsxdiUY/QlzeFR2Dx+7QKBgQD03cAOIavy1RCkgLjI
-sPXQ1eRLZIrqVzXjt7Z7nAzeRqV261ynbq7xi9wS1iRBD0fcQbQox/cWuz/bOHj5
-aFyYGm0Z/ldtDvBhl6xNgbKgtWVCYUIXpXBiqayXOZXP9CCfxsWhtTrVYBinm7l0
-r3xHibpkHF75KBOQZgf4ntwSfwKBgQDE6pj+CnKInVPGMvaEt9fNFimjj3V+d232
-jjD1nDd6EIO2OGQdyBfWablxNkyngriM5bBJSX6D4RM2rQ2FAixTwicp0bgCB1rl
-nNQpheGMYKE31gcoabnnWWb54Mja1Lno9/b/G4J7jOaTNa9a3ruhL4ylYzv5J1gU
-QaEBOl+QhwKBgFaYqZgVzmKVeUpD/5VyB6zwR8ll6D7R0swSp2V1nZNqNpAk0mKg
-IRxpUs4Sj0W26rn5PoaBmV+fnwifIyFJCB3+koDz0uVNuDM7WYMbkBmHrSTZkm8c
-Ye9yhAgDJHkjo/n9aN00Y3ccgfucdezPNstx6MoIwomo46pYew8w1zFvAoGBAJwq
-CKb/lhFt47A9Xm+mdMg6mU8TSHTBNj3gSkeeWgi97Bao5g0QUIdEVULJc0UtUDq9
-NW8JkAH6j4g++YfQT2MliHWL0kgZmSabl05O1K7FO1XSsN6F6l7k8dudPuz842s0
-q3dpU7Oz7HA2lRiVp2uPEBVhe4B+iUWXPp6AsqUlAoGBAIuLxMsLxEFlBOTZmaRu
-TkKpLbhkeKH46rC+8hWKUPEN6JW22y0uBjOW4+FzpWMuuAyZTxLbsJvfNQXBfV7M
-byxMq2CV371aky/CAW7mqidoioxbzZEsCilIGl9XG/YTv9VSMhDaTV4FtVfxvY2I
-crVZihkbd2H0tE3DBsrTb6EK
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC9rv+b+EXE7Jvy
+SLqOPw6u6YE0oVeLzmnTD2qiNh8A0OOvKFyAC5uH6FnASuDcCdzpYjL/0Z1FxIMl
+cko39gOKwQpN5Zn6Bm3NRZGT3WbjnaS1bXSEOJuNawgNFCuDE9Kz3jWlwynUvLLL
+4ol83WIZzn2oouf4HVJ2RvfcvEhiceh+Dg+ajcIi4xpgZTMQ9Ao3nbhATrx/IPG3
+8jpgkSeUPZ+nvwzxjclRiqQttUORsm/9hmeDE/bYL6RVAiV9MSogvkiQCBpuPsDq
+e/HXaaM+powDDtkPjUd7KqCh0GvWM2qdruWlNQKyonSaz6ABpUqKFJavLmqhXkbr
+qQ7N4CJrAgMBAAECggEANPOASZMSLvn6QrWI1qLFv5BR0FZl8RJLOm8oTmYbW4f0
+t3Xl9JzI6zSysVp10Rczwzb1k7J5W/uSvMZd76dOr9JZxQseY8ydpFsSW5vH2Cyu
+yTLn/u0qh1zkn3oM94d2H14dzctghxGyO/ZeeSv38cpSC9yGMx5EYd5H3Sf2cPxu
+KT5FCBLjbvylVwnXHYHiZXv7WwTXuAtEe0Ou2LPLvHc3NnC9gJZC5j2Ei4+DZkUG
+2s0O5UMaGClVocfhTiXCNf8I94urXX2qsQfJAqh+D0pgjrFabgA4fgwn8j/hK0Yi
+YHR/bvgbcJEc2NG+OFLzqIuWAZ/naVVa+yAhN9RogQKBgQDq48b0Zz6DDUyUBwJ3
+VlPs81EYYWMcY77XScVo8ekojM5iNtKpz8XGHwAe18Vhtscf0AQR2XM6WubygrpG
+f7ub+NF2Xr6HM1OnCPcIcJxNK/p3nCf8fwmO8RfWAiID6e2Stjf1R/zWyI3Mqenv
+06uFnfxVmSdQCxTOW92a3bo2wQKBgQDOuyQbLn9DT9pxFZoAywZuhLQMV/vx3njr
+FcBtdizomEL8J7MA0DS+lU+kSXDJDH10B6xt8yWGG/xBG2aDqHco0qYhJXRaRt4r
+StZHozPPZPVSFOeZ+zqvXsjIfbyoqnlXlMEd54us58rIICguj/5Uxrdfq+u/S0nQ
+/XSbsUTwKwKBgFBiOwgQ/RekSXyvGWz1oisI6cvKKDzi9cB/gotznjM+XLLHyDhM
+3oX6vfPQK8BQ6Lw+V+Yz4Hcr/LUpf834kJ/D+wrjSZjDO/GB4+iDgTn3vvOIATcr
+0n2UjG+0sydbuu3mZigOxrxKThyoWWK1sZE8i8pPa2C9KhWk4qXJE50BAoGAeYyU
+1RqInwYjdJvz2YWFuZNy3VMaAoMA64/1fSafjv5/XAzndZH1gRz/H6RCmSMr2/3r
+BxaQOILZ1VoL81so/KqmHRUNjUrfs+qjhKlTfBxrFSDPb7zEK3p6aU9sjmr1P2Zq
+CXArsrTyiKpHleD589SG2syVpvrYYvWzCxu2YdMCgYABkwLg2wuEPT5Wxh4i2rx4
+ReymHtc3kaJnq6AuSdbFG0xAQnAtUqAZL+IF6Njdvy7xJ+g4HNS+XsQbspGMte4c
+JXwjp9xjEgjJpdZf6i0WwYDBSJwXm6IXUNfirdTUzC+InWts1PFDIWu3xvn4pd/Q
+6lsJ0Pi0QBO74CqGD5YrZg==
 -----END PRIVATE KEY-----

From 841bb1d0f38bb147cf7c6caa3329910b873a5b95 Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Thu, 11 Feb 2021 12:19:17 +0200
Subject: [PATCH 069/137] Add state-manager service to the devstack

---
 Makefile                         | 15 +++++----
 docker-compose-state-manager.yml | 56 ++++++++++++++++++++++++++++++++
 edraak.mk                        |  4 +++
 nginx/default.conf               |  9 +++++
 4 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100644 docker-compose-state-manager.yml

diff --git a/Makefile b/Makefile
index 912e3f164a..6f7d80b33d 100644
--- a/Makefile
+++ b/Makefile
@@ -72,18 +72,18 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 	@make studio-restart
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-state-manager.yml up -d
 
 dev.nfs.setup:  ## set's up an nfs server on the /Users folder, allowing nfs mounting on docker
 	./setup_native_nfs_docker_osx.sh
 
 dev.nfs.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-state-manager.yml up -d
 	@# Comment out this next line if you want to save some time and don't care about catalog programs
 	#./programs/provision.sh cache >/dev/null
 
 dev.nfs.up.all: ## Bring up all services with host volumes, including watchers
-	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-watchers-nfs.yml up -d
+	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-watchers-nfs.yml -f docker-compose-state-manager.yml up -d
 
 dev.nfs.provision: | check-memory dev.clone dev.provision.nfs.run stop ## Provision dev environment with all services stopped
 
@@ -129,7 +129,10 @@ provision: | dev.provision ## This command will be deprecated in a future releas
 
 stop: ## Stop all services
 	(test -d .docker-sync && docker-sync stop) || true ## Ignore failure here
-	docker-compose stop
+	docker-compose -f docker-compose.yml -f docker-compose-state-manager.yml stop
+
+stop.state_manager: ## Stop state-manager
+	docker-compose -f docker-compose-state-manager.yml stop
 
 stop.watchers: ## Stop asset watchers
 	docker-compose -f docker-compose-watchers.yml stop
@@ -147,10 +150,10 @@ destroy: ## Remove all devstack-related containers, networks, and volumes
 	./destroy.sh
 
 logs: ## View logs from containers running in detached mode
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml logs -f --tail 0
+	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-state-manager.yml logs -f --tail 0
 
 %-logs: ## View the logs of the specified service container
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-watchers.yml logs -f --tail=500 $*
+	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-watchers.yml -f docker-compose-state-manager.yml logs -f --tail=500 $*
 
 xqueue-logs: ## View logs from containers running in detached mode
 	docker-compose -f docker-compose-xqueue.yml logs -f xqueue
diff --git a/docker-compose-state-manager.yml b/docker-compose-state-manager.yml
new file mode 100644
index 0000000000..7b232a2ac1
--- /dev/null
+++ b/docker-compose-state-manager.yml
@@ -0,0 +1,56 @@
+version: "3"
+services:
+  state-manager-api:
+    build:
+      context: ${DEVSTACK_WORKSPACE}/state-manager/.
+      dockerfile: ${DEVSTACK_WORKSPACE}/state-manager/Dockerfile
+    ports:
+      - "6000:80"
+    env_file:
+      - ${DEVSTACK_WORKSPACE}/state-manager/.env
+    container_name: edraak.devstack.state_manager
+    command: bash entrypoint.sh
+    depends_on:
+      - state-manager-mysql
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/state-manager:/app
+    environment:
+      APP_ENV: "devstack"
+
+  state-manager-mysql:
+    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password
+    container_name: edraak.devstack.state_manager_mysql
+    environment:
+      MYSQL_ROOT_PASSWORD: ""
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    image: mysql:8.0
+    ports:
+      - "6306:3306"
+    volumes:
+      - state_manager_mysql_data:/var/lib/mysql
+
+  edraak_programs:
+    depends_on:
+      - mysql
+      - mongo
+      - memcached
+      - state-manager-api
+
+  edraak_dev_router:
+    depends_on:
+      - lms
+      - studio
+      - edraak_marketing
+      - edraak_programs
+      - state-manager-api
+    networks:
+      default:
+        aliases:
+          - www.edraak.dev
+          - courses.edraak.dev
+          - programs.edraak.dev
+          - edraak.dev
+          - states.edraak.dev
+volumes:
+  state_manager_mysql_data:
+    driver: local
diff --git a/edraak.mk b/edraak.mk
index 2bd3422d0d..d5e7e4a5a5 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -92,6 +92,9 @@ edraak.marketing.provision:
 marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
+state_manager-restart: ## Kill the state-manager development server. The watcher process will restart it.
+	docker exec -t edraak.devstack.state-manager bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
+
 edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
@@ -117,3 +120,4 @@ edraak.restart:  ## Restart all of the lms, studio, marketing and progs
 	make programs-restart
 	make lms-restart
 	make studio-restart
+	make state_manager-restart
diff --git a/nginx/default.conf b/nginx/default.conf
index 8b0b909628..432301b766 100644
--- a/nginx/default.conf
+++ b/nginx/default.conf
@@ -15,6 +15,15 @@ server {
     }
 }
 
+server {
+    server_name states.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+    location / {
+        proxy_pass http://edraak.devstack.state_manager;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
+
 server {
     server_name www.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;

From 1671ec9bd8de84466ef5cfe7135aee95cd2d09cf Mon Sep 17 00:00:00 2001
From: Fahmi <fahmi.najjar@gmail.com>
Date: Thu, 18 Mar 2021 13:12:31 +0200
Subject: [PATCH 070/137] Add restart command for the state manager

---
 edraak.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/edraak.mk b/edraak.mk
index d5e7e4a5a5..1b9f381bd4 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -93,7 +93,7 @@ marketing-restart: ## Kill the Marketing Django development server. The watcher
 	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 state_manager-restart: ## Kill the state-manager development server. The watcher process will restart it.
-	docker exec -t edraak.devstack.state-manager bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
+	docker exec -t edraak.devstack.state_manager bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'

From 7b473a456b119e6c032f559b8d05518fef3a5cba Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 24 Jan 2021 10:04:34 +0200
Subject: [PATCH 071/137] cert and other enhancment

---
 Makefile                  |   2 +-
 docker-compose.yml        |   2 +
 nginx/ssl/ca_bundle.crt   |  47 +++++++++--------
 nginx/ssl/certificate.crt |  57 ++++++++++-----------
 nginx/ssl/chained.crt     | 104 +++++++++++++++++++-------------------
 nginx/ssl/private.key     |  52 +++++++++----------
 6 files changed, 131 insertions(+), 133 deletions(-)

diff --git a/Makefile b/Makefile
index 610a56c45c..9e73f929a5 100644
--- a/Makefile
+++ b/Makefile
@@ -263,7 +263,7 @@ lms-static: ## Rebuild static assets for the LMS container
 studio-static: ## Rebuild static assets for the Studio container
 	docker exec -t edx.devstack.studio bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform/ && paver update_assets'
 
-static: | credentials-static discovery-static ecommerce-static lms-static studio-static ## Rebuild static assets for all service containers
+static: | lms-static studio-static ## Rebuild static assets for all service containers
 
 healthchecks: ## Run a curl against all services' healthcheck endpoints to make sure they are up. This will eventually be parameterized
 	./healthchecks.sh
diff --git a/docker-compose.yml b/docker-compose.yml
index 8b8e3debb4..764bf720f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,6 +142,7 @@ services:
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
+      NO_PREREQ_INSTALL: 1
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18000:18000"
@@ -188,6 +189,7 @@ services:
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 1
+      NO_PREREQ_INSTALL: 1
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18010:18010"
diff --git a/nginx/ssl/ca_bundle.crt b/nginx/ssl/ca_bundle.crt
index 0002462ce8..1d82449ab8 100755
--- a/nginx/ssl/ca_bundle.crt
+++ b/nginx/ssl/ca_bundle.crt
@@ -1,27 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
 MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
+MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
+AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
+jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
+Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
+U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
+gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
+/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
+oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
+BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
+ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
+p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
+AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
+Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
+LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
+r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
+ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
+S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
+qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
+O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
+UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
index c79df1e5a1..d437dce3b5 100755
--- a/nginx/ssl/certificate.crt
+++ b/nginx/ssl/certificate.crt
@@ -1,31 +1,30 @@
 -----BEGIN CERTIFICATE-----
-MIIFXDCCBESgAwIBAgISBOAzeVhFPhSTtbH0Es7uT+34MA0GCSqGSIb3DQEBCwUA
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjQyMTA3MjlaFw0y
-MTAxMjIyMTA3MjlaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALxaLBMGvZYG9gwUVgKVmxa59QcYLG0ETqqV
-IHYpxEMftw0ChcMooc2YxVIHxl9jUlU9USI1Tl7ABLNIZn9A/ldbVwF3I73RCHDX
-mDRpJJMv+h8veX5LXMiZHmlQ2sAY8jdajUQ3QmkV9q57K6fTgWo5Vnz0kjDUeuxc
-j9YJ/EztCw9OL1kAdGx6Z9Vhl0Azx2V0EiXWgRB5/0R78bZg5zrNqdl6ESy+gngp
-xFXimXai0l5p7WhZKRuNdnVzO3S4RpBvRAg26eom4NGOXAMMz8KLeyfPp7oPeicS
-GK9OK3a4jeGlfkOMFX0R2IoFBVipPMRHZnAc2ncReEfO0jOWMPkCAwEAAaOCAm0w
-ggJpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyFR9xgRXiuRUhRthBk4E3+q0y8Iw
-HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
-MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
-QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
-L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQCU
-ILwejtWNbIhzH4KLIiwN0dpNXmxPlD1h204vWE2iwgAAAXVcpv1sAAAEAwBGMEQC
-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
+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
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index d7efcd4ddf..4cc957a6b0 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,58 +1,56 @@
 -----BEGIN CERTIFICATE-----
-MIIFXDCCBESgAwIBAgISBOAzeVhFPhSTtbH0Es7uT+34MA0GCSqGSIb3DQEBCwUA
-MEoxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MSMwIQYDVQQD
-ExpMZXQncyBFbmNyeXB0IEF1dGhvcml0eSBYMzAeFw0yMDEwMjQyMTA3MjlaFw0y
-MTAxMjIyMTA3MjlaMBcxFTATBgNVBAMMDCouZWRyYWFrLmRldjCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBALxaLBMGvZYG9gwUVgKVmxa59QcYLG0ETqqV
-IHYpxEMftw0ChcMooc2YxVIHxl9jUlU9USI1Tl7ABLNIZn9A/ldbVwF3I73RCHDX
-mDRpJJMv+h8veX5LXMiZHmlQ2sAY8jdajUQ3QmkV9q57K6fTgWo5Vnz0kjDUeuxc
-j9YJ/EztCw9OL1kAdGx6Z9Vhl0Azx2V0EiXWgRB5/0R78bZg5zrNqdl6ESy+gngp
-xFXimXai0l5p7WhZKRuNdnVzO3S4RpBvRAg26eom4NGOXAMMz8KLeyfPp7oPeicS
-GK9OK3a4jeGlfkOMFX0R2IoFBVipPMRHZnAc2ncReEfO0jOWMPkCAwEAAaOCAm0w
-ggJpMA4GA1UdDwEB/wQEAwIFoDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQUyFR9xgRXiuRUhRthBk4E3+q0y8Iw
-HwYDVR0jBBgwFoAUqEpqYwR93brm0Tm3pkVl7/Oo7KEwbwYIKwYBBQUHAQEEYzBh
-MC4GCCsGAQUFBzABhiJodHRwOi8vb2NzcC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-MC8GCCsGAQUFBzAChiNodHRwOi8vY2VydC5pbnQteDMubGV0c2VuY3J5cHQub3Jn
-LzAjBgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwTAYDVR0gBEUw
-QzAIBgZngQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDov
-L2Nwcy5sZXRzZW5jcnlwdC5vcmcwggEEBgorBgEEAdZ5AgQCBIH1BIHyAPAAdQCU
-ILwejtWNbIhzH4KLIiwN0dpNXmxPlD1h204vWE2iwgAAAXVcpv1sAAAEAwBGMEQC
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/
+MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
 MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow
-SjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxIzAhBgNVBAMT
-GkxldCdzIEVuY3J5cHQgQXV0aG9yaXR5IFgzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAnNMM8FrlLke3cl03g7NoYzDq1zUmGSXhvb418XCSL7e4S0EF
-q6meNQhY7LEqxGiHC6PjdeTm86dicbp5gWAf15Gan/PQeGdxyGkOlZHP/uaZ6WA8
-SMx+yk13EiSdRxta67nsHjcAHJyse6cF6s5K671B5TaYucv9bTyWaN8jKkKQDIZ0
-Z8h/pZq4UmEUEz9l6YKHy9v6Dlb2honzhT+Xhq+w3Brvaw2VFn3EK6BlspkENnWA
-a6xK8xuQSXgvopZPKiAlKQTGdMDQMc2PMTiVFrqoM7hD8bEfwzB/onkxEz0tNvjj
-/PIzark5McWvxI0NHWQWM6r6hCm21AvA2H3DkwIDAQABo4IBfTCCAXkwEgYDVR0T
-AQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8EBAMCAYYwfwYIKwYBBQUHAQEEczBxMDIG
-CCsGAQUFBzABhiZodHRwOi8vaXNyZy50cnVzdGlkLm9jc3AuaWRlbnRydXN0LmNv
-bTA7BggrBgEFBQcwAoYvaHR0cDovL2FwcHMuaWRlbnRydXN0LmNvbS9yb290cy9k
-c3Ryb290Y2F4My5wN2MwHwYDVR0jBBgwFoAUxKexpHsscfrb4UuQdf/EFWCFiRAw
-VAYDVR0gBE0wSzAIBgZngQwBAgEwPwYLKwYBBAGC3xMBAQEwMDAuBggrBgEFBQcC
-ARYiaHR0cDovL2Nwcy5yb290LXgxLmxldHNlbmNyeXB0Lm9yZzA8BgNVHR8ENTAz
-MDGgL6AthitodHRwOi8vY3JsLmlkZW50cnVzdC5jb20vRFNUUk9PVENBWDNDUkwu
-Y3JsMB0GA1UdDgQWBBSoSmpjBH3duubRObemRWXv86jsoTANBgkqhkiG9w0BAQsF
-AAOCAQEA3TPXEfNjWDjdGBX7CVW+dla5cEilaUcne8IkCJLxWh9KEik3JHRRHGJo
-uM2VcGfl96S8TihRzZvoroed6ti6WqEBmtzw3Wodatg+VyOeph4EYpr/1wXKtx8/
-wApIvJSwtmVi4MFU5aMqrSDE6ea73Mj2tcMyo5jMd6jmeWUHK8so/joWUoHOUgwu
-X4Po1QYz+3dszkDqMp4fklxBwXRsW10KXzPMTZ+sOPAveyxindmjkW8lGy+QsRlG
-PfZ+G6Z6h7mjem0Y+iWlkYcV4PIWL1iwBi8saCbGS5jN2p8M+X+Q7UNKEkROb3N6
-KOqkqm57TH2H3eDJAkSnh6/DNFu0Qg==
+DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
+MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
+AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
+jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
+Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
+U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
+gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
+/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
+oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
+BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
+ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
+p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
+AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
+Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
+LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
+r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
+AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
+ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
+S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
+qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
+O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
+UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index c67f0b34a0..2716706e16 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC8WiwTBr2WBvYM
-FFYClZsWufUHGCxtBE6qlSB2KcRDH7cNAoXDKKHNmMVSB8ZfY1JVPVEiNU5ewASz
-SGZ/QP5XW1cBdyO90Qhw15g0aSSTL/ofL3l+S1zImR5pUNrAGPI3Wo1EN0JpFfau
-eyun04FqOVZ89JIw1HrsXI/WCfxM7QsPTi9ZAHRsemfVYZdAM8dldBIl1oEQef9E
-e/G2YOc6zanZehEsvoJ4KcRV4pl2otJeae1oWSkbjXZ1czt0uEaQb0QINunqJuDR
-jlwDDM/Ci3snz6e6D3onEhivTit2uI3hpX5DjBV9EdiKBQVYqTzER2ZwHNp3EXhH
-ztIzljD5AgMBAAECggEAYkmPzFHtJtf1F3KZO3oEV0Sst4oGzNC9mEh/iwnaj8iC
-Bjj1wlR2ssnw1hCWlPpIYZDAwOAeSFVdXoz+Z5Nr5fwVF/+q2Ae3puLqWxcu7dvQ
-YuusM5pyDX/RndWCgVHDO9118E4BysKaWoyNyGMXmm3XUxdxHigTCTp4GJJXZXA6
-lpOfSnGVMjO9RxM5czytkdsZrIzzVY/A+FRYBPc0HVidd1r9Z5phanigX3MDgxu5
-WevzY/EVUBERnwVD1IfHhilXIPaBIwLqU0mH3y4hfXNefSU1/bjheTb+W1rrxE8i
-UQhBXwLFEgWU5lwlucGPwLnsxdiUY/QlzeFR2Dx+7QKBgQD03cAOIavy1RCkgLjI
-sPXQ1eRLZIrqVzXjt7Z7nAzeRqV261ynbq7xi9wS1iRBD0fcQbQox/cWuz/bOHj5
-aFyYGm0Z/ldtDvBhl6xNgbKgtWVCYUIXpXBiqayXOZXP9CCfxsWhtTrVYBinm7l0
-r3xHibpkHF75KBOQZgf4ntwSfwKBgQDE6pj+CnKInVPGMvaEt9fNFimjj3V+d232
-jjD1nDd6EIO2OGQdyBfWablxNkyngriM5bBJSX6D4RM2rQ2FAixTwicp0bgCB1rl
-nNQpheGMYKE31gcoabnnWWb54Mja1Lno9/b/G4J7jOaTNa9a3ruhL4ylYzv5J1gU
-QaEBOl+QhwKBgFaYqZgVzmKVeUpD/5VyB6zwR8ll6D7R0swSp2V1nZNqNpAk0mKg
-IRxpUs4Sj0W26rn5PoaBmV+fnwifIyFJCB3+koDz0uVNuDM7WYMbkBmHrSTZkm8c
-Ye9yhAgDJHkjo/n9aN00Y3ccgfucdezPNstx6MoIwomo46pYew8w1zFvAoGBAJwq
-CKb/lhFt47A9Xm+mdMg6mU8TSHTBNj3gSkeeWgi97Bao5g0QUIdEVULJc0UtUDq9
-NW8JkAH6j4g++YfQT2MliHWL0kgZmSabl05O1K7FO1XSsN6F6l7k8dudPuz842s0
-q3dpU7Oz7HA2lRiVp2uPEBVhe4B+iUWXPp6AsqUlAoGBAIuLxMsLxEFlBOTZmaRu
-TkKpLbhkeKH46rC+8hWKUPEN6JW22y0uBjOW4+FzpWMuuAyZTxLbsJvfNQXBfV7M
-byxMq2CV371aky/CAW7mqidoioxbzZEsCilIGl9XG/YTv9VSMhDaTV4FtVfxvY2I
-crVZihkbd2H0tE3DBsrTb6EK
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC9rv+b+EXE7Jvy
+SLqOPw6u6YE0oVeLzmnTD2qiNh8A0OOvKFyAC5uH6FnASuDcCdzpYjL/0Z1FxIMl
+cko39gOKwQpN5Zn6Bm3NRZGT3WbjnaS1bXSEOJuNawgNFCuDE9Kz3jWlwynUvLLL
+4ol83WIZzn2oouf4HVJ2RvfcvEhiceh+Dg+ajcIi4xpgZTMQ9Ao3nbhATrx/IPG3
+8jpgkSeUPZ+nvwzxjclRiqQttUORsm/9hmeDE/bYL6RVAiV9MSogvkiQCBpuPsDq
+e/HXaaM+powDDtkPjUd7KqCh0GvWM2qdruWlNQKyonSaz6ABpUqKFJavLmqhXkbr
+qQ7N4CJrAgMBAAECggEANPOASZMSLvn6QrWI1qLFv5BR0FZl8RJLOm8oTmYbW4f0
+t3Xl9JzI6zSysVp10Rczwzb1k7J5W/uSvMZd76dOr9JZxQseY8ydpFsSW5vH2Cyu
+yTLn/u0qh1zkn3oM94d2H14dzctghxGyO/ZeeSv38cpSC9yGMx5EYd5H3Sf2cPxu
+KT5FCBLjbvylVwnXHYHiZXv7WwTXuAtEe0Ou2LPLvHc3NnC9gJZC5j2Ei4+DZkUG
+2s0O5UMaGClVocfhTiXCNf8I94urXX2qsQfJAqh+D0pgjrFabgA4fgwn8j/hK0Yi
+YHR/bvgbcJEc2NG+OFLzqIuWAZ/naVVa+yAhN9RogQKBgQDq48b0Zz6DDUyUBwJ3
+VlPs81EYYWMcY77XScVo8ekojM5iNtKpz8XGHwAe18Vhtscf0AQR2XM6WubygrpG
+f7ub+NF2Xr6HM1OnCPcIcJxNK/p3nCf8fwmO8RfWAiID6e2Stjf1R/zWyI3Mqenv
+06uFnfxVmSdQCxTOW92a3bo2wQKBgQDOuyQbLn9DT9pxFZoAywZuhLQMV/vx3njr
+FcBtdizomEL8J7MA0DS+lU+kSXDJDH10B6xt8yWGG/xBG2aDqHco0qYhJXRaRt4r
+StZHozPPZPVSFOeZ+zqvXsjIfbyoqnlXlMEd54us58rIICguj/5Uxrdfq+u/S0nQ
+/XSbsUTwKwKBgFBiOwgQ/RekSXyvGWz1oisI6cvKKDzi9cB/gotznjM+XLLHyDhM
+3oX6vfPQK8BQ6Lw+V+Yz4Hcr/LUpf834kJ/D+wrjSZjDO/GB4+iDgTn3vvOIATcr
+0n2UjG+0sydbuu3mZigOxrxKThyoWWK1sZE8i8pPa2C9KhWk4qXJE50BAoGAeYyU
+1RqInwYjdJvz2YWFuZNy3VMaAoMA64/1fSafjv5/XAzndZH1gRz/H6RCmSMr2/3r
+BxaQOILZ1VoL81so/KqmHRUNjUrfs+qjhKlTfBxrFSDPb7zEK3p6aU9sjmr1P2Zq
+CXArsrTyiKpHleD589SG2syVpvrYYvWzCxu2YdMCgYABkwLg2wuEPT5Wxh4i2rx4
+ReymHtc3kaJnq6AuSdbFG0xAQnAtUqAZL+IF6Njdvy7xJ+g4HNS+XsQbspGMte4c
+JXwjp9xjEgjJpdZf6i0WwYDBSJwXm6IXUNfirdTUzC+InWts1PFDIWu3xvn4pd/Q
+6lsJ0Pi0QBO74CqGD5YrZg==
 -----END PRIVATE KEY-----

From 0e6c8c0286be5b7bdd45227bcf70adb63b9dae09 Mon Sep 17 00:00:00 2001
From: MohammedAl-rowad <rowadwo@gmail.com>
Date: Mon, 1 Feb 2021 16:49:58 +0200
Subject: [PATCH 072/137] Add edraak judge to network

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 764bf720f6..2e1e3c3634 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -291,6 +291,7 @@ services:
           - courses.edraak.dev
           - programs.edraak.dev
           - edraak.dev
+          - judge.edraak.dev
 
 
 volumes:

From 5aed7eaed19f36b640e3fb1d7dc6678353f82ca2 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 25 Apr 2021 11:50:17 +0300
Subject: [PATCH 073/137] SSL cert APR 25

---
 nginx/ssl/ca_bundle.crt   | 26 --------------------
 nginx/ssl/certificate.crt | 30 ----------------------
 nginx/ssl/chained.crt     | 44 ++++++++++++++++-----------------
 nginx/ssl/private.key     | 52 +++++++++++++++++++--------------------
 4 files changed, 48 insertions(+), 104 deletions(-)
 delete mode 100755 nginx/ssl/ca_bundle.crt
 delete mode 100755 nginx/ssl/certificate.crt

diff --git a/nginx/ssl/ca_bundle.crt b/nginx/ssl/ca_bundle.crt
deleted file mode 100755
index 1d82449ab8..0000000000
--- a/nginx/ssl/ca_bundle.crt
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
-MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
-AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
-jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
-Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
-U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
-gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
-/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
-oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
-BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
-ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
-p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
-AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
-Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
-LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
-r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
-ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
-S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
-qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
-O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
-UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
------END CERTIFICATE-----
diff --git a/nginx/ssl/certificate.crt b/nginx/ssl/certificate.crt
deleted file mode 100755
index d437dce3b5..0000000000
--- a/nginx/ssl/certificate.crt
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFKzCCBBOgAwIBAgISBGbEmOFvB0Xe4tvQ+m2dAdFJMA0GCSqGSIb3DQEBCwUA
-MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTAxMjQwNjU1MzhaFw0yMTA0MjQwNjU1MzhaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL2u
-/5v4RcTsm/JIuo4/Dq7pgTShV4vOadMPaqI2HwDQ468oXIALm4foWcBK4NwJ3Oli
-Mv/RnUXEgyVySjf2A4rBCk3lmfoGbc1FkZPdZuOdpLVtdIQ4m41rCA0UK4MT0rPe
-NaXDKdS8ssviiXzdYhnOfaii5/gdUnZG99y8SGJx6H4OD5qNwiLjGmBlMxD0Cjed
-uEBOvH8g8bfyOmCRJ5Q9n6e/DPGNyVGKpC21Q5Gyb/2GZ4MT9tgvpFUCJX0xKiC+
-SJAIGm4+wOp78ddpoz6mjAMO2Q+NR3sqoKHQa9Yzap2u5aU1ArKidJrPoAGlSooU
-lq8uaqFeRuupDs3gImsCAwEAAaOCAlQwggJQMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQURIzXrXhUSAr4o3h4zwD39Yy6FcgwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
-5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
-by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
-IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
-CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHcARJRl
-LrDuzq/EQAfYqP4owNrmgr7YyzG1P9MzlrW2gagAAAF3M2Qq9AAABAMASDBGAiEA
-vON/NASwQv9XtVk3a/+cQc//ij7lC+VotLvtwS6U90UCIQCVBIPHe3BzA8cXyHP5
-RC8hyAZ5tTKRDF1O0tlo4VJyiQB2AH0+8viP/4hVaCTCwMqeUol5K8UOeAl/LmqX
-aJl+IvDXAAABdzNkKxQAAAQDAEcwRQIhAKrvw3qOUJfWoxz2MFQXy0Q/VJyKQTuH
-piyT2pkZWlHTAiBCQclNek9tqSZ9nSlh0wwrWmDDvTlKTtUkIL8iUeU6uzANBgkq
-hkiG9w0BAQsFAAOCAQEAAr1csrc+Zglg/KvHaxYU/xDBzXxUbexJCH3qhwaBMRsS
-3f1kOgl+lkm5+jeu1QX39eTb9XtcaP+RqfAaEUqayM+Mig86XzxFtXh2xiPp29bq
-eefwi+7H0URNcPEb6Su2+2971SCM9MTGuGNLEB9Q/B3s15EomT3VHUm3aJheSxRC
-DUUdEfIl/vD7iKtZylxa27REmK6xmSiL26WYuckM57qcmRsNwyFPBgg9YZ4W/jtw
-tUMmUQ2RswK4emQWbUdjC/rJ8ZNyR0wMWyX4vbC1snhY7PDbF2XLoXmaNIUuNCX2
-HL/vRPwDu2g1z0HYDhDD6TLW2KB2jDWtXFMW1bGKDg==
------END CERTIFICATE-----
diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 4cc957a6b0..0844b41131 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+EwJSMzAeFw0yMTA0MjUwNzQ0NTNaFw0yMTA3MjQwNzQ0NTNaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrB
+vwY/FxaujhDGjox7ON6EkmKWXXF8ifPR6W/lxBwomZudSyOaLYxFHytnn9TptHSL
+BISE8Z8EL8GQYhX1LYt772jiLgtfwGnYGSuIuW2CbT0kVo9QVFZ1h1VQ7Dx1N3C+
+0elMRQFCkBeFN6jlZYzFerds0qsIAPb+hqQ1RDRpsxiF07+dDWRoMnch0SIjzi9t
+IlbZPAsu5gqhKQSAl5ATx8+EWocJJNsItnwm89Gk1xNLdu3lzw+F1lDgSLtAVzCK
+Kf7DmymGN+aZHgzYlUNs/tSfgvvxt6AtTkm8UP2ePq+kRAvGSNEcCwvzCAytN3L5
+FXY8JN+bVHR26dJ230UCAwEAAaOCAlIwggJOMA4GA1UdDwEB/wQEAwIFoDAdBgNV
 HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQURIzXrXhUSAr4o3h4zwD39Yy6FcgwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 2716706e16..6cbbbad822 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQC9rv+b+EXE7Jvy
-SLqOPw6u6YE0oVeLzmnTD2qiNh8A0OOvKFyAC5uH6FnASuDcCdzpYjL/0Z1FxIMl
-cko39gOKwQpN5Zn6Bm3NRZGT3WbjnaS1bXSEOJuNawgNFCuDE9Kz3jWlwynUvLLL
-4ol83WIZzn2oouf4HVJ2RvfcvEhiceh+Dg+ajcIi4xpgZTMQ9Ao3nbhATrx/IPG3
-8jpgkSeUPZ+nvwzxjclRiqQttUORsm/9hmeDE/bYL6RVAiV9MSogvkiQCBpuPsDq
-e/HXaaM+powDDtkPjUd7KqCh0GvWM2qdruWlNQKyonSaz6ABpUqKFJavLmqhXkbr
-qQ7N4CJrAgMBAAECggEANPOASZMSLvn6QrWI1qLFv5BR0FZl8RJLOm8oTmYbW4f0
-t3Xl9JzI6zSysVp10Rczwzb1k7J5W/uSvMZd76dOr9JZxQseY8ydpFsSW5vH2Cyu
-yTLn/u0qh1zkn3oM94d2H14dzctghxGyO/ZeeSv38cpSC9yGMx5EYd5H3Sf2cPxu
-KT5FCBLjbvylVwnXHYHiZXv7WwTXuAtEe0Ou2LPLvHc3NnC9gJZC5j2Ei4+DZkUG
-2s0O5UMaGClVocfhTiXCNf8I94urXX2qsQfJAqh+D0pgjrFabgA4fgwn8j/hK0Yi
-YHR/bvgbcJEc2NG+OFLzqIuWAZ/naVVa+yAhN9RogQKBgQDq48b0Zz6DDUyUBwJ3
-VlPs81EYYWMcY77XScVo8ekojM5iNtKpz8XGHwAe18Vhtscf0AQR2XM6WubygrpG
-f7ub+NF2Xr6HM1OnCPcIcJxNK/p3nCf8fwmO8RfWAiID6e2Stjf1R/zWyI3Mqenv
-06uFnfxVmSdQCxTOW92a3bo2wQKBgQDOuyQbLn9DT9pxFZoAywZuhLQMV/vx3njr
-FcBtdizomEL8J7MA0DS+lU+kSXDJDH10B6xt8yWGG/xBG2aDqHco0qYhJXRaRt4r
-StZHozPPZPVSFOeZ+zqvXsjIfbyoqnlXlMEd54us58rIICguj/5Uxrdfq+u/S0nQ
-/XSbsUTwKwKBgFBiOwgQ/RekSXyvGWz1oisI6cvKKDzi9cB/gotznjM+XLLHyDhM
-3oX6vfPQK8BQ6Lw+V+Yz4Hcr/LUpf834kJ/D+wrjSZjDO/GB4+iDgTn3vvOIATcr
-0n2UjG+0sydbuu3mZigOxrxKThyoWWK1sZE8i8pPa2C9KhWk4qXJE50BAoGAeYyU
-1RqInwYjdJvz2YWFuZNy3VMaAoMA64/1fSafjv5/XAzndZH1gRz/H6RCmSMr2/3r
-BxaQOILZ1VoL81so/KqmHRUNjUrfs+qjhKlTfBxrFSDPb7zEK3p6aU9sjmr1P2Zq
-CXArsrTyiKpHleD589SG2syVpvrYYvWzCxu2YdMCgYABkwLg2wuEPT5Wxh4i2rx4
-ReymHtc3kaJnq6AuSdbFG0xAQnAtUqAZL+IF6Njdvy7xJ+g4HNS+XsQbspGMte4c
-JXwjp9xjEgjJpdZf6i0WwYDBSJwXm6IXUNfirdTUzC+InWts1PFDIWu3xvn4pd/Q
-6lsJ0Pi0QBO74CqGD5YrZg==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6wb8GPxcWro4Q
+xo6MezjehJJill1xfInz0elv5cQcKJmbnUsjmi2MRR8rZ5/U6bR0iwSEhPGfBC/B
+kGIV9S2Le+9o4i4LX8Bp2BkriLltgm09JFaPUFRWdYdVUOw8dTdwvtHpTEUBQpAX
+hTeo5WWMxXq3bNKrCAD2/oakNUQ0abMYhdO/nQ1kaDJ3IdEiI84vbSJW2TwLLuYK
+oSkEgJeQE8fPhFqHCSTbCLZ8JvPRpNcTS3bt5c8PhdZQ4Ei7QFcwiin+w5sphjfm
+mR4M2JVDbP7Un4L78begLU5JvFD9nj6vpEQLxkjRHAsL8wgMrTdy+RV2PCTfm1R0
+dunSdt9FAgMBAAECggEAGzhB71citluauTc3b6JGF6ia7WOdGv1b3f2qWHTUsIX6
+XYP/f6DpIpiwglMIKLAnbRUWA3qc/OBPVZcFtM2XZc0ah97vdxjton+sq3uyCxQH
+d/Hj6995a2CV6QlyZR1why5Iyggjxps9BTCVfDhzJKFj0Xg6/FKeUWGnnidlWX4O
+f4wG9V63efViNhlP4PPErNYcYLHe2oZDv/x8d2GEDvm6n3NvZx74oHnGWvdnfRM6
+/f6XdG+pgzQypGA8fy92b03cbS+AE5R5aSIsU5tHOFAoraqRVadW7cIcXtJEAivh
+LqL9VaVF74kM8Gy22V62TW78q8LSMoxB77w4bxyfwQKBgQDsDFZW/W9PL4BGhBC9
+Pi+5JA0Pgp7f7gr0lYa28qgedMzspIW5HNi7iaaiy+SV04Z7kHCe68rtmQB0K6AP
+oTiof3+DDL5OvtKMGLZaoH6rZ9AbD41b4W3Pgg8FQ2XK0dTN/ahC8tEaTw4FbKZC
+vjz6QoNKgQSAuanYFCS+xBPCWwKBgQDKitTVfCFkWkvv7gp8PsN5zHrXeIJpgOqH
+X6gMVoJngxu3wmq4t2sqTCxK4MZgBENyolR64AnIg+Aic6VmJG4EfJyP7CBjD6wI
+fdEJKhxNrKy6qYo/HG1FdjYG9oIv3HW7dI16pfdxs9LwyRCK0ziAnapEBfRfZQUX
+SMkom8JW3wKBgQCtTj2R7s7rj4+Ztlrn5qF5SAvCyH9HH+mxO5tF9REUE2Nll0GK
+8K/7uQu8WQDCNCR30kutkqdSHNSldmY1M4R6yelf2VpcTGQfcgFoto9p33V+eMOr
+ou5RvUaz8ZDqAXdBqiwAw3Bc5ZAA0Y2cUTpJ782fROx+alJWECwOV72+IwKBgHXy
+Ksa3Jmrd+mKZ6Bk6I3MGFHLthmQR4oE6vw2QQxgsTTPRT3yJsypKeXCRPHQlh3F1
+/mQfmxLdWOQ3HBZDGJ4cQr+87Y9CTRgUzGndz+WbrGp22D6wOyG8GPItEtr0Mssa
+sFi/1TytTyVQsQVmwvyC0+gQ36G9nh1VEW9IZP9ZAoGBALafDYJGB/aZB0/Qb5m2
+vmmXzS5AoHLB3+5xHnee+eOrUjM0wm28FXXUc7YhTnRudONZiu6L+/OJG3z91eWZ
+vbU9NLWYnsrXsyNoRg6wTZriTupNGKuWJWHm4YwSVLPNVY4dfialkaUDKZWLfc71
+/Varc6WijcZQxhOkfNZx9LqV
 -----END PRIVATE KEY-----

From f3a42978a2226eff521b2e589519e76820b9cb47 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 16 Jun 2021 12:20:15 +0300
Subject: [PATCH 074/137] new ssl cert

---
 nginx/ssl/chained.crt | 107 ++++++++++++++++++++++--------------------
 nginx/ssl/private.key |  52 ++++++++++----------
 2 files changed, 82 insertions(+), 77 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 0844b41131..ca1c1a68de 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,56 +1,61 @@
 -----BEGIN CERTIFICATE-----
-MIIFKTCCBBGgAwIBAgISA76P2muquw9wCMlphUNdtEgsMA0GCSqGSIb3DQEBCwUA
-MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTA0MjUwNzQ0NTNaFw0yMTA3MjQwNzQ0NTNaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALrB
-vwY/FxaujhDGjox7ON6EkmKWXXF8ifPR6W/lxBwomZudSyOaLYxFHytnn9TptHSL
-BISE8Z8EL8GQYhX1LYt772jiLgtfwGnYGSuIuW2CbT0kVo9QVFZ1h1VQ7Dx1N3C+
-0elMRQFCkBeFN6jlZYzFerds0qsIAPb+hqQ1RDRpsxiF07+dDWRoMnch0SIjzi9t
-IlbZPAsu5gqhKQSAl5ATx8+EWocJJNsItnwm89Gk1xNLdu3lzw+F1lDgSLtAVzCK
-Kf7DmymGN+aZHgzYlUNs/tSfgvvxt6AtTkm8UP2ePq+kRAvGSNEcCwvzCAytN3L5
-FXY8JN+bVHR26dJ230UCAwEAAaOCAlIwggJOMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQUHEDdB6NNpAMzPiE36GIpk8yEdUkwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
-5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
-by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
-IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
-CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHUAlCC8
-Ho7VjWyIcx+CiyIsDdHaTV5sT5Q9YdtOL1hNosIAAAF5CDP18QAABAMARjBEAiAa
-xl/MYevTVurAvaevlXYn+pOZbFpUE8gdmH5EF1ujyAIgBghXs4RtoYew+I2fxqeN
-9yBij5wohnqmHp6zTHI3tPcAdgD2XJQv0XcwIhRUGAgwlFaO400TGTO/3wwvIAvM
-TvFk4wAAAXkIM/XpAAAEAwBHMEUCIHzOyQxOKPVjNCRWU21pj1hdmjo98y5EEWcs
-UgIurar/AiEApE2SNScVb9l2B75ljODeLzEjA5wlVEZP0pKm5R6bhlYwDQYJKoZI
-hvcNAQELBQADggEBAFX7GK1x0NFZFdlJFWt9pxV3QkvTHDiWzc0mH/kMK1bzhpJR
-ia8MvVbIa2alXY4V29FGUC7esSKkLIjaBT8IcSHNEU5ZbidLHkkt46Jsejxd2f9n
-s6f5Umc+tlgYnxsRCgTrQkR64XESqfACSXF+d9ftZC34DY2K52Zp+rXsmfApyIHA
-j/OX1Ewy/YVwVkWFhiXLn9tf3i55D3IehdYACdc+a1aDmszXvtpf9hESaCbPUrN1
-WhvGQ8vhdeF8dWGaQcPzXzUomjO71kFJDwTlzb9UH/2ForG88LTNdDA9P5UTW66H
-rWPA5zNP//zCdNLJMwCjHjQWTjpAcbUsXRbnovY=
+MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
+WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
+R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
+sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
+NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
+Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
+/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
+AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
+Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
+FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
+AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
+Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
+gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
+PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
+ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
+CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
+lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
+avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
+yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
+yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
+hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
+HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
+MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
+nLRbwHOoq7hHwg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEZTCCA02gAwIBAgIQQAF1BIMUpMghjISpDBbN3zANBgkqhkiG9w0BAQsFADA/
+MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
 MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTIwMTAwNzE5MjE0MFoXDTIxMDkyOTE5MjE0MFow
-MjELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUxldCdzIEVuY3J5cHQxCzAJBgNVBAMT
-AlIzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuwIVKMz2oJTTDxLs
-jVWSw/iC8ZmmekKIp10mqrUrucVMsa+Oa/l1yKPXD0eUFFU1V4yeqKI5GfWCPEKp
-Tm71O8Mu243AsFzzWTjn7c9p8FoLG77AlCQlh/o3cbMT5xys4Zvv2+Q7RVJFlqnB
-U840yFLuta7tj95gcOKlVKu2bQ6XpUA0ayvTvGbrZjR8+muLj1cpmfgwF126cm/7
-gcWt0oZYPRfH5wm78Sv3htzB2nFd1EbjzK0lwYi8YGd1ZrPxGPeiXOZT/zqItkel
-/xMY6pgJdz+dU/nPAeX1pnAXFK9jpP+Zs5Od3FOnBv5IhR2haa4ldbsTzFID9e1R
-oYvbFQIDAQABo4IBaDCCAWQwEgYDVR0TAQH/BAgwBgEB/wIBADAOBgNVHQ8BAf8E
-BAMCAYYwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5p
-ZGVudHJ1c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTE
-p7Gkeyxx+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEE
-AYLfEwEBATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2Vu
-Y3J5cHQub3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0
-LmNvbS9EU1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYf
-r52LFMLGMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjANBgkqhkiG9w0B
-AQsFAAOCAQEA2UzgyfWEiDcx27sT4rP8i2tiEmxYt0l+PAK3qB8oYevO4C5z70kH
-ejWEHx2taPDY/laBL21/WKZuNTYQHHPD5b1tXgHXbnL7KqC401dk5VvCadTQsvd8
-S8MXjohyc9z9/G2948kLjmE6Flh9dDYrVYA9x2O+hEPGOaEOa1eePynBgPayvUfL
-qjBstzLhWVQLGAkXXmNs+5ZnPBxzDJOLxhF2JIbeQAcH5H0tZrUlo5ZYyOqA7s9p
-O5b85o3AM/OJ+CktFBQtfvBhcJVd9wvlwPsk+uyOy2HI7mNxKKgsBTt375teA2Tw
-UdHkhVNcsAKX1H7GNNLOEADksd86wuoXvg==
+DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
+ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
+wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
+LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
+4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
+bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
+sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
+Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
+FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
+SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
+PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
+TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
+c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
++tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
+ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
+b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
+U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
+MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
+5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
+9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
+WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
+he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
+Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 6cbbbad822..e70ac1c57c 100755
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC6wb8GPxcWro4Q
-xo6MezjehJJill1xfInz0elv5cQcKJmbnUsjmi2MRR8rZ5/U6bR0iwSEhPGfBC/B
-kGIV9S2Le+9o4i4LX8Bp2BkriLltgm09JFaPUFRWdYdVUOw8dTdwvtHpTEUBQpAX
-hTeo5WWMxXq3bNKrCAD2/oakNUQ0abMYhdO/nQ1kaDJ3IdEiI84vbSJW2TwLLuYK
-oSkEgJeQE8fPhFqHCSTbCLZ8JvPRpNcTS3bt5c8PhdZQ4Ei7QFcwiin+w5sphjfm
-mR4M2JVDbP7Un4L78begLU5JvFD9nj6vpEQLxkjRHAsL8wgMrTdy+RV2PCTfm1R0
-dunSdt9FAgMBAAECggEAGzhB71citluauTc3b6JGF6ia7WOdGv1b3f2qWHTUsIX6
-XYP/f6DpIpiwglMIKLAnbRUWA3qc/OBPVZcFtM2XZc0ah97vdxjton+sq3uyCxQH
-d/Hj6995a2CV6QlyZR1why5Iyggjxps9BTCVfDhzJKFj0Xg6/FKeUWGnnidlWX4O
-f4wG9V63efViNhlP4PPErNYcYLHe2oZDv/x8d2GEDvm6n3NvZx74oHnGWvdnfRM6
-/f6XdG+pgzQypGA8fy92b03cbS+AE5R5aSIsU5tHOFAoraqRVadW7cIcXtJEAivh
-LqL9VaVF74kM8Gy22V62TW78q8LSMoxB77w4bxyfwQKBgQDsDFZW/W9PL4BGhBC9
-Pi+5JA0Pgp7f7gr0lYa28qgedMzspIW5HNi7iaaiy+SV04Z7kHCe68rtmQB0K6AP
-oTiof3+DDL5OvtKMGLZaoH6rZ9AbD41b4W3Pgg8FQ2XK0dTN/ahC8tEaTw4FbKZC
-vjz6QoNKgQSAuanYFCS+xBPCWwKBgQDKitTVfCFkWkvv7gp8PsN5zHrXeIJpgOqH
-X6gMVoJngxu3wmq4t2sqTCxK4MZgBENyolR64AnIg+Aic6VmJG4EfJyP7CBjD6wI
-fdEJKhxNrKy6qYo/HG1FdjYG9oIv3HW7dI16pfdxs9LwyRCK0ziAnapEBfRfZQUX
-SMkom8JW3wKBgQCtTj2R7s7rj4+Ztlrn5qF5SAvCyH9HH+mxO5tF9REUE2Nll0GK
-8K/7uQu8WQDCNCR30kutkqdSHNSldmY1M4R6yelf2VpcTGQfcgFoto9p33V+eMOr
-ou5RvUaz8ZDqAXdBqiwAw3Bc5ZAA0Y2cUTpJ782fROx+alJWECwOV72+IwKBgHXy
-Ksa3Jmrd+mKZ6Bk6I3MGFHLthmQR4oE6vw2QQxgsTTPRT3yJsypKeXCRPHQlh3F1
-/mQfmxLdWOQ3HBZDGJ4cQr+87Y9CTRgUzGndz+WbrGp22D6wOyG8GPItEtr0Mssa
-sFi/1TytTyVQsQVmwvyC0+gQ36G9nh1VEW9IZP9ZAoGBALafDYJGB/aZB0/Qb5m2
-vmmXzS5AoHLB3+5xHnee+eOrUjM0wm28FXXUc7YhTnRudONZiu6L+/OJG3z91eWZ
-vbU9NLWYnsrXsyNoRg6wTZriTupNGKuWJWHm4YwSVLPNVY4dfialkaUDKZWLfc71
-/Varc6WijcZQxhOkfNZx9LqV
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPnJUlRnk5PqOE
+F9i2JHCTk7q7tAlX1kXTEAiGF1QEgfdGwrTlUEb21CVrjwtlR+8RK4pebfKkVcDJ
++NlAXz2VeSnCHJjg5IpDPoeQtSxoZaMNaXfaKSLBlTafdyNuqoT20KmK/B8+38TI
+m4G5ogHE57+dlCMxXEQRGIwfXbt1O/aOtMlZ96Pig1H8B6n1kf5xQ7wnhoPDnFAO
+g5a7vKIsVF9U5JbusHjbFCzW3lgs87gxvkNk2lYCLojIiZtwbJYd5BvrgHPU0IQS
+CRyv1whN1M6+meqFXV83j9xBVSyLtskKse7N4AELikA1EUJ4CHAs1YtyjWalcY+1
+XHrgYEjXAgMBAAECggEBAMJd6hQXwm4hgpysZqs/ulWvvOb2Srj9VimfnRtMw8/k
+jUimCQ2W9pknTFFCfny3t83vYX++l6fa0L9GRr7Ja7KA2ONuOoJx9C+4XtrPg1/J
+p7lqwFZypKNvus/YjkeRRSJ9f/0qxWXrwSO+0tikH9vky7QPeFNB+ke3H5hN/K5n
+X9mohkvlasW8YCQCVjqFyLxwuVBSsrjr37LClDzyFiW3kkEoVAtedCrGpOA97l/O
+bcbtFvUpPKS/zfEZ1LnCdWj/XzJoLVFEnrplLPFr723DH4RbTni7cLmIk/5+uOKw
+12WxzhgPtCQN183FTsB45Ri+7wyGGQyrfs0b7mWVtIECgYEA+ubhEkOZnT2JARMX
+PhR3LGSa0MOoldZCdAEj9TQpiiogRE353GAqBrVWFF65GuAw0nXNjMTLSZENIYGd
+lWa27a5jtBr8W6Dv5sQmUjxbaazq0hVUIMk7Mu2+WYXqjtvE+dnMox7euDiXoV39
+ZjzJjQs0KqsVj2uXa3+uo5WKW+cCgYEA09SFF1m+clhgahwD7A0MUgglyGvYLO55
+nfkaX7EJyw3hBoM54cc+CDsX5zTkTnMLLEZiYKo9EhdjpkJmaqkY+wRztDpuGVTd
+SxRKd/o/LvgFwL+GTDrVAu2A4J1DkK4mznIyVc5sfzMJmjxHKVzgXj4rVYymTDUt
+Qd1HuFf8jZECgYEAnySMxEnuiMb8PJtAVdcjVBwn+pzwNMInem8ywJgqdQGNX+XZ
+w0eXwJOKmvcOEBb9wLCKBWzZyLrhikwtiRMSmqXPhfDL+s6U/FmUOPshvGC6vTBc
+IUOicgZMg3omsiCByzyzyQ+Ok2kJ/IeicBPEf9sIZrwHu+WxsLTXL9ltXicCgYBo
+09LJK3BDxdhwqkyGlC50qfOIq1XfZmRo+M1EbagbBFNHlckfIipgiF3b3SDecbAl
+yO8GRzjRqyF1NYbZYbUrA5j+p6u0fXrFnNT9aqm55KN0L1OWhcbEHCSbAzhccNJj
+d7/RFsY6bFdkLFBK99tQyBNJ0sC5Fde/sHG9mE0zAQKBgAqpAEyxo6ExkVrugpzd
+lnW9CLGMly59VPvEL+F7GdIDxjdPQbAfFfsf/jobBNfdQ5DUSWup/GVbuKsARazD
+oFMJGzAWCmjVv8RGsbR2zeR1BbrBwYbct/e659rc1a4DL4KbmPT9lTK9X3hTWmGr
+kgl71fN+ER1DNooL37zZ4ZIp
 -----END PRIVATE KEY-----

From 64f3324f6e6410976624c24573c47450ef0c4966 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Thu, 17 Jun 2021 10:31:40 +0300
Subject: [PATCH 075/137] edraak.dev cert

---
 nginx/ssl/chained.crt | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index ca1c1a68de..abaf4561fb 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,4 +1,34 @@
 -----BEGIN CERTIFICATE-----
+MIIFKjCCBBKgAwIBAgISBNN1XaUssNNisU0mLhoWzwUNMA0GCSqGSIb3DQEBCwUA
+MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
+EwJSMzAeFw0yMTA2MTYwODE3NTVaFw0yMTA5MTQwODE3NTRaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+c
+lSVGeTk+o4QX2LYkcJOTuru0CVfWRdMQCIYXVASB90bCtOVQRvbUJWuPC2VH7xEr
+il5t8qRVwMn42UBfPZV5KcIcmODkikM+h5C1LGhlow1pd9opIsGVNp93I26qhPbQ
+qYr8Hz7fxMibgbmiAcTnv52UIzFcRBEYjB9du3U79o60yVn3o+KDUfwHqfWR/nFD
+vCeGg8OcUA6Dlru8oixUX1Tklu6weNsULNbeWCzzuDG+Q2TaVgIuiMiJm3Bslh3k
+G+uAc9TQhBIJHK/XCE3Uzr6Z6oVdXzeP3EFVLIu2yQqx7s3gAQuKQDURQngIcCzV
+i3KNZqVxj7VceuBgSNcCAwEAAaOCAlMwggJPMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
+FgQUST4vu5iNXtybMVB+gPAa1lEm1xIwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
+by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
+IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
+CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
+cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYAlCC8
+Ho7VjWyIcx+CiyIsDdHaTV5sT5Q9YdtOL1hNosIAAAF6FBzlwwAABAMARzBFAiAV
+2wtpMRUPaIYVRXAN0pP5iyKGuqYY4Xvp3r0t3Vnk2QIhAIdCEZDaievjF6Utpcr9
+DAOhqzKIWSvk5ll0oRSgCy7xAHYAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdo
+mX4i8NcAAAF6FBzl6gAABAMARzBFAiEAgDZ0TlSS77nehnVpftccokU1EYVSWZeF
+6dGRNMx0aAwCID+bEbjqAUy0MiuhpLSaczlp0jld22XIStd53pL8247GMA0GCSqG
+SIb3DQEBCwUAA4IBAQB+Rnj6PFNo1LbcJkhB98ahjAO3Wp6G5Mg7mapwOI6/s1oH
+C9lr/YNQguyRky06+kK1dh4W7asnYsPc9ZfWyrAH0vLK7fyQvFjo+0J9++yaYvn8
+MhumKAD6MkYqQKr56XpbLaO5mOojaLisIrUyYlj3SOMySX20udIv0qYSfDnC9xt5
+e3uRZgClw5L1C4ynRWGLx9n1xqiszjFBXCyqgRfxxPSllbw1V/gBDbizL5bs0lCP
+zASaDMBT2e4PgFbapB4qXxpaVARIlEfsqUYny0gC7rxXfM/kNQbmunMtZYE+bcAa
+uCZ6BEjBThqP7wPpSYT9kFcmgpCoURtoJGUKc7Lt
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
 TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
 cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw

From 7e991a74a9461240ce0e709fe0eefa910cf0d853 Mon Sep 17 00:00:00 2001
From: Kyle McCormick <kmccormick@edx.org>
Date: Thu, 1 Apr 2021 13:53:54 +0300
Subject: [PATCH 076/137] core devstack fixes

---
 docker-compose-edraak-judge.yml   |   2 +-
 docker-compose-host-nfs.yml       |  29 -------
 docker-compose-state-manager.yml  |  13 +---
 docker-compose.yml                | 124 ++----------------------------
 docker-sync-marketing-site.yml    |   2 +-
 docker-sync.yml                   |   2 +-
 nginx/b2b.conf                    |  30 ++++++++
 nginx/{default.conf => core.conf} |  38 ++-------
 nginx/edx.conf                    |  19 +++++
 nginx/judge.conf                  |   8 ++
 provision-edraak-state-manager.sh |  22 ++++++
 provision-edraak.sh               |   3 +
 provision.sh                      |   2 +-
 repo.sh                           |  18 ++---
 14 files changed, 107 insertions(+), 205 deletions(-)
 create mode 100644 nginx/b2b.conf
 rename nginx/{default.conf => core.conf} (58%)
 create mode 100644 nginx/edx.conf
 create mode 100644 nginx/judge.conf
 create mode 100755 provision-edraak-state-manager.sh

diff --git a/docker-compose-edraak-judge.yml b/docker-compose-edraak-judge.yml
index 290a440263..f28edef92e 100644
--- a/docker-compose-edraak-judge.yml
+++ b/docker-compose-edraak-judge.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "2.1"
 services:
   edraak-judge-api:
     build:
diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
index f57237d11f..7fdb93bad5 100644
--- a/docker-compose-host-nfs.yml
+++ b/docker-compose-host-nfs.yml
@@ -1,29 +1,10 @@
 version: "2.1"
 
 services:
-#  credentials:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/credentials:/edx/app/credentials/credentials:cached
-#      - credentials_node_modules:/edx/app/credentials/credentials/node_modules
-#      - src-nfs:/edx/src:cached
-#  discovery:
-#      volumes:
-#      - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:cached
-#      - discovery_node_modules:/edx/app/discovery/discovery/node_modules
-#      - src-nfs:/edx/src:cached
-#  ecommerce:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/ecommerce:/edx/app/ecommerce/ecommerce:cached
-#      - ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
-#      - src-nfs:/edx/src:cached
   lms:
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
       - src-nfs:/edx/src
-#  edx_notes_api:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
-#      - src-nfs:/edx/src:cached
   studio:
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
@@ -35,21 +16,11 @@ services:
     volumes:
       - progs-nfs:/app
       - ~/.ssh/:/root/.ssh
-#  edraak_programs_gulp:
-#    volumes:
-#      - progs-nfs:/app
-#      - ~/.ssh/:/root/.ssh
   edraak_marketing:
     volumes:
       - marketing-nfs:/app
-#  edraak_marketing_gulp:
-#    volumes:
-#      - marketing-nfs:/app
 
 volumes:
-#  credentials_node_modules:
-#  discovery_node_modules:
-#  ecommerce_node_modules:
   edx-nfs:
     driver: local
     driver_opts:
diff --git a/docker-compose-state-manager.yml b/docker-compose-state-manager.yml
index 7b232a2ac1..dd18718ac8 100644
--- a/docker-compose-state-manager.yml
+++ b/docker-compose-state-manager.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "2.1"
 services:
   state-manager-api:
     build:
@@ -6,8 +6,6 @@ services:
       dockerfile: ${DEVSTACK_WORKSPACE}/state-manager/Dockerfile
     ports:
       - "6000:80"
-    env_file:
-      - ${DEVSTACK_WORKSPACE}/state-manager/.env
     container_name: edraak.devstack.state_manager
     command: bash entrypoint.sh
     depends_on:
@@ -43,14 +41,7 @@ services:
       - edraak_marketing
       - edraak_programs
       - state-manager-api
-    networks:
-      default:
-        aliases:
-          - www.edraak.dev
-          - courses.edraak.dev
-          - programs.edraak.dev
-          - edraak.dev
-          - states.edraak.dev
+
 volumes:
   state_manager_mysql_data:
     driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 2e1e3c3634..3d003ea0ff 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,16 +11,6 @@
 version: "2.1"
 
 services:
-  # Third-party services
-#  chrome:
-#    container_name: edx.devstack.chrome
-#    image: edxops/chrome:${OPENEDX_RELEASE:-latest}
-#    shm_size: 2g
-#    ports:
-#      - "15900:5900"
-#    volumes:  # for file uploads
-#      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
-#      - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
 
   elasticsearch:
     container_name: edx.devstack.elasticsearch
@@ -32,16 +22,6 @@ services:
       - elasticsearch_data:/usr/share/elasticsearch/data
       - elasticsearch_data:/usr/share/elasticsearch/logs
 
-#  firefox:
-#    container_name: edx.devstack.firefox
-#    image: edxops/firefox:${OPENEDX_RELEASE:-latest}
-#    shm_size: 2g
-#    ports:
-#      - "25900:5900"
-#    volumes:  # for file uploads
-#      - ../edx-e2e-tests/upload_files:/edx/app/e2e/edx-e2e-tests/upload_files
-#      - ../edx-platform/common/test/data:/edx/app/edxapp/edx-platform/common/test/data
-
   memcached:
     container_name: edx.devstack.memcached
     image: memcached:1.4.24
@@ -72,59 +52,7 @@ services:
     volumes:
       - mysql_data:/var/lib/mysql
 
-#  # edX services
-#  credentials:
-#    command: bash -c 'source /edx/app/credentials/credentials_env && while true; do python /edx/app/credentials/credentials/manage.py runserver 0.0.0.0:18150; sleep 2; done'
-#    container_name: edx.devstack.credentials
-#    depends_on:
-#      - mysql
-#      - memcached
-#    # Allows attachment to the credentials service using 'docker attach <containerID>'.
-#    stdin_open: true
-#    tty: true
-#    environment:
-#      CACHE_LOCATION: edx.devstack.memcached:12211
-#      DB_HOST: edx.devstack.mysql
-#      SOCIAL_AUTH_EDX_OIDC_URL_ROOT: http://edx.devstack.lms:18000/oauth2
-#      ENABLE_DJANGO_TOOLBAR: 1
-#    image: edxops/credentials:${OPENEDX_RELEASE:-latest}
-#    ports:
-#      - "18150:18150"
-
-#  discovery:
-#    command: bash -c 'source /edx/app/discovery/discovery_env && while true; do python /edx/app/discovery/discovery/manage.py runserver 0.0.0.0:18381; sleep 2; done'
-#    container_name: edx.devstack.discovery
-#    depends_on:
-#      - mysql
-#      - elasticsearch
-#      - memcached
-#    # Allows attachment to the discovery service using 'docker attach <containerID>'.
-#    stdin_open: true
-#    tty: true
-#    environment:
-#      TEST_ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
-#      ENABLE_DJANGO_TOOLBAR: 1
-#    image: edxops/discovery:${OPENEDX_RELEASE:-latest}
-#    ports:
-#      - "18381:18381"
-#    volumes:
-#      - discovery_assets:/edx/var/discovery/
-
-#  ecommerce:
-#    command: bash -c 'source /edx/app/ecommerce/ecommerce_env && while true; do python /edx/app/ecommerce/ecommerce/manage.py runserver 0.0.0.0:18130; sleep 2; done'
-#    container_name: edx.devstack.ecommerce
-#    depends_on:
-#      - mysql
-#      - memcached
-#    # Allows attachment to the ecommerce service using 'docker attach <containerID>'.
-#    stdin_open: true
-#    tty: true
-#    environment:
-#      ENABLE_DJANGO_TOOLBAR: 0
-#    image: edxops/ecommerce:${OPENEDX_RELEASE:-latest}
-#    ports:
-#      - "18130:18130"
-
+# edX
   lms:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done'
     container_name: edx.devstack.lms
@@ -152,26 +80,6 @@ services:
     volumes:
       - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
 
-#  edx_notes_api:
-#    command: bash -c 'source /edx/app/edx_notes_api/edx_notes_api_env && while true; do python /edx/app/edx_notes_api/edx_notes_api/manage.py runserver 0.0.0.0:18120 --settings notesserver.settings.devstack; sleep 2; done'
-#    container_name: edx.devstack.edx_notes_api
-#    depends_on:
-#      - devpi
-#      - elasticsearch
-#      - mysql
-#    image: edxops/notes:${OPENEDX_RELEASE:-latest}
-#    ports:
-#      - "18120:18120"
-#    environment:
-#      DB_ENGINE: "django.db.backends.mysql"
-#      DB_HOST: "edx.devstack.mysql"
-#      DB_NAME: "notes"
-#      DB_PASSWORD: "password"
-#      DB_PORT: "3306"
-#      DB_USER: "notes001"
-#      ENABLE_DJANGO_TOOLBAR: 1
-#      ELASTICSEARCH_URL: "http://edx.devstack.elasticsearch:9200"
-
   studio:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
     container_name: edx.devstack.studio
@@ -233,17 +141,6 @@ services:
       - mongo
       - memcached
 
-#  edraak_programs_gulp:
-#    image: eu.gcr.io/openedx-231314/edraak/progs
-#    environment:
-#      NODE_ENV: development
-#    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
-#    container_name: edraak.devstack.programs-gulp
-#    working_dir: /app
-#    depends_on:
-#      - mysql
-#      - memcached
-
   edraak_marketing:
     image: eu.gcr.io/openedx-231314/edraak/marketing
     environment:
@@ -257,24 +154,16 @@ services:
       - mysql
       - memcached
 
-#  edraak_marketing_gulp:
-#    image: eu.gcr.io/openedx-231314/edraak/marketing
-#    environment:
-#      NODE_ENV: development
-#    command: bash -c 'while true; do npx gulp watch; sleep 2; done'
-#    container_name: edraak.devstack.marketing-gulp
-#    working_dir: /app
-#    depends_on:
-#      - mysql
-#      - memcached
-
   edraak_dev_router:
     image: nginx
     container_name: edraak_dev_router
 #    logging:
 #      driver: none
     volumes:
-      - ./nginx:/etc/nginx/conf.d
+      - ./nginx/includes:/etc/nginx/conf.d/includes
+      - ./nginx/ssl:/etc/nginx/conf.d/ssl
+      - ./nginx/core.conf:/etc/nginx/conf.d/core.conf
+      - ./nginx/edx.conf:/etc/nginx/conf.d/edx.conf
     command: bash -c 'while true; do nginx -g "daemon off;"; sleep 2; done'
     ports:
       - "80:80"
@@ -292,10 +181,9 @@ services:
           - programs.edraak.dev
           - edraak.dev
           - judge.edraak.dev
-
+          - states.edraak.dev
 
 volumes:
-#  discovery_assets:
   edxapp_lms_assets:
   edxapp_studio_assets:
   elasticsearch_data:
diff --git a/docker-sync-marketing-site.yml b/docker-sync-marketing-site.yml
index 6d671f54a9..adc1cd261c 100644
--- a/docker-sync-marketing-site.yml
+++ b/docker-sync-marketing-site.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.1"
 
 options:
   compose-file-path:
diff --git a/docker-sync.yml b/docker-sync.yml
index 91744a451f..389f082c8a 100644
--- a/docker-sync.yml
+++ b/docker-sync.yml
@@ -1,4 +1,4 @@
-version: "2"
+version: "2.1"
 
 options:
   compose-file-path: 'docker-compose.yml'
diff --git a/nginx/b2b.conf b/nginx/b2b.conf
new file mode 100644
index 0000000000..023f623bec
--- /dev/null
+++ b/nginx/b2b.conf
@@ -0,0 +1,30 @@
+# Redirect any http reqeust to https
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server;
+	server_name _;
+	return 301 https://$host$request_uri;
+    client_max_body_size 100M;
+}
+
+# Top Level doamin to b2b
+server {
+    server_name edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        return 301 https://b2b.edraak.dev$request_uri;
+    }
+}
+
+
+# Progs
+server {
+    server_name b2b.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://edraak.devstack.programs:8800;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/nginx/default.conf b/nginx/core.conf
similarity index 58%
rename from nginx/default.conf
rename to nginx/core.conf
index ac22b1c527..a8a47b9c58 100644
--- a/nginx/default.conf
+++ b/nginx/core.conf
@@ -1,3 +1,4 @@
+# Redirect any http reqeust to https
 server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
@@ -6,6 +7,7 @@ server {
     client_max_body_size 100M;
 }
 
+# Top Level doamin to www
 server {
     server_name edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
@@ -15,24 +17,7 @@ server {
     }
 }
 
-server {
-    server_name judge.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-    location / {
-        proxy_pass http://edraak.devstack.judge;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
-
-server {
-    server_name states.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-    location / {
-        proxy_pass http://edraak.devstack.state_manager;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
-
+# Marketing
 server {
     server_name www.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
@@ -43,6 +28,7 @@ server {
     }
 }
 
+# Progs
 server {
     server_name programs.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
@@ -53,22 +39,12 @@ server {
     }
 }
 
+# state manager
 server {
-    server_name courses.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-
-    location / {
-        proxy_pass http://edx.devstack.lms:18000;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
-
-server {
-    server_name studio.edraak.dev;
+    server_name state.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
-
     location / {
-        proxy_pass http://edx.devstack.studio:18010;
+        proxy_pass http://edraak.devstack.state_manager;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/nginx/edx.conf b/nginx/edx.conf
new file mode 100644
index 0000000000..ea8695f3a6
--- /dev/null
+++ b/nginx/edx.conf
@@ -0,0 +1,19 @@
+server {
+    server_name courses.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://edx.devstack.lms:18000;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
+
+server {
+    server_name studio.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://edx.devstack.studio:18010;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/nginx/judge.conf b/nginx/judge.conf
new file mode 100644
index 0000000000..e2f8aa5013
--- /dev/null
+++ b/nginx/judge.conf
@@ -0,0 +1,8 @@
+server {
+    server_name judge.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+    location / {
+        proxy_pass http://edraak.devstack.judge;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/provision-edraak-state-manager.sh b/provision-edraak-state-manager.sh
new file mode 100755
index 0000000000..75b0b3b9d8
--- /dev/null
+++ b/provision-edraak-state-manager.sh
@@ -0,0 +1,22 @@
+set -e
+
+echo "** state-manager-api: Restarting **"
+docker-compose restart state-manager-api state-manager-mysql
+
+echo "Waiting for state-manager-mysql"
+until docker exec -i state-manager-mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
+do
+  printf "."
+  sleep 1
+done
+# In the event of a fresh MySQL container, wait a few seconds for the server to restart
+# This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
+sleep 10
+
+echo "** state-manager-api: Create/Upgrade DB **"
+docker-compose exec state-manager-api bash -c 'flask create-db'
+docker-compose exec state-manager-api bash -c 'flask db upgrade'
+
+
+echo "** state-manager-api: Restarting **"
+docker-compose restart state-manager-api
diff --git a/provision-edraak.sh b/provision-edraak.sh
index 713f541fd7..8f671c22ac 100755
--- a/provision-edraak.sh
+++ b/provision-edraak.sh
@@ -9,5 +9,8 @@ docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-edraak.sql
 echo "** Marketing **"
 ./provision-edraak-marketing.sh
 
+echo "** State Manager **"
+./provision-edraak-state-manager.sh
+
 echo "** Programs **"
 ./provision-edraak-programs.sh
diff --git a/provision.sh b/provision.sh
index 7488e90d02..1f22bf00fe 100755
--- a/provision.sh
+++ b/provision.sh
@@ -30,7 +30,7 @@ done
 
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
-sleep 20
+sleep 10
 
 echo -e "MySQL ready"
 
diff --git a/repo.sh b/repo.sh
index 87a16d599e..53b28501eb 100755
--- a/repo.sh
+++ b/repo.sh
@@ -18,25 +18,19 @@ else
 fi
 
 repos=(
-#    "https://github.com/Edraak/course-discovery.git"
-#    "https://github.com/Edraak/credentials.git"
     "https://github.com/Edraak/cs_comments_service.git"
-#    "https://github.com/Edraak/ecommerce.git"
-#    "https://github.com/Edraak/edx-e2e-tests.git"
-#    "https://github.com/Edraak/edx-notes-api.git"
     "https://github.com/Edraak/edraak-platform.git"
-#    "https://github.com/Edraak/xqueue.git"
-#    "https://github.com/Edraak/edx-analytics-pipeline.git"
     "git@github.com:Edraak/marketing-site.git"
     "git@github.com:Edraak/edraak-programs.git"
     "git@github.com:Edraak/edraak-2019-theme.git"
     "git@github.com:Edraak/shared-devstack-configs.git"
+    "git@github.com:Edraak/state-manager.git"
 )
 
 repo_alternative_directory=(
 	"https://github.com/Edraak/edraak-platform.git,edx-platform"
 	"git@github.com:Edraak/edraak-2019-theme.git,src/edraak-2019-theme"
-      "git@github.com:Edraak/shared-devstack-configs.git,src/edxapp-envs"
+  "git@github.com:Edraak/shared-devstack-configs.git,src/edxapp-envs"
 )
 
 private_repos=(
@@ -115,10 +109,10 @@ _clone ()
             else
                 git clone $repo $name
             fi
-            cd $name
-            branch=master
-            git checkout "$branch"
-            cd -
+#            cd $name
+#            branch=master
+#            git checkout "$branch"
+#            cd -
         fi
     done
     cd - &> /dev/null

From da00c7359ac6754a9eef4c11dbf91e7abaca7fbc Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Sun, 4 Apr 2021 10:20:20 +0300
Subject: [PATCH 077/137] rename services

---
 Makefile                          |  2 +-
 destroy.sh                        |  2 +-
 docker-compose-edraak-judge.yml   |  4 ++--
 docker-compose-host-nfs.yml       |  2 +-
 docker-compose-host.yml           | 32 ++-----------------------------
 docker-compose-state-manager.yml  |  4 ++--
 docker-compose-sync.yml           |  2 +-
 docker-compose.yml                |  4 ++--
 edraak.mk                         | 31 ++++++++++++++++--------------
 nginx/b2b.conf                    |  2 +-
 nginx/core.conf                   |  2 +-
 provision-edraak-programs.sh      | 22 ++++++++++-----------
 provision-edraak-state-manager.sh |  2 +-
 provision-edraak.sh               |  6 +++---
 provision.sh                      | 28 +++++++++++++--------------
 15 files changed, 60 insertions(+), 85 deletions(-)

diff --git a/Makefile b/Makefile
index 693f8c6e81..c67eafd155 100644
--- a/Makefile
+++ b/Makefile
@@ -96,7 +96,7 @@ dev.nfs.up.all: ## Bring up all services with host volumes, including watchers
 dev.nfs.provision: | check-memory dev.clone dev.provision.nfs.run stop ## Provision dev environment with all services stopped
 
 dev.provision.nfs.run: ## Provision all services with local mounted directories
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host-nfs.yml" ./provision.sh
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-state-manager.yml -f docker-compose-host-nfs.yml" ./provision.sh
 
 dev.up.watchers: | check-memory ## Bring up asset watcher containers
 	docker-compose -f docker-compose-watchers.yml up -d
diff --git a/destroy.sh b/destroy.sh
index a63dd00e76..aaf7d7bd14 100755
--- a/destroy.sh
+++ b/destroy.sh
@@ -5,5 +5,5 @@ set -e
 read -p "This will delete all data in your devstack. Would you like to proceed? [y/n] " -r
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
-    docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml down -v
+    docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-state-manager.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml down -v
 fi
diff --git a/docker-compose-edraak-judge.yml b/docker-compose-edraak-judge.yml
index f28edef92e..64fab54a11 100644
--- a/docker-compose-edraak-judge.yml
+++ b/docker-compose-edraak-judge.yml
@@ -34,7 +34,7 @@ services:
     expose:
       - "6379"
 
-  edraak_programs:
+  progs:
     depends_on:
       - mysql
       - mongo
@@ -46,7 +46,7 @@ services:
       - lms
       - studio
       - edraak_marketing
-      - edraak_programs
+      - progs
       - edraak-judge-api
     networks:
       default:
diff --git a/docker-compose-host-nfs.yml b/docker-compose-host-nfs.yml
index 7fdb93bad5..941601f01d 100644
--- a/docker-compose-host-nfs.yml
+++ b/docker-compose-host-nfs.yml
@@ -12,7 +12,7 @@ services:
   forum:
     volumes:
       - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-  edraak_programs:
+  progs:
     volumes:
       - progs-nfs:/app
       - ~/.ssh/:/root/.ssh
diff --git a/docker-compose-host.yml b/docker-compose-host.yml
index cd1a37d6ac..17fa90ef70 100644
--- a/docker-compose-host.yml
+++ b/docker-compose-host.yml
@@ -1,30 +1,11 @@
 version: "2.1"
 
 services:
-#  credentials:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/credentials:/edx/app/credentials/credentials:cached
-#      - credentials_node_modules:/edx/app/credentials/credentials/node_modules
-#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-#  discovery:
-#      volumes:
-#      - ${DEVSTACK_WORKSPACE}/course-discovery:/edx/app/discovery/discovery:cached
-#      - discovery_node_modules:/edx/app/discovery/discovery/node_modules
-#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-#  ecommerce:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/ecommerce:/edx/app/ecommerce/ecommerce:cached
-#      - ecommerce_node_modules:/edx/app/ecommerce/ecommerce/node_modules
-#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   lms:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-#  edx_notes_api:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/edx-notes-api:/edx/app/edx_notes_api/edx_notes_api:cached
-#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
   studio:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
@@ -33,23 +14,14 @@ services:
   forum:
     volumes:
       - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-  edraak_programs:
+  progs:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
       - ~/.ssh/:/root/.ssh
-#  edraak_programs_gulp:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
-#      - ~/.ssh/:/root/.ssh
+
   edraak_marketing:
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
-#  edraak_marketing_gulp:
-#    volumes:
-#      - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
 
 volumes:
-#  credentials_node_modules:
-#  discovery_node_modules:
-#  ecommerce_node_modules:
   edxapp_node_modules:
diff --git a/docker-compose-state-manager.yml b/docker-compose-state-manager.yml
index dd18718ac8..76adc583e2 100644
--- a/docker-compose-state-manager.yml
+++ b/docker-compose-state-manager.yml
@@ -27,7 +27,7 @@ services:
     volumes:
       - state_manager_mysql_data:/var/lib/mysql
 
-  edraak_programs:
+  progs:
     depends_on:
       - mysql
       - mongo
@@ -39,7 +39,7 @@ services:
       - lms
       - studio
       - edraak_marketing
-      - edraak_programs
+      - progs
       - state-manager-api
 
 volumes:
diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml
index 82c0b00be4..98ebc5a683 100644
--- a/docker-compose-sync.yml
+++ b/docker-compose-sync.yml
@@ -27,7 +27,7 @@ services:
   edraak_marketing_gulp:
     volumes:
       - edraak-marketing-sync:/app:nocopy
-  edraak_programs:
+  progs:
     volumes:
       - edraak-programs-sync:/app:nocopy
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 3d003ea0ff..a1d7fe0b82 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -126,7 +126,7 @@ services:
     volumes:
       - devpi_data:/data
 
-  edraak_programs:
+  progs:
     image: eu.gcr.io/openedx-231314/edraak/progs
     environment:
       PROGS_CFG: '/app/docker.json'
@@ -172,7 +172,7 @@ services:
       - lms
       - studio
       - edraak_marketing
-      - edraak_programs
+      - progs
     networks:
       default:
         aliases:
diff --git a/edraak.mk b/edraak.mk
index 194e7c1613..7e538709e6 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -2,7 +2,7 @@ edraak.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
 
 edraak.sync.provision: | dev.sync.daemon.start
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-sync.yml" ./provision-edraak.sh
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-state-manager.yml -f docker-compose-sync.yml" ./provision-edraak.sh
 
 edraak.build.all:
 	$(MAKE) edraak.build.programs
@@ -35,28 +35,28 @@ edraak.programs.help:
 	echo ""
 
 edraak.programs.migrate:
-	docker-compose exec edraak_programs python manage.py migrate --settings=edraakprograms.dev
+	docker-compose exec progs python manage.py migrate --settings=edraakprograms.dev
 
 edraak.programs.langs_push:
-	docker-compose exec edraak_programs python manage.py langs_push --settings=edraakprograms.dev
+	docker-compose exec progs python manage.py langs_push --settings=edraakprograms.dev
 
 edraak.programs.langs_pull:
-	docker-compose exec edraak_programs python manage.py langs_pull --settings=edraakprograms.dev
+	docker-compose exec progs python manage.py langs_pull --settings=edraakprograms.dev
 
 edraak.programs.install_pip:
-	docker-compose exec edraak_programs pip install -r requirements.txt
+	docker-compose exec progs pip install -r requirements.txt
 
 edraak.programs.install_npm:
-	docker-compose exec edraak_programs npm install
+	docker-compose exec progs npm install
 
 edraak.programs.copy_cache:
-	docker-compose exec edraak_programs cp -Rnv /cache/node_modules /cache/.compiled /app
+	docker-compose exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
 
 edraak.programs.dev:
-	docker-compose exec edraak_programs npm run dev
+	docker-compose exec progs npm run dev
 
 edraak.programs.watch:
-	docker exec -t edraak.devstack.programs bash -c 'while true; do npx gulp watch; sleep 2; done'
+	docker exec -t progs bash -c 'while true; do npx gulp watch; sleep 2; done'
 
 edraak.marketing.watch:
 	docker exec -t edraak.devstack.marketing bash -c 'while true; do npx gulp watch; sleep 2; done'
@@ -67,16 +67,16 @@ edraak.programs.install_all:
 	$(MAKE) edraak.programs.migrate
 
 edraak.programs.watch_js:
-	docker-compose exec edraak_programs npm run dev:watch
+	docker-compose exec progs npm run dev:watch
 
 edraak.programs.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-programs.sh
 
 edraak.programs.watch_css:
-	docker-compose exec edraak_programs npm run watch-scss
+	docker-compose exec progs npm run watch-scss
 
 edraak.programs.shell:
-	docker-compose exec edraak_programs bash
+	docker-compose exec progs bash
 
 edraak.marketing.shell:
 	docker-compose exec edraak_marketing bash
@@ -84,6 +84,9 @@ edraak.marketing.shell:
 edraak.marketing.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-marketing.sh
 
+edraak.states.provision:
+	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-state-manager.yml -f docker-compose-host.yml" ./provision-edraak-state-manager.sh
+
 marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
@@ -101,11 +104,11 @@ edraak.marketing.langs_push:
 
 
 programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
-	docker exec -t edraak.devstack.programs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
+	docker exec -t progs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 
 programs-fix-npm-install-permissions:
-	docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
+	docker-compose exec progs bash -c 'chown -R root ~/.npm'
 
 marketing_gulp-restart:
 	docker exec -t edraak.devstack.marketing-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
diff --git a/nginx/b2b.conf b/nginx/b2b.conf
index 023f623bec..b689015f2d 100644
--- a/nginx/b2b.conf
+++ b/nginx/b2b.conf
@@ -24,7 +24,7 @@ server {
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
-        proxy_pass http://edraak.devstack.programs:8800;
+        proxy_pass http://progs:8800;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/nginx/core.conf b/nginx/core.conf
index a8a47b9c58..4297e90d56 100644
--- a/nginx/core.conf
+++ b/nginx/core.conf
@@ -34,7 +34,7 @@ server {
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
-        proxy_pass http://edraak.devstack.programs:8800;
+        proxy_pass http://progs:8800;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index 8d6205008c..5fd32f6bc2 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -1,22 +1,22 @@
 set -e
 
 echo "** Progs: Restarting **"
-docker-compose restart edraak_programs
+docker-compose restart progs
 
 echo "** Progs: Copy cacheed files to code dir **"
-docker-compose exec edraak_programs bash -c 'cp -Rn /cache/* /app/.'
-docker-compose exec edraak_programs bash -c 'pip install -r requirements.txt'
+docker-compose exec progs bash -c 'cp -Rn /cache/* /app/.'
+docker-compose exec progs bash -c 'pip install -r requirements.txt'
 
 echo "** Progs: Migrating databases **"
-docker-compose exec edraak_programs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker-compose exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
 echo "** Progs: Compiling assets **"
-docker-compose exec edraak_programs bash -c 'npm rebuild node-sass'
-docker-compose exec edraak_programs bash -c 'chown -R root ~/.npm'
-docker-compose exec edraak_programs bash -c 'npm install'
-docker-compose exec edraak_programs bash -c 'bower install'
-docker-compose exec edraak_programs bash -c 'npm run dev'
-docker-compose exec edraak_programs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker-compose exec progs bash -c 'npm rebuild node-sass'
+docker-compose exec progs bash -c 'chown -R root ~/.npm'
+docker-compose exec progs bash -c 'npm install'
+docker-compose exec progs bash -c 'bower install'
+docker-compose exec progs bash -c 'npm run dev'
+docker-compose exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
 echo "** Progs: Restarting **"
-docker-compose restart edraak_programs
+docker-compose restart progs
diff --git a/provision-edraak-state-manager.sh b/provision-edraak-state-manager.sh
index 75b0b3b9d8..c923a84348 100755
--- a/provision-edraak-state-manager.sh
+++ b/provision-edraak-state-manager.sh
@@ -1,7 +1,7 @@
 set -e
 
 echo "** state-manager-api: Restarting **"
-docker-compose restart state-manager-api state-manager-mysql
+docker-compose $DOCKER_COMPOSE_FILES restart state-manager-mysql
 
 echo "Waiting for state-manager-mysql"
 until docker exec -i state-manager-mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
diff --git a/provision-edraak.sh b/provision-edraak.sh
index 8f671c22ac..99a33bc600 100755
--- a/provision-edraak.sh
+++ b/provision-edraak.sh
@@ -1,13 +1,13 @@
 set -e
 
 echo "** Bringing up **"
-docker-compose $DOCKER_COMPOSE_FILES up -d mysql edraak_programs edraak_marketing
+docker-compose $DOCKER_COMPOSE_FILES up -d mysql progs edraak_marketing
 
 echo "** Creating databases **"
 docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-edraak.sql
 
-echo "** Marketing **"
-./provision-edraak-marketing.sh
+#echo "** Marketing **"
+#./provision-edraak-marketing.sh
 
 echo "** State Manager **"
 ./provision-edraak-state-manager.sh
diff --git a/provision.sh b/provision.sh
index 1f22bf00fe..26b99f1e4e 100755
--- a/provision.sh
+++ b/provision.sh
@@ -21,24 +21,24 @@ NC='\033[0m' # No Color
 docker-compose up -d mysql mongo
 
 # Ensure the MySQL server is online and usable
-echo "Waiting for MySQL"
-until docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-do
-  printf "."
-  sleep 1
-done
+#echo "Waiting for MySQL"
+#until docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
+#do
+#  printf "."
+#  sleep 1
+#done
 
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
-sleep 10
+#sleep 10
 
-echo -e "MySQL ready"
-
-echo -e "${GREEN}Creating databases and users...${NC}"
-docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
-docker exec -i edx.devstack.mongo mongo < mongo-provision.js
-
-./provision-lms.sh
+#echo -e "MySQL ready"
+#
+#echo -e "${GREEN}Creating databases and users...${NC}"
+#docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
+#docker exec -i edx.devstack.mongo mongo < mongo-provision.js
+#
+#./provision-lms.sh
 
 # Nothing special needed for studio
 docker-compose $DOCKER_COMPOSE_FILES up -d studio

From 212d98adb9251e623c2cede913604afa363d5c6f Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Mon, 5 Apr 2021 14:53:16 +0300
Subject: [PATCH 078/137] Complete refactor, for core and b2b

---
 .env.b2b                                      |   18 +
 .env.core                                     |   19 +
 .env.example                                  |    5 -
 Makefile                                      |  127 +-
 Makefile.edx                                  |   34 -
 docker-compose-analytics-pipeline.yml         |  122 -
 ...host-nfs.yml => docker-compose-edx-nfs.yml |   19 -
 docker-compose-edx.yml                        |  111 +
 docker-compose-host.yml                       |   27 -
 docker-compose-judge-nfs.yml                  |   17 +
 ...raak-judge.yml => docker-compose-judge.yml |   27 +-
 docker-compose-marketing-site-host.yml        |    9 -
 docker-compose-marketing-site-sync.yml        |   10 -
 docker-compose-marketing-site.yml             |   30 -
 docker-compose-mktg-nfs.yml                   |    9 +
 docker-compose-mktg.yml                       |   41 +
 docker-compose-progs-nfs.yml                  |   15 +
 docker-compose-progs.yml                      |   47 +
 docker-compose-state-manager-nfs.yml          |   15 +
 docker-compose-state-manager.yml              |    7 +-
 docker-compose-sync.yml                       |   50 -
 docker-compose-themes.yml                     |   15 -
 docker-compose-watchers-nfs.yml               |   32 -
 docker-compose-watchers.yml                   |   34 -
 docker-compose-xqueue.yml                     |   20 -
 docker-compose.yml                            |  123 +-
 docker-sync-marketing-site.yml                |   36 -
 docker-sync.yml                               |   46 -
 ecommerce.sql                                 | 3891 -----------------
 edraak.mk                                     |    6 +-
 marketing.mk                                  |   24 -
 nginx/b2b-redirects.conf                      |   11 +
 nginx/b2b.conf                                |   30 -
 nginx/core-redirects.conf                     |   11 +
 nginx/core.conf                               |   50 -
 nginx/edx.conf                                |    4 +-
 nginx/includes/redirect2https.conf            |    8 +
 nginx/judge.conf                              |    2 +-
 nginx/mktg.conf                               |   10 +
 nginx/progs.conf                              |   11 +
 nginx/states.conf                             |   10 +
 provision-analytics-pipeline.sh               |   75 -
 provision-analytics-pipeline.sql              |    9 -
 provision-credentials.sh                      |   28 -
 provision-discovery.sh                        |   10 -
 provision-e2e.sh                              |   23 -
 provision-ecommerce.sh                        |    9 -
 provision-edraak-marketing.sh                 |   14 +-
 provision-edraak.sh                           |    2 +-
 provision-ida-user.sh                         |    9 -
 provision-ida.sh                              |   21 -
 provision-notes.sh                            |    8 -
 provision-xqueue.sh                           |   24 -
 provision-xqueue.sql                          |    4 -
 repo.sh                                       |    4 -
 55 files changed, 427 insertions(+), 4946 deletions(-)
 create mode 100644 .env.b2b
 create mode 100644 .env.core
 delete mode 100644 .env.example
 delete mode 100644 Makefile.edx
 delete mode 100644 docker-compose-analytics-pipeline.yml
 rename docker-compose-host-nfs.yml => docker-compose-edx-nfs.yml (57%)
 create mode 100644 docker-compose-edx.yml
 delete mode 100644 docker-compose-host.yml
 create mode 100644 docker-compose-judge-nfs.yml
 rename docker-compose-edraak-judge.yml => docker-compose-judge.yml (71%)
 delete mode 100644 docker-compose-marketing-site-host.yml
 delete mode 100644 docker-compose-marketing-site-sync.yml
 delete mode 100644 docker-compose-marketing-site.yml
 create mode 100644 docker-compose-mktg-nfs.yml
 create mode 100644 docker-compose-mktg.yml
 create mode 100644 docker-compose-progs-nfs.yml
 create mode 100644 docker-compose-progs.yml
 create mode 100644 docker-compose-state-manager-nfs.yml
 delete mode 100644 docker-compose-sync.yml
 delete mode 100644 docker-compose-themes.yml
 delete mode 100644 docker-compose-watchers-nfs.yml
 delete mode 100644 docker-compose-watchers.yml
 delete mode 100644 docker-compose-xqueue.yml
 delete mode 100644 docker-sync-marketing-site.yml
 delete mode 100644 docker-sync.yml
 delete mode 100644 ecommerce.sql
 delete mode 100644 marketing.mk
 create mode 100644 nginx/b2b-redirects.conf
 delete mode 100644 nginx/b2b.conf
 create mode 100644 nginx/core-redirects.conf
 delete mode 100644 nginx/core.conf
 create mode 100644 nginx/includes/redirect2https.conf
 create mode 100644 nginx/mktg.conf
 create mode 100644 nginx/progs.conf
 create mode 100644 nginx/states.conf
 delete mode 100755 provision-analytics-pipeline.sh
 delete mode 100644 provision-analytics-pipeline.sql
 delete mode 100755 provision-credentials.sh
 delete mode 100755 provision-discovery.sh
 delete mode 100755 provision-e2e.sh
 delete mode 100755 provision-ecommerce.sh
 delete mode 100755 provision-ida-user.sh
 delete mode 100755 provision-ida.sh
 delete mode 100755 provision-notes.sh
 delete mode 100755 provision-xqueue.sh
 delete mode 100644 provision-xqueue.sql

diff --git a/.env.b2b b/.env.b2b
new file mode 100644
index 0000000000..d1e50cd6ba
--- /dev/null
+++ b/.env.b2b
@@ -0,0 +1,18 @@
+PROGS_CFG=/app/docker-b2b.json
+
+#Check nginx folder, ssl and include all will be mounted, one of other files will be the entry point
+NGINX_ENTRY=b2b.conf
+
+# Change mount tyoe to "-nfs" to enable nfs, otherwise leave it empty
+MOUNT_TYPE=-nfs
+
+# Enable disable services
+ENABLE_PROGS=true
+ENABLE_MKTG=false
+ENABLE_EDX=false
+
+ENABLE_STATE_MANAGER=false
+ENABLE_JUDGE=false
+ENABLE_ANALYTICS=false
+ENABLE_AUTH=false
+ENABLE_NOTIFIER=false
diff --git a/.env.core b/.env.core
new file mode 100644
index 0000000000..0eb1cc71ab
--- /dev/null
+++ b/.env.core
@@ -0,0 +1,19 @@
+PROGS_CFG=/app/docker.json
+
+#Check nginx folder, ssl and include all will be mounted, one of other files will be the entry point
+NGINX_ENTRY=core.conf
+
+# Change mount tyoe to "-nfs" to enable nfs, otherwise leave it empty
+MOUNT_TYPE=-nfs
+
+# Enable disable services
+ENABLE_PROGS=true
+ENABLE_MKTG=true
+ENABLE_EDX=true
+
+ENABLE_STATE_MANAGER=true
+ENABLE_JUDGE=false
+ENABLE_ANALYTICS=false
+ENABLE_AUTH=false
+ENABLE_NOTIFIER=false
+
diff --git a/.env.example b/.env.example
deleted file mode 100644
index 22f9e2c809..0000000000
--- a/.env.example
+++ /dev/null
@@ -1,5 +0,0 @@
-# Change the value to the IP address of your machine/browser to enable debugging.
-XDEBUG_IP_ADDRESS=127.0.0.1
-# Provides local environment overrides if used.  See docker.settings.private.php.example for details
-DRUPAL_EXTRA_SETTINGS=/var/www/html/sites/default/docker.settings.private.php
-
diff --git a/Makefile b/Makefile
index c67eafd155..e0c26acba6 100644
--- a/Makefile
+++ b/Makefile
@@ -8,16 +8,48 @@
 .PHONY: requirements
 
 DEVSTACK_WORKSPACE ?= $(shell pwd)/..
+include .env
 
 OS := $(shell uname)
 
 COMPOSE_PROJECT_NAME=${EDRAAK_COMPOSE_PROJECT_NAME:-devstack}
+DOCKER_COMPOSE_FILES=-f docker-compose.yml
+
+ifeq (${ENABLE_PROGS}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-progs.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-progs${MOUNT_TYPE}.yml
+endif
+
+ifeq (${ENABLE_MKTG}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-mktg.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-mktg${MOUNT_TYPE}.yml
+endif
+
+ifeq (${ENABLE_EDX}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-edx.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-edx${MOUNT_TYPE}.yml
+endif
+
+ifeq (${ENABLE_STATE_MANAGER}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-state-manager.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-state-manager${MOUNT_TYPE}.yml
+endif
+
+ifeq (${ENABLE_JUDGE}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-judge.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-judge${MOUNT_TYPE}.yml
+endif
+
+export DOCKER_COMPOSE_FILES
 
 export DEVSTACK_WORKSPACE
 export COMPOSE_PROJECT_NAME
 
 include *.mk
 
+compose-files:
+	echo ${DOCKER_COMPOSE_FILES};
+
 # Generates a help message. Borrowed from https://github.com/pydanny/cookiecutter-djangopackage.
 help: ## Display this help message
 	@echo "Please use \`make <target>' where <target> is one of"
@@ -34,24 +66,17 @@ upgrade: ## Upgrade requirements with pip-tools
 		requirements/pip-tools.txt \
 		requirements/base.txt \
 
-dev.checkout: ## Check out "openedx-release/$OPENEDX_RELEASE" in each repo if set, "master" otherwise
+dev.checkout: ## Check out "masters" otherwise
 	./repo.sh checkout
 
 dev.clone: ## Clone service repos to the parent directory
 	./repo.sh clone
 
 dev.provision.run: ## Provision all services with local mounted directories
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision.sh
-
-dev.provision.sync.run: ## Provision all services with local mounted directories
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-sync.yml" ./provision.sh
+	./provision.sh
 
 dev.provision: | check-memory dev.clone dev.provision.run stop ## Provision dev environment with all services stopped
 
-dev.provision.xqueue: | check-memory dev.provision.xqueue.run stop stop.xqueue
-
-dev.provision.xqueue.run:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-xqueue.yml" ./provision-xqueue.sh
 
 dev.reset: | down dev.repo.reset pull dev.up static update-db ## Attempts to reset the local devstack to a the master working state
 
@@ -72,52 +97,7 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 	@make studio-restart
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-state-manager.yml up -d
-
-dev.judge.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-edraak-judge.yml up -d
-
-dev.nfs.setup:  ## set's up an nfs server on the /Users folder, allowing nfs mounting on docker
-	./setup_native_nfs_docker_osx.sh
-
-dev.nfs.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-state-manager.yml up -d
-	@# Comment out this next line if you want to save some time and don't care about catalog programs
-	#./programs/provision.sh cache >/dev/null
-
-dev.nfs.judge.up: | check-memory ## Bring up all services with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-edraak-judge.yml up -d
-	@# Comment out this next line if you want to save some time and don't care about catalog programs
-	#./programs/provision.sh cache >/dev/null
-
-dev.nfs.up.all: ## Bring up all services with host volumes, including watchers
-	docker-compose -f docker-compose.yml -f docker-compose-host-nfs.yml -f docker-compose-watchers-nfs.yml -f docker-compose-state-manager.yml up -d
-
-dev.nfs.provision: | check-memory dev.clone dev.provision.nfs.run stop ## Provision dev environment with all services stopped
-
-dev.provision.nfs.run: ## Provision all services with local mounted directories
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-state-manager.yml -f docker-compose-host-nfs.yml" ./provision.sh
-
-dev.up.watchers: | check-memory ## Bring up asset watcher containers
-	docker-compose -f docker-compose-watchers.yml up -d
-
-dev.up.xqueue: | check-memory ## Bring up xqueue, assumes you already have lms running
-	docker-compose -f docker-compose.yml -f  docker-compose-xqueue.yml -f docker-compose-host.yml up -d
-
-dev.up.all: | dev.up dev.up.watchers ## Bring up all services with host volumes, including watchers
-
-dev.sync.daemon.start: ## Start the docker-sycn daemon
-	docker-sync start
-
-dev.sync.provision: | dev.sync.daemon.start dev.provision ## Provision with docker-sync enabled
-
-dev.sync.requirements: ## Install requirements
-	gem install docker-sync
-
-dev.sync.up: dev.sync.daemon.start ## Bring up all services with docker-sync enabled
-	docker-compose -f docker-compose.yml -f docker-compose-sync.yml up -d
-	@# Comment out this next line if you want to save some time and don't care about catalog programs
-	#./programs/provision.sh cache >/dev/null
+	docker-compose ${DOCKER_COMPOSE_FILES} up -d
 
 edraak.dev.up.hacks:
 	@# Start: Edraak hacks
@@ -132,54 +112,29 @@ edraak.dev.up.hacks:
 	@make studio-restart
 	@# End: Edraak hacks
 
-provision: | dev.provision ## This command will be deprecated in a future release, use dev.provision
-	echo "\033[0;31mThis command will be deprecated in a future release, use dev.provision\033[0m"
+provision: | dev.provision
 
 stop: ## Stop all services
 	(test -d .docker-sync && docker-sync stop) || true ## Ignore failure here
-	docker-compose -f docker-compose.yml -f docker-compose-state-manager.yml stop
-
-stop.state_manager: ## Stop state-manager
-	docker-compose -f docker-compose-state-manager.yml stop
-
-stop.watchers: ## Stop asset watchers
-	docker-compose -f docker-compose-watchers.yml stop
-
-stop.judge: ## Stop edraak judge
-	docker-compose -f docker-compose.yml -f docker-compose-edraak-judge.yml stop
-
-stop.all: | stop.analytics_pipeline stop stop.watchers stop.judge ## Stop all containers, including asset watchers
-
-stop.xqueue:
-	docker-compose -f docker-compose-xqueue.yml stop
+	docker-compose ${DOCKER_COMPOSE_FILES} stop
 
 down: ## Remove all service containers and networks
-	(test -d .docker-sync && docker-sync clean) || true ## Ignore failure here
-	docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-xqueue.yml -f docker-compose-analytics-pipeline.yml down
+	docker-compose ${DOCKER_COMPOSE_FILES} down
 
 destroy: ## Remove all devstack-related containers, networks, and volumes
 	./destroy.sh
 
 logs: ## View logs from containers running in detached mode
-	docker-compose -f docker-compose.yml -f docker-compose-edraak-judge.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-state-manager.yml logs -f --tail 0
+	docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail 10
 
 %-logs: ## View the logs of the specified service container
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-watchers.yml -f docker-compose-state-manager.yml logs -f --tail=500 $*
-
-xqueue-logs: ## View logs from containers running in detached mode
-	docker-compose -f docker-compose-xqueue.yml logs -f xqueue
-
-xqueue_consumer-logs: ## View logs from containers running in detached mode
-	docker-compose -f docker-compose-xqueue.yml logs -f xqueue_consumer
+	docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail=500 $*
 
 pull:
 	docker-compose pull --parallel
 
-pull.xqueue: ## Update XQueue Docker images
-	docker-compose -f docker-compose-xqueue.yml pull --parallel
-
 validate: ## Validate the devstack configuration
-	docker-compose config
+	docker-compose ${DOCKER_COMPOSE_FILES} config
 
 backup: ## Write all data volumes to the host.
 	docker run --rm --volumes-from edx.devstack.mysql -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql.tar.gz /var/lib/mysql
diff --git a/Makefile.edx b/Makefile.edx
deleted file mode 100644
index fd9f8ac83d..0000000000
--- a/Makefile.edx
+++ /dev/null
@@ -1,34 +0,0 @@
-########################################################################################################################
-#
-# edX-specific Makefile
-#   - Contains edX-only targets used to access/use private GitHub repos
-#
-# To run these targets, use (for example):
-#
-#   > make -f Makefile.edx dev.up.e2e_wl_tests
-#
-########################################################################################################################
-include Makefile
-
-dev.clone_whitelabel: ## Clone edx-themes repo to the parent directory
-	./repo.sh whitelabel
-
-dev.up.e2e_wl_tests: | check-memory dev.clone_whitelabel ## Bring up all services with edx-themes repo mounted for whitelabel tests.
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-themes.yml -f ${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_hostnames.yml up -d
-
-dev.provision.whitelabel:
-	${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/devstack_provision_wl.sh
-
-## Run the whitelabel tests against the service containers.
-# The containers must be started with the 'dev.up.e2e_wl_tests' target.
-# AND the test must be setup using the 'dev.provision.whitelabel' target.
-whitelabel-tests:
-	docker run -d --name=devstack.whitelabel --network=devstack_default -v ${DEVSTACK_WORKSPACE}/edx-e2e-tests:/edx-e2e-tests -v ${DEVSTACK_WORKSPACE}/edx-platform:/edx-e2e-tests/lib/edx-platform --env-file ${DEVSTACK_WORKSPACE}/edx-e2e-tests/devstack_env edxops/e2e
-	docker cp ${DEVSTACK_WORKSPACE}/edx-themes/edx-platform/run_whitelabel_tests.sh devstack.whitelabel:/tmp/run_whitelabel_tests.sh
-	docker exec -t devstack.whitelabel env TEST_ENV=devstack TERM=$(TERM) bash /tmp/run_whitelabel_tests.sh
-
-whitelabel-cleanup:
-	docker rm --force devstack.whitelabel
-
-whitelabel-shell: ## Start a whitelabel test shell session
-	docker exec -it devstack.whitelabel env TERM=$(TERM) bash
diff --git a/docker-compose-analytics-pipeline.yml b/docker-compose-analytics-pipeline.yml
deleted file mode 100644
index eef6b6fa24..0000000000
--- a/docker-compose-analytics-pipeline.yml
+++ /dev/null
@@ -1,122 +0,0 @@
-version: "2.1"
-
-services:
-  namenode:
-    image: edxops/analytics_pipeline_hadoop_namenode:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline.namenode
-    hostname: namenode
-    environment:
-      - CLUSTER_NAME=devstack
-    ports:
-      - 127.0.0.1:50070:50070
-    command: ["/run.sh"]
-    volumes:
-      - namenode_data:/hadoop/dfs/name
-
-  datanode:
-    image: edxops/analytics_pipeline_hadoop_datanode:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline.datanode
-    hostname: datanode
-    environment:
-      CORE_CONF_fs_defaultFS: "hdfs://namenode:8020"
-    depends_on:
-      - namenode
-    ports:
-      - 127.0.0.1:50075:50075
-    command: ["/run.sh"]
-    volumes:
-      - datanode_data:/hadoop/dfs/data
-
-  resourcemanager:
-    image: edxops/analytics_pipeline_hadoop_resourcemanager:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline.resourcemanager
-    hostname: resourcemanager
-    environment:
-      CORE_CONF_fs_defaultFS: "hdfs://namenode:8020"
-      YARN_CONF_yarn_log___aggregation___enable: 'true'
-      YARN_CONF_yarn_nodemanager_aux___services: mapreduce_shuffle
-      YARN_CONF_yarn_nodemanager_aux___services_mapreduce_shuffle_class: 'org.apache.hadoop.mapred.ShuffleHandler'
-      MAPRED_CONF_mapreduce_framework_name: yarn
-    depends_on:
-      - namenode
-      - datanode
-    ports:
-      - 127.0.0.1:8088:8088      # resource manager web ui
-    command: ["/run.sh"]
-
-  nodemanager:
-    image: edxops/analytics_pipeline_hadoop_nodemanager:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline.nodemanager
-    hostname: nodemanager
-    environment:
-      CORE_CONF_fs_defaultFS: "hdfs://namenode:8020"
-      YARN_CONF_yarn_resourcemanager_hostname: resourcemanager
-      YARN_CONF_yarn_log___aggregation___enable: 'true'
-      YARN_CONF_yarn_nodemanager_aux___services: mapreduce_shuffle
-      YARN_CONF_yarn_nodemanager_aux___services_mapreduce_shuffle_class: 'org.apache.hadoop.mapred.ShuffleHandler'
-      YARN_CONF_yarn_nodemanager_vmem___check___enabled: 'false'
-      MAPRED_CONF_mapreduce_framework_name: yarn
-    depends_on:
-      - resourcemanager
-      - namenode
-      - datanode
-    ports:
-      - 127.0.0.1:8042:8042      # node manager web ui
-      - 127.0.0.1:19888:19888    # node manager job history server ui
-    command: ["/run.sh"]
-
-  sparkmaster:
-    image: edxops/analytics_pipeline_spark_master:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline.sparkmaster
-    hostname: sparkmaster
-    ports:
-      - 127.0.0.1:8080:8080
-      - 127.0.0.1:7077:7077       # spark master port
-      - 127.0.0.1:6066:6066       # spark api
-      - 127.0.0.1:18080:18080     # spark history server
-
-  sparkworker:
-    image: edxops/analytics_pipeline_spark_worker:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline.sparkworker
-    hostname: sparkworker
-    depends_on:
-      - sparkmaster
-    environment:
-      - SPARK_MASTER=spark://sparkmaster:7077
-    ports:
-      - 127.0.0.1:8081:8081       # spark worker UI
-
-  vertica:
-    image: sumitchawla/vertica:latest
-    container_name: edx.devstack.analytics_pipeline.vertica
-    volumes:
-      - vertica_data:/home/dbadmin/docker
-
-  analyticspipeline:
-    image: edxops/analytics_pipeline:${OPENEDX_RELEASE:-latest}
-    container_name: edx.devstack.analytics_pipeline
-    hostname: analyticspipeline
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-analytics-pipeline:/edx/app/analytics_pipeline/analytics_pipeline
-    command: ["/etc/bootstrap.sh", "-d"]
-    depends_on:
-      - mysql
-      - namenode
-      - resourcemanager
-      - nodemanager
-      - datanode
-      - sparkworker
-      - elasticsearch
-      - vertica
-    ports:
-      - 127.0.0.1:4040:4040     # spark web UI
-    environment:
-      HADOOP_COMMON_RESOURCE_MANAGER_HOST: "resourcemanager"
-      HADOOP_DEFAULT_FS: "hdfs://namenode:8020"
-      SPARK_MASTER_HOST: "spark://sparkmaster:7077"
-      SPARK_MASTER_PORT: "7077"
-
-volumes:
-  namenode_data:
-  datanode_data:
-  vertica_data:
diff --git a/docker-compose-host-nfs.yml b/docker-compose-edx-nfs.yml
similarity index 57%
rename from docker-compose-host-nfs.yml
rename to docker-compose-edx-nfs.yml
index 941601f01d..3057699651 100644
--- a/docker-compose-host-nfs.yml
+++ b/docker-compose-edx-nfs.yml
@@ -12,13 +12,6 @@ services:
   forum:
     volumes:
       - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-  progs:
-    volumes:
-      - progs-nfs:/app
-      - ~/.ssh/:/root/.ssh
-  edraak_marketing:
-    volumes:
-      - marketing-nfs:/app
 
 volumes:
   edx-nfs:
@@ -33,15 +26,3 @@ volumes:
       type: nfs
       o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
       device: :${DEVSTACK_WORKSPACE}/src
-  marketing-nfs:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
-      device: :${DEVSTACK_WORKSPACE}/marketing-site
-  progs-nfs:
-    driver: local
-    driver_opts:
-      type: nfs
-      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
-      device: :${DEVSTACK_WORKSPACE}/edraak-programs
diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
new file mode 100644
index 0000000000..8b093600b6
--- /dev/null
+++ b/docker-compose-edx.yml
@@ -0,0 +1,111 @@
+# This file contains all of the services for an edX installation. See https://docs.docker.com/compose/compose-file/
+# for the appropriate syntax and definitions.
+#
+# Housekeeping Rules:
+# - Group third-party and edX services separately
+# - Alphabetize services in the groups
+# - Alphabetize individual configuration options for each service
+# - Every service's container name should be prefixed with "edx.devstack." to avoid conflicts with other containers
+#   that might be running for the same service.
+
+version: "2.1"
+
+services:
+
+# edX
+  lms:
+    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done'
+    container_name: edx.devstack.lms
+    depends_on:
+      - devpi
+      - mysql
+      - memcached
+      - mongo
+    # Allows attachment to the LMS service using 'docker attach <containerID>'.
+    stdin_open: true
+    tty: true
+    environment:
+      BOK_CHOY_HOSTNAME: edx.devstack.lms
+      BOK_CHOY_LMS_PORT: 18003
+      BOK_CHOY_CMS_PORT: 18031
+      EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
+      NO_PYTHON_UNINSTALL: 1
+      NO_PREREQ_INSTALL: 1
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
+    ports:
+      - "18000:18000"
+      - "19876:19876" # JS test debugging
+      - "18003:18003"
+      - "18031:18031"
+    volumes:
+      - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
+      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
+      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+
+  studio:
+    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
+    container_name: edx.devstack.studio
+    depends_on:
+      - devpi
+      - mysql
+      - memcached
+      - mongo
+    # Allows attachment to the Studio service using 'docker attach <containerID>'.
+    stdin_open: true
+    tty: true
+    environment:
+      BOK_CHOY_HOSTNAME: edx.devstack.studio
+      BOK_CHOY_LMS_PORT: 18103
+      BOK_CHOY_CMS_PORT: 18131
+      EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
+      NO_PYTHON_UNINSTALL: 1
+      NO_PREREQ_INSTALL: 1
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
+    ports:
+      - "18010:18010"
+      - "19877:19877" # JS test debugging
+      - "18103:18103"
+      - "18131:18131"
+    volumes:
+      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
+      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
+      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+
+  forum:
+    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
+    container_name: edx.devstack.forum
+    depends_on:
+      - mongo
+      - memcached
+      - elasticsearch
+    image: edxops/forum:${OPENEDX_RELEASE:-latest}
+    ports:
+      - "44567:4567"
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
+
+  devpi:
+    container_name: edx.devstack.devpi
+    image: edxops/devpi:${OPENEDX_RELEASE:-latest}
+    ports:
+      - "3141:3141"
+    volumes:
+      - devpi_data:/data
+
+
+  router:
+    depends_on:
+      - lms
+      - studio
+      - mktg
+      - progs
+    volumes:
+      - ./nginx/edx.conf:/etc/nginx/conf.d/edx.conf
+
+
+volumes:
+  edxapp_lms_assets:
+  edxapp_studio_assets:
+  edxapp_node_modules:
diff --git a/docker-compose-host.yml b/docker-compose-host.yml
deleted file mode 100644
index 17fa90ef70..0000000000
--- a/docker-compose-host.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-version: "2.1"
-
-services:
-  lms:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
-      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  studio:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
-      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-  forum:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-  progs:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
-      - ~/.ssh/:/root/.ssh
-
-  edraak_marketing:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/marketing-site:/app:cached
-
-volumes:
-  edxapp_node_modules:
diff --git a/docker-compose-judge-nfs.yml b/docker-compose-judge-nfs.yml
new file mode 100644
index 0000000000..8807082b79
--- /dev/null
+++ b/docker-compose-judge-nfs.yml
@@ -0,0 +1,17 @@
+version: "2.1"
+services:
+  judge-api:
+    volumes:
+      - judge-nfs:/app
+
+  judge-worker:
+    volumes:
+      - judge-nfs:/app
+
+volumes:
+  judge-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/edraak-judge
diff --git a/docker-compose-edraak-judge.yml b/docker-compose-judge.yml
similarity index 71%
rename from docker-compose-edraak-judge.yml
rename to docker-compose-judge.yml
index 64fab54a11..6e33f4cb21 100644
--- a/docker-compose-edraak-judge.yml
+++ b/docker-compose-judge.yml
@@ -1,6 +1,6 @@
 version: "2.1"
 services:
-  edraak-judge-api:
+  judge-api:
     build:
       context: ${DEVSTACK_WORKSPACE}/edraak-judge/.
       dockerfile: ${DEVSTACK_WORKSPACE}/edraak-judge/Dockerfile
@@ -15,7 +15,7 @@ services:
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-judge:/app
 
-  edraak-judge-worker:
+  judge-worker:
     build:
       context: ${DEVSTACK_WORKSPACE}/edraak-judge/.
       dockerfile: ${DEVSTACK_WORKSPACE}/edraak-judge/Dockerfile
@@ -36,23 +36,8 @@ services:
 
   progs:
     depends_on:
-      - mysql
-      - mongo
-      - memcached
-      - edraak-judge-api
+      - judge-api
 
-  edraak_dev_router:
-    depends_on:
-      - lms
-      - studio
-      - edraak_marketing
-      - progs
-      - edraak-judge-api
-    networks:
-      default:
-        aliases:
-          - www.edraak.dev
-          - courses.edraak.dev
-          - programs.edraak.dev
-          - edraak.dev
-          - judge.edraak.dev
+  router:
+    volumes:
+      - ./nginx/judge.conf:/etc/nginx/conf.d/judge.conf
diff --git a/docker-compose-marketing-site-host.yml b/docker-compose-marketing-site-host.yml
deleted file mode 100644
index d7e664eaed..0000000000
--- a/docker-compose-marketing-site-host.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "2.1"
-
-services:
-  marketing:
-    volumes:
-      # NOTE: A private key is needed to sync the files and database from production.
-      - ~/.ssh/id_rsa_acquia:/root/.ssh/id_rsa_acquia
-      - ../edx-mktg:/edx/app/edx-mktg/edx-mktg
-      - ../edx-mktg/docroot:/var/www/html
diff --git a/docker-compose-marketing-site-sync.yml b/docker-compose-marketing-site-sync.yml
deleted file mode 100644
index 156375e4c6..0000000000
--- a/docker-compose-marketing-site-sync.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "2.1"
-
-services:
-  marketing:
-    volumes:
-      - marketing-sync:/var/www/html:nocopy
-
-volumes:
-  marketing-sync:
-    external: true
diff --git a/docker-compose-marketing-site.yml b/docker-compose-marketing-site.yml
deleted file mode 100644
index 4bd2693b7a..0000000000
--- a/docker-compose-marketing-site.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: "2.1"
-
-services:
-  lms:
-    environment:
-      - ENABLE_MARKETING_SITE=1
-      - MARKETING_SITE_ROOT="http://localhost:8080"
-
-  marketing:
-    container_name: edx.devstack.marketing
-    depends_on:
-      - mysql
-      - memcached
-    environment:
-      - DB_HOST=edx.devstack.mysql
-      - DB_NAME=edxmktg
-      - DB_PASSWORD=password
-      - DB_USER=edxmktg001
-      - LMS_HOST=http://localhost:18000
-      - MEMCACHE_HOST=edx.devstack.memcached
-      # Used by PhpStorm to attach the debug connection
-      - PHP_IDE_CONFIG=serverName=edx.docker
-      # For the settings below, see .env.example to provide values (default is after the ':-')
-      # Provides local environment overrides.  (PRIVATE_SETTINGS set in .env file)
-      - DRUPAL_EXTRA_SETTINGS=${DRUPAL_EXTRA_SETTINGS:-/var/www/html/sites/default/docker.settings.php}
-      # IP address of your machine to enable debugging (IP_ADDRESS set in .env file)
-      - XDEBUG_CONFIG=remote_host=${XDEBUG_IP_ADDRESS:-127.0.0.1}
-    image: edxops/edx-mktg:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "8080:80"
diff --git a/docker-compose-mktg-nfs.yml b/docker-compose-mktg-nfs.yml
new file mode 100644
index 0000000000..0923b2e83e
--- /dev/null
+++ b/docker-compose-mktg-nfs.yml
@@ -0,0 +1,9 @@
+version: "2.1"
+
+volumes:
+  mktg-code:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/marketing-site
diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml
new file mode 100644
index 0000000000..61e3c43e76
--- /dev/null
+++ b/docker-compose-mktg.yml
@@ -0,0 +1,41 @@
+# This file contains all of the services for an edraak installation. See https://docs.docker.com/compose/compose-file/
+# for the appropriate syntax and definitions.
+#
+# Housekeeping Rules:
+# - Group third-party and edraak services separately
+# - Alphabetize services in the groups
+# - Alphabetize individual configuration options for each service
+# - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
+#   that might be running for the same service.
+
+version: "2.1"
+
+services:
+
+  mktg:
+    image: eu.gcr.io/openedx-231314/edraak/marketing
+    environment:
+      NODE_ENV: development
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done'
+    container_name: edraak.devstack.marketing
+    working_dir: /app
+    ports:
+      - "18500:8500"
+    depends_on:
+      - mysql
+      - memcached
+    volumes:
+      - mktg-code:/app
+
+  router:
+    volumes:
+      - ./nginx/mktg.conf:/etc/nginx/conf.d/mktg.conf
+      - ./nginx/core-redirects.conf:/etc/nginx/conf.d/redirects.conf
+
+volumes:
+  mktg-code:
+    driver: local
+    driver_opts:
+      device: :${DEVSTACK_WORKSPACE}/marketing-site
+
+
diff --git a/docker-compose-progs-nfs.yml b/docker-compose-progs-nfs.yml
new file mode 100644
index 0000000000..f0deea8d56
--- /dev/null
+++ b/docker-compose-progs-nfs.yml
@@ -0,0 +1,15 @@
+version: "2.1"
+
+services:
+  progs:
+    volumes:
+      - progs-nfs:/app
+      - ~/.ssh/:/root/.ssh
+
+volumes:
+  progs-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/edraak-programs
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
new file mode 100644
index 0000000000..8fe67bcd86
--- /dev/null
+++ b/docker-compose-progs.yml
@@ -0,0 +1,47 @@
+# This file contains all of the services for an edraak installation. See https://docs.docker.com/compose/compose-file/
+# for the appropriate syntax and definitions.
+#
+# Housekeeping Rules:
+# - Group third-party and edraak services separately
+# - Alphabetize services in the groups
+# - Alphabetize individual configuration options for each service
+# - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
+#   that might be running for the same service.
+
+version: "2.1"
+
+services:
+
+  progs:
+    image: eu.gcr.io/openedx-231314/edraak/progs
+    environment:
+      PROGS_CFG: ${PROGS_CFG:-/app/docker.json}
+      NODE_ENV: development
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
+    container_name: edraak.devstack.programs
+    working_dir: /app
+    ports:
+      - "18800:8800"
+    depends_on:
+      - mysql
+      - mongo
+      - memcached
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
+      - ~/.ssh/:/root/.ssh
+
+  router:
+    depends_on:
+      - progs
+    volumes:
+      - ./nginx/progs.conf:/etc/nginx/conf.d/progs.conf
+      - ./nginx/b2b-redirects.conf:/etc/nginx/conf.d/redirects.conf
+
+
+volumes:
+  edxapp_lms_assets:
+  edxapp_studio_assets:
+  elasticsearch_data:
+  mongo_data:
+  mysql_data:
+  devpi_data:
diff --git a/docker-compose-state-manager-nfs.yml b/docker-compose-state-manager-nfs.yml
new file mode 100644
index 0000000000..f26da45232
--- /dev/null
+++ b/docker-compose-state-manager-nfs.yml
@@ -0,0 +1,15 @@
+version: "2.1"
+
+services:
+  state-manager-api:
+    volumes:
+      - state-manager-nfs:/app
+      - ~/.ssh/:/root/.ssh
+
+volumes:
+  state-manager-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/state-manager
diff --git a/docker-compose-state-manager.yml b/docker-compose-state-manager.yml
index 76adc583e2..0f071e31cd 100644
--- a/docker-compose-state-manager.yml
+++ b/docker-compose-state-manager.yml
@@ -34,13 +34,16 @@ services:
       - memcached
       - state-manager-api
 
-  edraak_dev_router:
+  router:
     depends_on:
       - lms
       - studio
-      - edraak_marketing
+      - mktg
       - progs
       - state-manager-api
+    volumes:
+      - ./nginx/states.conf:/etc/nginx/conf.d/states.conf
+
 
 volumes:
   state_manager_mysql_data:
diff --git a/docker-compose-sync.yml b/docker-compose-sync.yml
deleted file mode 100644
index 98ebc5a683..0000000000
--- a/docker-compose-sync.yml
+++ /dev/null
@@ -1,50 +0,0 @@
-version: "2.1"
-
-services:
-#  credentials:
-#    volumes:
-#      - credentials-sync:/edx/app/credentials/credentials:nocopy
-#  discovery:
-#    volumes:
-#      - discovery-sync:/edx/app/discovery/discovery:nocopy
-#  ecommerce:
-#    volumes:
-#      - ecommerce-sync:/edx/app/ecommerce/ecommerce:nocopy
-  lms:
-    volumes:
-      - edxapp-sync:/edx/app/edxapp/edx-platform:nocopy
-      - src-sync:/edx/src:nocopy
-  studio:
-    volumes:
-      - edxapp-sync:/edx/app/edxapp/edx-platform:nocopy
-      - src-sync:/edx/src:nocopy
-  forum:
-    volumes:
-      - forum-sync:/edx/app/forum/cs_comments_service:nocopy
-  edraak_marketing:
-    volumes:
-      - edraak-marketing-sync:/app:nocopy
-  edraak_marketing_gulp:
-    volumes:
-      - edraak-marketing-sync:/app:nocopy
-  progs:
-    volumes:
-      - edraak-programs-sync:/app:nocopy
-
-volumes:
-#  credentials-sync:
-#    external: true
-#  discovery-sync:
-#    external: true
-#  ecommerce-sync:
-#    external: true
-  edxapp-sync:
-    external: true
-  forum-sync:
-    external: true
-  edraak-marketing-sync:
-    external: true
-  edraak-programs-sync:
-    external: true
-  src-sync:
-    external: true
diff --git a/docker-compose-themes.yml b/docker-compose-themes.yml
deleted file mode 100644
index 889e597ba8..0000000000
--- a/docker-compose-themes.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: "2.1"
-
-services:
-#  discovery:
-#      volumes:
-#      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
-#  ecommerce:
-#      volumes:
-#      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
-  lms:
-      volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
-  studio:
-      volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
diff --git a/docker-compose-watchers-nfs.yml b/docker-compose-watchers-nfs.yml
deleted file mode 100644
index 4c08af44b7..0000000000
--- a/docker-compose-watchers-nfs.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: "2.1"
-
-services:
-  lms_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
-    container_name: edx.devstack.lms_watcher
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
-      ASSET_WATCHER_TIMEOUT: 12
-      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/src'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
-    volumes:
-      - edx-nfs:/edx/app/edxapp/edx-platform
-      - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
-      - src-nfs:/edx/src:cached
-
-  studio_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
-    container_name: edx.devstack.studio_watcher
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
-      ASSET_WATCHER_TIMEOUT: 12
-      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/src'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
-    volumes:
-      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
-      - edx-nfs:/edx/app/edxapp/edx-platform
-      - src-nfs:/edx/src:cached
-
-volumes:
-  edxapp_lms_assets:
-  edxapp_studio_assets:
diff --git a/docker-compose-watchers.yml b/docker-compose-watchers.yml
deleted file mode 100644
index 4b80c03a31..0000000000
--- a/docker-compose-watchers.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-version: "2.1"
-
-services:
-  lms_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
-    container_name: edx.devstack.lms_watcher
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.lms_watcher
-      ASSET_WATCHER_TIMEOUT: 12
-      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
-      - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
-
-  studio_watcher:
-    command: bash -c 'cd /edx/app/edxapp/edx-platform && source ../edxapp_env && while true; do paver watch_assets $$EXTRA --w=$$ASSET_WATCHER_TIMEOUT; sleep 2; done'
-    container_name: edx.devstack.studio_watcher
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.studio_watcher
-      ASSET_WATCHER_TIMEOUT: 12
-      EXTRA: '--themes edraak-2019-theme --theme-dirs /edx/app/edx-themes'
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
-    volumes:
-      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
-      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-      - ${DEVSTACK_WORKSPACE}/edx-themes:/edx/app/edx-themes:cached
-
-volumes:
-  edxapp_lms_assets:
-  edxapp_studio_assets:
diff --git a/docker-compose-xqueue.yml b/docker-compose-xqueue.yml
deleted file mode 100644
index bf4a73ac54..0000000000
--- a/docker-compose-xqueue.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-version: "2.1"
-
-services:
-  xqueue:
-    container_name: edx.devstack.xqueue
-    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
-    command: bash -c 'source /edx/app/xqueue/xqueue_env && while true; do python /edx/app/xqueue/xqueue/manage.py runserver 0.0.0.0:18040 ; sleep 2; done'
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/xqueue:/edx/app/xqueue/xqueue:cached
-    # depends_on: even though we need mysql, we can't refer to it because it's started in the other compose file
-    ports:
-      - 18040:18040
-
-  xqueue_consumer:
-    container_name: edx.devstack.xqueue_consumer
-    image: edxops/xqueue:${OPENEDX_RELEASE:-latest}
-    command: bash -c 'source /edx/app/xqueue/xqueue_env && while true; do python /edx/app/xqueue/xqueue/manage.py run_consumer ; sleep 2; done'
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/xqueue:/edx/app/xqueue/xqueue:cached
-    # depends_on: even though we need mysql, we can't refer to it because it's started in the other compose file
diff --git a/docker-compose.yml b/docker-compose.yml
index a1d7fe0b82..8aa00774e2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,11 +1,11 @@
-# This file contains all of the services for an edX installation. See https://docs.docker.com/compose/compose-file/
+# This file contains all of the services for an edraak installation. See https://docs.docker.com/compose/compose-file/
 # for the appropriate syntax and definitions.
 #
 # Housekeeping Rules:
-# - Group third-party and edX services separately
+# - Group third-party and edraak services separately
 # - Alphabetize services in the groups
 # - Alphabetize individual configuration options for each service
-# - Every service's container name should be prefixed with "edx.devstack." to avoid conflicts with other containers
+# - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
 version: "2.1"
@@ -52,127 +52,19 @@ services:
     volumes:
       - mysql_data:/var/lib/mysql
 
-# edX
-  lms:
-    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done'
-    container_name: edx.devstack.lms
-    depends_on:
-      - devpi
-      - mysql
-      - memcached
-      - mongo
-    # Allows attachment to the LMS service using 'docker attach <containerID>'.
-    stdin_open: true
-    tty: true
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.lms
-      BOK_CHOY_LMS_PORT: 18003
-      BOK_CHOY_CMS_PORT: 18031
-      EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
-      NO_PYTHON_UNINSTALL: 1
-      NO_PREREQ_INSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
-    ports:
-      - "18000:18000"
-      - "19876:19876" # JS test debugging
-      - "18003:18003"
-      - "18031:18031"
-    volumes:
-      - edxapp_lms_assets:/edx/var/edxapp/staticfiles/
-
-  studio:
-    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
-    container_name: edx.devstack.studio
-    depends_on:
-      - devpi
-      - mysql
-      - memcached
-      - mongo
-    # Allows attachment to the Studio service using 'docker attach <containerID>'.
-    stdin_open: true
-    tty: true
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.studio
-      BOK_CHOY_LMS_PORT: 18103
-      BOK_CHOY_CMS_PORT: 18131
-      EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
-      NO_PYTHON_UNINSTALL: 1
-      NO_PREREQ_INSTALL: 1
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
-    ports:
-      - "18010:18010"
-      - "19877:19877" # JS test debugging
-      - "18103:18103"
-      - "18131:18131"
-    volumes:
-      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
-
-  forum:
-    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
-    container_name: edx.devstack.forum
-    depends_on:
-      - mongo
-      - memcached
-      - elasticsearch
-    image: edxops/forum:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "44567:4567"
-
-  devpi:
-    container_name: edx.devstack.devpi
-    image: edxops/devpi:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "3141:3141"
-    volumes:
-      - devpi_data:/data
-
-  progs:
-    image: eu.gcr.io/openedx-231314/edraak/progs
-    environment:
-      PROGS_CFG: '/app/docker.json'
-      NODE_ENV: development
-    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
-    container_name: edraak.devstack.programs
-    working_dir: /app
-    ports:
-      - "18800:8800"
-    depends_on:
-      - mysql
-      - mongo
-      - memcached
-
-  edraak_marketing:
-    image: eu.gcr.io/openedx-231314/edraak/marketing
-    environment:
-      NODE_ENV: development
-    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done'
-    container_name: edraak.devstack.marketing
-    working_dir: /app
-    ports:
-      - "18500:8500"
-    depends_on:
-      - mysql
-      - memcached
-
-  edraak_dev_router:
+  router:
     image: nginx
     container_name: edraak_dev_router
+#    #Uncomment to disable router logs
 #    logging:
 #      driver: none
     volumes:
       - ./nginx/includes:/etc/nginx/conf.d/includes
       - ./nginx/ssl:/etc/nginx/conf.d/ssl
-      - ./nginx/core.conf:/etc/nginx/conf.d/core.conf
-      - ./nginx/edx.conf:/etc/nginx/conf.d/edx.conf
     command: bash -c 'while true; do nginx -g "daemon off;"; sleep 2; done'
     ports:
       - "80:80"
       - "443:443"
-    depends_on:
-      - lms
-      - studio
-      - edraak_marketing
-      - progs
     networks:
       default:
         aliases:
@@ -182,10 +74,11 @@ services:
           - edraak.dev
           - judge.edraak.dev
           - states.edraak.dev
+          - b2b.edraak.dev
+          - notify.edraak.dev
+          - analytics.edraak.dev
 
 volumes:
-  edxapp_lms_assets:
-  edxapp_studio_assets:
   elasticsearch_data:
   mongo_data:
   mysql_data:
diff --git a/docker-sync-marketing-site.yml b/docker-sync-marketing-site.yml
deleted file mode 100644
index adc1cd261c..0000000000
--- a/docker-sync-marketing-site.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-version: "2.1"
-
-options:
-  compose-file-path:
-    - 'docker-compose.yml'
-    - 'docker-compose-marketing-site.yml'
-  compose-dev-file-path:
-    - 'docker-compose-sync.yml'
-    - 'docker-compose-marketing-site-sync.yml'
-
-syncs:
-  credentials-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../credentials/'
-    sync_excludes: [ '.git', '.idea', 'node_modules', 'credentials/assets', 'credentials/static/bundles', 'webpack-stats.json' ]
-
-  discovery-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../course-discovery/'
-    sync_excludes: [ '.git', '.idea', 'node_modules', 'course_discovery/assets', 'course_discovery/static/bower_components', 'course_discovery/static/build' ]
-
-  ecommerce-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../ecommerce/'
-    sync_excludes: [ '.git', '.idea', 'node_modules', 'assets', 'ecommerce/static/bower_components', 'ecommerce/static/build' ]
-
-  edxapp-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../edx-platform/'
-    sync_excludes: [ '.git', '.idea', 'node_modules', '.prereqs_cache' ]
-
-  marketing-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../edx-mktg/docroot/'
-    sync_excludes: [ '.git', '.idea', 'node_modules', ]
-    sync_userid: 33
diff --git a/docker-sync.yml b/docker-sync.yml
deleted file mode 100644
index 389f082c8a..0000000000
--- a/docker-sync.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-version: "2.1"
-
-options:
-  compose-file-path: 'docker-compose.yml'
-  compose-dev-file-path: 'docker-compose-sync.yml'
-
-syncs:
-#  credentials-sync:
-#    host_disk_mount_mode: 'cached'
-#    src: '../credentials/'
-#    sync_excludes: [ '.git', '.idea' ]
-#
-#  discovery-sync:
-#    host_disk_mount_mode: 'cached'
-#    src: '../course-discovery/'
-#    sync_excludes: [ '.git', '.idea' ]
-#
-#  ecommerce-sync:
-#    host_disk_mount_mode: 'cached'
-#    src: '../ecommerce/'
-#    sync_excludes: [ '.git', '.idea' ]
-
-  edxapp-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../edx-platform/'
-    sync_excludes: [ '.idea' ]
-
-  forum-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../cs_comments_service/'
-    sync_excludes: [ '.git', '.idea' ]
-
-  edraak-marketing-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../marketing-site/'
-    sync_excludes: [ '.git', '.idea']
-
-  edraak-programs-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../edraak-programs/'
-    sync_excludes: [ '.git', '.idea']
-
-  src-sync:
-    host_disk_mount_mode: 'cached'
-    src: '../src/'
-    sync_excludes: [ '.git', '.idea']
diff --git a/ecommerce.sql b/ecommerce.sql
deleted file mode 100644
index 77ae00c7af..0000000000
--- a/ecommerce.sql
+++ /dev/null
@@ -1,3891 +0,0 @@
--- MySQL dump 10.13  Distrib 5.6.39, for Linux (x86_64)
---
--- Host: localhost    Database: ecommerce
--- ------------------------------------------------------
--- Server version	5.6.39
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Current Database: `ecommerce`
---
-
-/*!40000 DROP DATABASE IF EXISTS `ecommerce`*/;
-
-CREATE DATABASE /*!32312 IF NOT EXISTS*/ `ecommerce` /*!40100 DEFAULT CHARACTER SET utf8 */;
-
-USE `ecommerce`;
-
---
--- Table structure for table `address_country`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `address_country` (
-  `iso_3166_1_a2` varchar(2) NOT NULL,
-  `iso_3166_1_a3` varchar(3) NOT NULL,
-  `iso_3166_1_numeric` varchar(3) NOT NULL,
-  `printable_name` varchar(128) NOT NULL,
-  `name` varchar(128) NOT NULL,
-  `display_order` smallint(5) unsigned NOT NULL,
-  `is_shipping_country` tinyint(1) NOT NULL,
-  PRIMARY KEY (`iso_3166_1_a2`),
-  KEY `address_country_010c8bce` (`display_order`),
-  KEY `address_country_0b3676f8` (`is_shipping_country`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `address_country`
---
-
-LOCK TABLES `address_country` WRITE;
-/*!40000 ALTER TABLE `address_country` DISABLE KEYS */;
-INSERT INTO `address_country` VALUES ('AD','AND','020','Andorra','Principality of Andorra',0,1),('AE','ARE','784','United Arab Emirates','',0,1),('AF','AFG','004','Afghanistan','Islamic Republic of Afghanistan',0,1),('AG','ATG','028','Antigua and Barbuda','',0,1),('AI','AIA','660','Anguilla','',0,1),('AL','ALB','008','Albania','Republic of Albania',0,1),('AM','ARM','051','Armenia','Republic of Armenia',0,1),('AO','AGO','024','Angola','Republic of Angola',0,1),('AQ','ATA','010','Antarctica','',0,1),('AR','ARG','032','Argentina','Argentine Republic',0,1),('AS','ASM','016','American Samoa','',0,1),('AT','AUT','040','Austria','Republic of Austria',0,1),('AU','AUS','036','Australia','',0,1),('AW','ABW','533','Aruba','',0,1),('AX','ALA','248','Åland Islands','',0,1),('AZ','AZE','031','Azerbaijan','Republic of Azerbaijan',0,1),('BA','BIH','070','Bosnia and Herzegovina','Republic of Bosnia and Herzegovina',0,1),('BB','BRB','052','Barbados','',0,1),('BD','BGD','050','Bangladesh','People\'s Republic of Bangladesh',0,1),('BE','BEL','056','Belgium','Kingdom of Belgium',0,1),('BF','BFA','854','Burkina Faso','',0,1),('BG','BGR','100','Bulgaria','Republic of Bulgaria',0,1),('BH','BHR','048','Bahrain','Kingdom of Bahrain',0,1),('BI','BDI','108','Burundi','Republic of Burundi',0,1),('BJ','BEN','204','Benin','Republic of Benin',0,1),('BL','BLM','652','Saint Barthélemy','',0,1),('BM','BMU','060','Bermuda','',0,1),('BN','BRN','096','Brunei Darussalam','',0,1),('BO','BOL','068','Bolivia, Plurinational State of','Plurinational State of Bolivia',0,1),('BQ','BES','535','Bonaire, Sint Eustatius and Saba','Bonaire, Sint Eustatius and Saba',0,1),('BR','BRA','076','Brazil','Federative Republic of Brazil',0,1),('BS','BHS','044','Bahamas','Commonwealth of the Bahamas',0,1),('BT','BTN','064','Bhutan','Kingdom of Bhutan',0,1),('BV','BVT','074','Bouvet Island','',0,1),('BW','BWA','072','Botswana','Republic of Botswana',0,1),('BY','BLR','112','Belarus','Republic of Belarus',0,1),('BZ','BLZ','084','Belize','',0,1),('CA','CAN','124','Canada','',0,1),('CC','CCK','166','Cocos (Keeling) Islands','',0,1),('CD','COD','180','Congo, The Democratic Republic of the','',0,1),('CF','CAF','140','Central African Republic','',0,1),('CG','COG','178','Congo','Republic of the Congo',0,1),('CH','CHE','756','Switzerland','Swiss Confederation',0,1),('CI','CIV','384','Côte d\'Ivoire','Republic of Côte d\'Ivoire',0,1),('CK','COK','184','Cook Islands','',0,1),('CL','CHL','152','Chile','Republic of Chile',0,1),('CM','CMR','120','Cameroon','Republic of Cameroon',0,1),('CN','CHN','156','China','People\'s Republic of China',0,1),('CO','COL','170','Colombia','Republic of Colombia',0,1),('CR','CRI','188','Costa Rica','Republic of Costa Rica',0,1),('CU','CUB','192','Cuba','Republic of Cuba',0,1),('CV','CPV','132','Cabo Verde','Republic of Cabo Verde',0,1),('CW','CUW','531','Curaçao','Curaçao',0,1),('CX','CXR','162','Christmas Island','',0,1),('CY','CYP','196','Cyprus','Republic of Cyprus',0,1),('CZ','CZE','203','Czechia','Czech Republic',0,1),('DE','DEU','276','Germany','Federal Republic of Germany',0,1),('DJ','DJI','262','Djibouti','Republic of Djibouti',0,1),('DK','DNK','208','Denmark','Kingdom of Denmark',0,1),('DM','DMA','212','Dominica','Commonwealth of Dominica',0,1),('DO','DOM','214','Dominican Republic','',0,1),('DZ','DZA','012','Algeria','People\'s Democratic Republic of Algeria',0,1),('EC','ECU','218','Ecuador','Republic of Ecuador',0,1),('EE','EST','233','Estonia','Republic of Estonia',0,1),('EG','EGY','818','Egypt','Arab Republic of Egypt',0,1),('EH','ESH','732','Western Sahara','',0,1),('ER','ERI','232','Eritrea','the State of Eritrea',0,1),('ES','ESP','724','Spain','Kingdom of Spain',0,1),('ET','ETH','231','Ethiopia','Federal Democratic Republic of Ethiopia',0,1),('FI','FIN','246','Finland','Republic of Finland',0,1),('FJ','FJI','242','Fiji','Republic of Fiji',0,1),('FK','FLK','238','Falkland Islands (Malvinas)','',0,1),('FM','FSM','583','Micronesia, Federated States of','Federated States of Micronesia',0,1),('FO','FRO','234','Faroe Islands','',0,1),('FR','FRA','250','France','French Republic',0,1),('GA','GAB','266','Gabon','Gabonese Republic',0,1),('GB','GBR','826','United Kingdom','United Kingdom of Great Britain and Northern Ireland',0,1),('GD','GRD','308','Grenada','',0,1),('GE','GEO','268','Georgia','',0,1),('GF','GUF','254','French Guiana','',0,1),('GG','GGY','831','Guernsey','',0,1),('GH','GHA','288','Ghana','Republic of Ghana',0,1),('GI','GIB','292','Gibraltar','',0,1),('GL','GRL','304','Greenland','',0,1),('GM','GMB','270','Gambia','Islamic Republic of the Gambia',0,1),('GN','GIN','324','Guinea','Republic of Guinea',0,1),('GP','GLP','312','Guadeloupe','',0,1),('GQ','GNQ','226','Equatorial Guinea','Republic of Equatorial Guinea',0,1),('GR','GRC','300','Greece','Hellenic Republic',0,1),('GS','SGS','239','South Georgia and the South Sandwich Islands','',0,1),('GT','GTM','320','Guatemala','Republic of Guatemala',0,1),('GU','GUM','316','Guam','',0,1),('GW','GNB','624','Guinea-Bissau','Republic of Guinea-Bissau',0,1),('GY','GUY','328','Guyana','Republic of Guyana',0,1),('HK','HKG','344','Hong Kong','Hong Kong Special Administrative Region of China',0,1),('HM','HMD','334','Heard Island and McDonald Islands','',0,1),('HN','HND','340','Honduras','Republic of Honduras',0,1),('HR','HRV','191','Croatia','Republic of Croatia',0,1),('HT','HTI','332','Haiti','Republic of Haiti',0,1),('HU','HUN','348','Hungary','Hungary',0,1),('ID','IDN','360','Indonesia','Republic of Indonesia',0,1),('IE','IRL','372','Ireland','',0,1),('IL','ISR','376','Israel','State of Israel',0,1),('IM','IMN','833','Isle of Man','',0,1),('IN','IND','356','India','Republic of India',0,1),('IO','IOT','086','British Indian Ocean Territory','',0,1),('IQ','IRQ','368','Iraq','Republic of Iraq',0,1),('IR','IRN','364','Iran, Islamic Republic of','Islamic Republic of Iran',0,1),('IS','ISL','352','Iceland','Republic of Iceland',0,1),('IT','ITA','380','Italy','Italian Republic',0,1),('JE','JEY','832','Jersey','',0,1),('JM','JAM','388','Jamaica','',0,1),('JO','JOR','400','Jordan','Hashemite Kingdom of Jordan',0,1),('JP','JPN','392','Japan','',0,1),('KE','KEN','404','Kenya','Republic of Kenya',0,1),('KG','KGZ','417','Kyrgyzstan','Kyrgyz Republic',0,1),('KH','KHM','116','Cambodia','Kingdom of Cambodia',0,1),('KI','KIR','296','Kiribati','Republic of Kiribati',0,1),('KM','COM','174','Comoros','Union of the Comoros',0,1),('KN','KNA','659','Saint Kitts and Nevis','',0,1),('KP','PRK','408','Korea, Democratic People\'s Republic of','Democratic People\'s Republic of Korea',0,1),('KR','KOR','410','Korea, Republic of','',0,1),('KW','KWT','414','Kuwait','State of Kuwait',0,1),('KY','CYM','136','Cayman Islands','',0,1),('KZ','KAZ','398','Kazakhstan','Republic of Kazakhstan',0,1),('LA','LAO','418','Lao People\'s Democratic Republic','',0,1),('LB','LBN','422','Lebanon','Lebanese Republic',0,1),('LC','LCA','662','Saint Lucia','',0,1),('LI','LIE','438','Liechtenstein','Principality of Liechtenstein',0,1),('LK','LKA','144','Sri Lanka','Democratic Socialist Republic of Sri Lanka',0,1),('LR','LBR','430','Liberia','Republic of Liberia',0,1),('LS','LSO','426','Lesotho','Kingdom of Lesotho',0,1),('LT','LTU','440','Lithuania','Republic of Lithuania',0,1),('LU','LUX','442','Luxembourg','Grand Duchy of Luxembourg',0,1),('LV','LVA','428','Latvia','Republic of Latvia',0,1),('LY','LBY','434','Libya','Libya',0,1),('MA','MAR','504','Morocco','Kingdom of Morocco',0,1),('MC','MCO','492','Monaco','Principality of Monaco',0,1),('MD','MDA','498','Moldova, Republic of','Republic of Moldova',0,1),('ME','MNE','499','Montenegro','Montenegro',0,1),('MF','MAF','663','Saint Martin (French part)','',0,1),('MG','MDG','450','Madagascar','Republic of Madagascar',0,1),('MH','MHL','584','Marshall Islands','Republic of the Marshall Islands',0,1),('MK','MKD','807','Macedonia, Republic of','The Former Yugoslav Republic of Macedonia',0,1),('ML','MLI','466','Mali','Republic of Mali',0,1),('MM','MMR','104','Myanmar','Republic of Myanmar',0,1),('MN','MNG','496','Mongolia','',0,1),('MO','MAC','446','Macao','Macao Special Administrative Region of China',0,1),('MP','MNP','580','Northern Mariana Islands','Commonwealth of the Northern Mariana Islands',0,1),('MQ','MTQ','474','Martinique','',0,1),('MR','MRT','478','Mauritania','Islamic Republic of Mauritania',0,1),('MS','MSR','500','Montserrat','',0,1),('MT','MLT','470','Malta','Republic of Malta',0,1),('MU','MUS','480','Mauritius','Republic of Mauritius',0,1),('MV','MDV','462','Maldives','Republic of Maldives',0,1),('MW','MWI','454','Malawi','Republic of Malawi',0,1),('MX','MEX','484','Mexico','United Mexican States',0,1),('MY','MYS','458','Malaysia','',0,1),('MZ','MOZ','508','Mozambique','Republic of Mozambique',0,1),('NA','NAM','516','Namibia','Republic of Namibia',0,1),('NC','NCL','540','New Caledonia','',0,1),('NE','NER','562','Niger','Republic of the Niger',0,1),('NF','NFK','574','Norfolk Island','',0,1),('NG','NGA','566','Nigeria','Federal Republic of Nigeria',0,1),('NI','NIC','558','Nicaragua','Republic of Nicaragua',0,1),('NL','NLD','528','Netherlands','Kingdom of the Netherlands',0,1),('NO','NOR','578','Norway','Kingdom of Norway',0,1),('NP','NPL','524','Nepal','Federal Democratic Republic of Nepal',0,1),('NR','NRU','520','Nauru','Republic of Nauru',0,1),('NU','NIU','570','Niue','Niue',0,1),('NZ','NZL','554','New Zealand','',0,1),('OM','OMN','512','Oman','Sultanate of Oman',0,1),('PA','PAN','591','Panama','Republic of Panama',0,1),('PE','PER','604','Peru','Republic of Peru',0,1),('PF','PYF','258','French Polynesia','',0,1),('PG','PNG','598','Papua New Guinea','Independent State of Papua New Guinea',0,1),('PH','PHL','608','Philippines','Republic of the Philippines',0,1),('PK','PAK','586','Pakistan','Islamic Republic of Pakistan',0,1),('PL','POL','616','Poland','Republic of Poland',0,1),('PM','SPM','666','Saint Pierre and Miquelon','',0,1),('PN','PCN','612','Pitcairn','',0,1),('PR','PRI','630','Puerto Rico','',0,1),('PS','PSE','275','Palestine, State of','the State of Palestine',0,1),('PT','PRT','620','Portugal','Portuguese Republic',0,1),('PW','PLW','585','Palau','Republic of Palau',0,1),('PY','PRY','600','Paraguay','Republic of Paraguay',0,1),('QA','QAT','634','Qatar','State of Qatar',0,1),('RE','REU','638','Réunion','',0,1),('RO','ROU','642','Romania','',0,1),('RS','SRB','688','Serbia','Republic of Serbia',0,1),('RU','RUS','643','Russian Federation','',0,1),('RW','RWA','646','Rwanda','Rwandese Republic',0,1),('SA','SAU','682','Saudi Arabia','Kingdom of Saudi Arabia',0,1),('SB','SLB','090','Solomon Islands','',0,1),('SC','SYC','690','Seychelles','Republic of Seychelles',0,1),('SD','SDN','729','Sudan','Republic of the Sudan',0,1),('SE','SWE','752','Sweden','Kingdom of Sweden',0,1),('SG','SGP','702','Singapore','Republic of Singapore',0,1),('SH','SHN','654','Saint Helena, Ascension and Tristan da Cunha','',0,1),('SI','SVN','705','Slovenia','Republic of Slovenia',0,1),('SJ','SJM','744','Svalbard and Jan Mayen','',0,1),('SK','SVK','703','Slovakia','Slovak Republic',0,1),('SL','SLE','694','Sierra Leone','Republic of Sierra Leone',0,1),('SM','SMR','674','San Marino','Republic of San Marino',0,1),('SN','SEN','686','Senegal','Republic of Senegal',0,1),('SO','SOM','706','Somalia','Federal Republic of Somalia',0,1),('SR','SUR','740','Suriname','Republic of Suriname',0,1),('SS','SSD','728','South Sudan','Republic of South Sudan',0,1),('ST','STP','678','Sao Tome and Principe','Democratic Republic of Sao Tome and Principe',0,1),('SV','SLV','222','El Salvador','Republic of El Salvador',0,1),('SX','SXM','534','Sint Maarten (Dutch part)','Sint Maarten (Dutch part)',0,1),('SY','SYR','760','Syrian Arab Republic','',0,1),('SZ','SWZ','748','Swaziland','Kingdom of Swaziland',0,1),('TC','TCA','796','Turks and Caicos Islands','',0,1),('TD','TCD','148','Chad','Republic of Chad',0,1),('TF','ATF','260','French Southern Territories','',0,1),('TG','TGO','768','Togo','Togolese Republic',0,1),('TH','THA','764','Thailand','Kingdom of Thailand',0,1),('TJ','TJK','762','Tajikistan','Republic of Tajikistan',0,1),('TK','TKL','772','Tokelau','',0,1),('TL','TLS','626','Timor-Leste','Democratic Republic of Timor-Leste',0,1),('TM','TKM','795','Turkmenistan','',0,1),('TN','TUN','788','Tunisia','Republic of Tunisia',0,1),('TO','TON','776','Tonga','Kingdom of Tonga',0,1),('TR','TUR','792','Turkey','Republic of Turkey',0,1),('TT','TTO','780','Trinidad and Tobago','Republic of Trinidad and Tobago',0,1),('TV','TUV','798','Tuvalu','',0,1),('TW','TWN','158','Taiwan, Province of China','Taiwan, Province of China',0,1),('TZ','TZA','834','Tanzania, United Republic of','United Republic of Tanzania',0,1),('UA','UKR','804','Ukraine','',0,1),('UG','UGA','800','Uganda','Republic of Uganda',0,1),('UM','UMI','581','United States Minor Outlying Islands','',0,1),('US','USA','840','United States','United States of America',0,1),('UY','URY','858','Uruguay','Eastern Republic of Uruguay',0,1),('UZ','UZB','860','Uzbekistan','Republic of Uzbekistan',0,1),('VA','VAT','336','Holy See (Vatican City State)','',0,1),('VC','VCT','670','Saint Vincent and the Grenadines','',0,1),('VE','VEN','862','Venezuela, Bolivarian Republic of','Bolivarian Republic of Venezuela',0,1),('VG','VGB','092','Virgin Islands, British','British Virgin Islands',0,1),('VI','VIR','850','Virgin Islands, U.S.','Virgin Islands of the United States',0,1),('VN','VNM','704','Viet Nam','Socialist Republic of Viet Nam',0,1),('VU','VUT','548','Vanuatu','Republic of Vanuatu',0,1),('WF','WLF','876','Wallis and Futuna','',0,1),('WS','WSM','882','Samoa','Independent State of Samoa',0,1),('YE','YEM','887','Yemen','Republic of Yemen',0,1),('YT','MYT','175','Mayotte','',0,1),('ZA','ZAF','710','South Africa','Republic of South Africa',0,1),('ZM','ZMB','894','Zambia','Republic of Zambia',0,1),('ZW','ZWE','716','Zimbabwe','Republic of Zimbabwe',0,1);
-/*!40000 ALTER TABLE `address_country` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `address_useraddress`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `address_useraddress` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(64) NOT NULL,
-  `first_name` varchar(255) NOT NULL,
-  `last_name` varchar(255) NOT NULL,
-  `line1` varchar(255) NOT NULL,
-  `line2` varchar(255) NOT NULL,
-  `line3` varchar(255) NOT NULL,
-  `line4` varchar(255) NOT NULL,
-  `state` varchar(255) NOT NULL,
-  `postcode` varchar(64) NOT NULL,
-  `search_text` longtext NOT NULL,
-  `phone_number` varchar(128) NOT NULL,
-  `notes` longtext NOT NULL,
-  `is_default_for_shipping` tinyint(1) NOT NULL,
-  `is_default_for_billing` tinyint(1) NOT NULL,
-  `num_orders` int(10) unsigned NOT NULL,
-  `hash` varchar(255) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `country_id` varchar(2) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `address_useraddress_user_id_9d1738c7_uniq` (`user_id`,`hash`),
-  KEY `address_use_country_id_fa26a249_fk_address_country_iso_3166_1_a2` (`country_id`),
-  KEY `address_useraddress_0800fc57` (`hash`),
-  CONSTRAINT `address_use_country_id_fa26a249_fk_address_country_iso_3166_1_a2` FOREIGN KEY (`country_id`) REFERENCES `address_country` (`iso_3166_1_a2`),
-  CONSTRAINT `address_useraddress_user_id_6edf0244_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `address_useraddress`
---
-
-LOCK TABLES `address_useraddress` WRITE;
-/*!40000 ALTER TABLE `address_useraddress` DISABLE KEYS */;
-/*!40000 ALTER TABLE `address_useraddress` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `analytics_productrecord`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `analytics_productrecord` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `num_views` int(10) unsigned NOT NULL,
-  `num_basket_additions` int(10) unsigned NOT NULL,
-  `num_purchases` int(10) unsigned NOT NULL,
-  `score` double NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `product_id` (`product_id`),
-  KEY `analytics_productrecord_81a5c7b1` (`num_purchases`),
-  CONSTRAINT `analytics_productrec_product_id_dad3a871_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `analytics_productrecord`
---
-
-LOCK TABLES `analytics_productrecord` WRITE;
-/*!40000 ALTER TABLE `analytics_productrecord` DISABLE KEYS */;
-/*!40000 ALTER TABLE `analytics_productrecord` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `analytics_userproductview`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `analytics_userproductview` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `date_created` datetime(6) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `analytics_userproduc_product_id_a55b87ad_fk_catalogue_product_id` (`product_id`),
-  KEY `analytics_userproductview_user_id_5e49a8b1_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `analytics_userproduc_product_id_a55b87ad_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `analytics_userproductview_user_id_5e49a8b1_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `analytics_userproductview`
---
-
-LOCK TABLES `analytics_userproductview` WRITE;
-/*!40000 ALTER TABLE `analytics_userproductview` DISABLE KEYS */;
-/*!40000 ALTER TABLE `analytics_userproductview` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `analytics_userrecord`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `analytics_userrecord` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `num_product_views` int(10) unsigned NOT NULL,
-  `num_basket_additions` int(10) unsigned NOT NULL,
-  `num_orders` int(10) unsigned NOT NULL,
-  `num_order_lines` int(10) unsigned NOT NULL,
-  `num_order_items` int(10) unsigned NOT NULL,
-  `total_spent` decimal(12,2) NOT NULL,
-  `date_last_order` datetime(6) DEFAULT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `user_id` (`user_id`),
-  KEY `analytics_userrecord_29bdb5ea` (`num_orders`),
-  KEY `analytics_userrecord_89bb6879` (`num_order_lines`),
-  KEY `analytics_userrecord_25cd4b4a` (`num_order_items`),
-  CONSTRAINT `analytics_userrecord_user_id_702cff4c_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `analytics_userrecord`
---
-
-LOCK TABLES `analytics_userrecord` WRITE;
-/*!40000 ALTER TABLE `analytics_userrecord` DISABLE KEYS */;
-/*!40000 ALTER TABLE `analytics_userrecord` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `analytics_usersearch`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `analytics_usersearch` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `query` varchar(255) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `analytics_usersearch_user_id_1775992d_fk_ecommerce_user_id` (`user_id`),
-  KEY `analytics_usersearch_1b1cc7f0` (`query`),
-  CONSTRAINT `analytics_usersearch_user_id_1775992d_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `analytics_usersearch`
---
-
-LOCK TABLES `analytics_usersearch` WRITE;
-/*!40000 ALTER TABLE `analytics_usersearch` DISABLE KEYS */;
-/*!40000 ALTER TABLE `analytics_usersearch` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `auth_group`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `auth_group` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(80) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `auth_group`
---
-
-LOCK TABLES `auth_group` WRITE;
-/*!40000 ALTER TABLE `auth_group` DISABLE KEYS */;
-/*!40000 ALTER TABLE `auth_group` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `auth_group_permissions`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `auth_group_permissions` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `group_id` int(11) NOT NULL,
-  `permission_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `auth_group_permissions_group_id_0cd325b0_uniq` (`group_id`,`permission_id`),
-  KEY `auth_group_permissi_permission_id_84c5c92e_fk_auth_permission_id` (`permission_id`),
-  CONSTRAINT `auth_group_permissi_permission_id_84c5c92e_fk_auth_permission_id` FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`),
-  CONSTRAINT `auth_group_permissions_group_id_b120cbf9_fk_auth_group_id` FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `auth_group_permissions`
---
-
-LOCK TABLES `auth_group_permissions` WRITE;
-/*!40000 ALTER TABLE `auth_group_permissions` DISABLE KEYS */;
-/*!40000 ALTER TABLE `auth_group_permissions` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `auth_permission`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `auth_permission` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `content_type_id` int(11) NOT NULL,
-  `codename` varchar(100) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `auth_permission_content_type_id_01ab375a_uniq` (`content_type_id`,`codename`),
-  CONSTRAINT `auth_permissi_content_type_id_2f476e4b_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=385 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `auth_permission`
---
-
-LOCK TABLES `auth_permission` WRITE;
-/*!40000 ALTER TABLE `auth_permission` DISABLE KEYS */;
-INSERT INTO `auth_permission` VALUES (1,'Can add content type',1,'add_contenttype'),(2,'Can change content type',1,'change_contenttype'),(3,'Can delete content type',1,'delete_contenttype'),(4,'Can add permission',2,'add_permission'),(5,'Can change permission',2,'change_permission'),(6,'Can delete permission',2,'delete_permission'),(7,'Can add group',3,'add_group'),(8,'Can change group',3,'change_group'),(9,'Can delete group',3,'delete_group'),(10,'Can add site configuration',4,'add_siteconfiguration'),(11,'Can change site configuration',4,'change_siteconfiguration'),(12,'Can delete site configuration',4,'delete_siteconfiguration'),(13,'Can add user',5,'add_user'),(14,'Can change user',5,'change_user'),(15,'Can delete user',5,'delete_user'),(16,'Can add user',6,'add_client'),(17,'Can change user',6,'change_client'),(18,'Can delete user',6,'delete_client'),(19,'Can add Country',7,'add_country'),(20,'Can change Country',7,'change_country'),(21,'Can delete Country',7,'delete_country'),(22,'Can add User address',8,'add_useraddress'),(23,'Can change User address',8,'change_useraddress'),(24,'Can delete User address',8,'delete_useraddress'),(25,'Can add log entry',9,'add_logentry'),(26,'Can change log entry',9,'change_logentry'),(27,'Can delete log entry',9,'delete_logentry'),(28,'Can add Attribute option',10,'add_attributeoption'),(29,'Can change Attribute option',10,'change_attributeoption'),(30,'Can delete Attribute option',10,'delete_attributeoption'),(31,'Can add Product',11,'add_product'),(32,'Can change Product',11,'change_product'),(33,'Can delete Product',11,'delete_product'),(34,'Can add Option',12,'add_option'),(35,'Can change Option',12,'change_option'),(36,'Can delete Option',12,'delete_option'),(37,'Can add Product class',13,'add_productclass'),(38,'Can change Product class',13,'change_productclass'),(39,'Can delete Product class',13,'delete_productclass'),(40,'Can add Category',14,'add_category'),(41,'Can change Category',14,'change_category'),(42,'Can delete Category',14,'delete_category'),(43,'Can add catalog',15,'add_catalog'),(44,'Can change catalog',15,'change_catalog'),(45,'Can delete catalog',15,'delete_catalog'),(46,'Can add Product recommendation',16,'add_productrecommendation'),(47,'Can change Product recommendation',16,'change_productrecommendation'),(48,'Can delete Product recommendation',16,'delete_productrecommendation'),(49,'Can add Product attribute',17,'add_productattribute'),(50,'Can change Product attribute',17,'change_productattribute'),(51,'Can delete Product attribute',17,'delete_productattribute'),(52,'Can add Attribute option group',18,'add_attributeoptiongroup'),(53,'Can change Attribute option group',18,'change_attributeoptiongroup'),(54,'Can delete Attribute option group',18,'delete_attributeoptiongroup'),(55,'Can add Product image',19,'add_productimage'),(56,'Can change Product image',19,'change_productimage'),(57,'Can delete Product image',19,'delete_productimage'),(58,'Can add Product attribute value',20,'add_productattributevalue'),(59,'Can change Product attribute value',20,'change_productattributevalue'),(60,'Can delete Product attribute value',20,'delete_productattributevalue'),(61,'Can add Product category',21,'add_productcategory'),(62,'Can change Product category',21,'change_productcategory'),(63,'Can delete Product category',21,'delete_productcategory'),(64,'Can add historical Product attribute value',22,'add_historicalproductattributevalue'),(65,'Can change historical Product attribute value',22,'change_historicalproductattributevalue'),(66,'Can delete historical Product attribute value',22,'delete_historicalproductattributevalue'),(67,'Can add historical Product',23,'add_historicalproduct'),(68,'Can change historical Product',23,'change_historicalproduct'),(69,'Can delete historical Product',23,'delete_historicalproduct'),(70,'Can add User product view',24,'add_userproductview'),(71,'Can change User product view',24,'change_userproductview'),(72,'Can delete User product view',24,'delete_userproductview'),(73,'Can add User record',25,'add_userrecord'),(74,'Can change User record',25,'change_userrecord'),(75,'Can delete User record',25,'delete_userrecord'),(76,'Can add User search query',26,'add_usersearch'),(77,'Can change User search query',26,'change_usersearch'),(78,'Can delete User search query',26,'delete_usersearch'),(79,'Can add Product record',27,'add_productrecord'),(80,'Can change Product record',27,'change_productrecord'),(81,'Can delete Product record',27,'delete_productrecord'),(82,'Can add sample',28,'add_sample'),(83,'Can change sample',28,'change_sample'),(84,'Can delete sample',28,'delete_sample'),(85,'Can add switch',29,'add_switch'),(86,'Can change switch',29,'change_switch'),(87,'Can delete switch',29,'delete_switch'),(88,'Can add flag',30,'add_flag'),(89,'Can change flag',30,'change_flag'),(90,'Can delete flag',30,'delete_flag'),(91,'Can add site',31,'add_site'),(92,'Can change site',31,'change_site'),(93,'Can delete site',31,'delete_site'),(94,'Can add historical Stock record',32,'add_historicalstockrecord'),(95,'Can change historical Stock record',32,'change_historicalstockrecord'),(96,'Can delete historical Stock record',32,'delete_historicalstockrecord'),(97,'Can add Partner',33,'add_partner'),(98,'Can change Partner',33,'change_partner'),(99,'Can delete Partner',33,'delete_partner'),(100,'Can add Partner address',34,'add_partneraddress'),(101,'Can change Partner address',34,'change_partneraddress'),(102,'Can delete Partner address',34,'delete_partneraddress'),(103,'Can add Stock record',35,'add_stockrecord'),(104,'Can change Stock record',35,'change_stockrecord'),(105,'Can delete Stock record',35,'delete_stockrecord'),(106,'Can add Stock alert',36,'add_stockalert'),(107,'Can change Stock alert',36,'change_stockalert'),(108,'Can delete Stock alert',36,'delete_stockalert'),(109,'Can add Product alert',37,'add_productalert'),(110,'Can change Product alert',37,'change_productalert'),(111,'Can delete Product alert',37,'delete_productalert'),(112,'Can add Email',38,'add_email'),(113,'Can change Email',38,'change_email'),(114,'Can delete Email',38,'delete_email'),(115,'Can add Communication event type',39,'add_communicationeventtype'),(116,'Can change Communication event type',39,'change_communicationeventtype'),(117,'Can delete Communication event type',39,'delete_communicationeventtype'),(118,'Can add Notification',40,'add_notification'),(119,'Can change Notification',40,'change_notification'),(120,'Can delete Notification',40,'delete_notification'),(121,'Can add basket attribute',41,'add_basketattribute'),(122,'Can change basket attribute',41,'change_basketattribute'),(123,'Can delete basket attribute',41,'delete_basketattribute'),(124,'Can add basket attribute type',42,'add_basketattributetype'),(125,'Can change basket attribute type',42,'change_basketattributetype'),(126,'Can delete basket attribute type',42,'delete_basketattributetype'),(127,'Can add Basket',43,'add_basket'),(128,'Can change Basket',43,'change_basket'),(129,'Can delete Basket',43,'delete_basket'),(130,'Can add Basket line',44,'add_line'),(131,'Can change Basket line',44,'change_line'),(132,'Can delete Basket line',44,'delete_line'),(133,'Can add Line attribute',45,'add_lineattribute'),(134,'Can change Line attribute',45,'change_lineattribute'),(135,'Can delete Line attribute',45,'delete_lineattribute'),(136,'Can add Line Price',46,'add_lineprice'),(137,'Can change Line Price',46,'change_lineprice'),(138,'Can delete Line Price',46,'delete_lineprice'),(139,'Can add Shipping address',47,'add_shippingaddress'),(140,'Can change Shipping address',47,'change_shippingaddress'),(141,'Can delete Shipping address',47,'delete_shippingaddress'),(142,'Can add Billing address',48,'add_billingaddress'),(143,'Can change Billing address',48,'change_billingaddress'),(144,'Can delete Billing address',48,'delete_billingaddress'),(145,'Can add Shipping Event',49,'add_shippingevent'),(146,'Can change Shipping Event',49,'change_shippingevent'),(147,'Can delete Shipping Event',49,'delete_shippingevent'),(148,'Can add Order Line',50,'add_line'),(149,'Can change Order Line',50,'change_line'),(150,'Can delete Order Line',50,'delete_line'),(151,'Can add Payment Event',51,'add_paymentevent'),(152,'Can change Payment Event',51,'change_paymentevent'),(153,'Can delete Payment Event',51,'delete_paymentevent'),(154,'Can add Communication Event',52,'add_communicationevent'),(155,'Can change Communication Event',52,'change_communicationevent'),(156,'Can delete Communication Event',52,'delete_communicationevent'),(157,'Can add Order Note',53,'add_ordernote'),(158,'Can change Order Note',53,'change_ordernote'),(159,'Can delete Order Note',53,'delete_ordernote'),(160,'Can add Order',54,'add_order'),(161,'Can change Order',54,'change_order'),(162,'Can delete Order',54,'delete_order'),(163,'Can add Payment Event Quantity',55,'add_paymenteventquantity'),(164,'Can change Payment Event Quantity',55,'change_paymenteventquantity'),(165,'Can delete Payment Event Quantity',55,'delete_paymenteventquantity'),(166,'Can add Shipping Event Type',56,'add_shippingeventtype'),(167,'Can change Shipping Event Type',56,'change_shippingeventtype'),(168,'Can delete Shipping Event Type',56,'delete_shippingeventtype'),(169,'Can add Shipping Event Quantity',57,'add_shippingeventquantity'),(170,'Can change Shipping Event Quantity',57,'change_shippingeventquantity'),(171,'Can delete Shipping Event Quantity',57,'delete_shippingeventquantity'),(172,'Can add Payment Event Type',58,'add_paymenteventtype'),(173,'Can change Payment Event Type',58,'change_paymenteventtype'),(174,'Can delete Payment Event Type',58,'delete_paymenteventtype'),(175,'Can add Line Attribute',59,'add_lineattribute'),(176,'Can change Line Attribute',59,'change_lineattribute'),(177,'Can delete Line Attribute',59,'delete_lineattribute'),(178,'Can add Order Discount',60,'add_orderdiscount'),(179,'Can change Order Discount',60,'change_orderdiscount'),(180,'Can delete Order Discount',60,'delete_orderdiscount'),(181,'Can add range product',61,'add_rangeproduct'),(182,'Can change range product',61,'change_rangeproduct'),(183,'Can delete range product',61,'delete_rangeproduct'),(184,'Can add Benefit',62,'add_benefit'),(185,'Can change Benefit',62,'change_benefit'),(186,'Can delete Benefit',62,'delete_benefit'),(187,'Can add Multibuy discount benefit',62,'add_multibuydiscountbenefit'),(188,'Can change Multibuy discount benefit',62,'change_multibuydiscountbenefit'),(189,'Can delete Multibuy discount benefit',62,'delete_multibuydiscountbenefit'),(190,'Can add Range',63,'add_range'),(191,'Can change Range',63,'change_range'),(192,'Can delete Range',63,'delete_range'),(193,'Can add Condition',64,'add_condition'),(194,'Can change Condition',64,'change_condition'),(195,'Can delete Condition',64,'delete_condition'),(196,'Can add shipping benefit',62,'add_shippingbenefit'),(197,'Can change shipping benefit',62,'change_shippingbenefit'),(198,'Can delete shipping benefit',62,'delete_shippingbenefit'),(199,'Can add Shipping percentage discount benefit',62,'add_shippingpercentagediscountbenefit'),(200,'Can change Shipping percentage discount benefit',62,'change_shippingpercentagediscountbenefit'),(201,'Can delete Shipping percentage discount benefit',62,'delete_shippingpercentagediscountbenefit'),(202,'Can add Conditional offer',65,'add_conditionaloffer'),(203,'Can change Conditional offer',65,'change_conditionaloffer'),(204,'Can delete Conditional offer',65,'delete_conditionaloffer'),(205,'Can add Shipping absolute discount benefit',62,'add_shippingabsolutediscountbenefit'),(206,'Can change Shipping absolute discount benefit',62,'change_shippingabsolutediscountbenefit'),(207,'Can delete Shipping absolute discount benefit',62,'delete_shippingabsolutediscountbenefit'),(208,'Can add Percentage discount benefit',62,'add_percentagediscountbenefit'),(209,'Can change Percentage discount benefit',62,'change_percentagediscountbenefit'),(210,'Can delete Percentage discount benefit',62,'delete_percentagediscountbenefit'),(211,'Can add Absolute discount benefit',62,'add_absolutediscountbenefit'),(212,'Can change Absolute discount benefit',62,'change_absolutediscountbenefit'),(213,'Can delete Absolute discount benefit',62,'delete_absolutediscountbenefit'),(214,'Can add Coverage Condition',64,'add_coveragecondition'),(215,'Can change Coverage Condition',64,'change_coveragecondition'),(216,'Can delete Coverage Condition',64,'delete_coveragecondition'),(217,'Can add Range Product Uploaded File',66,'add_rangeproductfileupload'),(218,'Can change Range Product Uploaded File',66,'change_rangeproductfileupload'),(219,'Can delete Range Product Uploaded File',66,'delete_rangeproductfileupload'),(220,'Can add Fixed price benefit',62,'add_fixedpricebenefit'),(221,'Can change Fixed price benefit',62,'change_fixedpricebenefit'),(222,'Can delete Fixed price benefit',62,'delete_fixedpricebenefit'),(223,'Can add Fixed price shipping benefit',62,'add_shippingfixedpricebenefit'),(224,'Can change Fixed price shipping benefit',62,'change_shippingfixedpricebenefit'),(225,'Can delete Fixed price shipping benefit',62,'delete_shippingfixedpricebenefit'),(226,'Can add Value condition',64,'add_valuecondition'),(227,'Can change Value condition',64,'change_valuecondition'),(228,'Can delete Value condition',64,'delete_valuecondition'),(229,'Can add Count condition',64,'add_countcondition'),(230,'Can change Count condition',64,'change_countcondition'),(231,'Can delete Count condition',64,'delete_countcondition'),(232,'Can add Voucher Application',67,'add_voucherapplication'),(233,'Can change Voucher Application',67,'change_voucherapplication'),(234,'Can delete Voucher Application',67,'delete_voucherapplication'),(235,'Can add Voucher',68,'add_voucher'),(236,'Can change Voucher',68,'change_voucher'),(237,'Can delete Voucher',68,'delete_voucher'),(238,'Can add course',69,'add_course'),(239,'Can change course',69,'change_course'),(240,'Can delete course',69,'delete_course'),(241,'Can add flat page',70,'add_flatpage'),(242,'Can change flat page',70,'change_flatpage'),(243,'Can delete flat page',70,'delete_flatpage'),(244,'Can add session',71,'add_session'),(245,'Can change session',71,'change_session'),(246,'Can delete session',71,'delete_session'),(247,'Can add nonce',72,'add_nonce'),(248,'Can change nonce',72,'change_nonce'),(249,'Can delete nonce',72,'delete_nonce'),(250,'Can add code',73,'add_code'),(251,'Can change code',73,'change_code'),(252,'Can delete code',73,'delete_code'),(253,'Can add association',74,'add_association'),(254,'Can change association',74,'change_association'),(255,'Can delete association',74,'delete_association'),(256,'Can add partial',75,'add_partial'),(257,'Can change partial',75,'change_partial'),(258,'Can delete partial',75,'delete_partial'),(259,'Can add user social auth',76,'add_usersocialauth'),(260,'Can change user social auth',76,'change_usersocialauth'),(261,'Can delete user social auth',76,'delete_usersocialauth'),(262,'Can add business client',77,'add_businessclient'),(263,'Can change business client',77,'change_businessclient'),(264,'Can delete business client',77,'delete_businessclient'),(265,'Can add historical course',78,'add_historicalcourse'),(266,'Can change historical course',78,'change_historicalcourse'),(267,'Can delete historical course',78,'delete_historicalcourse'),(268,'Can add historical invoice',79,'add_historicalinvoice'),(269,'Can change historical invoice',79,'change_historicalinvoice'),(270,'Can delete historical invoice',79,'delete_historicalinvoice'),(271,'Can add invoice',80,'add_invoice'),(272,'Can change invoice',80,'change_invoice'),(273,'Can delete invoice',80,'delete_invoice'),(274,'Can add referral',81,'add_referral'),(275,'Can change referral',81,'change_referral'),(276,'Can delete referral',81,'delete_referral'),(277,'Can add site theme',82,'add_sitetheme'),(278,'Can change site theme',82,'change_sitetheme'),(279,'Can delete site theme',82,'delete_sitetheme'),(280,'Can add historical refund line',83,'add_historicalrefundline'),(281,'Can change historical refund line',83,'change_historicalrefundline'),(282,'Can delete historical refund line',83,'delete_historicalrefundline'),(283,'Can add refund line',84,'add_refundline'),(284,'Can change refund line',84,'change_refundline'),(285,'Can delete refund line',84,'delete_refundline'),(286,'Can add refund',85,'add_refund'),(287,'Can change refund',85,'change_refund'),(288,'Can delete refund',85,'delete_refund'),(289,'Can add historical refund',86,'add_historicalrefund'),(290,'Can change historical refund',86,'change_historicalrefund'),(291,'Can delete historical refund',86,'delete_historicalrefund'),(292,'Can add Weight-based Shipping Method',87,'add_weightbased'),(293,'Can change Weight-based Shipping Method',87,'change_weightbased'),(294,'Can delete Weight-based Shipping Method',87,'delete_weightbased'),(295,'Can add Order and Item Charge',88,'add_orderanditemcharges'),(296,'Can change Order and Item Charge',88,'change_orderanditemcharges'),(297,'Can delete Order and Item Charge',88,'delete_orderanditemcharges'),(298,'Can add Weight Band',89,'add_weightband'),(299,'Can change Weight Band',89,'change_weightband'),(300,'Can delete Weight Band',89,'delete_weightband'),(301,'Can add Vote',90,'add_vote'),(302,'Can change Vote',90,'change_vote'),(303,'Can delete Vote',90,'delete_vote'),(304,'Can add Product review',91,'add_productreview'),(305,'Can change Product review',91,'change_productreview'),(306,'Can delete Product review',91,'delete_productreview'),(307,'Can add paypal web profile',92,'add_paypalwebprofile'),(308,'Can change paypal web profile',92,'change_paypalwebprofile'),(309,'Can delete paypal web profile',92,'delete_paypalwebprofile'),(310,'Can add Paypal Processor Configuration',93,'add_paypalprocessorconfiguration'),(311,'Can change Paypal Processor Configuration',93,'change_paypalprocessorconfiguration'),(312,'Can delete Paypal Processor Configuration',93,'delete_paypalprocessorconfiguration'),(313,'Can add Bankcard',94,'add_bankcard'),(314,'Can change Bankcard',94,'change_bankcard'),(315,'Can delete Bankcard',94,'delete_bankcard'),(316,'Can add Payment Processor Response',95,'add_paymentprocessorresponse'),(317,'Can change Payment Processor Response',95,'change_paymentprocessorresponse'),(318,'Can delete Payment Processor Response',95,'delete_paymentprocessorresponse'),(319,'Can add Transaction',96,'add_transaction'),(320,'Can change Transaction',96,'change_transaction'),(321,'Can delete Transaction',96,'delete_transaction'),(322,'Can add Source Type',97,'add_sourcetype'),(323,'Can change Source Type',97,'change_sourcetype'),(324,'Can delete Source Type',97,'delete_sourcetype'),(325,'Can add SDN Check Failure',98,'add_sdncheckfailure'),(326,'Can change SDN Check Failure',98,'change_sdncheckfailure'),(327,'Can delete SDN Check Failure',98,'delete_sdncheckfailure'),(328,'Can add Source',99,'add_source'),(329,'Can change Source',99,'change_source'),(330,'Can delete Source',99,'delete_source'),(331,'Can add historical Order',111,'add_historicalorder'),(332,'Can change historical Order',111,'change_historicalorder'),(333,'Can delete historical Order',111,'delete_historicalorder'),(334,'Can add historical Order Line',112,'add_historicalline'),(335,'Can change historical Order Line',112,'change_historicalline'),(336,'Can delete historical Order Line',112,'delete_historicalline'),(337,'Can add Automatic product list',113,'add_automaticproductlist'),(338,'Can change Automatic product list',113,'change_automaticproductlist'),(339,'Can delete Automatic product list',113,'delete_automaticproductlist'),(340,'Can add Raw HTML',114,'add_rawhtml'),(341,'Can change Raw HTML',114,'change_rawhtml'),(342,'Can delete Raw HTML',114,'delete_rawhtml'),(343,'Can add Image',115,'add_image'),(344,'Can change Image',115,'change_image'),(345,'Can delete Image',115,'delete_image'),(346,'Can add Multi Image',116,'add_multiimage'),(347,'Can change Multi Image',116,'change_multiimage'),(348,'Can delete Multi Image',116,'delete_multiimage'),(349,'Can add Ordered product',117,'add_orderedproduct'),(350,'Can change Ordered product',117,'change_orderedproduct'),(351,'Can delete Ordered product',117,'delete_orderedproduct'),(352,'Can add Tabbed Block',118,'add_tabbedblock'),(353,'Can change Tabbed Block',118,'change_tabbedblock'),(354,'Can delete Tabbed Block',118,'delete_tabbedblock'),(355,'Can add Page Promotion',119,'add_pagepromotion'),(356,'Can change Page Promotion',119,'change_pagepromotion'),(357,'Can delete Page Promotion',119,'delete_pagepromotion'),(358,'Can add Hand Picked Product List',120,'add_handpickedproductlist'),(359,'Can change Hand Picked Product List',120,'change_handpickedproductlist'),(360,'Can delete Hand Picked Product List',120,'delete_handpickedproductlist'),(361,'Can add Ordered Product List',121,'add_orderedproductlist'),(362,'Can change Ordered Product List',121,'change_orderedproductlist'),(363,'Can delete Ordered Product List',121,'delete_orderedproductlist'),(364,'Can add Single product',122,'add_singleproduct'),(365,'Can change Single product',122,'change_singleproduct'),(366,'Can delete Single product',122,'delete_singleproduct'),(367,'Can add Keyword Promotion',123,'add_keywordpromotion'),(368,'Can change Keyword Promotion',123,'change_keywordpromotion'),(369,'Can delete Keyword Promotion',123,'delete_keywordpromotion'),(370,'Can add order line vouchers',124,'add_orderlinevouchers'),(371,'Can change order line vouchers',124,'change_orderlinevouchers'),(372,'Can delete order line vouchers',124,'delete_orderlinevouchers'),(373,'Can add coupon vouchers',125,'add_couponvouchers'),(374,'Can change coupon vouchers',125,'change_couponvouchers'),(375,'Can delete coupon vouchers',125,'delete_couponvouchers'),(376,'Can add Wish List',126,'add_wishlist'),(377,'Can change Wish List',126,'change_wishlist'),(378,'Can delete Wish List',126,'delete_wishlist'),(379,'Can add Wish list line',127,'add_line'),(380,'Can change Wish list line',127,'change_line'),(381,'Can delete Wish list line',127,'delete_line'),(382,'Can add kv store',128,'add_kvstore'),(383,'Can change kv store',128,'change_kvstore'),(384,'Can delete kv store',128,'delete_kvstore');
-/*!40000 ALTER TABLE `auth_permission` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `basket_basket`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `basket_basket` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `status` varchar(128) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_merged` datetime(6) DEFAULT NULL,
-  `date_submitted` datetime(6) DEFAULT NULL,
-  `owner_id` int(11) DEFAULT NULL,
-  `site_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `basket_basket_owner_id_3a018de5_fk_ecommerce_user_id` (`owner_id`),
-  KEY `basket_basket_site_id_c45bd035_fk_django_site_id` (`site_id`),
-  CONSTRAINT `basket_basket_owner_id_3a018de5_fk_ecommerce_user_id` FOREIGN KEY (`owner_id`) REFERENCES `ecommerce_user` (`id`),
-  CONSTRAINT `basket_basket_site_id_c45bd035_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `basket_basket`
---
-
-LOCK TABLES `basket_basket` WRITE;
-/*!40000 ALTER TABLE `basket_basket` DISABLE KEYS */;
-/*!40000 ALTER TABLE `basket_basket` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `basket_basket_vouchers`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `basket_basket_vouchers` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `basket_id` int(11) NOT NULL,
-  `voucher_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `basket_basket_vouchers_basket_id_0731eee2_uniq` (`basket_id`,`voucher_id`),
-  KEY `basket_basket_vouchers_voucher_id_c2b66981_fk_voucher_voucher_id` (`voucher_id`),
-  CONSTRAINT `basket_basket_vouchers_basket_id_f857c2f8_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`),
-  CONSTRAINT `basket_basket_vouchers_voucher_id_c2b66981_fk_voucher_voucher_id` FOREIGN KEY (`voucher_id`) REFERENCES `voucher_voucher` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `basket_basket_vouchers`
---
-
-LOCK TABLES `basket_basket_vouchers` WRITE;
-/*!40000 ALTER TABLE `basket_basket_vouchers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `basket_basket_vouchers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `basket_basketattribute`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `basket_basketattribute` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `value_text` longtext NOT NULL,
-  `attribute_type_id` int(11) NOT NULL,
-  `basket_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `basket_basketattribute_basket_id_a6c168f8_uniq` (`basket_id`,`attribute_type_id`),
-  KEY `bask_attribute_type_id_822adc5d_fk_basket_basketattributetype_id` (`attribute_type_id`),
-  CONSTRAINT `bask_attribute_type_id_822adc5d_fk_basket_basketattributetype_id` FOREIGN KEY (`attribute_type_id`) REFERENCES `basket_basketattributetype` (`id`),
-  CONSTRAINT `basket_basketattribute_basket_id_55c452f8_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `basket_basketattribute`
---
-
-LOCK TABLES `basket_basketattribute` WRITE;
-/*!40000 ALTER TABLE `basket_basketattribute` DISABLE KEYS */;
-/*!40000 ALTER TABLE `basket_basketattribute` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `basket_basketattributetype`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `basket_basketattributetype` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `basket_basketattributetype`
---
-
-LOCK TABLES `basket_basketattributetype` WRITE;
-/*!40000 ALTER TABLE `basket_basketattributetype` DISABLE KEYS */;
-INSERT INTO `basket_basketattributetype` VALUES (2,'bundle_identifier'),(1,'sailthru_bid');
-/*!40000 ALTER TABLE `basket_basketattributetype` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `basket_line`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `basket_line` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `line_reference` varchar(128) NOT NULL,
-  `quantity` int(10) unsigned NOT NULL,
-  `price_currency` varchar(12) NOT NULL,
-  `price_excl_tax` decimal(12,2) DEFAULT NULL,
-  `price_incl_tax` decimal(12,2) DEFAULT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `basket_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  `stockrecord_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `basket_line_basket_id_8977e974_uniq` (`basket_id`,`line_reference`),
-  KEY `basket_line_767217f5` (`line_reference`),
-  KEY `basket_line_product_id_303d743e_fk_catalogue_product_id` (`product_id`),
-  KEY `basket_line_stockrecord_id_7039d8a4_fk_partner_stockrecord_id` (`stockrecord_id`),
-  CONSTRAINT `basket_line_basket_id_b615c905_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`),
-  CONSTRAINT `basket_line_product_id_303d743e_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `basket_line_stockrecord_id_7039d8a4_fk_partner_stockrecord_id` FOREIGN KEY (`stockrecord_id`) REFERENCES `partner_stockrecord` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `basket_line`
---
-
-LOCK TABLES `basket_line` WRITE;
-/*!40000 ALTER TABLE `basket_line` DISABLE KEYS */;
-/*!40000 ALTER TABLE `basket_line` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `basket_lineattribute`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `basket_lineattribute` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `value` varchar(255) NOT NULL,
-  `line_id` int(11) NOT NULL,
-  `option_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `basket_lineattribute_line_id_c41e0cdf_fk_basket_line_id` (`line_id`),
-  KEY `basket_lineattribute_option_id_9387a3f7_fk_catalogue_option_id` (`option_id`),
-  CONSTRAINT `basket_lineattribute_line_id_c41e0cdf_fk_basket_line_id` FOREIGN KEY (`line_id`) REFERENCES `basket_line` (`id`),
-  CONSTRAINT `basket_lineattribute_option_id_9387a3f7_fk_catalogue_option_id` FOREIGN KEY (`option_id`) REFERENCES `catalogue_option` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `basket_lineattribute`
---
-
-LOCK TABLES `basket_lineattribute` WRITE;
-/*!40000 ALTER TABLE `basket_lineattribute` DISABLE KEYS */;
-/*!40000 ALTER TABLE `basket_lineattribute` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_attributeoption`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_attributeoption` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `option` varchar(255) NOT NULL,
-  `group_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_attributeoption_group_id_7a8f6c11_uniq` (`group_id`,`option`),
-  CONSTRAINT `catalogue_group_id_3d4a5e24_fk_catalogue_attributeoptiongroup_id` FOREIGN KEY (`group_id`) REFERENCES `catalogue_attributeoptiongroup` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_attributeoption`
---
-
-LOCK TABLES `catalogue_attributeoption` WRITE;
-/*!40000 ALTER TABLE `catalogue_attributeoption` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_attributeoption` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_attributeoptiongroup`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_attributeoptiongroup` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_attributeoptiongroup`
---
-
-LOCK TABLES `catalogue_attributeoptiongroup` WRITE;
-/*!40000 ALTER TABLE `catalogue_attributeoptiongroup` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_attributeoptiongroup` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_catalog`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_catalog` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `partner_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `catalogue_catalog_partner_id_eeba0b62_fk_partner_partner_id` (`partner_id`),
-  CONSTRAINT `catalogue_catalog_partner_id_eeba0b62_fk_partner_partner_id` FOREIGN KEY (`partner_id`) REFERENCES `partner_partner` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_catalog`
---
-
-LOCK TABLES `catalogue_catalog` WRITE;
-/*!40000 ALTER TABLE `catalogue_catalog` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_catalog` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_catalog_stock_records`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_catalog_stock_records` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `catalog_id` int(11) NOT NULL,
-  `stockrecord_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_catalog_stock_records_catalog_id_f363d53b_uniq` (`catalog_id`,`stockrecord_id`),
-  KEY `catalogue_cata_stockrecord_id_e480f401_fk_partner_stockrecord_id` (`stockrecord_id`),
-  CONSTRAINT `catalogue_cata_stockrecord_id_e480f401_fk_partner_stockrecord_id` FOREIGN KEY (`stockrecord_id`) REFERENCES `partner_stockrecord` (`id`),
-  CONSTRAINT `catalogue_catalog_st_catalog_id_8fa6c918_fk_catalogue_catalog_id` FOREIGN KEY (`catalog_id`) REFERENCES `catalogue_catalog` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_catalog_stock_records`
---
-
-LOCK TABLES `catalogue_catalog_stock_records` WRITE;
-/*!40000 ALTER TABLE `catalogue_catalog_stock_records` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_catalog_stock_records` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_category`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_category` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `path` varchar(255) NOT NULL,
-  `depth` int(10) unsigned NOT NULL,
-  `numchild` int(10) unsigned NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `description` longtext NOT NULL,
-  `image` varchar(255) DEFAULT NULL,
-  `slug` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `path` (`path`),
-  KEY `catalogue_category_b068931c` (`name`),
-  KEY `catalogue_category_2dbcba41` (`slug`)
-) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_category`
---
-
-LOCK TABLES `catalogue_category` WRITE;
-/*!40000 ALTER TABLE `catalogue_category` DISABLE KEYS */;
-INSERT INTO `catalogue_category` VALUES (1,'0001',1,1,'Seats','All course seats','','seats'),(2,'0002',1,15,'Coupons','All Coupons','','coupons'),(3,'00020001',2,0,'Affiliate Promotion','','','affiliate-promotion'),(4,'00020002',2,0,'Bulk Enrollment','','','bulk-enrollment'),(5,'00020003',2,0,'ConnectEd','','','connected'),(6,'00020004',2,0,'Course Promotion','','','course-promotion'),(7,'00020005',2,0,'Customer Service','','','customer-service'),(8,'00020006',2,0,'Financial Assistance','','','financial-assistance'),(9,'00020007',2,0,'Geography Promotion','','','geography-promotion'),(10,'00020008',2,0,'Marketing Partner Promotion','','','marketing-partner-promotion'),(11,'00020009',2,0,'Marketing-Other','','','marketing-other'),(12,'0002000A',2,0,'Paid Cohort','','','paid-cohort'),(13,'0002000B',2,0,'Other','','','other'),(14,'0002000C',2,0,'Retention Promotion','','','retention-promotion'),(15,'0002000D',2,0,'Services-Other','','','services-other'),(16,'0002000E',2,0,'Support-Other','','','support-other'),(17,'0002000F',2,0,'Upsell Promotion','','','upsell-promotion'),(18,'0003',1,0,'Course Entitlements','All course entitlements','','course_entitlements'),(19,'0004',1,0,'Donations','All donations','','donations');
-/*!40000 ALTER TABLE `catalogue_category` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_option`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_option` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `code` varchar(128) NOT NULL,
-  `type` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_option`
---
-
-LOCK TABLES `catalogue_option` WRITE;
-/*!40000 ALTER TABLE `catalogue_option` DISABLE KEYS */;
-INSERT INTO `catalogue_option` VALUES (1,'Course Entitlement','course_entitlement','Optional');
-/*!40000 ALTER TABLE `catalogue_option` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_product`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_product` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `structure` varchar(10) NOT NULL,
-  `upc` varchar(64) DEFAULT NULL,
-  `title` varchar(255) NOT NULL,
-  `slug` varchar(255) NOT NULL,
-  `description` longtext NOT NULL,
-  `rating` double DEFAULT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_updated` datetime(6) NOT NULL,
-  `is_discountable` tinyint(1) NOT NULL,
-  `parent_id` int(11) DEFAULT NULL,
-  `product_class_id` int(11) DEFAULT NULL,
-  `course_id` varchar(255) DEFAULT NULL,
-  `expires` datetime(6) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `upc` (`upc`),
-  KEY `catalogue_product_2dbcba41` (`slug`),
-  KEY `catalogue_product_9474e4b5` (`date_updated`),
-  KEY `catalogue_product_parent_id_9bfd2382_fk_catalogue_product_id` (`parent_id`),
-  KEY `catalogue_product_course_id_1918bc6b_fk_courses_course_id` (`course_id`),
-  KEY `catalogue_product_class_id_0c6c5b54_fk_catalogue_productclass_id` (`product_class_id`),
-  CONSTRAINT `catalogue_product_class_id_0c6c5b54_fk_catalogue_productclass_id` FOREIGN KEY (`product_class_id`) REFERENCES `catalogue_productclass` (`id`),
-  CONSTRAINT `catalogue_product_course_id_1918bc6b_fk_courses_course_id` FOREIGN KEY (`course_id`) REFERENCES `courses_course` (`id`),
-  CONSTRAINT `catalogue_product_parent_id_9bfd2382_fk_catalogue_product_id` FOREIGN KEY (`parent_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_product`
---
-
-LOCK TABLES `catalogue_product` WRITE;
-/*!40000 ALTER TABLE `catalogue_product` DISABLE KEYS */;
-INSERT INTO `catalogue_product` VALUES (1,'parent',NULL,'Seat in edX Demonstration Course','seat-in-edx-demonstration-course','',NULL,'2018-02-02 15:05:41.711720','2018-02-02 15:05:41.717384',1,NULL,1,'course-v1:edX+DemoX+Demo_Course',NULL),(2,'child',NULL,'Seat in edX Demonstration Course','seat-in-edx-demonstration-course','',NULL,'2018-02-02 15:05:41.733143','2018-02-02 15:05:41.733175',1,1,NULL,'course-v1:edX+DemoX+Demo_Course',NULL),(3,'child',NULL,'Seat in edX Demonstration Course with verified certificate (and ID verification)','seat-in-edx-demonstration-course-with-verified-certificate-and-id-verification','',NULL,'2018-02-02 15:05:41.764904','2018-02-02 15:05:41.764939',1,1,NULL,'course-v1:edX+DemoX+Demo_Course','2019-02-02 15:05:41.690970');
-/*!40000 ALTER TABLE `catalogue_product` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_product_product_options`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_product_product_options` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `product_id` int(11) NOT NULL,
-  `option_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_product_product_options_product_id_9b3abb31_uniq` (`product_id`,`option_id`),
-  KEY `catalogue_product_prod_option_id_ff470e13_fk_catalogue_option_id` (`option_id`),
-  CONSTRAINT `catalogue_product_pr_product_id_ad2b46bd_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `catalogue_product_prod_option_id_ff470e13_fk_catalogue_option_id` FOREIGN KEY (`option_id`) REFERENCES `catalogue_option` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_product_product_options`
---
-
-LOCK TABLES `catalogue_product_product_options` WRITE;
-/*!40000 ALTER TABLE `catalogue_product_product_options` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_product_product_options` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productattribute`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productattribute` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `code` varchar(128) NOT NULL,
-  `type` varchar(20) NOT NULL,
-  `required` tinyint(1) NOT NULL,
-  `option_group_id` int(11) DEFAULT NULL,
-  `product_class_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `ca_option_group_id_6b422dc2_fk_catalogue_attributeoptiongroup_id` (`option_group_id`),
-  KEY `catalogue_productattribute_c1336794` (`code`),
-  KEY `catalogue_product_class_id_7af808ec_fk_catalogue_productclass_id` (`product_class_id`),
-  CONSTRAINT `ca_option_group_id_6b422dc2_fk_catalogue_attributeoptiongroup_id` FOREIGN KEY (`option_group_id`) REFERENCES `catalogue_attributeoptiongroup` (`id`),
-  CONSTRAINT `catalogue_product_class_id_7af808ec_fk_catalogue_productclass_id` FOREIGN KEY (`product_class_id`) REFERENCES `catalogue_productclass` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productattribute`
---
-
-LOCK TABLES `catalogue_productattribute` WRITE;
-/*!40000 ALTER TABLE `catalogue_productattribute` DISABLE KEYS */;
-INSERT INTO `catalogue_productattribute` VALUES (1,'course_key','course_key','text',1,NULL,1),(2,'id_verification_required','id_verification_required','boolean',0,NULL,1),(3,'certificate_type','certificate_type','text',0,NULL,1),(4,'credit_provider','credit_provider','text',0,NULL,1),(5,'credit_hours','credit_hours','integer',0,NULL,1),(6,'Coupon vouchers','coupon_vouchers','entity',1,NULL,2),(7,'Note','note','text',0,NULL,2),(8,'Course Key','course_key','text',1,NULL,3),(9,'Seat Type','seat_type','text',1,NULL,3),(10,'id_verification_required','id_verification_required','boolean',0,NULL,3),(11,'UUID','UUID','text',1,NULL,4),(12,'certificate_type','certificate_type','text',0,NULL,4);
-/*!40000 ALTER TABLE `catalogue_productattribute` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productattributevalue`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productattributevalue` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `value_text` longtext,
-  `value_integer` int(11) DEFAULT NULL,
-  `value_boolean` tinyint(1) DEFAULT NULL,
-  `value_float` double DEFAULT NULL,
-  `value_richtext` longtext,
-  `value_date` date DEFAULT NULL,
-  `value_file` varchar(255) DEFAULT NULL,
-  `value_image` varchar(255) DEFAULT NULL,
-  `entity_object_id` int(10) unsigned DEFAULT NULL,
-  `attribute_id` int(11) NOT NULL,
-  `entity_content_type_id` int(11) DEFAULT NULL,
-  `product_id` int(11) NOT NULL,
-  `value_option_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_productattributevalue_attribute_id_1e8e7112_uniq` (`attribute_id`,`product_id`),
-  KEY `catalo_entity_content_type_id_f7186ab5_fk_django_content_type_id` (`entity_content_type_id`),
-  KEY `catalogue_productatt_product_id_a03cd90e_fk_catalogue_product_id` (`product_id`),
-  KEY `catalog_value_option_id_21026066_fk_catalogue_attributeoption_id` (`value_option_id`),
-  CONSTRAINT `catalo_entity_content_type_id_f7186ab5_fk_django_content_type_id` FOREIGN KEY (`entity_content_type_id`) REFERENCES `django_content_type` (`id`),
-  CONSTRAINT `catalog_value_option_id_21026066_fk_catalogue_attributeoption_id` FOREIGN KEY (`value_option_id`) REFERENCES `catalogue_attributeoption` (`id`),
-  CONSTRAINT `catalogue_attribute_id_0287c1e7_fk_catalogue_productattribute_id` FOREIGN KEY (`attribute_id`) REFERENCES `catalogue_productattribute` (`id`),
-  CONSTRAINT `catalogue_productatt_product_id_a03cd90e_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productattributevalue`
---
-
-LOCK TABLES `catalogue_productattributevalue` WRITE;
-/*!40000 ALTER TABLE `catalogue_productattributevalue` DISABLE KEYS */;
-INSERT INTO `catalogue_productattributevalue` VALUES (1,'course-v1:edX+DemoX+Demo_Course',NULL,NULL,NULL,NULL,NULL,'','',NULL,1,NULL,1,NULL),(2,'course-v1:edX+DemoX+Demo_Course',NULL,NULL,NULL,NULL,NULL,'','',NULL,1,NULL,2,NULL),(3,NULL,NULL,0,NULL,NULL,NULL,'','',NULL,2,NULL,2,NULL),(4,'verified',NULL,NULL,NULL,NULL,NULL,'','',NULL,3,NULL,3,NULL),(5,'course-v1:edX+DemoX+Demo_Course',NULL,NULL,NULL,NULL,NULL,'','',NULL,1,NULL,3,NULL),(6,NULL,NULL,1,NULL,NULL,NULL,'','',NULL,2,NULL,3,NULL);
-/*!40000 ALTER TABLE `catalogue_productattributevalue` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productcategory`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productcategory` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `category_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_productcategory_product_id_8f0dbfe2_uniq` (`product_id`,`category_id`),
-  KEY `catalogue_productc_category_id_176db535_fk_catalogue_category_id` (`category_id`),
-  CONSTRAINT `catalogue_productc_category_id_176db535_fk_catalogue_category_id` FOREIGN KEY (`category_id`) REFERENCES `catalogue_category` (`id`),
-  CONSTRAINT `catalogue_productcat_product_id_846a4061_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productcategory`
---
-
-LOCK TABLES `catalogue_productcategory` WRITE;
-/*!40000 ALTER TABLE `catalogue_productcategory` DISABLE KEYS */;
-INSERT INTO `catalogue_productcategory` VALUES (1,1,1);
-/*!40000 ALTER TABLE `catalogue_productcategory` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productclass`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productclass` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `slug` varchar(128) NOT NULL,
-  `requires_shipping` tinyint(1) NOT NULL,
-  `track_stock` tinyint(1) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `slug` (`slug`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productclass`
---
-
-LOCK TABLES `catalogue_productclass` WRITE;
-/*!40000 ALTER TABLE `catalogue_productclass` DISABLE KEYS */;
-INSERT INTO `catalogue_productclass` VALUES (1,'Seat','seat',0,0),(2,'Coupon','coupon',0,0),(3,'Enrollment Code','enrollment_code',0,0),(4,'Course Entitlement','course-entitlement',0,0),(5,'Donation','donation',0,0);
-/*!40000 ALTER TABLE `catalogue_productclass` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productclass_options`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productclass_options` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `productclass_id` int(11) NOT NULL,
-  `option_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_productclass_options_productclass_id_2266c635_uniq` (`productclass_id`,`option_id`),
-  KEY `catalogue_productclass_option_id_b099542c_fk_catalogue_option_id` (`option_id`),
-  CONSTRAINT `catalogue__productclass_id_732df4c8_fk_catalogue_productclass_id` FOREIGN KEY (`productclass_id`) REFERENCES `catalogue_productclass` (`id`),
-  CONSTRAINT `catalogue_productclass_option_id_b099542c_fk_catalogue_option_id` FOREIGN KEY (`option_id`) REFERENCES `catalogue_option` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productclass_options`
---
-
-LOCK TABLES `catalogue_productclass_options` WRITE;
-/*!40000 ALTER TABLE `catalogue_productclass_options` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_productclass_options` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productimage`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productimage` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `original` varchar(255) NOT NULL,
-  `caption` varchar(200) NOT NULL,
-  `display_order` int(10) unsigned NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_productimage_product_id_2df78171_uniq` (`product_id`,`display_order`),
-  CONSTRAINT `catalogue_productima_product_id_49474fe8_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productimage`
---
-
-LOCK TABLES `catalogue_productimage` WRITE;
-/*!40000 ALTER TABLE `catalogue_productimage` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_productimage` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `catalogue_productrecommendation`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `catalogue_productrecommendation` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ranking` smallint(5) unsigned NOT NULL,
-  `primary_id` int(11) NOT NULL,
-  `recommendation_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `catalogue_productrecommendation_primary_id_da1fdf43_uniq` (`primary_id`,`recommendation_id`),
-  KEY `catalogue_pro_recommendation_id_daf8ae95_fk_catalogue_product_id` (`recommendation_id`),
-  CONSTRAINT `catalogue_pro_recommendation_id_daf8ae95_fk_catalogue_product_id` FOREIGN KEY (`recommendation_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `catalogue_productrec_primary_id_6e51a55c_fk_catalogue_product_id` FOREIGN KEY (`primary_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `catalogue_productrecommendation`
---
-
-LOCK TABLES `catalogue_productrecommendation` WRITE;
-/*!40000 ALTER TABLE `catalogue_productrecommendation` DISABLE KEYS */;
-/*!40000 ALTER TABLE `catalogue_productrecommendation` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `core_businessclient`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `core_businessclient` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `core_businessclient`
---
-
-LOCK TABLES `core_businessclient` WRITE;
-/*!40000 ALTER TABLE `core_businessclient` DISABLE KEYS */;
-/*!40000 ALTER TABLE `core_businessclient` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `core_client`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `core_client` (
-  `user_ptr_id` int(11) NOT NULL,
-  PRIMARY KEY (`user_ptr_id`),
-  CONSTRAINT `core_client_user_ptr_id_e5908bcf_fk_ecommerce_user_id` FOREIGN KEY (`user_ptr_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `core_client`
---
-
-LOCK TABLES `core_client` WRITE;
-/*!40000 ALTER TABLE `core_client` DISABLE KEYS */;
-/*!40000 ALTER TABLE `core_client` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `core_siteconfiguration`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `core_siteconfiguration` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `lms_url_root` varchar(200) NOT NULL,
-  `theme_scss_path` varchar(255) DEFAULT NULL,
-  `payment_processors` varchar(255) NOT NULL,
-  `partner_id` int(11) NOT NULL,
-  `site_id` int(11) NOT NULL,
-  `oauth_settings` longtext NOT NULL,
-  `segment_key` varchar(255) DEFAULT NULL,
-  `from_email` varchar(255) DEFAULT NULL,
-  `enable_enrollment_codes` tinyint(1) NOT NULL,
-  `payment_support_email` varchar(255) NOT NULL,
-  `payment_support_url` varchar(255) NOT NULL,
-  `affiliate_cookie_name` varchar(255) NOT NULL,
-  `utm_cookie_name` varchar(255) NOT NULL,
-  `client_side_payment_processor` varchar(255) DEFAULT NULL,
-  `send_refund_notifications` tinyint(1) NOT NULL,
-  `enable_sdn_check` tinyint(1) NOT NULL,
-  `sdn_api_key` varchar(255) NOT NULL,
-  `sdn_api_list` varchar(255) NOT NULL,
-  `sdn_api_url` varchar(255) NOT NULL,
-  `require_account_activation` tinyint(1) NOT NULL,
-  `optimizely_snippet_src` varchar(255) NOT NULL,
-  `enable_sailthru` tinyint(1) NOT NULL,
-  `base_cookie_domain` varchar(255) NOT NULL,
-  `enable_embargo_check` tinyint(1) NOT NULL,
-  `discovery_api_url` varchar(200) NOT NULL,
-  `enable_apple_pay` tinyint(1) NOT NULL,
-  `enable_partial_program` tinyint(1) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `core_siteconfiguration_site_id_3124a87d_uniq` (`site_id`),
-  UNIQUE KEY `core_siteconfiguration_partner_id_75739217_uniq` (`partner_id`),
-  CONSTRAINT `core_siteconfiguration_partner_id_75739217_fk_partner_partner_id` FOREIGN KEY (`partner_id`) REFERENCES `partner_partner` (`id`),
-  CONSTRAINT `core_siteconfiguration_site_id_3124a87d_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `core_siteconfiguration`
---
-
-LOCK TABLES `core_siteconfiguration` WRITE;
-/*!40000 ALTER TABLE `core_siteconfiguration` DISABLE KEYS */;
-INSERT INTO `core_siteconfiguration` VALUES (1,'http://edx.devstack.lms:18000',NULL,'cybersource,paypal',1,1,'{\"SOCIAL_AUTH_EDX_OIDC_ID_TOKEN_DECRYPTION_KEY\":\"ecommerce-secret\",\"SOCIAL_AUTH_EDX_OIDC_URL_ROOT\":\"http://edx.devstack.lms:18000/oauth2\",\"SOCIAL_AUTH_EDX_OIDC_ISSUERS\":[\"http://edx.devstack.lms:18000\"],\"SOCIAL_AUTH_EDX_OIDC_KEY\":\"ecommerce-key\",\"SOCIAL_AUTH_EDX_OIDC_SECRET\":\"ecommerce-secret\"}',NULL,'staff@example.com',0,'support@example.com','','','','cybersource',0,0,'','','',1,'',0,'',0,'http://edx.devstack.discovery:18381/api/v1/',0,0);
-/*!40000 ALTER TABLE `core_siteconfiguration` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `courses_course`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `courses_course` (
-  `id` varchar(255) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `thumbnail_url` varchar(200) DEFAULT NULL,
-  `verification_deadline` datetime(6) DEFAULT NULL,
-  `site_id` int(11) NOT NULL,
-  `created` datetime(6),
-  `modified` datetime(6),
-  PRIMARY KEY (`id`),
-  KEY `courses_course_site_id_af38aac5_fk_django_site_id` (`site_id`),
-  CONSTRAINT `courses_course_site_id_af38aac5_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `courses_course`
---
-
-LOCK TABLES `courses_course` WRITE;
-/*!40000 ALTER TABLE `courses_course` DISABLE KEYS */;
-INSERT INTO `courses_course` VALUES ('course-v1:edX+DemoX+Demo_Course','edX Demonstration Course',NULL,'2020-02-02 15:05:41.690970',1,'2018-02-02 15:05:41.703298','2018-02-02 15:05:41.703319');
-/*!40000 ALTER TABLE `courses_course` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `customer_communicationeventtype`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `customer_communicationeventtype` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(128) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `category` varchar(255) NOT NULL,
-  `email_subject_template` varchar(255) DEFAULT NULL,
-  `email_body_template` longtext,
-  `email_body_html_template` longtext,
-  `sms_template` varchar(170) DEFAULT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_updated` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `customer_communicationeventtype`
---
-
-LOCK TABLES `customer_communicationeventtype` WRITE;
-/*!40000 ALTER TABLE `customer_communicationeventtype` DISABLE KEYS */;
-/*!40000 ALTER TABLE `customer_communicationeventtype` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `customer_email`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `customer_email` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `subject` longtext NOT NULL,
-  `body_text` longtext NOT NULL,
-  `body_html` longtext NOT NULL,
-  `date_sent` datetime(6) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `customer_email_user_id_a69ad588_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `customer_email_user_id_a69ad588_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `customer_email`
---
-
-LOCK TABLES `customer_email` WRITE;
-/*!40000 ALTER TABLE `customer_email` DISABLE KEYS */;
-/*!40000 ALTER TABLE `customer_email` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `customer_notification`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `customer_notification` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `subject` varchar(255) NOT NULL,
-  `body` longtext NOT NULL,
-  `category` varchar(255) NOT NULL,
-  `location` varchar(32) NOT NULL,
-  `date_sent` datetime(6) NOT NULL,
-  `date_read` datetime(6) DEFAULT NULL,
-  `recipient_id` int(11) NOT NULL,
-  `sender_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `customer_notification_recipient_id_d99de5c8_fk_ecommerce_user_id` (`recipient_id`),
-  KEY `customer_notification_sender_id_affa1632_fk_ecommerce_user_id` (`sender_id`),
-  CONSTRAINT `customer_notification_recipient_id_d99de5c8_fk_ecommerce_user_id` FOREIGN KEY (`recipient_id`) REFERENCES `ecommerce_user` (`id`),
-  CONSTRAINT `customer_notification_sender_id_affa1632_fk_ecommerce_user_id` FOREIGN KEY (`sender_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `customer_notification`
---
-
-LOCK TABLES `customer_notification` WRITE;
-/*!40000 ALTER TABLE `customer_notification` DISABLE KEYS */;
-/*!40000 ALTER TABLE `customer_notification` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `customer_productalert`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `customer_productalert` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `email` varchar(254) NOT NULL,
-  `key` varchar(128) NOT NULL,
-  `status` varchar(20) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_confirmed` datetime(6) DEFAULT NULL,
-  `date_cancelled` datetime(6) DEFAULT NULL,
-  `date_closed` datetime(6) DEFAULT NULL,
-  `product_id` int(11) NOT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `customer_productaler_product_id_7e529a41_fk_catalogue_product_id` (`product_id`),
-  KEY `customer_productalert_user_id_677ad6d6_fk_ecommerce_user_id` (`user_id`),
-  KEY `customer_productalert_0c83f57c` (`email`),
-  KEY `customer_productalert_3c6e0b8a` (`key`),
-  CONSTRAINT `customer_productaler_product_id_7e529a41_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `customer_productalert_user_id_677ad6d6_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `customer_productalert`
---
-
-LOCK TABLES `customer_productalert` WRITE;
-/*!40000 ALTER TABLE `customer_productalert` DISABLE KEYS */;
-/*!40000 ALTER TABLE `customer_productalert` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_admin_log`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_admin_log` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `action_time` datetime(6) NOT NULL,
-  `object_id` longtext,
-  `object_repr` varchar(200) NOT NULL,
-  `action_flag` smallint(5) unsigned NOT NULL,
-  `change_message` longtext NOT NULL,
-  `content_type_id` int(11) DEFAULT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `django_admin__content_type_id_c4bce8eb_fk_django_content_type_id` (`content_type_id`),
-  KEY `django_admin_log_user_id_c564eba6_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `django_admin__content_type_id_c4bce8eb_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`),
-  CONSTRAINT `django_admin_log_user_id_c564eba6_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_admin_log`
---
-
-LOCK TABLES `django_admin_log` WRITE;
-/*!40000 ALTER TABLE `django_admin_log` DISABLE KEYS */;
-/*!40000 ALTER TABLE `django_admin_log` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_content_type`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_content_type` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `app_label` varchar(100) NOT NULL,
-  `model` varchar(100) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `django_content_type_app_label_76bd3d3b_uniq` (`app_label`,`model`)
-) ENGINE=InnoDB AUTO_INCREMENT=129 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_content_type`
---
-
-LOCK TABLES `django_content_type` WRITE;
-/*!40000 ALTER TABLE `django_content_type` DISABLE KEYS */;
-INSERT INTO `django_content_type` VALUES (7,'address','country'),(8,'address','useraddress'),(9,'admin','logentry'),(27,'analytics','productrecord'),(24,'analytics','userproductview'),(25,'analytics','userrecord'),(26,'analytics','usersearch'),(3,'auth','group'),(2,'auth','permission'),(43,'basket','basket'),(41,'basket','basketattribute'),(42,'basket','basketattributetype'),(44,'basket','line'),(45,'basket','lineattribute'),(10,'catalogue','attributeoption'),(18,'catalogue','attributeoptiongroup'),(15,'catalogue','catalog'),(14,'catalogue','category'),(23,'catalogue','historicalproduct'),(22,'catalogue','historicalproductattributevalue'),(12,'catalogue','option'),(11,'catalogue','product'),(17,'catalogue','productattribute'),(20,'catalogue','productattributevalue'),(21,'catalogue','productcategory'),(13,'catalogue','productclass'),(19,'catalogue','productimage'),(16,'catalogue','productrecommendation'),(1,'contenttypes','contenttype'),(77,'core','businessclient'),(6,'core','client'),(4,'core','siteconfiguration'),(5,'core','user'),(69,'courses','course'),(78,'courses','historicalcourse'),(39,'customer','communicationeventtype'),(38,'customer','email'),(40,'customer','notification'),(37,'customer','productalert'),(70,'flatpages','flatpage'),(79,'invoice','historicalinvoice'),(80,'invoice','invoice'),(106,'offer','absolutediscountbenefit'),(62,'offer','benefit'),(64,'offer','condition'),(65,'offer','conditionaloffer'),(102,'offer','countcondition'),(101,'offer','coveragecondition'),(110,'offer','fixedpricebenefit'),(104,'offer','multibuydiscountbenefit'),(109,'offer','percentagediscountbenefit'),(63,'offer','range'),(61,'offer','rangeproduct'),(66,'offer','rangeproductfileupload'),(108,'offer','shippingabsolutediscountbenefit'),(107,'offer','shippingbenefit'),(100,'offer','shippingfixedpricebenefit'),(105,'offer','shippingpercentagediscountbenefit'),(103,'offer','valuecondition'),(48,'order','billingaddress'),(52,'order','communicationevent'),(112,'order','historicalline'),(111,'order','historicalorder'),(50,'order','line'),(59,'order','lineattribute'),(46,'order','lineprice'),(54,'order','order'),(60,'order','orderdiscount'),(53,'order','ordernote'),(51,'order','paymentevent'),(55,'order','paymenteventquantity'),(58,'order','paymenteventtype'),(47,'order','shippingaddress'),(49,'order','shippingevent'),(57,'order','shippingeventquantity'),(56,'order','shippingeventtype'),(32,'partner','historicalstockrecord'),(33,'partner','partner'),(34,'partner','partneraddress'),(36,'partner','stockalert'),(35,'partner','stockrecord'),(94,'payment','bankcard'),(95,'payment','paymentprocessorresponse'),(93,'payment','paypalprocessorconfiguration'),(92,'payment','paypalwebprofile'),(98,'payment','sdncheckfailure'),(99,'payment','source'),(97,'payment','sourcetype'),(96,'payment','transaction'),(113,'promotions','automaticproductlist'),(120,'promotions','handpickedproductlist'),(115,'promotions','image'),(123,'promotions','keywordpromotion'),(116,'promotions','multiimage'),(117,'promotions','orderedproduct'),(121,'promotions','orderedproductlist'),(119,'promotions','pagepromotion'),(114,'promotions','rawhtml'),(122,'promotions','singleproduct'),(118,'promotions','tabbedblock'),(81,'referrals','referral'),(86,'refund','historicalrefund'),(83,'refund','historicalrefundline'),(85,'refund','refund'),(84,'refund','refundline'),(91,'reviews','productreview'),(90,'reviews','vote'),(71,'sessions','session'),(88,'shipping','orderanditemcharges'),(89,'shipping','weightband'),(87,'shipping','weightbased'),(31,'sites','site'),(74,'social_django','association'),(73,'social_django','code'),(72,'social_django','nonce'),(75,'social_django','partial'),(76,'social_django','usersocialauth'),(82,'theming','sitetheme'),(128,'thumbnail','kvstore'),(125,'voucher','couponvouchers'),(124,'voucher','orderlinevouchers'),(68,'voucher','voucher'),(67,'voucher','voucherapplication'),(30,'waffle','flag'),(28,'waffle','sample'),(29,'waffle','switch'),(127,'wishlists','line'),(126,'wishlists','wishlist');
-/*!40000 ALTER TABLE `django_content_type` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_flatpage`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_flatpage` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `url` varchar(100) NOT NULL,
-  `title` varchar(200) NOT NULL,
-  `content` longtext NOT NULL,
-  `enable_comments` tinyint(1) NOT NULL,
-  `template_name` varchar(70) NOT NULL,
-  `registration_required` tinyint(1) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `django_flatpage_572d4e42` (`url`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_flatpage`
---
-
-LOCK TABLES `django_flatpage` WRITE;
-/*!40000 ALTER TABLE `django_flatpage` DISABLE KEYS */;
-/*!40000 ALTER TABLE `django_flatpage` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_flatpage_sites`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_flatpage_sites` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `flatpage_id` int(11) NOT NULL,
-  `site_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `django_flatpage_sites_flatpage_id_0d29d9d1_uniq` (`flatpage_id`,`site_id`),
-  KEY `django_flatpage_sites_site_id_bfd8ea84_fk_django_site_id` (`site_id`),
-  CONSTRAINT `django_flatpage_sites_flatpage_id_078bbc8b_fk_django_flatpage_id` FOREIGN KEY (`flatpage_id`) REFERENCES `django_flatpage` (`id`),
-  CONSTRAINT `django_flatpage_sites_site_id_bfd8ea84_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_flatpage_sites`
---
-
-LOCK TABLES `django_flatpage_sites` WRITE;
-/*!40000 ALTER TABLE `django_flatpage_sites` DISABLE KEYS */;
-/*!40000 ALTER TABLE `django_flatpage_sites` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_migrations`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_migrations` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `app` varchar(255) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `applied` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=224 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_migrations`
---
-
-LOCK TABLES `django_migrations` WRITE;
-/*!40000 ALTER TABLE `django_migrations` DISABLE KEYS */;
-INSERT INTO `django_migrations` VALUES (1,'contenttypes','0001_initial','2017-06-21 16:05:49.551317'),(2,'auth','0001_initial','2017-06-21 16:05:49.673816'),(3,'core','0001_initial','2017-06-21 16:05:49.807312'),(4,'address','0001_initial','2017-06-21 16:05:49.926981'),(5,'admin','0001_initial','2017-06-21 16:05:49.993513'),(6,'admin','0002_logentry_remove_auto_add','2017-06-21 16:05:50.016405'),(7,'catalogue','0001_initial','2017-06-21 16:05:51.003261'),(8,'analytics','0001_initial','2017-06-21 16:05:51.281021'),(9,'analytics','0002_auto_20140827_1705','2017-06-21 16:05:51.471947'),(10,'contenttypes','0002_remove_content_type_name','2017-06-21 16:05:51.605464'),(11,'auth','0002_alter_permission_name_max_length','2017-06-21 16:05:51.667690'),(12,'auth','0003_alter_user_email_max_length','2017-06-21 16:05:51.704038'),(13,'auth','0004_alter_user_username_opts','2017-06-21 16:05:51.767547'),(14,'auth','0005_alter_user_last_login_null','2017-06-21 16:05:51.806075'),(15,'auth','0006_require_contenttypes_0002','2017-06-21 16:05:51.810382'),(16,'auth','0007_alter_validators_add_error_messages','2017-06-21 16:05:51.872874'),(17,'auth','0008_alter_user_username_max_length','2017-06-21 16:05:51.913960'),(18,'waffle','0001_initial','2017-06-21 16:05:52.135884'),(19,'sites','0001_initial','2017-06-21 16:05:52.152571'),(20,'partner','0001_initial','2017-06-21 16:05:52.734436'),(21,'customer','0001_initial','2017-06-21 16:05:52.981986'),(22,'basket','0001_initial','2017-06-21 16:05:53.054902'),(23,'basket','0002_auto_20140827_1705','2017-06-21 16:05:53.481365'),(24,'order','0001_initial','2017-06-21 16:05:56.279225'),(25,'offer','0001_initial','2017-06-21 16:05:57.369962'),(26,'voucher','0001_initial','2017-06-21 16:05:57.774380'),(27,'basket','0003_basket_vouchers','2017-06-21 16:05:57.898606'),(28,'basket','0004_auto_20141007_2032','2017-06-21 16:05:57.998004'),(29,'basket','0005_auto_20150709_1205','2017-06-21 16:05:58.126583'),(30,'basket','0006_basket_site','2017-06-21 16:05:58.260271'),(31,'basket','0007_auto_20160907_2040','2017-06-21 16:05:58.666312'),(32,'basket','0008_auto_20170215_2224','2017-06-21 16:05:58.762045'),(33,'basket','0009_auto_20170215_2229','2017-06-21 16:05:58.853370'),(34,'basket','0010_create_repeat_purchase_switch','2017-06-21 16:05:58.868269'),(35,'partner','0002_auto_20141007_2032','2017-06-21 16:05:58.959479'),(36,'partner','0003_auto_20150223_1130','2017-06-21 16:05:58.964988'),(37,'courses','0001_initial','2017-06-21 16:05:58.985294'),(38,'catalogue','0002_auto_20150223_1052','2017-06-21 16:05:58.999844'),(39,'catalogue','0003_product_course','2017-06-21 16:05:59.132713'),(40,'catalogue','0004_auto_20150609_0129','2017-06-21 16:05:59.832827'),(41,'partner','0004_auto_20150609_1215','2017-06-21 16:06:00.097699'),(42,'partner','0005_auto_20150610_1355','2017-06-21 16:06:00.505369'),(43,'partner','0006_auto_20150709_1205','2017-06-21 16:06:00.652897'),(44,'partner','0007_auto_20150914_0841','2017-06-21 16:06:00.915471'),(45,'partner','0008_auto_20150914_1057','2017-06-21 16:06:01.102651'),(46,'catalogue','0005_auto_20150610_1355','2017-06-21 16:06:01.848561'),(47,'catalogue','0006_credit_provider_attr','2017-06-21 16:06:01.863528'),(48,'catalogue','0007_auto_20150709_1205','2017-06-21 16:06:02.686841'),(49,'catalogue','0008_auto_20150709_1254','2017-06-21 16:06:02.949476'),(50,'catalogue','0009_credit_hours_attr','2017-06-21 16:06:02.967837'),(51,'catalogue','0010_catalog','2017-06-21 16:06:03.143270'),(52,'catalogue','0011_auto_20151019_0639','2017-06-21 16:06:03.413804'),(53,'catalogue','0012_enrollment_code_product_class','2017-06-21 16:06:03.419622'),(54,'catalogue','0013_coupon_product_class','2017-06-21 16:06:03.443933'),(55,'catalogue','0014_alter_couponvouchers_attribute','2017-06-21 16:06:03.460062'),(56,'catalogue','0015_default_categories','2017-06-21 16:06:03.550800'),(57,'catalogue','0016_coupon_note_attribute','2017-06-21 16:06:03.567405'),(58,'catalogue','0017_enrollment_code_product_class','2017-06-21 16:06:03.580494'),(59,'catalogue','0018_auto_20160530_0134','2017-06-21 16:06:03.680446'),(60,'catalogue','0019_enrollment_code_idverifyreq_attribute','2017-06-21 16:06:03.696244'),(61,'catalogue','0020_auto_20161025_1446','2017-06-21 16:06:03.794998'),(62,'catalogue','0021_auto_20170215_2224','2017-06-21 16:06:04.003025'),(63,'catalogue','0022_auto_20170215_2229','2017-06-21 16:06:04.103362'),(64,'catalogue','0023_auto_20170215_2234','2017-06-21 16:06:04.333640'),(65,'catalogue','0024_fix_enrollment_code_slug','2017-06-21 16:06:04.354223'),(66,'core','0002_auto_20150826_1455','2017-06-21 16:06:04.891149'),(67,'core','0003_auto_20150914_1120','2017-06-21 16:06:05.276691'),(68,'core','0004_auto_20150915_1023','2017-06-21 16:06:05.401159'),(69,'core','0005_auto_20150924_0123','2017-06-21 16:06:05.420381'),(70,'core','0006_add_service_user','2017-06-21 16:06:05.436037'),(71,'core','0007_auto_20151005_1333','2017-06-21 16:06:05.451894'),(72,'core','0008_client','2017-06-21 16:06:05.576998'),(73,'core','0009_service_user_privileges','2017-06-21 16:06:05.818551'),(74,'core','0010_add_async_sample','2017-06-21 16:06:05.833429'),(75,'core','0011_siteconfiguration_oauth_settings','2017-06-21 16:06:05.949988'),(76,'core','0012_businessclient','2017-06-21 16:06:05.976250'),(77,'core','0013_siteconfiguration_segment_key','2017-06-21 16:06:06.205485'),(78,'core','0014_enrollment_code_switch','2017-06-21 16:06:06.220427'),(79,'core','0015_siteconfiguration_from_email','2017-06-21 16:06:06.338747'),(80,'core','0016_siteconfiguration_enable_enrollment_codes','2017-06-21 16:06:06.460846'),(81,'core','0017_siteconfiguration_payment_support_email','2017-06-21 16:06:06.581720'),(82,'core','0018_siteconfiguration_payment_support_url','2017-06-21 16:06:06.704463'),(83,'core','0019_auto_20161012_1404','2017-06-21 16:06:07.064038'),(84,'core','0020_siteconfiguration_enable_otto_receipt_page','2017-06-21 16:06:07.182648'),(85,'core','0021_siteconfiguration_client_side_payment_processor','2017-06-21 16:06:07.301689'),(86,'core','0022_auto_20161108_2101','2017-06-21 16:06:07.404661'),(87,'core','0023_siteconfiguration_send_refund_notifications','2017-06-21 16:06:07.523941'),(88,'core','0024_auto_20170208_1520','2017-06-21 16:06:08.105558'),(89,'core','0025_auto_20170214_0003','2017-06-21 16:06:08.203122'),(90,'core','0026_auto_20170215_2234','2017-06-21 16:06:08.306396'),(91,'core','0027_siteconfiguration_require_account_activation','2017-06-21 16:06:08.552051'),(92,'core','0028_siteconfiguration_optimizely_snippet_src','2017-06-21 16:06:08.666797'),(93,'core','0029_auto_20170525_2131','2017-06-21 16:06:08.778008'),(94,'core','0030_auto_20170525_2134','2017-06-21 16:06:09.001822'),(95,'core','0031_siteconfiguration_enable_sailthru','2017-06-21 16:06:09.127717'),(96,'core','0032_auto_20170602_0516','2017-06-21 16:06:09.349844'),(97,'core','0033_auto_20170606_0539','2017-06-21 16:06:09.365479'),(98,'core','0034_auto_20170613_2039','2017-06-21 16:06:09.472448'),(99,'core','0035_siteconfiguration_base_cookie_domain','2017-06-21 16:06:09.585163'),(100,'sites','0002_alter_domain_unique','2017-06-21 16:06:09.691529'),(101,'courses','0002_historicalcourse','2017-06-21 16:06:09.819716'),(102,'courses','0003_auto_20150618_1108','2017-06-21 16:06:10.171366'),(103,'courses','0004_auto_20150803_1406','2017-06-21 16:06:10.391371'),(104,'courses','0005_auto_20170525_0131','2017-06-21 16:06:10.887317'),(105,'customer','0002_auto_20160517_0930','2017-06-21 16:06:10.986331'),(106,'customer','0003_auto_20170215_2229','2017-06-21 16:06:11.110497'),(107,'flatpages','0001_initial','2017-06-21 16:06:11.266107'),(108,'order','0002_auto_20141007_2032','2017-06-21 16:06:11.376644'),(109,'order','0003_auto_20150224_1520','2017-06-21 16:06:11.390396'),(110,'order','0004_order_payment_processor','2017-06-21 16:06:11.632563'),(111,'order','0005_deprecate_order_payment_processor','2017-06-21 16:06:11.750681'),(112,'order','0006_paymentevent_processor_name','2017-06-21 16:06:11.865118'),(113,'order','0007_create_history_tables','2017-06-21 16:06:12.187771'),(114,'order','0008_delete_order_payment_processor','2017-06-21 16:06:12.574357'),(115,'order','0009_auto_20150709_1205','2017-06-21 16:06:12.777236'),(116,'invoice','0001_initial','2017-06-21 16:06:13.040948'),(117,'invoice','0002_auto_20160324_1919','2017-06-21 16:06:13.816402'),(118,'invoice','0003_auto_20160616_0657','2017-06-21 16:06:15.760107'),(119,'invoice','0004_auto_20170215_2234','2017-06-21 16:06:16.147364'),(120,'offer','0002_range_catalog','2017-06-21 16:06:16.416336'),(121,'offer','0003_auto_20160517_1247','2017-06-21 16:06:16.710751'),(122,'offer','0004_auto_20160530_0944','2017-06-21 16:06:16.837796'),(123,'offer','0005_conditionaloffer_email_domains','2017-06-21 16:06:16.973152'),(124,'offer','0006_auto_20161025_1446','2017-06-21 16:06:17.219424'),(125,'offer','0007_auto_20161026_0856','2017-06-21 16:06:17.346607'),(126,'offer','0008_range_course_catalog','2017-06-21 16:06:17.477979'),(127,'offer','0009_range_enterprise_customer','2017-06-21 16:06:17.613167'),(128,'offer','0010_auto_20170215_2224','2017-06-21 16:06:17.739899'),(129,'offer','0011_auto_20170215_2324','2017-06-21 16:06:17.863985'),(130,'offer','0012_condition_program_uuid','2017-06-21 16:06:18.129709'),(131,'order','0010_auto_20160529_2245','2017-06-21 16:06:18.254820'),(132,'order','0011_auto_20161025_1446','2017-06-21 16:06:18.371561'),(133,'order','0012_auto_20170215_2224','2017-06-21 16:06:18.489137'),(134,'order','0013_auto_20170215_2229','2017-06-21 16:06:18.885862'),(135,'order','0014_auto_20170606_0535','2017-06-21 16:06:18.903407'),(136,'partner','0009_partner_enable_sailthru','2017-06-21 16:06:19.035418'),(137,'partner','0010_auto_20161025_1446','2017-06-21 16:06:19.151682'),(138,'partner','0011_auto_20170525_2138','2017-06-21 16:06:19.267604'),(139,'payment','0001_initial','2017-06-21 16:06:19.976606'),(140,'payment','0002_auto_20141007_2032','2017-06-21 16:06:20.103018'),(141,'payment','0003_create_payment_processor_response','2017-06-21 16:06:20.493407'),(142,'payment','0004_source_card_type','2017-06-21 16:06:20.625358'),(143,'payment','0005_paypalwebprofile','2017-06-21 16:06:20.647990'),(144,'payment','0006_enable_payment_processors','2017-06-21 16:06:20.663730'),(145,'payment','0007_add_cybersource_level23_sample','2017-06-21 16:06:20.681480'),(146,'payment','0008_remove_cybersource_level23_sample','2017-06-21 16:06:20.698834'),(147,'payment','0009_auto_20161025_1446','2017-06-21 16:06:20.822359'),(148,'payment','0010_create_client_side_checkout_flag','2017-06-21 16:06:20.839799'),(149,'payment','0011_paypalprocessorconfiguration','2017-06-21 16:06:20.862305'),(150,'payment','0012_auto_20161109_1456','2017-06-21 16:06:20.878022'),(151,'payment','0013_sdncheckfailure','2017-06-21 16:06:20.903319'),(152,'payment','0014_sdncheckfailure_site','2017-06-21 16:06:21.063991'),(153,'payment','0015_auto_20170215_2229','2017-06-21 16:06:21.339661'),(154,'payment','0016_auto_20170227_1402','2017-06-21 16:06:21.635754'),(155,'payment','0017_auto_20170328_1445','2017-06-21 16:06:21.899514'),(156,'programs','0001_initial','2017-06-21 16:06:22.063843'),(157,'promotions','0001_initial','2017-06-21 16:06:23.284416'),(158,'promotions','0002_auto_20150604_1450','2017-06-21 16:06:23.465607'),(159,'referrals','0001_initial','2017-06-21 16:06:23.757288'),(160,'referrals','0002_auto_20161011_1728','2017-06-21 16:06:25.029171'),(161,'referrals','0003_auto_20161027_1738','2017-06-21 16:06:25.312302'),(162,'referrals','0004_auto_20170215_2234','2017-06-21 16:06:25.609480'),(163,'refund','0001_squashed_0002_auto_20150515_2220','2017-06-21 16:06:26.575513'),(164,'refund','0002_auto_20151214_1017','2017-06-21 16:06:27.232747'),(165,'reviews','0001_initial','2017-06-21 16:06:27.985315'),(166,'reviews','0002_update_email_length','2017-06-21 16:06:28.139106'),(167,'reviews','0003_auto_20160802_1358','2017-06-21 16:06:28.403386'),(168,'sailthru','0001_initial','2017-06-21 16:06:28.421924'),(169,'sailthru','0002_add_basket_attribute_type','2017-06-21 16:06:28.437071'),(170,'sessions','0001_initial','2017-06-21 16:06:28.468366'),(171,'shipping','0001_initial','2017-06-21 16:06:29.014968'),(172,'shipping','0002_auto_20150604_1450','2017-06-21 16:06:29.505730'),(173,'default','0001_initial','2017-06-21 16:06:30.043098'),(174,'social_auth','0001_initial','2017-06-21 16:06:30.049813'),(175,'default','0002_add_related_name','2017-06-21 16:06:30.223472'),(176,'social_auth','0002_add_related_name','2017-06-21 16:06:30.229770'),(177,'default','0003_alter_email_max_length','2017-06-21 16:06:30.263494'),(178,'social_auth','0003_alter_email_max_length','2017-06-21 16:06:30.270071'),(179,'default','0004_auto_20160423_0400','2017-06-21 16:06:30.419632'),(180,'social_auth','0004_auto_20160423_0400','2017-06-21 16:06:30.426254'),(181,'social_auth','0005_auto_20160727_2333','2017-06-21 16:06:30.450190'),(182,'social_django','0006_partial','2017-06-21 16:06:30.481230'),(183,'theming','0001_initial','2017-06-21 16:06:30.652332'),(184,'thumbnail','0001_initial','2017-06-21 16:06:30.677127'),(185,'voucher','0002_couponvouchers','2017-06-21 16:06:31.021983'),(186,'voucher','0003_orderlinevouchers','2017-06-21 16:06:31.223652'),(187,'voucher','0004_auto_20160517_0930','2017-06-21 16:06:31.400781'),(188,'wishlists','0001_initial','2017-06-21 16:06:32.217424'),(189,'wishlists','0002_auto_20160111_1108','2017-06-21 16:06:32.518710'),(190,'social_django','0002_add_related_name','2017-06-21 16:06:32.532458'),(191,'social_django','0003_alter_email_max_length','2017-06-21 16:06:32.538204'),(192,'social_django','0001_initial','2017-06-21 16:06:32.543488'),(193,'social_django','0004_auto_20160423_0400','2017-06-21 16:06:32.550442'),(194,'social_django','0005_auto_20160727_2333','2017-06-21 16:06:32.557222'),(195,'catalogue','0025_course_entitlement','2018-02-02 15:04:36.043989'),(196,'catalogue','0026_course_entitlement_attr_change','2018-02-02 15:04:36.066765'),(197,'catalogue','0027_catalogue_entitlement_option','2018-02-02 15:04:36.084135'),(198,'catalogue','0028_donations_from_checkout_tests_product_type','2018-02-02 15:04:36.106716'),(199,'catalogue','0029_auto_20180119_0903','2018-02-02 15:04:37.915699'),(200,'core','0036_remove_siteconfiguration_enable_otto_receipt_page','2018-02-02 15:04:38.220718'),(201,'core','0037_siteconfiguration_enable_embargo_check','2018-02-02 15:04:38.456875'),(202,'core','0038_siteconfiguration_discovery_api_url','2018-02-02 15:04:38.629571'),(203,'core','0039_auto_20170716_2212','2018-02-02 15:04:39.070212'),(204,'core','0040_siteconfiguration__allowed_segment_events','2018-02-02 15:04:39.251384'),(205,'core','0041_remove_siteconfiguration__allowed_segment_events','2018-02-02 15:04:39.427232'),(206,'core','0042_siteconfiguration_enable_partial_program','2018-02-02 15:04:39.601100'),(207,'core','0043_auto_20170808_1009','2018-02-02 15:04:39.878005'),(208,'courses','0006_auto_20171204_1036','2018-02-02 15:04:40.633011'),(209,'courses','0007_auto_20180119_0903','2018-02-02 15:04:40.978205'),(210,'enterprise','0001_initial','2018-02-02 15:04:41.023420'),(211,'enterprise','0002_add_enterprise_offers_switch','2018-02-02 15:04:41.047719'),(212,'enterprise','0003_add_enable_enterprise_switch','2018-02-02 15:04:41.070982'),(213,'invoice','0005_auto_20180119_0903','2018-02-02 15:04:41.995282'),(214,'offer','0013_auto_20170801_0742','2018-02-02 15:04:42.147161'),(215,'offer','0014_conditionaloffer_site','2018-02-02 15:04:42.337828'),(216,'offer','0015_auto_20170926_1357','2018-02-02 15:04:42.960556'),(217,'order','0015_create_disable_repeat_order_check_switch','2018-02-02 15:04:42.984712'),(218,'order','0016_auto_20180119_0903','2018-02-02 15:04:45.150878'),(219,'partner','0012_auto_20180119_0903','2018-02-02 15:04:45.632992'),(220,'payment','0018_create_stripe_switch','2018-02-02 15:04:45.653982'),(221,'programs','0002_add_basket_attribute_type','2018-02-02 15:04:45.675431'),(222,'refund','0003_auto_20180119_0903','2018-02-02 15:04:46.889521'),(223,'waffle','0002_auto_20161201_0958','2018-02-02 15:04:46.910687');
-/*!40000 ALTER TABLE `django_migrations` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_session`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_session` (
-  `session_key` varchar(40) NOT NULL,
-  `session_data` longtext NOT NULL,
-  `expire_date` datetime(6) NOT NULL,
-  PRIMARY KEY (`session_key`),
-  KEY `django_session_de54fa62` (`expire_date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_session`
---
-
-LOCK TABLES `django_session` WRITE;
-/*!40000 ALTER TABLE `django_session` DISABLE KEYS */;
-/*!40000 ALTER TABLE `django_session` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `django_site`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `django_site` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `domain` varchar(100) NOT NULL,
-  `name` varchar(50) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `django_site_domain_a2e37b91_uniq` (`domain`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `django_site`
---
-
-LOCK TABLES `django_site` WRITE;
-/*!40000 ALTER TABLE `django_site` DISABLE KEYS */;
-INSERT INTO `django_site` VALUES (1,'localhost:18130','example.com');
-/*!40000 ALTER TABLE `django_site` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ecommerce_user`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ecommerce_user` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `password` varchar(128) NOT NULL,
-  `last_login` datetime(6) DEFAULT NULL,
-  `is_superuser` tinyint(1) NOT NULL,
-  `username` varchar(150) NOT NULL,
-  `first_name` varchar(30) NOT NULL,
-  `last_name` varchar(30) NOT NULL,
-  `email` varchar(254) NOT NULL,
-  `is_staff` tinyint(1) NOT NULL,
-  `is_active` tinyint(1) NOT NULL,
-  `date_joined` datetime(6) NOT NULL,
-  `full_name` varchar(255) DEFAULT NULL,
-  `tracking_context` longtext,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `username` (`username`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ecommerce_user`
---
-
-LOCK TABLES `ecommerce_user` WRITE;
-/*!40000 ALTER TABLE `ecommerce_user` DISABLE KEYS */;
-INSERT INTO `ecommerce_user` VALUES (1,'!LOoBxP3FzidYPy42iWpSG8F94w9ub92p6KRY7KY5',NULL,0,'ecommerce_worker','','','',1,1,'2017-06-21 16:06:05.430048',NULL,NULL),(2,'pbkdf2_sha256$30000$jhECgW9zCQNz$xjvlasvmEiR6LSJEZkdswzRtiwiN35E8AGdgqAIoqsk=',NULL,1,'edx','','','edx@example.com',1,1,'2017-06-21 16:06:34.938363',NULL,NULL),(3,'',NULL,0,'discovery_worker','','','discovery_worker@example.com',1,1,'2017-06-21 16:09:04.071620',NULL,NULL);
-/*!40000 ALTER TABLE `ecommerce_user` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ecommerce_user_groups`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ecommerce_user_groups` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL,
-  `group_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `ecommerce_user_groups_user_id_2a9a583d_uniq` (`user_id`,`group_id`),
-  KEY `ecommerce_user_groups_group_id_a8fd9cb8_fk_auth_group_id` (`group_id`),
-  CONSTRAINT `ecommerce_user_groups_group_id_a8fd9cb8_fk_auth_group_id` FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`),
-  CONSTRAINT `ecommerce_user_groups_user_id_60d58887_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ecommerce_user_groups`
---
-
-LOCK TABLES `ecommerce_user_groups` WRITE;
-/*!40000 ALTER TABLE `ecommerce_user_groups` DISABLE KEYS */;
-/*!40000 ALTER TABLE `ecommerce_user_groups` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `ecommerce_user_user_permissions`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `ecommerce_user_user_permissions` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `user_id` int(11) NOT NULL,
-  `permission_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `ecommerce_user_user_permissions_user_id_6d807de6_uniq` (`user_id`,`permission_id`),
-  KEY `ecommerce_user_user_permission_id_4dc38e40_fk_auth_permission_id` (`permission_id`),
-  CONSTRAINT `ecommerce_user_user_permis_user_id_0ceec4a8_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`),
-  CONSTRAINT `ecommerce_user_user_permission_id_4dc38e40_fk_auth_permission_id` FOREIGN KEY (`permission_id`) REFERENCES `auth_permission` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `ecommerce_user_user_permissions`
---
-
-LOCK TABLES `ecommerce_user_user_permissions` WRITE;
-/*!40000 ALTER TABLE `ecommerce_user_user_permissions` DISABLE KEYS */;
-INSERT INTO `ecommerce_user_user_permissions` VALUES (1,1,161);
-/*!40000 ALTER TABLE `ecommerce_user_user_permissions` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `invoice_invoice`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `invoice_invoice` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  `state` varchar(255) NOT NULL,
-  `basket_id` int(11) DEFAULT NULL,
-  `business_client_id` int(11) DEFAULT NULL,
-  `order_id` int(11) DEFAULT NULL,
-  `discount_type` varchar(255) DEFAULT NULL,
-  `discount_value` int(10) unsigned DEFAULT NULL,
-  `number` varchar(255) DEFAULT NULL,
-  `payment_date` datetime(6) DEFAULT NULL,
-  `tax_deducted_source` int(10) unsigned DEFAULT NULL,
-  `type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `invoice_invoice_basket_id_8795b83e_fk_basket_basket_id` (`basket_id`),
-  KEY `invoice_in_business_client_id_44a4b698_fk_core_businessclient_id` (`business_client_id`),
-  KEY `invoice_invoice_order_id_c5fc9ae9_fk_order_order_id` (`order_id`),
-  CONSTRAINT `invoice_in_business_client_id_44a4b698_fk_core_businessclient_id` FOREIGN KEY (`business_client_id`) REFERENCES `core_businessclient` (`id`),
-  CONSTRAINT `invoice_invoice_basket_id_8795b83e_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`),
-  CONSTRAINT `invoice_invoice_order_id_c5fc9ae9_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `invoice_invoice`
---
-
-LOCK TABLES `invoice_invoice` WRITE;
-/*!40000 ALTER TABLE `invoice_invoice` DISABLE KEYS */;
-/*!40000 ALTER TABLE `invoice_invoice` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_benefit`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_benefit` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `type` varchar(128) NOT NULL,
-  `value` decimal(12,2) DEFAULT NULL,
-  `max_affected_items` int(10) unsigned DEFAULT NULL,
-  `proxy_class` varchar(255) DEFAULT NULL,
-  `range_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `offer_benefit_range_id_ab19c5ab_fk_offer_range_id` (`range_id`),
-  CONSTRAINT `offer_benefit_range_id_ab19c5ab_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_benefit`
---
-
-LOCK TABLES `offer_benefit` WRITE;
-/*!40000 ALTER TABLE `offer_benefit` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_benefit` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_condition`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_condition` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `type` varchar(128) NOT NULL,
-  `value` decimal(12,2) DEFAULT NULL,
-  `proxy_class` varchar(255) DEFAULT NULL,
-  `range_id` int(11) DEFAULT NULL,
-  `program_uuid` char(32) DEFAULT NULL,
-  `enterprise_customer_catalog_uuid` char(32),
-  `enterprise_customer_name` varchar(255),
-  `enterprise_customer_uuid` char(32),
-  PRIMARY KEY (`id`),
-  KEY `offer_condition_range_id_b023a2aa_fk_offer_range_id` (`range_id`),
-  CONSTRAINT `offer_condition_range_id_b023a2aa_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_condition`
---
-
-LOCK TABLES `offer_condition` WRITE;
-/*!40000 ALTER TABLE `offer_condition` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_condition` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_conditionaloffer`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_conditionaloffer` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `slug` varchar(128) NOT NULL,
-  `description` longtext NOT NULL,
-  `offer_type` varchar(128) NOT NULL,
-  `status` varchar(64) NOT NULL,
-  `priority` int(11) NOT NULL,
-  `start_datetime` datetime(6) DEFAULT NULL,
-  `end_datetime` datetime(6) DEFAULT NULL,
-  `max_global_applications` int(10) unsigned DEFAULT NULL,
-  `max_user_applications` int(10) unsigned DEFAULT NULL,
-  `max_basket_applications` int(10) unsigned DEFAULT NULL,
-  `max_discount` decimal(12,2) DEFAULT NULL,
-  `total_discount` decimal(12,2) NOT NULL,
-  `num_applications` int(10) unsigned NOT NULL,
-  `num_orders` int(10) unsigned NOT NULL,
-  `redirect_url` varchar(200) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `benefit_id` int(11) NOT NULL,
-  `condition_id` int(11) NOT NULL,
-  `email_domains` varchar(255) DEFAULT NULL,
-  `site_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  UNIQUE KEY `slug` (`slug`),
-  KEY `offer_conditionaloffer_benefit_id_f43f68b5_fk_offer_benefit_id` (`benefit_id`),
-  KEY `offer_conditionaloff_condition_id_e6baa945_fk_offer_condition_id` (`condition_id`),
-  KEY `offer_conditionaloffer_site_id_4409fcc5_fk_django_site_id` (`site_id`),
-  CONSTRAINT `offer_conditionaloff_condition_id_e6baa945_fk_offer_condition_id` FOREIGN KEY (`condition_id`) REFERENCES `offer_condition` (`id`),
-  CONSTRAINT `offer_conditionaloffer_benefit_id_f43f68b5_fk_offer_benefit_id` FOREIGN KEY (`benefit_id`) REFERENCES `offer_benefit` (`id`),
-  CONSTRAINT `offer_conditionaloffer_site_id_4409fcc5_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_conditionaloffer`
---
-
-LOCK TABLES `offer_conditionaloffer` WRITE;
-/*!40000 ALTER TABLE `offer_conditionaloffer` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_conditionaloffer` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_range`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_range` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `slug` varchar(128) NOT NULL,
-  `description` longtext NOT NULL,
-  `is_public` tinyint(1) NOT NULL,
-  `includes_all_products` tinyint(1) NOT NULL,
-  `proxy_class` varchar(255) DEFAULT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `catalog_id` int(11) DEFAULT NULL,
-  `catalog_query` longtext,
-  `course_seat_types` varchar(255) DEFAULT NULL,
-  `course_catalog` int(10) unsigned DEFAULT NULL,
-  `enterprise_customer` char(32) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  UNIQUE KEY `slug` (`slug`),
-  UNIQUE KEY `proxy_class` (`proxy_class`),
-  KEY `offer_range_catalog_id_10237996_fk_catalogue_catalog_id` (`catalog_id`),
-  CONSTRAINT `offer_range_catalog_id_10237996_fk_catalogue_catalog_id` FOREIGN KEY (`catalog_id`) REFERENCES `catalogue_catalog` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_range`
---
-
-LOCK TABLES `offer_range` WRITE;
-/*!40000 ALTER TABLE `offer_range` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_range` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_range_classes`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_range_classes` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `range_id` int(11) NOT NULL,
-  `productclass_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `offer_range_classes_range_id_28eeefae_uniq` (`range_id`,`productclass_id`),
-  KEY `offer_rang_productclass_id_6f6de46d_fk_catalogue_productclass_id` (`productclass_id`),
-  CONSTRAINT `offer_rang_productclass_id_6f6de46d_fk_catalogue_productclass_id` FOREIGN KEY (`productclass_id`) REFERENCES `catalogue_productclass` (`id`),
-  CONSTRAINT `offer_range_classes_range_id_7d3e573e_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_range_classes`
---
-
-LOCK TABLES `offer_range_classes` WRITE;
-/*!40000 ALTER TABLE `offer_range_classes` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_range_classes` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_range_excluded_products`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_range_excluded_products` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `range_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `offer_range_excluded_products_range_id_eb1cfe87_uniq` (`range_id`,`product_id`),
-  KEY `offer_range_excluded_product_id_78c49bfc_fk_catalogue_product_id` (`product_id`),
-  CONSTRAINT `offer_range_excluded_product_id_78c49bfc_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `offer_range_excluded_product_range_id_cce4a032_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_range_excluded_products`
---
-
-LOCK TABLES `offer_range_excluded_products` WRITE;
-/*!40000 ALTER TABLE `offer_range_excluded_products` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_range_excluded_products` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_range_included_categories`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_range_included_categories` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `range_id` int(11) NOT NULL,
-  `category_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `offer_range_included_categories_range_id_a661d336_uniq` (`range_id`,`category_id`),
-  KEY `offer_range_includ_category_id_c61569a5_fk_catalogue_category_id` (`category_id`),
-  CONSTRAINT `offer_range_includ_category_id_c61569a5_fk_catalogue_category_id` FOREIGN KEY (`category_id`) REFERENCES `catalogue_category` (`id`),
-  CONSTRAINT `offer_range_included_categor_range_id_1b616138_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_range_included_categories`
---
-
-LOCK TABLES `offer_range_included_categories` WRITE;
-/*!40000 ALTER TABLE `offer_range_included_categories` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_range_included_categories` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_rangeproduct`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_rangeproduct` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `display_order` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  `range_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `offer_rangeproduct_range_id_c46b1be8_uniq` (`range_id`,`product_id`),
-  KEY `offer_rangeproduct_product_id_723b3ea3_fk_catalogue_product_id` (`product_id`),
-  CONSTRAINT `offer_rangeproduct_product_id_723b3ea3_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `offer_rangeproduct_range_id_ee358495_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_rangeproduct`
---
-
-LOCK TABLES `offer_rangeproduct` WRITE;
-/*!40000 ALTER TABLE `offer_rangeproduct` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_rangeproduct` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `offer_rangeproductfileupload`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `offer_rangeproductfileupload` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `filepath` varchar(255) NOT NULL,
-  `size` int(10) unsigned NOT NULL,
-  `date_uploaded` datetime(6) NOT NULL,
-  `status` varchar(32) NOT NULL,
-  `error_message` varchar(255) NOT NULL,
-  `date_processed` datetime(6) DEFAULT NULL,
-  `num_new_skus` int(10) unsigned DEFAULT NULL,
-  `num_unknown_skus` int(10) unsigned DEFAULT NULL,
-  `num_duplicate_skus` int(10) unsigned DEFAULT NULL,
-  `range_id` int(11) NOT NULL,
-  `uploaded_by_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `offer_rangeproductfileupload_range_id_c055ebf8_fk_offer_range_id` (`range_id`),
-  KEY `offer_rangeproductf_uploaded_by_id_c01a3250_fk_ecommerce_user_id` (`uploaded_by_id`),
-  CONSTRAINT `offer_rangeproductf_uploaded_by_id_c01a3250_fk_ecommerce_user_id` FOREIGN KEY (`uploaded_by_id`) REFERENCES `ecommerce_user` (`id`),
-  CONSTRAINT `offer_rangeproductfileupload_range_id_c055ebf8_fk_offer_range_id` FOREIGN KEY (`range_id`) REFERENCES `offer_range` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `offer_rangeproductfileupload`
---
-
-LOCK TABLES `offer_rangeproductfileupload` WRITE;
-/*!40000 ALTER TABLE `offer_rangeproductfileupload` DISABLE KEYS */;
-/*!40000 ALTER TABLE `offer_rangeproductfileupload` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_billingaddress`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_billingaddress` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(64) NOT NULL,
-  `first_name` varchar(255) NOT NULL,
-  `last_name` varchar(255) NOT NULL,
-  `line1` varchar(255) NOT NULL,
-  `line2` varchar(255) NOT NULL,
-  `line3` varchar(255) NOT NULL,
-  `line4` varchar(255) NOT NULL,
-  `state` varchar(255) NOT NULL,
-  `postcode` varchar(64) NOT NULL,
-  `search_text` longtext NOT NULL,
-  `country_id` varchar(2) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_billi_country_id_17f57dca_fk_address_country_iso_3166_1_a2` (`country_id`),
-  CONSTRAINT `order_billi_country_id_17f57dca_fk_address_country_iso_3166_1_a2` FOREIGN KEY (`country_id`) REFERENCES `address_country` (`iso_3166_1_a2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_billingaddress`
---
-
-LOCK TABLES `order_billingaddress` WRITE;
-/*!40000 ALTER TABLE `order_billingaddress` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_billingaddress` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_communicationevent`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_communicationevent` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `date_created` datetime(6) NOT NULL,
-  `event_type_id` int(11) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `ord_event_type_id_4bc9ee29_fk_customer_communicationeventtype_id` (`event_type_id`),
-  KEY `order_communicationevent_order_id_94e784ac_fk_order_order_id` (`order_id`),
-  CONSTRAINT `ord_event_type_id_4bc9ee29_fk_customer_communicationeventtype_id` FOREIGN KEY (`event_type_id`) REFERENCES `customer_communicationeventtype` (`id`),
-  CONSTRAINT `order_communicationevent_order_id_94e784ac_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_communicationevent`
---
-
-LOCK TABLES `order_communicationevent` WRITE;
-/*!40000 ALTER TABLE `order_communicationevent` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_communicationevent` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_line`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_line` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `partner_name` varchar(128) NOT NULL,
-  `partner_sku` varchar(128) NOT NULL,
-  `partner_line_reference` varchar(128) NOT NULL,
-  `partner_line_notes` longtext NOT NULL,
-  `title` varchar(255) NOT NULL,
-  `upc` varchar(128) DEFAULT NULL,
-  `quantity` int(10) unsigned NOT NULL,
-  `line_price_incl_tax` decimal(12,2) NOT NULL,
-  `line_price_excl_tax` decimal(12,2) NOT NULL,
-  `line_price_before_discounts_incl_tax` decimal(12,2) NOT NULL,
-  `line_price_before_discounts_excl_tax` decimal(12,2) NOT NULL,
-  `unit_cost_price` decimal(12,2) DEFAULT NULL,
-  `unit_price_incl_tax` decimal(12,2) DEFAULT NULL,
-  `unit_price_excl_tax` decimal(12,2) DEFAULT NULL,
-  `unit_retail_price` decimal(12,2) DEFAULT NULL,
-  `status` varchar(255) NOT NULL,
-  `est_dispatch_date` date DEFAULT NULL,
-  `order_id` int(11) NOT NULL,
-  `partner_id` int(11) DEFAULT NULL,
-  `product_id` int(11) DEFAULT NULL,
-  `stockrecord_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_line_order_id_b9148391_fk_order_order_id` (`order_id`),
-  KEY `order_line_partner_id_258a2fb9_fk_partner_partner_id` (`partner_id`),
-  KEY `order_line_product_id_e620902d_fk_catalogue_product_id` (`product_id`),
-  KEY `order_line_stockrecord_id_1d65aff5_fk_partner_stockrecord_id` (`stockrecord_id`),
-  CONSTRAINT `order_line_order_id_b9148391_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`),
-  CONSTRAINT `order_line_partner_id_258a2fb9_fk_partner_partner_id` FOREIGN KEY (`partner_id`) REFERENCES `partner_partner` (`id`),
-  CONSTRAINT `order_line_product_id_e620902d_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `order_line_stockrecord_id_1d65aff5_fk_partner_stockrecord_id` FOREIGN KEY (`stockrecord_id`) REFERENCES `partner_stockrecord` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_line`
---
-
-LOCK TABLES `order_line` WRITE;
-/*!40000 ALTER TABLE `order_line` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_line` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_lineattribute`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_lineattribute` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `type` varchar(128) NOT NULL,
-  `value` varchar(255) NOT NULL,
-  `line_id` int(11) NOT NULL,
-  `option_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_lineattribute_line_id_adf6dd87_fk_order_line_id` (`line_id`),
-  KEY `order_lineattribute_option_id_b54d597c_fk_catalogue_option_id` (`option_id`),
-  CONSTRAINT `order_lineattribute_line_id_adf6dd87_fk_order_line_id` FOREIGN KEY (`line_id`) REFERENCES `order_line` (`id`),
-  CONSTRAINT `order_lineattribute_option_id_b54d597c_fk_catalogue_option_id` FOREIGN KEY (`option_id`) REFERENCES `catalogue_option` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_lineattribute`
---
-
-LOCK TABLES `order_lineattribute` WRITE;
-/*!40000 ALTER TABLE `order_lineattribute` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_lineattribute` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_lineprice`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_lineprice` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `quantity` int(10) unsigned NOT NULL,
-  `price_incl_tax` decimal(12,2) NOT NULL,
-  `price_excl_tax` decimal(12,2) NOT NULL,
-  `shipping_incl_tax` decimal(12,2) NOT NULL,
-  `shipping_excl_tax` decimal(12,2) NOT NULL,
-  `line_id` int(11) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_lineprice_line_id_2de52446_fk_order_line_id` (`line_id`),
-  KEY `order_lineprice_order_id_66792e56_fk_order_order_id` (`order_id`),
-  CONSTRAINT `order_lineprice_line_id_2de52446_fk_order_line_id` FOREIGN KEY (`line_id`) REFERENCES `order_line` (`id`),
-  CONSTRAINT `order_lineprice_order_id_66792e56_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_lineprice`
---
-
-LOCK TABLES `order_lineprice` WRITE;
-/*!40000 ALTER TABLE `order_lineprice` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_lineprice` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_order`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_order` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `number` varchar(128) NOT NULL,
-  `currency` varchar(12) NOT NULL,
-  `total_incl_tax` decimal(12,2) NOT NULL,
-  `total_excl_tax` decimal(12,2) NOT NULL,
-  `shipping_incl_tax` decimal(12,2) NOT NULL,
-  `shipping_excl_tax` decimal(12,2) NOT NULL,
-  `shipping_method` varchar(128) NOT NULL,
-  `shipping_code` varchar(128) NOT NULL,
-  `status` varchar(100) NOT NULL,
-  `guest_email` varchar(254) NOT NULL,
-  `date_placed` datetime(6) NOT NULL,
-  `basket_id` int(11) DEFAULT NULL,
-  `billing_address_id` int(11) DEFAULT NULL,
-  `shipping_address_id` int(11) DEFAULT NULL,
-  `site_id` int(11) DEFAULT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `number` (`number`),
-  KEY `order_order_basket_id_8b0acbb2_fk_basket_basket_id` (`basket_id`),
-  KEY `order_ord_billing_address_id_8fe537cf_fk_order_billingaddress_id` (`billing_address_id`),
-  KEY `order_order_90e84921` (`date_placed`),
-  KEY `order_o_shipping_address_id_57e64931_fk_order_shippingaddress_id` (`shipping_address_id`),
-  KEY `order_order_site_id_e27f3526_fk_django_site_id` (`site_id`),
-  KEY `order_order_user_id_7cf9bc2b_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `order_o_shipping_address_id_57e64931_fk_order_shippingaddress_id` FOREIGN KEY (`shipping_address_id`) REFERENCES `order_shippingaddress` (`id`),
-  CONSTRAINT `order_ord_billing_address_id_8fe537cf_fk_order_billingaddress_id` FOREIGN KEY (`billing_address_id`) REFERENCES `order_billingaddress` (`id`),
-  CONSTRAINT `order_order_basket_id_8b0acbb2_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`),
-  CONSTRAINT `order_order_site_id_e27f3526_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`),
-  CONSTRAINT `order_order_user_id_7cf9bc2b_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_order`
---
-
-LOCK TABLES `order_order` WRITE;
-/*!40000 ALTER TABLE `order_order` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_order` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_orderdiscount`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_orderdiscount` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `category` varchar(64) NOT NULL,
-  `offer_id` int(10) unsigned DEFAULT NULL,
-  `offer_name` varchar(128) NOT NULL,
-  `voucher_id` int(10) unsigned DEFAULT NULL,
-  `voucher_code` varchar(128) NOT NULL,
-  `frequency` int(10) unsigned DEFAULT NULL,
-  `amount` decimal(12,2) NOT NULL,
-  `message` longtext NOT NULL,
-  `order_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_orderdiscount_order_id_bc91e123_fk_order_order_id` (`order_id`),
-  KEY `order_orderdiscount_9eeed246` (`offer_name`),
-  KEY `order_orderdiscount_08e4f7cd` (`voucher_code`),
-  CONSTRAINT `order_orderdiscount_order_id_bc91e123_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_orderdiscount`
---
-
-LOCK TABLES `order_orderdiscount` WRITE;
-/*!40000 ALTER TABLE `order_orderdiscount` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_orderdiscount` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_ordernote`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_ordernote` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `note_type` varchar(128) NOT NULL,
-  `message` longtext NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_updated` datetime(6) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_ordernote_order_id_7d97583d_fk_order_order_id` (`order_id`),
-  KEY `order_ordernote_user_id_48d7a672_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `order_ordernote_order_id_7d97583d_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`),
-  CONSTRAINT `order_ordernote_user_id_48d7a672_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_ordernote`
---
-
-LOCK TABLES `order_ordernote` WRITE;
-/*!40000 ALTER TABLE `order_ordernote` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_ordernote` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_paymentevent`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_paymentevent` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `amount` decimal(12,2) NOT NULL,
-  `reference` varchar(128) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `event_type_id` int(11) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  `shipping_event_id` int(11) DEFAULT NULL,
-  `processor_name` varchar(32) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_paymen_event_type_id_568c7161_fk_order_paymenteventtype_id` (`event_type_id`),
-  KEY `order_paymentevent_order_id_395b3e82_fk_order_order_id` (`order_id`),
-  KEY `order_payme_shipping_event_id_213dcfb8_fk_order_shippingevent_id` (`shipping_event_id`),
-  CONSTRAINT `order_payme_shipping_event_id_213dcfb8_fk_order_shippingevent_id` FOREIGN KEY (`shipping_event_id`) REFERENCES `order_shippingevent` (`id`),
-  CONSTRAINT `order_paymen_event_type_id_568c7161_fk_order_paymenteventtype_id` FOREIGN KEY (`event_type_id`) REFERENCES `order_paymenteventtype` (`id`),
-  CONSTRAINT `order_paymentevent_order_id_395b3e82_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_paymentevent`
---
-
-LOCK TABLES `order_paymentevent` WRITE;
-/*!40000 ALTER TABLE `order_paymentevent` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_paymentevent` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_paymenteventquantity`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_paymenteventquantity` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `quantity` int(10) unsigned NOT NULL,
-  `event_id` int(11) NOT NULL,
-  `line_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `order_paymenteventquantity_event_id_765c5209_uniq` (`event_id`,`line_id`),
-  KEY `order_paymenteventquantity_line_id_df44b021_fk_order_line_id` (`line_id`),
-  CONSTRAINT `order_paymenteventqua_event_id_a540165a_fk_order_paymentevent_id` FOREIGN KEY (`event_id`) REFERENCES `order_paymentevent` (`id`),
-  CONSTRAINT `order_paymenteventquantity_line_id_df44b021_fk_order_line_id` FOREIGN KEY (`line_id`) REFERENCES `order_line` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_paymenteventquantity`
---
-
-LOCK TABLES `order_paymenteventquantity` WRITE;
-/*!40000 ALTER TABLE `order_paymenteventquantity` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_paymenteventquantity` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_paymenteventtype`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_paymenteventtype` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `code` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_paymenteventtype`
---
-
-LOCK TABLES `order_paymenteventtype` WRITE;
-/*!40000 ALTER TABLE `order_paymenteventtype` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_paymenteventtype` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_shippingaddress`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_shippingaddress` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(64) NOT NULL,
-  `first_name` varchar(255) NOT NULL,
-  `last_name` varchar(255) NOT NULL,
-  `line1` varchar(255) NOT NULL,
-  `line2` varchar(255) NOT NULL,
-  `line3` varchar(255) NOT NULL,
-  `line4` varchar(255) NOT NULL,
-  `state` varchar(255) NOT NULL,
-  `postcode` varchar(64) NOT NULL,
-  `search_text` longtext NOT NULL,
-  `phone_number` varchar(128) NOT NULL,
-  `notes` longtext NOT NULL,
-  `country_id` varchar(2) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_shipp_country_id_29abf9a0_fk_address_country_iso_3166_1_a2` (`country_id`),
-  CONSTRAINT `order_shipp_country_id_29abf9a0_fk_address_country_iso_3166_1_a2` FOREIGN KEY (`country_id`) REFERENCES `address_country` (`iso_3166_1_a2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_shippingaddress`
---
-
-LOCK TABLES `order_shippingaddress` WRITE;
-/*!40000 ALTER TABLE `order_shippingaddress` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_shippingaddress` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_shippingevent`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_shippingevent` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `notes` longtext NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `event_type_id` int(11) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `order_shipp_event_type_id_9f1efb20_fk_order_shippingeventtype_id` (`event_type_id`),
-  KEY `order_shippingevent_order_id_8c031fb6_fk_order_order_id` (`order_id`),
-  CONSTRAINT `order_shipp_event_type_id_9f1efb20_fk_order_shippingeventtype_id` FOREIGN KEY (`event_type_id`) REFERENCES `order_shippingeventtype` (`id`),
-  CONSTRAINT `order_shippingevent_order_id_8c031fb6_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_shippingevent`
---
-
-LOCK TABLES `order_shippingevent` WRITE;
-/*!40000 ALTER TABLE `order_shippingevent` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_shippingevent` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_shippingeventquantity`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_shippingeventquantity` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `quantity` int(10) unsigned NOT NULL,
-  `event_id` int(11) NOT NULL,
-  `line_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `order_shippingeventquantity_event_id_91687107_uniq` (`event_id`,`line_id`),
-  KEY `order_shippingeventquantity_line_id_3b089ee0_fk_order_line_id` (`line_id`),
-  CONSTRAINT `order_shippingeventq_event_id_1c7fb9c7_fk_order_shippingevent_id` FOREIGN KEY (`event_id`) REFERENCES `order_shippingevent` (`id`),
-  CONSTRAINT `order_shippingeventquantity_line_id_3b089ee0_fk_order_line_id` FOREIGN KEY (`line_id`) REFERENCES `order_line` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_shippingeventquantity`
---
-
-LOCK TABLES `order_shippingeventquantity` WRITE;
-/*!40000 ALTER TABLE `order_shippingeventquantity` DISABLE KEYS */;
-/*!40000 ALTER TABLE `order_shippingeventquantity` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `order_shippingeventtype`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `order_shippingeventtype` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `code` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `order_shippingeventtype`
---
-
-LOCK TABLES `order_shippingeventtype` WRITE;
-/*!40000 ALTER TABLE `order_shippingeventtype` DISABLE KEYS */;
-INSERT INTO `order_shippingeventtype` VALUES (1,'Shipped','shipped');
-/*!40000 ALTER TABLE `order_shippingeventtype` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `partner_partner`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `partner_partner` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(128) NOT NULL,
-  `name` varchar(128) NOT NULL,
-  `short_code` varchar(8) NOT NULL,
-  `enable_sailthru` tinyint(1) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`),
-  UNIQUE KEY `short_code` (`short_code`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `partner_partner`
---
-
-LOCK TABLES `partner_partner` WRITE;
-/*!40000 ALTER TABLE `partner_partner` DISABLE KEYS */;
-INSERT INTO `partner_partner` VALUES (1,'edX','Open edX','edX',1);
-/*!40000 ALTER TABLE `partner_partner` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `partner_partner_users`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `partner_partner_users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `partner_id` int(11) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `partner_partner_users_partner_id_9e5c0517_uniq` (`partner_id`,`user_id`),
-  KEY `partner_partner_users_user_id_d75d6e40_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `partner_partner_users_partner_id_1883dfd9_fk_partner_partner_id` FOREIGN KEY (`partner_id`) REFERENCES `partner_partner` (`id`),
-  CONSTRAINT `partner_partner_users_user_id_d75d6e40_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `partner_partner_users`
---
-
-LOCK TABLES `partner_partner_users` WRITE;
-/*!40000 ALTER TABLE `partner_partner_users` DISABLE KEYS */;
-/*!40000 ALTER TABLE `partner_partner_users` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `partner_partneraddress`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `partner_partneraddress` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(64) NOT NULL,
-  `first_name` varchar(255) NOT NULL,
-  `last_name` varchar(255) NOT NULL,
-  `line1` varchar(255) NOT NULL,
-  `line2` varchar(255) NOT NULL,
-  `line3` varchar(255) NOT NULL,
-  `line4` varchar(255) NOT NULL,
-  `state` varchar(255) NOT NULL,
-  `postcode` varchar(64) NOT NULL,
-  `search_text` longtext NOT NULL,
-  `country_id` varchar(2) NOT NULL,
-  `partner_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `partner_par_country_id_02c4f979_fk_address_country_iso_3166_1_a2` (`country_id`),
-  KEY `partner_partneraddress_partner_id_59551b0a_fk_partner_partner_id` (`partner_id`),
-  CONSTRAINT `partner_par_country_id_02c4f979_fk_address_country_iso_3166_1_a2` FOREIGN KEY (`country_id`) REFERENCES `address_country` (`iso_3166_1_a2`),
-  CONSTRAINT `partner_partneraddress_partner_id_59551b0a_fk_partner_partner_id` FOREIGN KEY (`partner_id`) REFERENCES `partner_partner` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `partner_partneraddress`
---
-
-LOCK TABLES `partner_partneraddress` WRITE;
-/*!40000 ALTER TABLE `partner_partneraddress` DISABLE KEYS */;
-/*!40000 ALTER TABLE `partner_partneraddress` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `partner_stockalert`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `partner_stockalert` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `threshold` int(10) unsigned NOT NULL,
-  `status` varchar(128) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_closed` datetime(6) DEFAULT NULL,
-  `stockrecord_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `partner_stocka_stockrecord_id_68ad503a_fk_partner_stockrecord_id` (`stockrecord_id`),
-  CONSTRAINT `partner_stocka_stockrecord_id_68ad503a_fk_partner_stockrecord_id` FOREIGN KEY (`stockrecord_id`) REFERENCES `partner_stockrecord` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `partner_stockalert`
---
-
-LOCK TABLES `partner_stockalert` WRITE;
-/*!40000 ALTER TABLE `partner_stockalert` DISABLE KEYS */;
-/*!40000 ALTER TABLE `partner_stockalert` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `partner_stockrecord`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `partner_stockrecord` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `partner_sku` varchar(128) NOT NULL,
-  `price_currency` varchar(12) NOT NULL,
-  `price_excl_tax` decimal(12,2) DEFAULT NULL,
-  `price_retail` decimal(12,2) DEFAULT NULL,
-  `cost_price` decimal(12,2) DEFAULT NULL,
-  `num_in_stock` int(10) unsigned DEFAULT NULL,
-  `num_allocated` int(11) DEFAULT NULL,
-  `low_stock_threshold` int(10) unsigned DEFAULT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `date_updated` datetime(6) NOT NULL,
-  `partner_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `partner_stockrecord_partner_id_8441e010_uniq` (`partner_id`,`partner_sku`),
-  KEY `partner_stockrecord_product_id_62fd9e45_fk_catalogue_product_id` (`product_id`),
-  KEY `partner_stockrecord_9474e4b5` (`date_updated`),
-  CONSTRAINT `partner_stockrecord_partner_id_4155a586_fk_partner_partner_id` FOREIGN KEY (`partner_id`) REFERENCES `partner_partner` (`id`),
-  CONSTRAINT `partner_stockrecord_product_id_62fd9e45_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `partner_stockrecord`
---
-
-LOCK TABLES `partner_stockrecord` WRITE;
-/*!40000 ALTER TABLE `partner_stockrecord` DISABLE KEYS */;
-INSERT INTO `partner_stockrecord` VALUES (1,'68EFFFF','USD',0.00,NULL,NULL,NULL,NULL,NULL,'2018-02-02 15:05:41.754060','2018-02-02 15:05:41.754121',1,2),(2,'8CF08E5','USD',149.00,NULL,NULL,NULL,NULL,NULL,'2018-02-02 15:05:41.787375','2018-02-02 15:05:41.787413',1,3);
-/*!40000 ALTER TABLE `partner_stockrecord` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_bankcard`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_bankcard` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `card_type` varchar(128) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `number` varchar(32) NOT NULL,
-  `expiry_date` date NOT NULL,
-  `partner_reference` varchar(255) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `payment_bankcard_user_id_08e1d04c_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `payment_bankcard_user_id_08e1d04c_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_bankcard`
---
-
-LOCK TABLES `payment_bankcard` WRITE;
-/*!40000 ALTER TABLE `payment_bankcard` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_bankcard` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_paymentprocessorresponse`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_paymentprocessorresponse` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `processor_name` varchar(255) NOT NULL,
-  `transaction_id` varchar(255) DEFAULT NULL,
-  `response` longtext NOT NULL,
-  `created` datetime(6) NOT NULL,
-  `basket_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `payment_paymentprocessorresponse_processor_name_c62034f3_idx` (`processor_name`,`transaction_id`),
-  KEY `payment_paymentprocessorr_basket_id_ff3d36a2_fk_basket_basket_id` (`basket_id`),
-  KEY `payment_paymentprocessorresponse_e2fa5388` (`created`),
-  CONSTRAINT `payment_paymentprocessorr_basket_id_ff3d36a2_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_paymentprocessorresponse`
---
-
-LOCK TABLES `payment_paymentprocessorresponse` WRITE;
-/*!40000 ALTER TABLE `payment_paymentprocessorresponse` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_paymentprocessorresponse` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_paypalprocessorconfiguration`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_paypalprocessorconfiguration` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `retry_attempts` smallint(5) unsigned NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_paypalprocessorconfiguration`
---
-
-LOCK TABLES `payment_paypalprocessorconfiguration` WRITE;
-/*!40000 ALTER TABLE `payment_paypalprocessorconfiguration` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_paypalprocessorconfiguration` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_paypalwebprofile`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_paypalwebprofile` (
-  `id` varchar(255) NOT NULL,
-  `name` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_paypalwebprofile`
---
-
-LOCK TABLES `payment_paypalwebprofile` WRITE;
-/*!40000 ALTER TABLE `payment_paypalwebprofile` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_paypalwebprofile` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_sdncheckfailure`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_sdncheckfailure` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  `full_name` varchar(255) NOT NULL,
-  `username` varchar(255) NOT NULL,
-  `country` varchar(2) NOT NULL,
-  `sdn_check_response` longtext NOT NULL,
-  `site_id` int(11) DEFAULT NULL,
-  `city` varchar(32) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `payment_sdncheckfailure_site_id_202cf400_fk_django_site_id` (`site_id`),
-  CONSTRAINT `payment_sdncheckfailure_site_id_202cf400_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_sdncheckfailure`
---
-
-LOCK TABLES `payment_sdncheckfailure` WRITE;
-/*!40000 ALTER TABLE `payment_sdncheckfailure` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_sdncheckfailure` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_sdncheckfailure_products`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_sdncheckfailure_products` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `sdncheckfailure_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `payment_sdncheckfailure_product_sdncheckfailure_id_5e39885c_uniq` (`sdncheckfailure_id`,`product_id`),
-  KEY `payment_sdncheckfail_product_id_6d431270_fk_catalogue_product_id` (`product_id`),
-  CONSTRAINT `paymen_sdncheckfailure_id_a8c1f0d4_fk_payment_sdncheckfailure_id` FOREIGN KEY (`sdncheckfailure_id`) REFERENCES `payment_sdncheckfailure` (`id`),
-  CONSTRAINT `payment_sdncheckfail_product_id_6d431270_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_sdncheckfailure_products`
---
-
-LOCK TABLES `payment_sdncheckfailure_products` WRITE;
-/*!40000 ALTER TABLE `payment_sdncheckfailure_products` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_sdncheckfailure_products` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_source`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_source` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `currency` varchar(12) NOT NULL,
-  `amount_allocated` decimal(12,2) NOT NULL,
-  `amount_debited` decimal(12,2) NOT NULL,
-  `amount_refunded` decimal(12,2) NOT NULL,
-  `reference` varchar(255) NOT NULL,
-  `label` varchar(128) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  `source_type_id` int(11) NOT NULL,
-  `card_type` varchar(255) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  KEY `payment_source_order_id_6b7f2215_fk_order_order_id` (`order_id`),
-  KEY `payment_source_source_type_id_700828fe_fk_payment_sourcetype_id` (`source_type_id`),
-  CONSTRAINT `payment_source_order_id_6b7f2215_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`),
-  CONSTRAINT `payment_source_source_type_id_700828fe_fk_payment_sourcetype_id` FOREIGN KEY (`source_type_id`) REFERENCES `payment_sourcetype` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_source`
---
-
-LOCK TABLES `payment_source` WRITE;
-/*!40000 ALTER TABLE `payment_source` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_source` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_sourcetype`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_sourcetype` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `code` varchar(128) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_sourcetype`
---
-
-LOCK TABLES `payment_sourcetype` WRITE;
-/*!40000 ALTER TABLE `payment_sourcetype` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_sourcetype` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `payment_transaction`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `payment_transaction` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `txn_type` varchar(128) NOT NULL,
-  `amount` decimal(12,2) NOT NULL,
-  `reference` varchar(128) NOT NULL,
-  `status` varchar(128) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `source_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `payment_transaction_source_id_c5ac31e8_fk_payment_source_id` (`source_id`),
-  CONSTRAINT `payment_transaction_source_id_c5ac31e8_fk_payment_source_id` FOREIGN KEY (`source_id`) REFERENCES `payment_source` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `payment_transaction`
---
-
-LOCK TABLES `payment_transaction` WRITE;
-/*!40000 ALTER TABLE `payment_transaction` DISABLE KEYS */;
-/*!40000 ALTER TABLE `payment_transaction` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_automaticproductlist`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_automaticproductlist` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `description` longtext NOT NULL,
-  `link_url` varchar(200) NOT NULL,
-  `link_text` varchar(255) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `method` varchar(128) NOT NULL,
-  `num_products` smallint(5) unsigned NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_automaticproductlist`
---
-
-LOCK TABLES `promotions_automaticproductlist` WRITE;
-/*!40000 ALTER TABLE `promotions_automaticproductlist` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_automaticproductlist` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_handpickedproductlist`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_handpickedproductlist` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `description` longtext NOT NULL,
-  `link_url` varchar(200) NOT NULL,
-  `link_text` varchar(255) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_handpickedproductlist`
---
-
-LOCK TABLES `promotions_handpickedproductlist` WRITE;
-/*!40000 ALTER TABLE `promotions_handpickedproductlist` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_handpickedproductlist` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_image`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_image` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `link_url` varchar(200) NOT NULL,
-  `image` varchar(255) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_image`
---
-
-LOCK TABLES `promotions_image` WRITE;
-/*!40000 ALTER TABLE `promotions_image` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_image` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_keywordpromotion`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_keywordpromotion` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `object_id` int(10) unsigned NOT NULL,
-  `position` varchar(100) NOT NULL,
-  `display_order` int(10) unsigned NOT NULL,
-  `clicks` int(10) unsigned NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `keyword` varchar(200) NOT NULL,
-  `filter` varchar(200) NOT NULL,
-  `content_type_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `promotions_ke_content_type_id_91959aa4_fk_django_content_type_id` (`content_type_id`),
-  CONSTRAINT `promotions_ke_content_type_id_91959aa4_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_keywordpromotion`
---
-
-LOCK TABLES `promotions_keywordpromotion` WRITE;
-/*!40000 ALTER TABLE `promotions_keywordpromotion` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_keywordpromotion` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_multiimage`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_multiimage` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_multiimage`
---
-
-LOCK TABLES `promotions_multiimage` WRITE;
-/*!40000 ALTER TABLE `promotions_multiimage` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_multiimage` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_multiimage_images`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_multiimage_images` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `multiimage_id` int(11) NOT NULL,
-  `image_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `promotions_multiimage_images_multiimage_id_29363bca_uniq` (`multiimage_id`,`image_id`),
-  KEY `promotions_multiimage_i_image_id_bb6eca34_fk_promotions_image_id` (`image_id`),
-  CONSTRAINT `promotions_mu_multiimage_id_62ed9a9f_fk_promotions_multiimage_id` FOREIGN KEY (`multiimage_id`) REFERENCES `promotions_multiimage` (`id`),
-  CONSTRAINT `promotions_multiimage_i_image_id_bb6eca34_fk_promotions_image_id` FOREIGN KEY (`image_id`) REFERENCES `promotions_image` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_multiimage_images`
---
-
-LOCK TABLES `promotions_multiimage_images` WRITE;
-/*!40000 ALTER TABLE `promotions_multiimage_images` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_multiimage_images` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_orderedproduct`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_orderedproduct` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `display_order` int(10) unsigned NOT NULL,
-  `list_id` int(11) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `promotions_orderedproduct_list_id_1e22874a_uniq` (`list_id`,`product_id`),
-  KEY `promotions_orderedpr_product_id_94dede36_fk_catalogue_product_id` (`product_id`),
-  CONSTRAINT `promotio_list_id_94f390b0_fk_promotions_handpickedproductlist_id` FOREIGN KEY (`list_id`) REFERENCES `promotions_handpickedproductlist` (`id`),
-  CONSTRAINT `promotions_orderedpr_product_id_94dede36_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_orderedproduct`
---
-
-LOCK TABLES `promotions_orderedproduct` WRITE;
-/*!40000 ALTER TABLE `promotions_orderedproduct` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_orderedproduct` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_orderedproductlist`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_orderedproductlist` (
-  `handpickedproductlist_ptr_id` int(11) NOT NULL,
-  `display_order` int(10) unsigned NOT NULL,
-  `tabbed_block_id` int(11) NOT NULL,
-  PRIMARY KEY (`handpickedproductlist_ptr_id`),
-  KEY `promotions_tabbed_block_id_a018e8d5_fk_promotions_tabbedblock_id` (`tabbed_block_id`),
-  CONSTRAINT `D0960c2dac786e2180c5e16db0f3bf02` FOREIGN KEY (`handpickedproductlist_ptr_id`) REFERENCES `promotions_handpickedproductlist` (`id`),
-  CONSTRAINT `promotions_tabbed_block_id_a018e8d5_fk_promotions_tabbedblock_id` FOREIGN KEY (`tabbed_block_id`) REFERENCES `promotions_tabbedblock` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_orderedproductlist`
---
-
-LOCK TABLES `promotions_orderedproductlist` WRITE;
-/*!40000 ALTER TABLE `promotions_orderedproductlist` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_orderedproductlist` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_pagepromotion`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_pagepromotion` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `object_id` int(10) unsigned NOT NULL,
-  `position` varchar(100) NOT NULL,
-  `display_order` int(10) unsigned NOT NULL,
-  `clicks` int(10) unsigned NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `page_url` varchar(128) NOT NULL,
-  `content_type_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `promotions_pa_content_type_id_00707bff_fk_django_content_type_id` (`content_type_id`),
-  KEY `promotions_pagepromotion_072c6e88` (`page_url`),
-  CONSTRAINT `promotions_pa_content_type_id_00707bff_fk_django_content_type_id` FOREIGN KEY (`content_type_id`) REFERENCES `django_content_type` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_pagepromotion`
---
-
-LOCK TABLES `promotions_pagepromotion` WRITE;
-/*!40000 ALTER TABLE `promotions_pagepromotion` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_pagepromotion` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_rawhtml`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_rawhtml` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `display_type` varchar(128) NOT NULL,
-  `body` longtext NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_rawhtml`
---
-
-LOCK TABLES `promotions_rawhtml` WRITE;
-/*!40000 ALTER TABLE `promotions_rawhtml` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_rawhtml` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_singleproduct`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_singleproduct` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `description` longtext NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `product_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `promotions_singlepro_product_id_d7ad5e03_fk_catalogue_product_id` (`product_id`),
-  CONSTRAINT `promotions_singlepro_product_id_d7ad5e03_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_singleproduct`
---
-
-LOCK TABLES `promotions_singleproduct` WRITE;
-/*!40000 ALTER TABLE `promotions_singleproduct` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_singleproduct` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `promotions_tabbedblock`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `promotions_tabbedblock` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `promotions_tabbedblock`
---
-
-LOCK TABLES `promotions_tabbedblock` WRITE;
-/*!40000 ALTER TABLE `promotions_tabbedblock` DISABLE KEYS */;
-/*!40000 ALTER TABLE `promotions_tabbedblock` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `referrals_referral`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `referrals_referral` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  `affiliate_id` varchar(255) NOT NULL,
-  `basket_id` int(11) DEFAULT NULL,
-  `order_id` int(11) DEFAULT NULL,
-  `site_id` int(11) DEFAULT NULL,
-  `utm_campaign` varchar(255) NOT NULL,
-  `utm_content` varchar(255) NOT NULL,
-  `utm_created_at` datetime(6) DEFAULT NULL,
-  `utm_medium` varchar(255) NOT NULL,
-  `utm_source` varchar(255) NOT NULL,
-  `utm_term` varchar(255) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `basket_id` (`basket_id`),
-  UNIQUE KEY `order_id` (`order_id`),
-  KEY `referrals_referral_site_id_2ba3a624_fk_django_site_id` (`site_id`),
-  CONSTRAINT `referrals_referral_basket_id_25e1749e_fk_basket_basket_id` FOREIGN KEY (`basket_id`) REFERENCES `basket_basket` (`id`),
-  CONSTRAINT `referrals_referral_order_id_170fad6d_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`),
-  CONSTRAINT `referrals_referral_site_id_2ba3a624_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `referrals_referral`
---
-
-LOCK TABLES `referrals_referral` WRITE;
-/*!40000 ALTER TABLE `referrals_referral` DISABLE KEYS */;
-/*!40000 ALTER TABLE `referrals_referral` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `refund_refund`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `refund_refund` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  `total_credit_excl_tax` decimal(12,2) NOT NULL,
-  `currency` varchar(12) NOT NULL,
-  `status` varchar(255) NOT NULL,
-  `order_id` int(11) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `refund_refund_order_id_44bf4b92_fk_order_order_id` (`order_id`),
-  KEY `refund_refund_user_id_f10f8f2a_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `refund_refund_order_id_44bf4b92_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`),
-  CONSTRAINT `refund_refund_user_id_f10f8f2a_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `refund_refund`
---
-
-LOCK TABLES `refund_refund` WRITE;
-/*!40000 ALTER TABLE `refund_refund` DISABLE KEYS */;
-/*!40000 ALTER TABLE `refund_refund` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `refund_refundline`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `refund_refundline` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  `line_credit_excl_tax` decimal(12,2) NOT NULL,
-  `quantity` int(10) unsigned NOT NULL,
-  `status` varchar(255) NOT NULL,
-  `order_line_id` int(11) NOT NULL,
-  `refund_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `refund_refundline_order_line_id_f775827b_fk_order_line_id` (`order_line_id`),
-  KEY `refund_refundline_refund_id_a1fc3ad0_fk_refund_refund_id` (`refund_id`),
-  CONSTRAINT `refund_refundline_order_line_id_f775827b_fk_order_line_id` FOREIGN KEY (`order_line_id`) REFERENCES `order_line` (`id`),
-  CONSTRAINT `refund_refundline_refund_id_a1fc3ad0_fk_refund_refund_id` FOREIGN KEY (`refund_id`) REFERENCES `refund_refund` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `refund_refundline`
---
-
-LOCK TABLES `refund_refundline` WRITE;
-/*!40000 ALTER TABLE `refund_refundline` DISABLE KEYS */;
-/*!40000 ALTER TABLE `refund_refundline` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `reviews_productreview`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `reviews_productreview` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `score` smallint(6) NOT NULL,
-  `title` varchar(255) NOT NULL,
-  `body` longtext NOT NULL,
-  `name` varchar(255) NOT NULL,
-  `email` varchar(254) NOT NULL,
-  `homepage` varchar(200) NOT NULL,
-  `status` smallint(6) NOT NULL,
-  `total_votes` int(11) NOT NULL,
-  `delta_votes` int(11) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `product_id` int(11) DEFAULT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `reviews_productreview_product_id_c4fdc4cd_uniq` (`product_id`,`user_id`),
-  KEY `reviews_productreview_user_id_8acb5ddd_fk_ecommerce_user_id` (`user_id`),
-  KEY `reviews_productreview_979acfd1` (`delta_votes`),
-  CONSTRAINT `reviews_productrevie_product_id_52e52a32_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `reviews_productreview_user_id_8acb5ddd_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `reviews_productreview`
---
-
-LOCK TABLES `reviews_productreview` WRITE;
-/*!40000 ALTER TABLE `reviews_productreview` DISABLE KEYS */;
-/*!40000 ALTER TABLE `reviews_productreview` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `reviews_vote`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `reviews_vote` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `delta` smallint(6) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `review_id` int(11) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `reviews_vote_user_id_bb858939_uniq` (`user_id`,`review_id`),
-  KEY `reviews_vote_review_id_371b2d8d_fk_reviews_productreview_id` (`review_id`),
-  CONSTRAINT `reviews_vote_review_id_371b2d8d_fk_reviews_productreview_id` FOREIGN KEY (`review_id`) REFERENCES `reviews_productreview` (`id`),
-  CONSTRAINT `reviews_vote_user_id_5fb87b53_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `reviews_vote`
---
-
-LOCK TABLES `reviews_vote` WRITE;
-/*!40000 ALTER TABLE `reviews_vote` DISABLE KEYS */;
-/*!40000 ALTER TABLE `reviews_vote` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `shipping_orderanditemcharges`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `shipping_orderanditemcharges` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(128) NOT NULL,
-  `name` varchar(128) NOT NULL,
-  `description` longtext NOT NULL,
-  `price_per_order` decimal(12,2) NOT NULL,
-  `price_per_item` decimal(12,2) NOT NULL,
-  `free_shipping_threshold` decimal(12,2) DEFAULT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `shipping_orderanditemcharges`
---
-
-LOCK TABLES `shipping_orderanditemcharges` WRITE;
-/*!40000 ALTER TABLE `shipping_orderanditemcharges` DISABLE KEYS */;
-/*!40000 ALTER TABLE `shipping_orderanditemcharges` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `shipping_orderanditemcharges_countries`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `shipping_orderanditemcharges_countries` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `orderanditemcharges_id` int(11) NOT NULL,
-  `country_id` varchar(2) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `shipping_orderanditemcharge_orderanditemcharges_id_9f0c9c8f_uniq` (`orderanditemcharges_id`,`country_id`),
-  KEY `shipping_or_country_id_30387f2e_fk_address_country_iso_3166_1_a2` (`country_id`),
-  CONSTRAINT `D7d640886e5bf6acefe7155c1048828a` FOREIGN KEY (`orderanditemcharges_id`) REFERENCES `shipping_orderanditemcharges` (`id`),
-  CONSTRAINT `shipping_or_country_id_30387f2e_fk_address_country_iso_3166_1_a2` FOREIGN KEY (`country_id`) REFERENCES `address_country` (`iso_3166_1_a2`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `shipping_orderanditemcharges_countries`
---
-
-LOCK TABLES `shipping_orderanditemcharges_countries` WRITE;
-/*!40000 ALTER TABLE `shipping_orderanditemcharges_countries` DISABLE KEYS */;
-/*!40000 ALTER TABLE `shipping_orderanditemcharges_countries` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `shipping_weightband`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `shipping_weightband` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `upper_limit` decimal(12,3) NOT NULL,
-  `charge` decimal(12,2) NOT NULL,
-  `method_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `shipping_weightban_method_id_b699a1ba_fk_shipping_weightbased_id` (`method_id`),
-  CONSTRAINT `shipping_weightban_method_id_b699a1ba_fk_shipping_weightbased_id` FOREIGN KEY (`method_id`) REFERENCES `shipping_weightbased` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `shipping_weightband`
---
-
-LOCK TABLES `shipping_weightband` WRITE;
-/*!40000 ALTER TABLE `shipping_weightband` DISABLE KEYS */;
-/*!40000 ALTER TABLE `shipping_weightband` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `shipping_weightbased`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `shipping_weightbased` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(128) NOT NULL,
-  `name` varchar(128) NOT NULL,
-  `description` longtext NOT NULL,
-  `default_weight` decimal(12,3) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `shipping_weightbased`
---
-
-LOCK TABLES `shipping_weightbased` WRITE;
-/*!40000 ALTER TABLE `shipping_weightbased` DISABLE KEYS */;
-/*!40000 ALTER TABLE `shipping_weightbased` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `shipping_weightbased_countries`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `shipping_weightbased_countries` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `weightbased_id` int(11) NOT NULL,
-  `country_id` varchar(2) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `shipping_weightbased_countries_weightbased_id_de8c5e42_uniq` (`weightbased_id`,`country_id`),
-  KEY `shipping_we_country_id_06117384_fk_address_country_iso_3166_1_a2` (`country_id`),
-  CONSTRAINT `shipping_we_country_id_06117384_fk_address_country_iso_3166_1_a2` FOREIGN KEY (`country_id`) REFERENCES `address_country` (`iso_3166_1_a2`),
-  CONSTRAINT `shipping_weig_weightbased_id_93e3132f_fk_shipping_weightbased_id` FOREIGN KEY (`weightbased_id`) REFERENCES `shipping_weightbased` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `shipping_weightbased_countries`
---
-
-LOCK TABLES `shipping_weightbased_countries` WRITE;
-/*!40000 ALTER TABLE `shipping_weightbased_countries` DISABLE KEYS */;
-/*!40000 ALTER TABLE `shipping_weightbased_countries` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `social_auth_association`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `social_auth_association` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `server_url` varchar(255) NOT NULL,
-  `handle` varchar(255) NOT NULL,
-  `secret` varchar(255) NOT NULL,
-  `issued` int(11) NOT NULL,
-  `lifetime` int(11) NOT NULL,
-  `assoc_type` varchar(64) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `social_auth_association_server_url_078befa2_uniq` (`server_url`,`handle`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `social_auth_association`
---
-
-LOCK TABLES `social_auth_association` WRITE;
-/*!40000 ALTER TABLE `social_auth_association` DISABLE KEYS */;
-/*!40000 ALTER TABLE `social_auth_association` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `social_auth_code`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `social_auth_code` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `email` varchar(254) NOT NULL,
-  `code` varchar(32) NOT NULL,
-  `verified` tinyint(1) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `social_auth_code_email_801b2d02_uniq` (`email`,`code`),
-  KEY `social_auth_code_c1336794` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `social_auth_code`
---
-
-LOCK TABLES `social_auth_code` WRITE;
-/*!40000 ALTER TABLE `social_auth_code` DISABLE KEYS */;
-/*!40000 ALTER TABLE `social_auth_code` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `social_auth_nonce`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `social_auth_nonce` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `server_url` varchar(255) NOT NULL,
-  `timestamp` int(11) NOT NULL,
-  `salt` varchar(65) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `social_auth_nonce_server_url_f6284463_uniq` (`server_url`,`timestamp`,`salt`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `social_auth_nonce`
---
-
-LOCK TABLES `social_auth_nonce` WRITE;
-/*!40000 ALTER TABLE `social_auth_nonce` DISABLE KEYS */;
-/*!40000 ALTER TABLE `social_auth_nonce` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `social_auth_partial`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `social_auth_partial` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `token` varchar(32) NOT NULL,
-  `next_step` smallint(5) unsigned NOT NULL,
-  `backend` varchar(32) NOT NULL,
-  `data` longtext NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `social_auth_partial_94a08da1` (`token`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `social_auth_partial`
---
-
-LOCK TABLES `social_auth_partial` WRITE;
-/*!40000 ALTER TABLE `social_auth_partial` DISABLE KEYS */;
-/*!40000 ALTER TABLE `social_auth_partial` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `social_auth_usersocialauth`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `social_auth_usersocialauth` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `provider` varchar(32) NOT NULL,
-  `uid` varchar(255) NOT NULL,
-  `extra_data` longtext NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `social_auth_usersocialauth_provider_e6b5e668_uniq` (`provider`,`uid`),
-  KEY `social_auth_usersocialauth_user_id_17d28448_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `social_auth_usersocialauth_user_id_17d28448_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `social_auth_usersocialauth`
---
-
-LOCK TABLES `social_auth_usersocialauth` WRITE;
-/*!40000 ALTER TABLE `social_auth_usersocialauth` DISABLE KEYS */;
-/*!40000 ALTER TABLE `social_auth_usersocialauth` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `theming_sitetheme`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `theming_sitetheme` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `theme_dir_name` varchar(255) NOT NULL,
-  `site_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `theming_sitetheme_site_id_fe93d039_fk_django_site_id` (`site_id`),
-  CONSTRAINT `theming_sitetheme_site_id_fe93d039_fk_django_site_id` FOREIGN KEY (`site_id`) REFERENCES `django_site` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `theming_sitetheme`
---
-
-LOCK TABLES `theming_sitetheme` WRITE;
-/*!40000 ALTER TABLE `theming_sitetheme` DISABLE KEYS */;
-/*!40000 ALTER TABLE `theming_sitetheme` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `thumbnail_kvstore`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `thumbnail_kvstore` (
-  `key` varchar(200) NOT NULL,
-  `value` longtext NOT NULL,
-  PRIMARY KEY (`key`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `thumbnail_kvstore`
---
-
-LOCK TABLES `thumbnail_kvstore` WRITE;
-/*!40000 ALTER TABLE `thumbnail_kvstore` DISABLE KEYS */;
-/*!40000 ALTER TABLE `thumbnail_kvstore` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_couponvouchers`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_couponvouchers` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `coupon_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `voucher_couponvoucher_coupon_id_44356128_fk_catalogue_product_id` (`coupon_id`),
-  CONSTRAINT `voucher_couponvoucher_coupon_id_44356128_fk_catalogue_product_id` FOREIGN KEY (`coupon_id`) REFERENCES `catalogue_product` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_couponvouchers`
---
-
-LOCK TABLES `voucher_couponvouchers` WRITE;
-/*!40000 ALTER TABLE `voucher_couponvouchers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_couponvouchers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_couponvouchers_vouchers`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_couponvouchers_vouchers` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `couponvouchers_id` int(11) NOT NULL,
-  `voucher_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `voucher_couponvouchers_vouchers_couponvouchers_id_390b5a38_uniq` (`couponvouchers_id`,`voucher_id`),
-  KEY `voucher_couponvouchers_voucher_id_d5507ed9_fk_voucher_voucher_id` (`voucher_id`),
-  CONSTRAINT `voucher__couponvouchers_id_ebe4c993_fk_voucher_couponvouchers_id` FOREIGN KEY (`couponvouchers_id`) REFERENCES `voucher_couponvouchers` (`id`),
-  CONSTRAINT `voucher_couponvouchers_voucher_id_d5507ed9_fk_voucher_voucher_id` FOREIGN KEY (`voucher_id`) REFERENCES `voucher_voucher` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_couponvouchers_vouchers`
---
-
-LOCK TABLES `voucher_couponvouchers_vouchers` WRITE;
-/*!40000 ALTER TABLE `voucher_couponvouchers_vouchers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_couponvouchers_vouchers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_orderlinevouchers`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_orderlinevouchers` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `line_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `voucher_orderlinevouchers_line_id_fa3dbd8e_fk_order_line_id` (`line_id`),
-  CONSTRAINT `voucher_orderlinevouchers_line_id_fa3dbd8e_fk_order_line_id` FOREIGN KEY (`line_id`) REFERENCES `order_line` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_orderlinevouchers`
---
-
-LOCK TABLES `voucher_orderlinevouchers` WRITE;
-/*!40000 ALTER TABLE `voucher_orderlinevouchers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_orderlinevouchers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_orderlinevouchers_vouchers`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_orderlinevouchers_vouchers` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `orderlinevouchers_id` int(11) NOT NULL,
-  `voucher_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `voucher_orderlinevouchers_vou_orderlinevouchers_id_2a30647d_uniq` (`orderlinevouchers_id`,`voucher_id`),
-  KEY `voucher_orderlinevouch_voucher_id_b8820f35_fk_voucher_voucher_id` (`voucher_id`),
-  CONSTRAINT `vo_orderlinevouchers_id_c916ee3a_fk_voucher_orderlinevouchers_id` FOREIGN KEY (`orderlinevouchers_id`) REFERENCES `voucher_orderlinevouchers` (`id`),
-  CONSTRAINT `voucher_orderlinevouch_voucher_id_b8820f35_fk_voucher_voucher_id` FOREIGN KEY (`voucher_id`) REFERENCES `voucher_voucher` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_orderlinevouchers_vouchers`
---
-
-LOCK TABLES `voucher_orderlinevouchers_vouchers` WRITE;
-/*!40000 ALTER TABLE `voucher_orderlinevouchers_vouchers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_orderlinevouchers_vouchers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_voucher`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_voucher` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) NOT NULL,
-  `code` varchar(128) NOT NULL,
-  `usage` varchar(128) NOT NULL,
-  `start_datetime` datetime(6) NOT NULL,
-  `end_datetime` datetime(6) NOT NULL,
-  `num_basket_additions` int(10) unsigned NOT NULL,
-  `num_orders` int(10) unsigned NOT NULL,
-  `total_discount` decimal(12,2) NOT NULL,
-  `date_created` date NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `code` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_voucher`
---
-
-LOCK TABLES `voucher_voucher` WRITE;
-/*!40000 ALTER TABLE `voucher_voucher` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_voucher` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_voucher_offers`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_voucher_offers` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `voucher_id` int(11) NOT NULL,
-  `conditionaloffer_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `voucher_voucher_offers_voucher_id_01628a7f_uniq` (`voucher_id`,`conditionaloffer_id`),
-  KEY `vouche_conditionaloffer_id_f9682bfb_fk_offer_conditionaloffer_id` (`conditionaloffer_id`),
-  CONSTRAINT `vouche_conditionaloffer_id_f9682bfb_fk_offer_conditionaloffer_id` FOREIGN KEY (`conditionaloffer_id`) REFERENCES `offer_conditionaloffer` (`id`),
-  CONSTRAINT `voucher_voucher_offers_voucher_id_7f9c575d_fk_voucher_voucher_id` FOREIGN KEY (`voucher_id`) REFERENCES `voucher_voucher` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_voucher_offers`
---
-
-LOCK TABLES `voucher_voucher_offers` WRITE;
-/*!40000 ALTER TABLE `voucher_voucher_offers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_voucher_offers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `voucher_voucherapplication`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `voucher_voucherapplication` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `date_created` date NOT NULL,
-  `order_id` int(11) NOT NULL,
-  `user_id` int(11) DEFAULT NULL,
-  `voucher_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  KEY `voucher_voucherapplication_order_id_30248a05_fk_order_order_id` (`order_id`),
-  KEY `voucher_voucherapplication_user_id_df53a393_fk_ecommerce_user_id` (`user_id`),
-  KEY `voucher_voucherapplica_voucher_id_5204edb7_fk_voucher_voucher_id` (`voucher_id`),
-  CONSTRAINT `voucher_voucherapplica_voucher_id_5204edb7_fk_voucher_voucher_id` FOREIGN KEY (`voucher_id`) REFERENCES `voucher_voucher` (`id`),
-  CONSTRAINT `voucher_voucherapplication_order_id_30248a05_fk_order_order_id` FOREIGN KEY (`order_id`) REFERENCES `order_order` (`id`),
-  CONSTRAINT `voucher_voucherapplication_user_id_df53a393_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `voucher_voucherapplication`
---
-
-LOCK TABLES `voucher_voucherapplication` WRITE;
-/*!40000 ALTER TABLE `voucher_voucherapplication` DISABLE KEYS */;
-/*!40000 ALTER TABLE `voucher_voucherapplication` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `waffle_flag`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `waffle_flag` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `everyone` tinyint(1) DEFAULT NULL,
-  `percent` decimal(3,1) DEFAULT NULL,
-  `testing` tinyint(1) NOT NULL,
-  `superusers` tinyint(1) NOT NULL,
-  `staff` tinyint(1) NOT NULL,
-  `authenticated` tinyint(1) NOT NULL,
-  `languages` longtext NOT NULL,
-  `rollout` tinyint(1) NOT NULL,
-  `note` longtext NOT NULL,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  KEY `waffle_flag_e2fa5388` (`created`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `waffle_flag`
---
-
-LOCK TABLES `waffle_flag` WRITE;
-/*!40000 ALTER TABLE `waffle_flag` DISABLE KEYS */;
-INSERT INTO `waffle_flag` VALUES (1,'enable_client_side_checkout',1,NULL,0,1,0,0,'',0,'This flag determines if the integrated/client-side checkout flow should be enabled.','2017-06-21 16:06:20.833592','2018-02-02 15:05:41.692051');
-/*!40000 ALTER TABLE `waffle_flag` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `waffle_flag_groups`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `waffle_flag_groups` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `flag_id` int(11) NOT NULL,
-  `group_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `waffle_flag_groups_flag_id_8ba0c71b_uniq` (`flag_id`,`group_id`),
-  KEY `waffle_flag_groups_group_id_a97c4f66_fk_auth_group_id` (`group_id`),
-  CONSTRAINT `waffle_flag_groups_flag_id_c11c0c05_fk_waffle_flag_id` FOREIGN KEY (`flag_id`) REFERENCES `waffle_flag` (`id`),
-  CONSTRAINT `waffle_flag_groups_group_id_a97c4f66_fk_auth_group_id` FOREIGN KEY (`group_id`) REFERENCES `auth_group` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `waffle_flag_groups`
---
-
-LOCK TABLES `waffle_flag_groups` WRITE;
-/*!40000 ALTER TABLE `waffle_flag_groups` DISABLE KEYS */;
-/*!40000 ALTER TABLE `waffle_flag_groups` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `waffle_flag_users`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `waffle_flag_users` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `flag_id` int(11) NOT NULL,
-  `user_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `waffle_flag_users_flag_id_b46f76b0_uniq` (`flag_id`,`user_id`),
-  KEY `waffle_flag_users_user_id_8026df9b_fk_ecommerce_user_id` (`user_id`),
-  CONSTRAINT `waffle_flag_users_flag_id_833c37b0_fk_waffle_flag_id` FOREIGN KEY (`flag_id`) REFERENCES `waffle_flag` (`id`),
-  CONSTRAINT `waffle_flag_users_user_id_8026df9b_fk_ecommerce_user_id` FOREIGN KEY (`user_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `waffle_flag_users`
---
-
-LOCK TABLES `waffle_flag_users` WRITE;
-/*!40000 ALTER TABLE `waffle_flag_users` DISABLE KEYS */;
-/*!40000 ALTER TABLE `waffle_flag_users` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `waffle_sample`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `waffle_sample` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `percent` decimal(4,1) NOT NULL,
-  `note` longtext NOT NULL,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  KEY `waffle_sample_e2fa5388` (`created`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `waffle_sample`
---
-
-LOCK TABLES `waffle_sample` WRITE;
-/*!40000 ALTER TABLE `waffle_sample` DISABLE KEYS */;
-INSERT INTO `waffle_sample` VALUES (1,'async_order_fulfillment',0.0,'Determines what percentage of orders are fulfilled asynchronously.','2017-06-21 16:06:05.827665','2017-06-21 16:06:05.827675');
-/*!40000 ALTER TABLE `waffle_sample` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `waffle_switch`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `waffle_switch` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(100) NOT NULL,
-  `active` tinyint(1) NOT NULL,
-  `note` longtext NOT NULL,
-  `created` datetime(6) NOT NULL,
-  `modified` datetime(6) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `name` (`name`),
-  KEY `waffle_switch_e2fa5388` (`created`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `waffle_switch`
---
-
-LOCK TABLES `waffle_switch` WRITE;
-/*!40000 ALTER TABLE `waffle_switch` DISABLE KEYS */;
-INSERT INTO `waffle_switch` VALUES (1,'allow_repeat_purchase',1,'','2017-06-21 16:05:58.863603','2017-06-21 16:05:58.863613'),(2,'publish_course_modes_to_lms',1,'','2017-06-21 16:06:05.413981','2017-06-21 16:06:05.413997'),(4,'create_enrollment_codes',0,'','2017-06-21 16:06:06.215623','2017-06-21 16:06:06.215633'),(5,'enable_user_list_view',1,'','2017-06-21 16:06:09.360454','2017-06-21 16:06:09.360463'),(6,'enable_order_list_view',1,'','2017-06-21 16:06:18.897479','2017-06-21 16:06:18.897489'),(7,'payment_processor_active_cybersource',1,'','2017-06-21 16:06:20.656777','2017-06-21 16:06:20.656795'),(8,'payment_processor_active_paypal',1,'','2017-06-21 16:06:20.657882','2017-06-21 16:06:20.657890'),(9,'sailthru_enable',0,'','2017-06-21 16:06:28.416700','2017-06-21 16:06:28.416709'),(10,'enable_enterprise_offers',0,'','2018-02-02 15:04:41.040305','2018-02-02 15:04:41.040320'),(11,'enable_enterprise_on_runtime',0,'','2018-02-02 15:04:41.062108','2018-02-02 15:04:41.062123'),(12,'disable_repeat_order_check',0,'','2018-02-02 15:04:42.976798','2018-02-02 15:04:42.976810'),(13,'payment_processor_active_stripe',1,'','2018-02-02 15:04:45.646511','2018-02-02 15:04:45.646527');
-/*!40000 ALTER TABLE `waffle_switch` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `wishlists_line`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `wishlists_line` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `quantity` int(10) unsigned NOT NULL,
-  `title` varchar(255) NOT NULL,
-  `product_id` int(11) DEFAULT NULL,
-  `wishlist_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `wishlists_line_wishlist_id_78f04673_uniq` (`wishlist_id`,`product_id`),
-  KEY `wishlists_line_product_id_9d6d9b37_fk_catalogue_product_id` (`product_id`),
-  CONSTRAINT `wishlists_line_product_id_9d6d9b37_fk_catalogue_product_id` FOREIGN KEY (`product_id`) REFERENCES `catalogue_product` (`id`),
-  CONSTRAINT `wishlists_line_wishlist_id_4cffe302_fk_wishlists_wishlist_id` FOREIGN KEY (`wishlist_id`) REFERENCES `wishlists_wishlist` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `wishlists_line`
---
-
-LOCK TABLES `wishlists_line` WRITE;
-/*!40000 ALTER TABLE `wishlists_line` DISABLE KEYS */;
-/*!40000 ALTER TABLE `wishlists_line` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `wishlists_wishlist`
---
-
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `wishlists_wishlist` (
-  `id` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) NOT NULL,
-  `key` varchar(6) NOT NULL,
-  `visibility` varchar(20) NOT NULL,
-  `date_created` datetime(6) NOT NULL,
-  `owner_id` int(11) NOT NULL,
-  PRIMARY KEY (`id`),
-  UNIQUE KEY `key` (`key`),
-  KEY `wishlists_wishlist_owner_id_d5464c62_fk_ecommerce_user_id` (`owner_id`),
-  CONSTRAINT `wishlists_wishlist_owner_id_d5464c62_fk_ecommerce_user_id` FOREIGN KEY (`owner_id`) REFERENCES `ecommerce_user` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `wishlists_wishlist`
---
-
-LOCK TABLES `wishlists_wishlist` WRITE;
-/*!40000 ALTER TABLE `wishlists_wishlist` DISABLE KEYS */;
-/*!40000 ALTER TABLE `wishlists_wishlist` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2018-02-02 15:44:26
diff --git a/edraak.mk b/edraak.mk
index 7e538709e6..6b957c585c 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -79,7 +79,7 @@ edraak.programs.shell:
 	docker-compose exec progs bash
 
 edraak.marketing.shell:
-	docker-compose exec edraak_marketing bash
+	docker-compose exec mktg bash
 
 edraak.marketing.provision:
 	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-marketing.sh
@@ -97,10 +97,10 @@ state_manager-restart: ## Kill the state-manager development server. The watcher
 	docker exec -t edraak.devstack.state_manager bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
-	docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+	docker-compose exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 edraak.marketing.langs_push:
-	docker-compose exec edraak_marketing python manage.py langs_pull --settings=marketingsite.envs.dev
+	docker-compose exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
 
 
 programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
diff --git a/marketing.mk b/marketing.mk
deleted file mode 100644
index 6932e36395..0000000000
--- a/marketing.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-help-marketing: ## Display this help message
-	@echo "Please use \`make <target>' where <target> is one of"
-	@perl -nle'print $& if m{^[\.a-zA-Z_-]+:.*?## .*$$}' $(MAKEFILE_LIST) | grep marketing | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m  %-25s\033[0m %s\n", $$1, $$2}'
-
-marketing-shell: ## Run a shell on the marketing site container
-	docker exec -it edx.devstack.marketing env TERM=$(TERM) bash
-
-stop-marketing:   ## Stop all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml stop
-
-down-marketing:   ## Bring down all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml down
-
-up-marketing:   ## Bring up all services (including the marketing site) with host volumes
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up
-
-up-marketing-detached:   ## Bring up all services (including the marketing site) with host volumes (in detached mode)
-	docker-compose -f docker-compose.yml -f docker-compose-host.yml -f docker-compose-marketing-site.yml -f docker-compose-marketing-site-host.yml up -d
-
-up-marketing-sync:  ## Bring up all services (including the marketing site) with docker-sync
-	docker-sync-stack start -c docker-sync-marketing-site.yml
-
-clean-marketing-sync:   ## Remove the docker-sync containers for all services (including the marketing site)
-	docker-sync-stack clean -c docker-sync-marketing-site.yml
diff --git a/nginx/b2b-redirects.conf b/nginx/b2b-redirects.conf
new file mode 100644
index 0000000000..6c62f2a010
--- /dev/null
+++ b/nginx/b2b-redirects.conf
@@ -0,0 +1,11 @@
+include /etc/nginx/conf.d/includes/redirect2https.conf;
+
+# Top Level doamin to b2b
+server {
+    server_name edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        return 301 https://b2b.edraak.dev$request_uri;
+    }
+}
diff --git a/nginx/b2b.conf b/nginx/b2b.conf
deleted file mode 100644
index b689015f2d..0000000000
--- a/nginx/b2b.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-# Redirect any http reqeust to https
-server {
-	listen 80 default_server;
-	listen [::]:80 default_server;
-	server_name _;
-	return 301 https://$host$request_uri;
-    client_max_body_size 100M;
-}
-
-# Top Level doamin to b2b
-server {
-    server_name edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-
-    location / {
-        return 301 https://b2b.edraak.dev$request_uri;
-    }
-}
-
-
-# Progs
-server {
-    server_name b2b.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-
-    location / {
-        proxy_pass http://progs:8800;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
diff --git a/nginx/core-redirects.conf b/nginx/core-redirects.conf
new file mode 100644
index 0000000000..b64954ff06
--- /dev/null
+++ b/nginx/core-redirects.conf
@@ -0,0 +1,11 @@
+include /etc/nginx/conf.d/includes/redirect2https.conf;
+
+# Top Level doamin to www
+server {
+    server_name edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        return 301 https://www.edraak.dev$request_uri;
+    }
+}
diff --git a/nginx/core.conf b/nginx/core.conf
deleted file mode 100644
index 4297e90d56..0000000000
--- a/nginx/core.conf
+++ /dev/null
@@ -1,50 +0,0 @@
-# Redirect any http reqeust to https
-server {
-	listen 80 default_server;
-	listen [::]:80 default_server;
-	server_name _;
-	return 301 https://$host$request_uri;
-    client_max_body_size 100M;
-}
-
-# Top Level doamin to www
-server {
-    server_name edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-
-    location / {
-        return 301 https://www.edraak.dev$request_uri;
-    }
-}
-
-# Marketing
-server {
-    server_name www.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-
-    location / {
-        proxy_pass http://edraak.devstack.marketing:8500;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
-
-# Progs
-server {
-    server_name programs.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-
-    location / {
-        proxy_pass http://progs:8800;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
-
-# state manager
-server {
-    server_name state.edraak.dev;
-    include /etc/nginx/conf.d/includes/server.conf;
-    location / {
-        proxy_pass http://edraak.devstack.state_manager;
-        include /etc/nginx/conf.d/includes/proxy.conf;
-    }
-}
diff --git a/nginx/edx.conf b/nginx/edx.conf
index ea8695f3a6..86087b1984 100644
--- a/nginx/edx.conf
+++ b/nginx/edx.conf
@@ -3,7 +3,7 @@ server {
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
-        proxy_pass http://edx.devstack.lms:18000;
+        proxy_pass http://lms:18000;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
@@ -13,7 +13,7 @@ server {
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
-        proxy_pass http://edx.devstack.studio:18010;
+        proxy_pass http://studio:18010;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/nginx/includes/redirect2https.conf b/nginx/includes/redirect2https.conf
new file mode 100644
index 0000000000..a1a1463718
--- /dev/null
+++ b/nginx/includes/redirect2https.conf
@@ -0,0 +1,8 @@
+# Redirect any http reqeust to https
+server {
+	listen 80 default_server;
+	listen [::]:80 default_server;
+	server_name _;
+	return 301 https://$host$request_uri;
+    client_max_body_size 100M;
+}
diff --git a/nginx/judge.conf b/nginx/judge.conf
index e2f8aa5013..3380f0a8d2 100644
--- a/nginx/judge.conf
+++ b/nginx/judge.conf
@@ -2,7 +2,7 @@ server {
     server_name judge.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
     location / {
-        proxy_pass http://edraak.devstack.judge;
+        proxy_pass http://judge-api;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/nginx/mktg.conf b/nginx/mktg.conf
new file mode 100644
index 0000000000..50304da8ba
--- /dev/null
+++ b/nginx/mktg.conf
@@ -0,0 +1,10 @@
+# Marketing
+server {
+    server_name www.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://mktg:8500;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/nginx/progs.conf b/nginx/progs.conf
new file mode 100644
index 0000000000..be6d9822ab
--- /dev/null
+++ b/nginx/progs.conf
@@ -0,0 +1,11 @@
+# Progs
+server {
+    server_name b2b.edraak.dev;
+    server_name programs.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://progs:8800;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/nginx/states.conf b/nginx/states.conf
new file mode 100644
index 0000000000..c68f6fc011
--- /dev/null
+++ b/nginx/states.conf
@@ -0,0 +1,10 @@
+# state manager
+server {
+    server_name state.edraak.dev;
+    server_name states.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+    location / {
+        proxy_pass http://edraak.devstack.state_manager;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/provision-analytics-pipeline.sh b/provision-analytics-pipeline.sh
deleted file mode 100755
index a866fe3fe6..0000000000
--- a/provision-analytics-pipeline.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -o pipefail
-set -x
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[0;33m'
-NC='\033[0m' # No Color
-
-if [ -z "$DEVSTACK_WORKSPACE" ]; then
-    DEVSTACK_WORKSPACE=..
-elif [ ! -d "$DEVSTACK_WORKSPACE" ]; then
-    echo "Workspace directory $DEVSTACK_WORKSPACE doesn't exist"
-    exit 1
-fi
-
-# Bring the mysql & pipeline containers online.
-docker-compose $DOCKER_COMPOSE_FILES up -d mysql analyticspipeline
-
-# Ensure the MySQL server is online and usable
-echo "Waiting for MySQL"
-until docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-
-# In the event of a fresh MySQL container, wait a few seconds for the server to restart.
-# This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
-sleep 20
-
-# Analytics pipeline has dependency on lms but we only need its db schema & not full lms. So we'll just load their db
-# schemas as part of analytics pipeline provisioning. If there is a need of a fully fledged LMS, then provision lms
-# by following their documentation.
-if [[ ! -z "`docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME='edxapp'" 2>&1`" ]];
-then
-  echo -e "${GREEN}LMS DB exists, skipping lms schema load.${NC}"
-else
-  echo -e "${GREEN}LMS DB not found, provisioning lms schema.${NC}"
-  docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
-  ./load-db.sh edxapp
-  docker-compose $DOCKER_COMPOSE_FILES up -d lms studio
-  docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
-  #Installing prereqs crashes the process
-  docker-compose restart lms
-  # Run edxapp migrations first since they are needed for the service users and OAuth clients
-  docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
-fi
-
-echo -e "${GREEN}LMS database provisioned successfully...${NC}"
-echo -e "${GREEN}Creating databases and users...${NC}"
-docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-analytics-pipeline.sql
-
-# initialize hive metastore
-echo -e "${GREEN}Initializing HIVE metastore...${NC}"
-docker-compose $DOCKER_COMPOSE_FILES exec analyticspipeline bash -c '/edx/app/hadoop/hive/bin/schematool -dbType mysql -initSchema'
-
-# materialize hadoop directory structure
-echo -e "${GREEN}Initializing Hadoop directory structure...${NC}"
-
-until curl http://127.0.0.1:50070/jmx?qry=Hadoop:service=NameNode,name=NameNodeStatus|grep -q 'active'; do
-  printf "Waiting for namenode!"
-  sleep 5
-done
-
-sleep 10 # for datanode & other services to activate
-echo -e "${GREEN}Namenode is ready!${NC}"
-
-docker exec -u hadoop -i edx.devstack.analytics_pipeline bash -c 'sudo /edx/app/hadoop/hadoop/bin/hdfs dfs -chown -R hadoop:hadoop hdfs://namenode:8020/; hdfs dfs -mkdir -p hdfs://namenode:8020/edx-analytics-pipeline/{warehouse,marker,manifest,packages} hdfs://namenode:8020/{spark-warehouse,data} hdfs://namenode:8020/tmp/spark-events;hdfs dfs -copyFromLocal -f /edx/app/hadoop/lib/edx-analytics-hadoop-util.jar hdfs://namenode:8020/edx-analytics-pipeline/packages/;'
-
-docker image prune -f
-
-echo -e "${GREEN}Analytics pipeline provisioning complete!${NC}"
diff --git a/provision-analytics-pipeline.sql b/provision-analytics-pipeline.sql
deleted file mode 100644
index e64ec35cc6..0000000000
--- a/provision-analytics-pipeline.sql
+++ /dev/null
@@ -1,9 +0,0 @@
-CREATE DATABASE IF NOT EXISTS reports;
-CREATE DATABASE IF NOT EXISTS edx_hive_metastore;
-GRANT ALL PRIVILEGES ON edx_hive_metastore.* TO 'edx_hive'@'%' IDENTIFIED BY 'edx';
-GRANT ALL PRIVILEGES ON `test\_%`.* TO 'edx_hive'@'%' IDENTIFIED BY 'edx';
-GRANT ALL PRIVILEGES ON reports.* TO 'pipeline001'@'%' IDENTIFIED BY 'password';
-GRANT ALL PRIVILEGES ON `acceptance\_%`.* TO 'pipeline001'@'%' IDENTIFIED BY 'password';
-GRANT SELECT ON edxapp.* TO 'read_only'@'%' IDENTIFIED BY 'password';
-
-FLUSH PRIVILEGES;
\ No newline at end of file
diff --git a/provision-credentials.sh b/provision-credentials.sh
deleted file mode 100755
index 32fccdaf61..0000000000
--- a/provision-credentials.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# NOTE (CCB): We do NOT call provision-ida because it expects a virtualenv.
-# The new images for Credentials do not use virtualenv.
-
-name=credentials
-port=18150
-
-docker-compose $DOCKER_COMPOSE_FILES up -d $name
-
-echo -e "${GREEN}Installing requirements for ${name}...${NC}"
-docker exec -t edx.devstack.${name}  bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials && make requirements && make production-requirements' -- "$name"
-
-echo -e "${GREEN}Running migrations for ${name}...${NC}"
-docker exec -t edx.devstack.${name}  bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials && make migrate' -- "$name"
-
-echo -e "${GREEN}Creating super-user for ${name}...${NC}"
-docker exec -t edx.devstack.${name}  bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials && echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser(\"edx\", \"edx@example.com\", \"edx\") if not User.objects.filter(username=\"edx\").exists() else None" | python /edx/app/$1/$1/manage.py shell' -- "$name"
-
-echo -e "${GREEN}Configuring site for ${name}...${NC}"
-docker exec -t edx.devstack.${name} bash -c 'source /edx/app/credentials/credentials_env && cd /edx/app/credentials/ && ./manage.py create_or_update_site --site-id=1 --site-domain=localhost:18150 --site-name="Open edX" --platform-name="Open edX" --company-name="Open edX" --lms-url-root=http://localhost:18000 --catalog-api-url=http://edx.devstack.discovery:18381/api/v1/ --tos-url=http://localhost:18000/tos --privacy-policy-url=http://localhost:18000/privacy --homepage-url=http://localhost:18000 --certificate-help-url=http://localhost:18000/faq --records-help-url=http://localhost:18000/faq --theme-name=openedx'
-
-./provision-ida-user.sh ${name} ${name} ${port}
-
-# Compile static assets last since they are absolutely necessary for all services. This will allow developers to get
-# started if they do not care about static assets
-echo -e "${GREEN}Compiling static assets for ${name}...${NC}"
-docker exec -t edx.devstack.${name}  bash -c ' if ! source /edx/app/credentials/credentials_env && cd /edx/app/credentials/credentials && make static 2>creds_make_static.err; then echo "------- Last 100 lines of stderr"; tail creds_make_static.err -n 100; echo "-------"; fi;' -- "$name"
diff --git a/provision-discovery.sh b/provision-discovery.sh
deleted file mode 100755
index 2ffec8d1d2..0000000000
--- a/provision-discovery.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# Provisioning script for the discovery service
-./provision-ida.sh discovery discovery 18381
-
-docker-compose exec discovery bash -c 'rm -rf /edx/var/discovery/*'
-docker-compose exec discovery bash -c 'source /edx/app/discovery/discovery_env && python /edx/app/discovery/discovery/manage.py create_or_update_partner --site-id 1 --site-domain localhost:18381 --code edx --name edX --courses-api-url "http://edx.devstack.lms:18000/api/courses/v1/" --ecommerce-api-url "http://edx.devstack.ecommerce:18130/api/v2/" --organizations-api-url "http://edx.devstack.lms:18000/api/organizations/v0/" --oidc-url-root "http://edx.devstack.lms:18000/oauth2" --oidc-key discovery-key --oidc-secret discovery-secret'
-docker-compose exec discovery bash -c 'source /edx/app/discovery/discovery_env && python /edx/app/discovery/discovery/manage.py refresh_course_metadata'
-docker-compose exec discovery bash -c 'source /edx/app/discovery/discovery_env && python /edx/app/discovery/discovery/manage.py update_index --disable-change-limit'
-
-# Add demo program
-./programs/provision.sh discovery
diff --git a/provision-e2e.sh b/provision-e2e.sh
deleted file mode 100755
index 47417df310..0000000000
--- a/provision-e2e.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-set -e
-set -o pipefail
-set -x
-
-if [ -z "$DEVSTACK_WORKSPACE" ]; then
-    DEVSTACK_WORKSPACE=..
-elif [ ! -d "$DEVSTACK_WORKSPACE" ]; then
-    echo "Workspace directory $DEVSTACK_WORKSPACE doesn't exist"
-    exit 1
-fi
-
-# Copy the test course tarball into the studio container
-docker cp ${DEVSTACK_WORKSPACE}/edx-e2e-tests/upload_files/course.tar.gz edx.devstack.studio:/tmp/
-
-# Extract the test course tarball
-docker-compose exec studio bash -c 'cd /tmp && tar xzf course.tar.gz'
-
-# Import the course content
-docker-compose exec studio bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py cms --settings=devstack_docker import /tmp course'
-
-# Clean up the temp files
-docker-compose exec studio bash -c 'rm /tmp/course.tar.gz'
-docker-compose exec studio bash -c 'rm -r /tmp/course'
diff --git a/provision-ecommerce.sh b/provision-ecommerce.sh
deleted file mode 100755
index b807af9c29..0000000000
--- a/provision-ecommerce.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# Load database dumps for the largest databases to save time
-./load-db.sh ecommerce
-
-./provision-ida.sh ecommerce ecommerce 18130
-
-# Configure ecommerce
-docker exec -t edx.devstack.ecommerce bash -c 'source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py create_or_update_site --site-id=1 --site-domain=localhost:18130 --partner-code=edX --partner-name="Open edX" --lms-url-root=http://edx.devstack.lms:18000 --client-side-payment-processor=cybersource --payment-processors=cybersource,paypal --client-id=ecommerce-key --client-secret=ecommerce-secret --from-email staff@example.com --discovery_api_url=http://edx.devstack.discovery:18381/api/v1/'
-docker exec -t edx.devstack.ecommerce bash -c 'source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py oscar_populate_countries --initial-only'
-docker exec -t edx.devstack.ecommerce bash -c 'source /edx/app/ecommerce/ecommerce_env && python /edx/app/ecommerce/ecommerce/manage.py create_demo_data --partner=edX'
diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
index c167c9273e..cce3f0fa57 100755
--- a/provision-edraak-marketing.sh
+++ b/provision-edraak-marketing.sh
@@ -1,18 +1,18 @@
 set -e
 
 echo "** Marketing: Restarting **"
-docker-compose restart edraak_marketing
+docker-compose restart mktg
 
 echo "** Marketing: Copy cacheed files to code dir **"
-docker-compose exec edraak_marketing bash -c 'cp -Rn /cache/* /app/.'
-docker-compose exec edraak_marketing bash -c 'pip install -r requirements.txt'
+docker-compose exec mktg bash -c 'cp -Rn /cache/* /app/.'
+docker-compose exec mktg bash -c 'pip install -r requirements.txt'
 
 echo "** Marketing: Migrating databases **"
-docker-compose exec edraak_marketing bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+docker-compose exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Marketing: Compiling assets **"
-docker-compose exec edraak_marketing bash -c 'yarn'
-docker-compose exec edraak_marketing bash -c 'npm run dev'
+docker-compose exec mktg bash -c 'yarn'
+docker-compose exec mktg bash -c 'npm run dev'
 
 echo "** Marketing: Restarting **"
-docker-compose restart edraak_marketing
+docker-compose restart mktg
diff --git a/provision-edraak.sh b/provision-edraak.sh
index 99a33bc600..aa79e889dc 100755
--- a/provision-edraak.sh
+++ b/provision-edraak.sh
@@ -1,7 +1,7 @@
 set -e
 
 echo "** Bringing up **"
-docker-compose $DOCKER_COMPOSE_FILES up -d mysql progs edraak_marketing
+docker-compose $DOCKER_COMPOSE_FILES up -d mysql progs mktg
 
 echo "** Creating databases **"
 docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-edraak.sql
diff --git a/provision-ida-user.sh b/provision-ida-user.sh
deleted file mode 100755
index a18ce1d301..0000000000
--- a/provision-ida-user.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#This script depends on the LMS being up!
-
-app_name=$1
-client_name=$2
-client_port=$3
-
-echo -e "${GREEN}Creating service user and OAuth client for ${app_name}...${NC}"
-docker exec -t edx.devstack.lms  bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user $1_worker $1_worker@example.com --staff --superuser' -- "$app_name"
-docker exec -t edx.devstack.lms  bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker create_oauth2_client "http://localhost:$3" "http://localhost:$3/complete/edx-oidc/" confidential --client_name $2 --client_id "$1-key" --client_secret "$1-secret" --trusted --logout_uri "http://localhost:$3/logout/" --username $1_worker' -- "$app_name" "$client_name" "$client_port"
diff --git a/provision-ida.sh b/provision-ida.sh
deleted file mode 100755
index 02206bd735..0000000000
--- a/provision-ida.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-app_name=$1  # The name of the IDA application, i.e. /edx/app/<app_name>
-client_name=$2  # The name of the Oauth client stored in the edxapp DB.
-client_port=$3  # The port corresponding to this IDA service in devstack.
-
-docker-compose $DOCKER_COMPOSE_FILES up -d $app_name
-
-echo -e "${GREEN}Installing requirements for ${app_name}...${NC}"
-docker exec -t edx.devstack.${app_name}  bash -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && make requirements' -- "$app_name"
-
-echo -e "${GREEN}Running migrations for ${app_name}...${NC}"
-docker exec -t edx.devstack.${app_name}  bash -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && make migrate' -- "$app_name"
-
-echo -e "${GREEN}Creating super-user for ${app_name}...${NC}"
-docker exec -t edx.devstack.${app_name}  bash -c 'source /edx/app/$1/$1_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser(\"edx\", \"edx@example.com\", \"edx\") if not User.objects.filter(username=\"edx\").exists() else None" | python /edx/app/$1/$1/manage.py shell' -- "$app_name"
-
-./provision-ida-user.sh $app_name $client_name $client_port
-
-# Compile static assets last since they are absolutely necessary for all services. This will allow developers to get
-# started if they do not care about static assets
-echo -e "${GREEN}Compiling static assets for ${app_name}...${NC}"
-docker exec -t edx.devstack.${app_name}  bash -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && make static' -- "$app_name"
diff --git a/provision-notes.sh b/provision-notes.sh
deleted file mode 100755
index 4a2c924ab4..0000000000
--- a/provision-notes.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Provisioning script for the notes service
-
-# Common provisioning tasks for IDAs, including requirements, migrations, oauth client creation, etc.
-./provision-ida.sh edx_notes_api edx-notes 18120
-
-# This will build the elasticsearch index for notes.
-echo -e "${GREEN}Creating indexes for edx_notes_api...${NC}"
-docker exec -t edx.devstack.edx_notes_api bash -c 'source /edx/app/$1/$1_env && cd /edx/app/$1/$1/ && python manage.py rebuild_index --noinput' -- edx_notes_api
diff --git a/provision-xqueue.sh b/provision-xqueue.sh
deleted file mode 100755
index 36e55579bb..0000000000
--- a/provision-xqueue.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-set -e
-set -o pipefail
-set -x
-
-# Bring up XQueue, we don't need the consumer for provisioning
-docker-compose $DOCKER_COMPOSE_FILES up -d xqueue
-
-# This works in case you provision xqueue without having other services up
-# Bring the database online.
-docker-compose up -d mysql
-
-# Ensure the MySQL server is online and usable
-echo "Waiting for MySQL"
-until docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-do
-  printf "."
-  sleep 1
-done
-
-docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-xqueue.sql
-# Run migrations
-docker-compose $DOCKER_COMPOSE_FILES exec xqueue bash -c 'source /edx/app/xqueue/xqueue_env && cd /edx/app/xqueue/xqueue && python manage.py migrate'
-# Add users that graders use to fetch data, there's one default user in Ansible which is part of our settings
-docker-compose $DOCKER_COMPOSE_FILES exec xqueue bash -c 'source /edx/app/xqueue/xqueue_env && cd /edx/app/xqueue/xqueue && python manage.py update_users' 
diff --git a/provision-xqueue.sql b/provision-xqueue.sql
deleted file mode 100644
index 88ae993e20..0000000000
--- a/provision-xqueue.sql
+++ /dev/null
@@ -1,4 +0,0 @@
-CREATE DATABASE IF NOT EXISTS xqueue;
-GRANT ALL ON xqueue.* TO 'xqueue001'@'%' IDENTIFIED BY 'password';
-
-FLUSH PRIVILEGES;
diff --git a/repo.sh b/repo.sh
index 53b28501eb..a0ebb39300 100755
--- a/repo.sh
+++ b/repo.sh
@@ -109,10 +109,6 @@ _clone ()
             else
                 git clone $repo $name
             fi
-#            cd $name
-#            branch=master
-#            git checkout "$branch"
-#            cd -
         fi
     done
     cd - &> /dev/null

From c659be2e664813aa99fd736ef5983a35836bacf2 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Mon, 5 Apr 2021 15:54:49 +0300
Subject: [PATCH 079/137] provisioners

---
 Makefile                          |  2 +-
 provision-edraak-marketing.sh     | 14 +++---
 provision-edraak-programs.sh      | 22 ++++-----
 provision-edraak-state-manager.sh | 12 ++---
 provision-edraak.sh               | 16 -------
 provision-edraak.sql              |  3 --
 provision-lms.sh                  | 22 ++++-----
 provision.sh                      | 76 +++++++++++++++++++++----------
 setup_native_nfs_docker_osx.sh    |  2 +-
 9 files changed, 89 insertions(+), 80 deletions(-)
 delete mode 100755 provision-edraak.sh
 delete mode 100644 provision-edraak.sql

diff --git a/Makefile b/Makefile
index e0c26acba6..5f14f90eb2 100644
--- a/Makefile
+++ b/Makefile
@@ -48,7 +48,7 @@ export COMPOSE_PROJECT_NAME
 include *.mk
 
 compose-files:
-	echo ${DOCKER_COMPOSE_FILES};
+	@echo ${DOCKER_COMPOSE_FILES};
 
 # Generates a help message. Borrowed from https://github.com/pydanny/cookiecutter-djangopackage.
 help: ## Display this help message
diff --git a/provision-edraak-marketing.sh b/provision-edraak-marketing.sh
index cce3f0fa57..e6dab3a473 100755
--- a/provision-edraak-marketing.sh
+++ b/provision-edraak-marketing.sh
@@ -1,18 +1,18 @@
 set -e
 
 echo "** Marketing: Restarting **"
-docker-compose restart mktg
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart mktg
 
 echo "** Marketing: Copy cacheed files to code dir **"
-docker-compose exec mktg bash -c 'cp -Rn /cache/* /app/.'
-docker-compose exec mktg bash -c 'pip install -r requirements.txt'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'cp -Rn /cache/* /app/.'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'pip install -r requirements.txt'
 
 echo "** Marketing: Migrating databases **"
-docker-compose exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Marketing: Compiling assets **"
-docker-compose exec mktg bash -c 'yarn'
-docker-compose exec mktg bash -c 'npm run dev'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'yarn'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'npm run dev'
 
 echo "** Marketing: Restarting **"
-docker-compose restart mktg
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart mktg
diff --git a/provision-edraak-programs.sh b/provision-edraak-programs.sh
index 5fd32f6bc2..e34e072d8d 100755
--- a/provision-edraak-programs.sh
+++ b/provision-edraak-programs.sh
@@ -1,22 +1,22 @@
 set -e
 
 echo "** Progs: Restarting **"
-docker-compose restart progs
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart progs
 
 echo "** Progs: Copy cacheed files to code dir **"
-docker-compose exec progs bash -c 'cp -Rn /cache/* /app/.'
-docker-compose exec progs bash -c 'pip install -r requirements.txt'
+#docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'cp -Rn /cache/* /app/.'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'pip install -r requirements.txt'
 
 echo "** Progs: Migrating databases **"
-docker-compose exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
 echo "** Progs: Compiling assets **"
-docker-compose exec progs bash -c 'npm rebuild node-sass'
-docker-compose exec progs bash -c 'chown -R root ~/.npm'
-docker-compose exec progs bash -c 'npm install'
-docker-compose exec progs bash -c 'bower install'
-docker-compose exec progs bash -c 'npm run dev'
-docker-compose exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'npm rebuild node-sass'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'chown -R root ~/.npm'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'npm install'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'bower install'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'npm run dev'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
 echo "** Progs: Restarting **"
-docker-compose restart progs
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart progs
diff --git a/provision-edraak-state-manager.sh b/provision-edraak-state-manager.sh
index c923a84348..da59faf872 100755
--- a/provision-edraak-state-manager.sh
+++ b/provision-edraak-state-manager.sh
@@ -1,10 +1,10 @@
 set -e
 
-echo "** state-manager-api: Restarting **"
-docker-compose $DOCKER_COMPOSE_FILES restart state-manager-mysql
+echo "** state-manager-api: starting **"
+docker-compose `echo $DOCKER_COMPOSE_FILES` start state-manager-mysql
 
 echo "Waiting for state-manager-mysql"
-until docker exec -i state-manager-mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
+until docker exec -i edraak.devstack.state_manager_mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
 do
   printf "."
   sleep 1
@@ -14,9 +14,9 @@ done
 sleep 10
 
 echo "** state-manager-api: Create/Upgrade DB **"
-docker-compose exec state-manager-api bash -c 'flask create-db'
-docker-compose exec state-manager-api bash -c 'flask db upgrade'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec state-manager-api bash -c 'flask create-db'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec state-manager-api bash -c 'flask db upgrade'
 
 
 echo "** state-manager-api: Restarting **"
-docker-compose restart state-manager-api
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart state-manager-api
diff --git a/provision-edraak.sh b/provision-edraak.sh
deleted file mode 100755
index aa79e889dc..0000000000
--- a/provision-edraak.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-set -e
-
-echo "** Bringing up **"
-docker-compose $DOCKER_COMPOSE_FILES up -d mysql progs mktg
-
-echo "** Creating databases **"
-docker exec -i edx.devstack.mysql mysql -uroot mysql < provision-edraak.sql
-
-#echo "** Marketing **"
-#./provision-edraak-marketing.sh
-
-echo "** State Manager **"
-./provision-edraak-state-manager.sh
-
-echo "** Programs **"
-./provision-edraak-programs.sh
diff --git a/provision-edraak.sql b/provision-edraak.sql
deleted file mode 100644
index 66f87d54a6..0000000000
--- a/provision-edraak.sql
+++ /dev/null
@@ -1,3 +0,0 @@
-CREATE DATABASE IF NOT EXISTS edraakprograms;
-CREATE DATABASE IF NOT EXISTS marketingsite;
--- TODO add some edraak fixtures
diff --git a/provision-lms.sh b/provision-lms.sh
index e3d64c13e9..0ea17c91af 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -11,37 +11,37 @@ apps=( lms studio )
 # Bring edxapp containers online
 for app in "${apps[@]}"; do
     echo $DOCKER_COMPOSE_FILES
-    docker-compose $DOCKER_COMPOSE_FILES up -d $app
+    docker-compose `echo $DOCKER_COMPOSE_FILES` up -d $app
 done
 
 echo $DOCKER_COMPOSE_FILES
-docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
 
 #Installing prereqs crashes the process
-docker-compose restart lms
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart lms
 
 # Run edxapp migrations first since they are needed for the service users and OAuth clients
-docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
 
 # Create a superuser for edxapp
-docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
-docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell  --settings=devstack_docker'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell  --settings=devstack_docker'
 
 # Create an enterprise service user for edxapp
-docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com'
 
 # Enable the LMS-E-Commerce integration
-docker-compose exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce'
 
 # Create demo course and users
-docker-compose exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
 
 # Fix missing vendor file by clearing the cache
-docker-compose exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'
 
 # Create static assets for both LMS and Studio
 for app in "${apps[@]}"; do
-    docker-compose exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
+    docker-compose `echo $DOCKER_COMPOSE_FILES` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
 done
 
 # Provision a retirement service account user
diff --git a/provision.sh b/provision.sh
index 26b99f1e4e..f64d3530a3 100755
--- a/provision.sh
+++ b/provision.sh
@@ -11,44 +11,72 @@
 set -e
 set -o pipefail
 set -x
+source .env
 
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[0;33m'
 NC='\033[0m' # No Color
 
+if [ "$MOUNT_TYPE" = "-nfs" ]; then
+  ./setup_native_nfs_docker_osx.sh
+fi
+
 # Bring the databases online.
 docker-compose up -d mysql mongo
 
 # Ensure the MySQL server is online and usable
-#echo "Waiting for MySQL"
-#until docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-#do
-#  printf "."
-#  sleep 1
-#done
+echo "Waiting for MySQL"
+until docker exec -i edx.devstack.mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
+do
+  printf "."
+  sleep 1
+done
 
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
-#sleep 10
+sleep 10
 
-#echo -e "MySQL ready"
-#
-#echo -e "${GREEN}Creating databases and users...${NC}"
-#docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
-#docker exec -i edx.devstack.mongo mongo < mongo-provision.js
-#
-#./provision-lms.sh
-
-# Nothing special needed for studio
-docker-compose $DOCKER_COMPOSE_FILES up -d studio
-#./provision-ecommerce.sh
-#./provision-discovery.sh
-#./provision-credentials.sh
-#./provision-e2e.sh
-#./provision-forum.sh
-#./provision-notes.sh
-./provision-edraak.sh
+echo -e "MySQL ready"
+
+if $ENABLE_EDX; then
+  echo "** Edx **"
+  echo -e "${GREEN}Creating databases and users...${NC}"
+  docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
+  docker exec -i edx.devstack.mongo mongo < mongo-provision.js
+
+  ./provision-lms.sh
+
+  # Nothing special needed for studio
+  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d studio
+fi
+
+
+if $ENABLE_PROGS; then
+
+  echo "** Programs **"
+  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d progs
+
+  echo "** Creating databases **"
+  echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
+  ./provision-edraak-programs.sh
+fi
+
+if $ENABLE_MKTG; then
+  echo "** Marketing **"
+  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d mktg
+
+  echo "** Creating databases **"
+  echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
+
+  ./provision-edraak-marketing.sh
+fi
+
+if $ENABLE_STATE_MANAGER; then
+  echo "** State Manager **"
+  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d state-manager-api
+  ./provision-edraak-state-manager.sh
+fi
 
 docker image prune -f
 
diff --git a/setup_native_nfs_docker_osx.sh b/setup_native_nfs_docker_osx.sh
index a74a2012fc..1d9f914266 100755
--- a/setup_native_nfs_docker_osx.sh
+++ b/setup_native_nfs_docker_osx.sh
@@ -25,7 +25,7 @@ read decision
 
 if [ "$decision" != "y" ]; then
   echo "Exiting. No changes made."
-  exit 1
+  exit 0
 fi
 
 echo ""

From aca31114876e3f75a393541cc8f0e9e6e7ab7998 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 6 Apr 2021 11:25:42 +0300
Subject: [PATCH 080/137] nfs/host living in peace togather

---
 .env.b2b                             |  3 ---
 .env.core                            |  3 ---
 docker-compose-edx.yml               |  3 +++
 docker-compose-judge.yml             |  2 ++
 docker-compose-mktg-nfs.yml          |  6 ++++-
 docker-compose-mktg.yml              |  9 ++-----
 docker-compose-progs-nfs.yml         |  1 -
 docker-compose-progs.yml             |  8 ------
 docker-compose-state-manager-nfs.yml |  1 -
 docker-compose-state-manager.yml     |  1 +
 edraak.mk                            | 39 ++++++++++++----------------
 11 files changed, 30 insertions(+), 46 deletions(-)

diff --git a/.env.b2b b/.env.b2b
index d1e50cd6ba..e9de4d3a9d 100644
--- a/.env.b2b
+++ b/.env.b2b
@@ -1,8 +1,5 @@
 PROGS_CFG=/app/docker-b2b.json
 
-#Check nginx folder, ssl and include all will be mounted, one of other files will be the entry point
-NGINX_ENTRY=b2b.conf
-
 # Change mount tyoe to "-nfs" to enable nfs, otherwise leave it empty
 MOUNT_TYPE=-nfs
 
diff --git a/.env.core b/.env.core
index 0eb1cc71ab..d94d4080ff 100644
--- a/.env.core
+++ b/.env.core
@@ -1,8 +1,5 @@
 PROGS_CFG=/app/docker.json
 
-#Check nginx folder, ssl and include all will be mounted, one of other files will be the entry point
-NGINX_ENTRY=core.conf
-
 # Change mount tyoe to "-nfs" to enable nfs, otherwise leave it empty
 MOUNT_TYPE=-nfs
 
diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
index 8b093600b6..28928070d1 100644
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -42,6 +42,7 @@ services:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ~/.ssh/:/root/.ssh
 
   studio:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
@@ -72,6 +73,7 @@ services:
       - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
       - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+      - ~/.ssh/:/root/.ssh
 
   forum:
     command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
@@ -85,6 +87,7 @@ services:
       - "44567:4567"
     volumes:
       - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
+      - ~/.ssh/:/root/.ssh
 
   devpi:
     container_name: edx.devstack.devpi
diff --git a/docker-compose-judge.yml b/docker-compose-judge.yml
index 6e33f4cb21..16cef10ea0 100644
--- a/docker-compose-judge.yml
+++ b/docker-compose-judge.yml
@@ -14,6 +14,7 @@ services:
       - edraak-judge-redis
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-judge:/app
+      - ~/.ssh/:/root/.ssh
 
   judge-worker:
     build:
@@ -26,6 +27,7 @@ services:
       - edraak-judge-redis
     volumes:
       - ${DEVSTACK_WORKSPACE}/edraak-judge:/app
+      - ~/.ssh/:/root/.ssh
 
   edraak-judge-redis:
     image: "redis:alpine"
diff --git a/docker-compose-mktg-nfs.yml b/docker-compose-mktg-nfs.yml
index 0923b2e83e..2ac13b81a3 100644
--- a/docker-compose-mktg-nfs.yml
+++ b/docker-compose-mktg-nfs.yml
@@ -1,7 +1,11 @@
 version: "2.1"
+services:
+  mktg:
+    volumes:
+      - mktg-nfs:/app
 
 volumes:
-  mktg-code:
+  mktg-nfs:
     driver: local
     driver_opts:
       type: nfs
diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml
index 61e3c43e76..53cf5de570 100644
--- a/docker-compose-mktg.yml
+++ b/docker-compose-mktg.yml
@@ -25,17 +25,12 @@ services:
       - mysql
       - memcached
     volumes:
-      - mktg-code:/app
+      - ${DEVSTACK_WORKSPACE}/marketing-site:/app
+      - ~/.ssh/:/root/.ssh
 
   router:
     volumes:
       - ./nginx/mktg.conf:/etc/nginx/conf.d/mktg.conf
       - ./nginx/core-redirects.conf:/etc/nginx/conf.d/redirects.conf
 
-volumes:
-  mktg-code:
-    driver: local
-    driver_opts:
-      device: :${DEVSTACK_WORKSPACE}/marketing-site
-
 
diff --git a/docker-compose-progs-nfs.yml b/docker-compose-progs-nfs.yml
index f0deea8d56..f54fb1e77e 100644
--- a/docker-compose-progs-nfs.yml
+++ b/docker-compose-progs-nfs.yml
@@ -4,7 +4,6 @@ services:
   progs:
     volumes:
       - progs-nfs:/app
-      - ~/.ssh/:/root/.ssh
 
 volumes:
   progs-nfs:
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 8fe67bcd86..a5e771920d 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -37,11 +37,3 @@ services:
       - ./nginx/progs.conf:/etc/nginx/conf.d/progs.conf
       - ./nginx/b2b-redirects.conf:/etc/nginx/conf.d/redirects.conf
 
-
-volumes:
-  edxapp_lms_assets:
-  edxapp_studio_assets:
-  elasticsearch_data:
-  mongo_data:
-  mysql_data:
-  devpi_data:
diff --git a/docker-compose-state-manager-nfs.yml b/docker-compose-state-manager-nfs.yml
index f26da45232..c752cc6aea 100644
--- a/docker-compose-state-manager-nfs.yml
+++ b/docker-compose-state-manager-nfs.yml
@@ -4,7 +4,6 @@ services:
   state-manager-api:
     volumes:
       - state-manager-nfs:/app
-      - ~/.ssh/:/root/.ssh
 
 volumes:
   state-manager-nfs:
diff --git a/docker-compose-state-manager.yml b/docker-compose-state-manager.yml
index 0f071e31cd..7d8289aeaf 100644
--- a/docker-compose-state-manager.yml
+++ b/docker-compose-state-manager.yml
@@ -12,6 +12,7 @@ services:
       - state-manager-mysql
     volumes:
       - ${DEVSTACK_WORKSPACE}/state-manager:/app
+      - ~/.ssh/:/root/.ssh
     environment:
       APP_ENV: "devstack"
 
diff --git a/edraak.mk b/edraak.mk
index 6b957c585c..c4d070c242 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -1,8 +1,3 @@
-edraak.provision:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak.sh
-
-edraak.sync.provision: | dev.sync.daemon.start
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-state-manager.yml -f docker-compose-sync.yml" ./provision-edraak.sh
 
 edraak.build.all:
 	$(MAKE) edraak.build.programs
@@ -35,25 +30,25 @@ edraak.programs.help:
 	echo ""
 
 edraak.programs.migrate:
-	docker-compose exec progs python manage.py migrate --settings=edraakprograms.dev
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev
 
 edraak.programs.langs_push:
-	docker-compose exec progs python manage.py langs_push --settings=edraakprograms.dev
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev
 
 edraak.programs.langs_pull:
-	docker-compose exec progs python manage.py langs_pull --settings=edraakprograms.dev
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev
 
 edraak.programs.install_pip:
-	docker-compose exec progs pip install -r requirements.txt
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt
 
 edraak.programs.install_npm:
-	docker-compose exec progs npm install
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install
 
 edraak.programs.copy_cache:
-	docker-compose exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
 
 edraak.programs.dev:
-	docker-compose exec progs npm run dev
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev
 
 edraak.programs.watch:
 	docker exec -t progs bash -c 'while true; do npx gulp watch; sleep 2; done'
@@ -67,25 +62,25 @@ edraak.programs.install_all:
 	$(MAKE) edraak.programs.migrate
 
 edraak.programs.watch_js:
-	docker-compose exec progs npm run dev:watch
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
 
 edraak.programs.provision:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-programs.sh
+	./provision-edraak-programs.sh
 
 edraak.programs.watch_css:
-	docker-compose exec progs npm run watch-scss
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss
 
 edraak.programs.shell:
-	docker-compose exec progs bash
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash
 
 edraak.marketing.shell:
-	docker-compose exec mktg bash
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash
 
 edraak.marketing.provision:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml" ./provision-edraak-marketing.sh
+	./provision-edraak-marketing.sh
 
 edraak.states.provision:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-state-manager.yml -f docker-compose-host.yml" ./provision-edraak-state-manager.sh
+	DOCKER_COMPOSE_FILES="-f docker-compose `echo ${DOCKER_COMPOSE_FILES}`.yml -f docker-compose `echo ${DOCKER_COMPOSE_FILES}`-state-manager.yml -f docker-compose `echo ${DOCKER_COMPOSE_FILES}`-host.yml" ./provision-edraak-state-manager.sh
 
 marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
@@ -97,10 +92,10 @@ state_manager-restart: ## Kill the state-manager development server. The watcher
 	docker exec -t edraak.devstack.state_manager bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
 
 edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
-	docker-compose exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 edraak.marketing.langs_push:
-	docker-compose exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
 
 
 programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
@@ -108,7 +103,7 @@ programs-restart: ## Kill the Edraak Programs Django development server. The wat
 
 
 programs-fix-npm-install-permissions:
-	docker-compose exec progs bash -c 'chown -R root ~/.npm'
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
 
 marketing_gulp-restart:
 	docker exec -t edraak.devstack.marketing-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'

From c4c0cf9e76bea6f095ee4f0ef30d5208cbd70d25 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 6 Apr 2021 17:52:33 +0300
Subject: [PATCH 081/137] Enhance make commands

---
 edraak.mk                                     | 125 +++---------------
 mktg.mk                                       |  59 +++++++++
 progs.mk                                      |  68 ++++++++++
 ...n-edraak-marketing.sh => provision-mktg.sh |   0
 ...n-edraak-programs.sh => provision-progs.sh |   0
 ...nager.sh => provision-state-manager-api.sh |   0
 provision.sh                                  |   6 +-
 7 files changed, 146 insertions(+), 112 deletions(-)
 create mode 100644 mktg.mk
 create mode 100644 progs.mk
 rename provision-edraak-marketing.sh => provision-mktg.sh (100%)
 rename provision-edraak-programs.sh => provision-progs.sh (100%)
 rename provision-edraak-state-manager.sh => provision-state-manager-api.sh (100%)

diff --git a/edraak.mk b/edraak.mk
index c4d070c242..8325ce37d2 100644
--- a/edraak.mk
+++ b/edraak.mk
@@ -1,117 +1,24 @@
 
-edraak.build.all:
-	$(MAKE) edraak.build.programs
-	$(MAKE) edraak.build.marketing
+edraak.buildall:
+	$(MAKE) progs.build
+	$(MAKE) mktg.build
 
-edraak.build.programs:
-	docker build -t eu.gcr.io/openedx-231314/edraak/progs -f ../edraak-programs/Dockerfile ../edraak-programs
+# Common commands for all services
 
-edraak.build.marketing:
-	docker build -t eu.gcr.io/openedx-231314/edraak/marketing -f ../marketing-site/Dockerfile ../marketing-site
+%.restart:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart $*
 
-edraak.programs.help:
-	echo ""
-	echo "make edraak.programs.COMMAND"
-	echo "======================================"
-	echo ""
-	echo "Commands:"
-	echo ""
-	echo "migrate:              Run django migrations i.e. python manage.py migrate"
-	echo "install_pip:          Install python dependencies in 'requirements.txt' file"
-	echo "install_npm:          Install npm dependencies in 'package.json' file"
-	echo "dev:                  Run npm run dev command"
-	echo "install_all:          Runs install_pip, install_npm, migrate"
-	echo "watch_js:             Run watcher to watch JavaScript changes"
-	echo "watch_css:            Run watcher to watch and compile scss changes"
-	echo "manage:               Run any manage.py command"
-	echo "shell:                Open bash inside docker container"
-	echo "copy_cache:           Copy node_modules, installed at build time, to the current app"
-	echo "help:                 Print help and exit"
-	echo ""
+%.start:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` start $*
 
-edraak.programs.migrate:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev
+%.stop:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` stop $*
 
-edraak.programs.langs_push:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev
+%.provision:
+	./provision-$*.sh
 
-edraak.programs.langs_pull:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev
+%.shell:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec $* bash
 
-edraak.programs.install_pip:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt
-
-edraak.programs.install_npm:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install
-
-edraak.programs.copy_cache:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
-
-edraak.programs.dev:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev
-
-edraak.programs.watch:
-	docker exec -t progs bash -c 'while true; do npx gulp watch; sleep 2; done'
-
-edraak.marketing.watch:
-	docker exec -t edraak.devstack.marketing bash -c 'while true; do npx gulp watch; sleep 2; done'
-
-edraak.programs.install_all:
-	$(MAKE) edraak.programs.copy_cache
-	$(MAKE) edraak.programs.dev
-	$(MAKE) edraak.programs.migrate
-
-edraak.programs.watch_js:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
-
-edraak.programs.provision:
-	./provision-edraak-programs.sh
-
-edraak.programs.watch_css:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss
-
-edraak.programs.shell:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash
-
-edraak.marketing.shell:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash
-
-edraak.marketing.provision:
-	./provision-edraak-marketing.sh
-
-edraak.states.provision:
-	DOCKER_COMPOSE_FILES="-f docker-compose `echo ${DOCKER_COMPOSE_FILES}`.yml -f docker-compose `echo ${DOCKER_COMPOSE_FILES}`-state-manager.yml -f docker-compose `echo ${DOCKER_COMPOSE_FILES}`-host.yml" ./provision-edraak-state-manager.sh
-
-marketing-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
-	docker exec -t edraak.devstack.marketing bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
-
-judge-restart: ## Kill the Marketing Django development server. The watcher process will restart it.
-	docker exec -t edraak.devstack.judge bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
-
-state_manager-restart: ## Kill the state-manager development server. The watcher process will restart it.
-	docker exec -t edraak.devstack.state_manager bash -c 'kill $$(ps aux | grep "gunicorn" | egrep -v "while|grep" | awk "{print \$$2}")'
-
-edraak.marketing.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
-
-edraak.marketing.langs_push:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
-
-
-programs-restart: ## Kill the Edraak Programs Django development server. The watcher process will restart it.
-	docker exec -t progs bash -c 'kill $$(ps aux | grep "manage.py" | egrep -v "while|grep" | awk "{print \$$2}")'
-
-
-programs-fix-npm-install-permissions:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
-
-marketing_gulp-restart:
-	docker exec -t edraak.devstack.marketing-gulp bash -c 'kill $$(ps aux | grep "gulp" | egrep -v "while|grep" | awk "{print \$$2}")'
-
-
-edraak.restart:  ## Restart all of the lms, studio, marketing and progs
-	make marketing-restart
-	make programs-restart
-	make lms-restart
-	make studio-restart
-	make state_manager-restart
+%.logs:
+	docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail=100 $*
diff --git a/mktg.mk b/mktg.mk
new file mode 100644
index 0000000000..b4ac8bb84d
--- /dev/null
+++ b/mktg.mk
@@ -0,0 +1,59 @@
+mktg.help:
+	@echo ""
+	@echo "make mktg.COMMAND"
+	@echo "======================================"
+	@echo ""
+	@echo "Commands:"
+	@echo "build:                Build the docker image"
+	@echo "pushimage:            Push the docker image to the shared container repository"
+	@echo "migrate:              Run django migrations i.e. python manage.py migrate"
+	@echo "langs_push:           Run django langs_push command i.e. python manage.py langs_push"
+	@echo "langs_pull:           Run django langs_pull command i.e. python manage.py langs_pull"
+	@echo "install_pip:          Install python dependencies in 'requirements.txt' file"
+	@echo "install_npm:          Install npm dependencies in 'package.json' file"
+	@echo "copy_cache:           Copy node_modules, installed at build time, to the current app"
+	@echo "dev:                  Run npm run dev command"
+	@echo "watch:                Run gulp watch"
+	@echo "install_all:          Runs install_pip, install_npm, dev, migrate"
+	@echo "shell:                Open bash shell inside docker container"
+	@echo "provision:            Run provision script, prepare the env"
+	@echo "restart:              Restart the container"
+	@echo "fix-npm:              Fix .npm folder ownership issue"
+	@echo "help:                 Print help and exit"
+	@echo ""
+
+
+mktg.build:
+	docker build -t eu.gcr.io/openedx-231314/edraak/marketing -f ../marketing-site/Dockerfile ../marketing-site
+
+mktg.pushimage:
+	docker push eu.gcr.io/openedx-231314/edraak/marketing
+
+mktg.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+
+mktg.langs_push:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_push --settings=marketingsite.envs.dev
+
+mktg.langs_pull:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
+
+mktg.install_pip:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg pip install -r requirements.txt
+
+mktg.install_npm:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install
+
+mktg.copy_cache:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app
+
+mktg.dev:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev
+
+mktg.watch:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch
+
+mktg.install_all: | mktg.install_pip mktg.install_npm mktg.dev mktg.migrate
+
+mktg.fix-npm:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'chown -R root ~/.npm'
diff --git a/progs.mk b/progs.mk
new file mode 100644
index 0000000000..252fb5976e
--- /dev/null
+++ b/progs.mk
@@ -0,0 +1,68 @@
+progs.help:
+	@echo ""
+	@echo "make progs.COMMAND"
+	@echo "======================================"
+	@echo ""
+	@echo "Commands:"
+	@echo "build:                Build the docker image"
+	@echo "pushimage:            Push the docker image to the shared container repository"
+	@echo "migrate:              Run django migrations i.e. python manage.py migrate"
+	@echo "langs_push:           Run django langs_push command i.e. python manage.py langs_push"
+	@echo "langs_pull:           Run django langs_pull command i.e. python manage.py langs_pull"
+	@echo "install_pip:          Install python dependencies in 'requirements.txt' file"
+	@echo "install_npm:          Install npm dependencies in 'package.json' file"
+	@echo "copy_cache:           Copy node_modules, installed at build time, to the current app"
+	@echo "dev:                  Run npm run dev command"
+	@echo "watch:                Run gulp watch"
+	@echo "install_all:          Runs install_pip, install_npm, dev, migrate"
+	@echo "watch_js:             Run watcher to watch JavaScript changes"
+	@echo "watch_css:            Run watcher to watch and compile scss changes"
+	@echo "shell:                Open bash shell inside docker container"
+	@echo "provision:            Run provision script, prepare the env"
+	@echo "restart:              Restart the container"
+	@echo "manage <Command>:     Run any manage.py command"
+	@echo "fix-npm:              Fix .npm folder ownership issue"
+	@echo "help:                 Print help and exit"
+	@echo ""
+
+progs.build:
+	docker build -t eu.gcr.io/openedx-231314/edraak/progs -f ../edraak-programs/Dockerfile ../edraak-programs
+
+progs.pushimage:
+	docker push eu.gcr.io/openedx-231314/edraak/progs
+
+progs.migrate:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev
+
+progs.langs_push:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev
+
+progs.langs_pull:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev
+
+progs.install_pip:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt
+
+progs.install_npm:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install
+
+progs.copy_cache:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
+
+progs.dev:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev
+
+progs.watch:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npx gulp watch
+
+progs.install_all: | progs.install_pip progs.install_npm progs.dev progs.migrate
+
+progs.watch_js:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
+
+progs.watch_css:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss
+
+progs.fix-npm:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
+
diff --git a/provision-edraak-marketing.sh b/provision-mktg.sh
similarity index 100%
rename from provision-edraak-marketing.sh
rename to provision-mktg.sh
diff --git a/provision-edraak-programs.sh b/provision-progs.sh
similarity index 100%
rename from provision-edraak-programs.sh
rename to provision-progs.sh
diff --git a/provision-edraak-state-manager.sh b/provision-state-manager-api.sh
similarity index 100%
rename from provision-edraak-state-manager.sh
rename to provision-state-manager-api.sh
diff --git a/provision.sh b/provision.sh
index f64d3530a3..1c83a460e6 100755
--- a/provision.sh
+++ b/provision.sh
@@ -59,7 +59,7 @@ if $ENABLE_PROGS; then
 
   echo "** Creating databases **"
   echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
-  ./provision-edraak-programs.sh
+  ./provision-progs.sh
 fi
 
 if $ENABLE_MKTG; then
@@ -69,13 +69,13 @@ if $ENABLE_MKTG; then
   echo "** Creating databases **"
   echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
-  ./provision-edraak-marketing.sh
+  ./provision-mktg.sh
 fi
 
 if $ENABLE_STATE_MANAGER; then
   echo "** State Manager **"
   docker-compose `echo $DOCKER_COMPOSE_FILES` up -d state-manager-api
-  ./provision-edraak-state-manager.sh
+  ./provision-state-manager-api.sh
 fi
 
 docker image prune -f

From 8b6e42f5e3ace8986433f415cc78133e22eeca41 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 7 Apr 2021 10:40:00 +0300
Subject: [PATCH 082/137] run b2b and progs side by side

---
 .env.all                   | 17 +++++++++++
 .env.b2b                   |  3 +-
 .env.core                  |  1 +
 b2b.mk                     | 60 ++++++++++++++++++++++++++++++++++++++
 docker-compose-b2b-nfs.yml | 14 +++++++++
 docker-compose-b2b.yml     | 39 +++++++++++++++++++++++++
 nginx/b2b.conf             | 10 +++++++
 nginx/progs.conf           |  1 -
 provision-b2b.sh           | 22 ++++++++++++++
 provision.sh               | 10 +++++++
 repo.sh                    |  2 ++
 11 files changed, 177 insertions(+), 2 deletions(-)
 create mode 100644 .env.all
 create mode 100644 b2b.mk
 create mode 100644 docker-compose-b2b-nfs.yml
 create mode 100644 docker-compose-b2b.yml
 create mode 100644 nginx/b2b.conf
 create mode 100755 provision-b2b.sh

diff --git a/.env.all b/.env.all
new file mode 100644
index 0000000000..434700aebd
--- /dev/null
+++ b/.env.all
@@ -0,0 +1,17 @@
+PROGS_CFG=/app/docker.json
+
+# Change mount tyoe to "-nfs" to enable nfs, otherwise leave it empty
+MOUNT_TYPE=-nfs
+
+# Enable disable services
+ENABLE_PROGS=true
+ENABLE_B2B=true
+ENABLE_MKTG=true
+ENABLE_EDX=true
+
+ENABLE_STATE_MANAGER=true
+ENABLE_JUDGE=false
+ENABLE_ANALYTICS=true
+ENABLE_AUTH=true
+ENABLE_NOTIFIER=true
+
diff --git a/.env.b2b b/.env.b2b
index e9de4d3a9d..6bed790af8 100644
--- a/.env.b2b
+++ b/.env.b2b
@@ -4,7 +4,8 @@ PROGS_CFG=/app/docker-b2b.json
 MOUNT_TYPE=-nfs
 
 # Enable disable services
-ENABLE_PROGS=true
+ENABLE_PROGS=false
+ENABLE_B2B=true
 ENABLE_MKTG=false
 ENABLE_EDX=false
 
diff --git a/.env.core b/.env.core
index d94d4080ff..f700eabff8 100644
--- a/.env.core
+++ b/.env.core
@@ -5,6 +5,7 @@ MOUNT_TYPE=-nfs
 
 # Enable disable services
 ENABLE_PROGS=true
+ENABLE_B2B=false
 ENABLE_MKTG=true
 ENABLE_EDX=true
 
diff --git a/b2b.mk b/b2b.mk
new file mode 100644
index 0000000000..1101e291a0
--- /dev/null
+++ b/b2b.mk
@@ -0,0 +1,60 @@
+b2b.help:
+	@echo ""
+	@echo "make b2b.COMMAND"
+	@echo "======================================"
+	@echo ""
+	@echo "Commands:"
+	@echo "migrate:              Run django migrations i.e. python manage.py migrate"
+	@echo "langs_push:           Run django langs_push command i.e. python manage.py langs_push"
+	@echo "langs_pull:           Run django langs_pull command i.e. python manage.py langs_pull"
+	@echo "install_pip:          Install python dependencies in 'requirements.txt' file"
+	@echo "install_npm:          Install npm dependencies in 'package.json' file"
+	@echo "copy_cache:           Copy node_modules, installed at build time, to the current app"
+	@echo "dev:                  Run npm run dev command"
+	@echo "watch:                Run gulp watch"
+	@echo "install_all:          Runs install_pip, install_npm, dev, migrate"
+	@echo "watch_js:             Run watcher to watch JavaScript changes"
+	@echo "watch_css:            Run watcher to watch and compile scss changes"
+	@echo "shell:                Open bash shell inside docker container"
+	@echo "provision:            Run provision script, prepare the env"
+	@echo "restart:              Restart the container"
+	@echo "manage <Command>:     Run any manage.py command"
+	@echo "fix-npm:              Fix .npm folder ownership issue"
+	@echo "help:                 Print help and exit"
+	@echo ""
+
+b2b.migrate:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b python manage.py migrate --settings=edraakprograms.dev
+
+b2b.langs_push:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b python manage.py langs_push --settings=edraakprograms.dev
+
+b2b.langs_pull:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b python manage.py langs_pull --settings=edraakprograms.dev
+
+b2b.install_pip:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b pip install -r requirements.txt
+
+b2b.install_npm:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm install
+
+b2b.copy_cache:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b cp -Rnv /cache/node_modules /cache/.compiled /app
+
+b2b.dev:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run dev
+
+b2b.watch:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npx gulp watch
+
+b2b.install_all: | b2b.install_pip b2b.install_npm b2b.dev b2b.migrate
+
+b2b.watch_js:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run dev:watch
+
+b2b.watch_css:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run watch-scss
+
+b2b.fix-npm:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
+
diff --git a/docker-compose-b2b-nfs.yml b/docker-compose-b2b-nfs.yml
new file mode 100644
index 0000000000..f144c9ee05
--- /dev/null
+++ b/docker-compose-b2b-nfs.yml
@@ -0,0 +1,14 @@
+version: "2.1"
+
+services:
+  b2b:
+    volumes:
+      - b2b-nfs:/app
+
+volumes:
+  b2b-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/b2b-programs
diff --git a/docker-compose-b2b.yml b/docker-compose-b2b.yml
new file mode 100644
index 0000000000..c1c331635c
--- /dev/null
+++ b/docker-compose-b2b.yml
@@ -0,0 +1,39 @@
+# This file contains all of the services for an edraak installation. See https://docs.docker.com/compose/compose-file/
+# for the appropriate syntax and definitions.
+#
+# Housekeeping Rules:
+# - Group third-party and edraak services separately
+# - Alphabetize services in the groups
+# - Alphabetize individual configuration options for each service
+# - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
+#   that might be running for the same service.
+
+version: "2.1"
+
+services:
+
+  b2b:
+    image: eu.gcr.io/openedx-231314/edraak/progs
+    environment:
+      PROGS_CFG: /app/docker-b2b.json
+      NODE_ENV: development
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
+    container_name: edraak.devstack.b2b
+    working_dir: /app
+    ports:
+      - "18800:8800"
+    depends_on:
+      - mysql
+      - mongo
+      - memcached
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/b2b-programs:/app:cached
+      - ~/.ssh/:/root/.ssh
+
+  router:
+    depends_on:
+      - b2b
+    volumes:
+      - ./nginx/b2b.conf:/etc/nginx/conf.d/b2b.conf
+      - ./nginx/b2b-redirects.conf:/etc/nginx/conf.d/redirects.conf
+
diff --git a/nginx/b2b.conf b/nginx/b2b.conf
new file mode 100644
index 0000000000..740e870f3c
--- /dev/null
+++ b/nginx/b2b.conf
@@ -0,0 +1,10 @@
+# Progs
+server {
+    server_name b2b.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://b2b:8800;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}
diff --git a/nginx/progs.conf b/nginx/progs.conf
index be6d9822ab..3d7055680d 100644
--- a/nginx/progs.conf
+++ b/nginx/progs.conf
@@ -1,6 +1,5 @@
 # Progs
 server {
-    server_name b2b.edraak.dev;
     server_name programs.edraak.dev;
     include /etc/nginx/conf.d/includes/server.conf;
 
diff --git a/provision-b2b.sh b/provision-b2b.sh
new file mode 100755
index 0000000000..95e5a0d13c
--- /dev/null
+++ b/provision-b2b.sh
@@ -0,0 +1,22 @@
+set -e
+
+echo "** b2b: Restarting **"
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart b2b
+
+echo "** b2b: Copy cacheed files to code dir **"
+#docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'cp -Rn /cache/* /app/.'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'pip install -r requirements.txt'
+
+echo "** b2b: Migrating databases **"
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+
+echo "** b2b: Compiling assets **"
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'npm rebuild node-sass'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'chown -R root ~/.npm'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'npm install'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'bower install'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'npm run dev'
+docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+
+echo "** b2b: Restarting **"
+docker-compose `echo $DOCKER_COMPOSE_FILES` restart b2b
diff --git a/provision.sh b/provision.sh
index 1c83a460e6..b1c6c44c9b 100755
--- a/provision.sh
+++ b/provision.sh
@@ -62,6 +62,16 @@ if $ENABLE_PROGS; then
   ./provision-progs.sh
 fi
 
+if $ENABLE_B2B; then
+
+  echo "** B2B **"
+  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d b2b
+
+  echo "** Creating databases **"
+  echo "CREATE DATABASE IF NOT EXISTS b2b;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
+  ./provision-b2b.sh
+fi
+
 if $ENABLE_MKTG; then
   echo "** Marketing **"
   docker-compose `echo $DOCKER_COMPOSE_FILES` up -d mktg
diff --git a/repo.sh b/repo.sh
index a0ebb39300..3127ec0322 100755
--- a/repo.sh
+++ b/repo.sh
@@ -22,6 +22,7 @@ repos=(
     "https://github.com/Edraak/edraak-platform.git"
     "git@github.com:Edraak/marketing-site.git"
     "git@github.com:Edraak/edraak-programs.git"
+    "git@github.com:Edraak/edraak-programs"
     "git@github.com:Edraak/edraak-2019-theme.git"
     "git@github.com:Edraak/shared-devstack-configs.git"
     "git@github.com:Edraak/state-manager.git"
@@ -31,6 +32,7 @@ repo_alternative_directory=(
 	"https://github.com/Edraak/edraak-platform.git,edx-platform"
 	"git@github.com:Edraak/edraak-2019-theme.git,src/edraak-2019-theme"
   "git@github.com:Edraak/shared-devstack-configs.git,src/edxapp-envs"
+  "git@github.com:Edraak/edraak-programs,b2b-programs"
 )
 
 private_repos=(

From d900e112f52232dcb94353ae0b1cb1bc206a4a4e Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 7 Apr 2021 11:03:22 +0300
Subject: [PATCH 083/137] b2b addtion, and fixes

---
 Makefile                       |  5 +++++
 docker-compose-b2b.yml         |  4 ++--
 docker-compose-progs.yml       |  2 +-
 nginx/b2b.conf                 |  2 +-
 provision-b2b.sh               | 27 +++++++++++++++------------
 provision-lms.sh               | 32 +++++++++++++++++++-------------
 provision-mktg.sh              | 19 +++++++++++--------
 provision-progs.sh             | 26 ++++++++++++++------------
 provision-state-manager-api.sh | 11 ++++++-----
 provision.sh                   | 22 +---------------------
 10 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/Makefile b/Makefile
index 5f14f90eb2..89bf020cd5 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,11 @@ ifeq (${ENABLE_PROGS}, true)
 	DOCKER_COMPOSE_FILES+=-f docker-compose-progs${MOUNT_TYPE}.yml
 endif
 
+ifeq (${ENABLE_B2B}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-b2b.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-b2b${MOUNT_TYPE}.yml
+endif
+
 ifeq (${ENABLE_MKTG}, true)
 	DOCKER_COMPOSE_FILES+=-f docker-compose-mktg.yml
 	DOCKER_COMPOSE_FILES+=-f docker-compose-mktg${MOUNT_TYPE}.yml
diff --git a/docker-compose-b2b.yml b/docker-compose-b2b.yml
index c1c331635c..19b25f87ff 100644
--- a/docker-compose-b2b.yml
+++ b/docker-compose-b2b.yml
@@ -17,11 +17,11 @@ services:
     environment:
       PROGS_CFG: /app/docker-b2b.json
       NODE_ENV: development
-    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
+    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8801 --settings=edraakprograms.dev; sleep 2; done'
     container_name: edraak.devstack.b2b
     working_dir: /app
     ports:
-      - "18800:8800"
+      - "18801:8801"
     depends_on:
       - mysql
       - mongo
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index a5e771920d..9a02566a9e 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -15,7 +15,7 @@ services:
   progs:
     image: eu.gcr.io/openedx-231314/edraak/progs
     environment:
-      PROGS_CFG: ${PROGS_CFG:-/app/docker.json}
+      PROGS_CFG: /app/docker.json
       NODE_ENV: development
     command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
     container_name: edraak.devstack.programs
diff --git a/nginx/b2b.conf b/nginx/b2b.conf
index 740e870f3c..e921e31b4d 100644
--- a/nginx/b2b.conf
+++ b/nginx/b2b.conf
@@ -4,7 +4,7 @@ server {
     include /etc/nginx/conf.d/includes/server.conf;
 
     location / {
-        proxy_pass http://b2b:8800;
+        proxy_pass http://b2b:8801;
         include /etc/nginx/conf.d/includes/proxy.conf;
     }
 }
diff --git a/provision-b2b.sh b/provision-b2b.sh
index 95e5a0d13c..1f28f8e269 100755
--- a/provision-b2b.sh
+++ b/provision-b2b.sh
@@ -1,22 +1,25 @@
 set -e
 
-echo "** b2b: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart b2b
+echo "** bring b2b container up **"
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d b2b
+
+
+echo "** Creating databases **"
+echo "CREATE DATABASE IF NOT EXISTS b2b;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
 echo "** b2b: Copy cacheed files to code dir **"
-#docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'pip install -r requirements.txt'
+#docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'cp -Rn /cache/* /app/.'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'pip install -r requirements.txt'
 
 echo "** b2b: Migrating databases **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
 echo "** b2b: Compiling assets **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'npm rebuild node-sass'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'chown -R root ~/.npm'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'npm install'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'bower install'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'npm run dev'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
 echo "** b2b: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart b2b
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart b2b
diff --git a/provision-lms.sh b/provision-lms.sh
index 0ea17c91af..40073ad0c2 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -4,44 +4,50 @@ set -x
 
 apps=( lms studio )
 
+echo "** Edx **"
+echo -e "${GREEN}Creating databases and users...${NC}"
+docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
+docker exec -i edx.devstack.mongo mongo < mongo-provision.js
+
 # Load database dumps for the largest databases to save time
 ./load-db.sh edxapp
 ./load-db.sh edxapp_csmh
 
 # Bring edxapp containers online
 for app in "${apps[@]}"; do
-    echo $DOCKER_COMPOSE_FILES
-    docker-compose `echo $DOCKER_COMPOSE_FILES` up -d $app
+    echo ${DOCKER_COMPOSE_FILES}
+    docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d $app
 done
 
-echo $DOCKER_COMPOSE_FILES
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
+
+echo ${DOCKER_COMPOSE_FILES}
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
 
 #Installing prereqs crashes the process
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart lms
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart lms
 
 # Run edxapp migrations first since they are needed for the service users and OAuth clients
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
 
 # Create a superuser for edxapp
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell  --settings=devstack_docker'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell  --settings=devstack_docker'
 
 # Create an enterprise service user for edxapp
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com'
 
 # Enable the LMS-E-Commerce integration
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce'
 
 # Create demo course and users
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
 
 # Fix missing vendor file by clearing the cache
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'
 
 # Create static assets for both LMS and Studio
 for app in "${apps[@]}"; do
-    docker-compose `echo $DOCKER_COMPOSE_FILES` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
+    docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
 done
 
 # Provision a retirement service account user
diff --git a/provision-mktg.sh b/provision-mktg.sh
index e6dab3a473..eb7ac378b0 100755
--- a/provision-mktg.sh
+++ b/provision-mktg.sh
@@ -1,18 +1,21 @@
 set -e
 
-echo "** Marketing: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart mktg
+echo "** Bring Marketing up **"
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg
+
+echo "** Creating databases **"
+echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
 echo "** Marketing: Copy cacheed files to code dir **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'pip install -r requirements.txt'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip install -r requirements.txt'
 
 echo "** Marketing: Migrating databases **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Marketing: Compiling assets **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'yarn'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec mktg bash -c 'npm run dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'yarn'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'npm run dev'
 
 echo "** Marketing: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart mktg
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart mktg
diff --git a/provision-progs.sh b/provision-progs.sh
index e34e072d8d..27492e2890 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -1,22 +1,24 @@
 set -e
 
-echo "** Progs: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart progs
+echo "** Bring progs up **"
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs
+
+echo "** Creating databases **"
+echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
 echo "** Progs: Copy cacheed files to code dir **"
-#docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'pip install -r requirements.txt'
+#docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip install -r requirements.txt'
 
 echo "** Progs: Migrating databases **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
 echo "** Progs: Compiling assets **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'npm rebuild node-sass'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'chown -R root ~/.npm'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'npm install'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'bower install'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'npm run dev'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
 echo "** Progs: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart progs
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart progs
diff --git a/provision-state-manager-api.sh b/provision-state-manager-api.sh
index da59faf872..ff9b308d2a 100755
--- a/provision-state-manager-api.sh
+++ b/provision-state-manager-api.sh
@@ -1,7 +1,8 @@
 set -e
 
 echo "** state-manager-api: starting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` start state-manager-mysql
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-api
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-mysql
 
 echo "Waiting for state-manager-mysql"
 until docker exec -i edraak.devstack.state_manager_mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
@@ -11,12 +12,12 @@ do
 done
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
-sleep 10
+sleep 5
 
 echo "** state-manager-api: Create/Upgrade DB **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec state-manager-api bash -c 'flask create-db'
-docker-compose `echo $DOCKER_COMPOSE_FILES` exec state-manager-api bash -c 'flask db upgrade'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask create-db'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask db upgrade'
 
 
 echo "** state-manager-api: Restarting **"
-docker-compose `echo $DOCKER_COMPOSE_FILES` restart state-manager-api
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart state-manager-api
diff --git a/provision.sh b/provision.sh
index b1c6c44c9b..3bc7d985c3 100755
--- a/provision.sh
+++ b/provision.sh
@@ -40,51 +40,31 @@ sleep 10
 echo -e "MySQL ready"
 
 if $ENABLE_EDX; then
-  echo "** Edx **"
-  echo -e "${GREEN}Creating databases and users...${NC}"
-  docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
-  docker exec -i edx.devstack.mongo mongo < mongo-provision.js
-
   ./provision-lms.sh
-
   # Nothing special needed for studio
-  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d studio
+  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
 fi
 
 
 if $ENABLE_PROGS; then
 
   echo "** Programs **"
-  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d progs
-
-  echo "** Creating databases **"
-  echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
   ./provision-progs.sh
 fi
 
 if $ENABLE_B2B; then
 
   echo "** B2B **"
-  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d b2b
-
-  echo "** Creating databases **"
-  echo "CREATE DATABASE IF NOT EXISTS b2b;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
   ./provision-b2b.sh
 fi
 
 if $ENABLE_MKTG; then
   echo "** Marketing **"
-  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d mktg
-
-  echo "** Creating databases **"
-  echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
-
   ./provision-mktg.sh
 fi
 
 if $ENABLE_STATE_MANAGER; then
   echo "** State Manager **"
-  docker-compose `echo $DOCKER_COMPOSE_FILES` up -d state-manager-api
   ./provision-state-manager-api.sh
 fi
 

From 2b383755ccb567afa42d0ee0d4bcad0275a75415 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Mon, 3 May 2021 11:05:16 +0300
Subject: [PATCH 084/137] Upgrade to mongo4, watch command progs/b2b

---
 Makefile           | 2 +-
 b2b.mk             | 2 +-
 docker-compose.yml | 2 +-
 progs.mk           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 89bf020cd5..949efdb39b 100644
--- a/Makefile
+++ b/Makefile
@@ -136,7 +136,7 @@ logs: ## View logs from containers running in detached mode
 	docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail=500 $*
 
 pull:
-	docker-compose pull --parallel
+	docker-compose ${DOCKER_COMPOSE_FILES} pull --parallel
 
 validate: ## Validate the devstack configuration
 	docker-compose ${DOCKER_COMPOSE_FILES} config
diff --git a/b2b.mk b/b2b.mk
index 1101e291a0..9c762183f4 100644
--- a/b2b.mk
+++ b/b2b.mk
@@ -45,7 +45,7 @@ b2b.dev:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run dev
 
 b2b.watch:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npx gulp watch
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run dev:watch
 
 b2b.install_all: | b2b.install_pip b2b.install_npm b2b.dev b2b.migrate
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8aa00774e2..ada64a4fb2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -34,7 +34,7 @@ services:
     # See https://docs.mongodb.com/v3.0/reference/program/mongod/#options for complete details.
     command: mongod --smallfiles --nojournal --storageEngine wiredTiger
     container_name: edx.devstack.mongo
-    image: mongo:3.6.17
+    image: mongo:4.0.24
     ports:
       - "27017:27017"
     volumes:
diff --git a/progs.mk b/progs.mk
index 252fb5976e..0eabe7b2ea 100644
--- a/progs.mk
+++ b/progs.mk
@@ -53,7 +53,7 @@ progs.dev:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev
 
 progs.watch:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npx gulp watch
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
 
 progs.install_all: | progs.install_pip progs.install_npm progs.dev progs.migrate
 

From b0b7c26a259e5539c486de8f9ad5b300a734db30 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 2 Jun 2021 15:40:09 +0300
Subject: [PATCH 085/137] Media file on a volume

---
 docker-compose-edx-nfs.yml |  6 +++---
 docker-compose-edx.yml     | 28 ++++++++++++++--------------
 docker-compose-progs.yml   |  3 +++
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/docker-compose-edx-nfs.yml b/docker-compose-edx-nfs.yml
index 3057699651..f245316a89 100644
--- a/docker-compose-edx-nfs.yml
+++ b/docker-compose-edx-nfs.yml
@@ -9,9 +9,9 @@ services:
     volumes:
       - edx-nfs:/edx/app/edxapp/edx-platform
       - src-nfs:/edx/src
-  forum:
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
+#  forum:
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
 
 volumes:
   edx-nfs:
diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
index 28928070d1..09a8f8f61c 100644
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -75,19 +75,19 @@ services:
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
       - ~/.ssh/:/root/.ssh
 
-  forum:
-    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
-    container_name: edx.devstack.forum
-    depends_on:
-      - mongo
-      - memcached
-      - elasticsearch
-    image: edxops/forum:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "44567:4567"
-    volumes:
-      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
-      - ~/.ssh/:/root/.ssh
+#  forum:
+#    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
+#    container_name: edx.devstack.forum
+#    depends_on:
+#      - mongo
+#      - memcached
+#      - elasticsearch
+#    image: edxops/forum:${OPENEDX_RELEASE:-latest}
+#    ports:
+#      - "44567:4567"
+#    volumes:
+#      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
+#      - ~/.ssh/:/root/.ssh
 
   devpi:
     container_name: edx.devstack.devpi
@@ -102,7 +102,7 @@ services:
     depends_on:
       - lms
       - studio
-      - mktg
+#      - mktg
       - progs
     volumes:
       - ./nginx/edx.conf:/etc/nginx/conf.d/edx.conf
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 9a02566a9e..926a624540 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -27,6 +27,7 @@ services:
       - mongo
       - memcached
     volumes:
+      - progs_media:/edx/var/progs/media
       - ${DEVSTACK_WORKSPACE}/edraak-programs:/app:cached
       - ~/.ssh/:/root/.ssh
 
@@ -37,3 +38,5 @@ services:
       - ./nginx/progs.conf:/etc/nginx/conf.d/progs.conf
       - ./nginx/b2b-redirects.conf:/etc/nginx/conf.d/redirects.conf
 
+volumes:
+  progs_media:

From d84bb01f57baf939d110025e3415ff139b8fb708 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Tue, 8 Jun 2021 12:14:54 +0300
Subject: [PATCH 086/137] b2b theme

---
 b2b.mk                 | 2 +-
 docker-compose-b2b.yml | 1 +
 repo.sh                | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/b2b.mk b/b2b.mk
index 9c762183f4..26dca88630 100644
--- a/b2b.mk
+++ b/b2b.mk
@@ -53,7 +53,7 @@ b2b.watch_js:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run dev:watch
 
 b2b.watch_css:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run watch-scss
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b npm run scss:watch
 
 b2b.fix-npm:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
diff --git a/docker-compose-b2b.yml b/docker-compose-b2b.yml
index 19b25f87ff..c5a4319af9 100644
--- a/docker-compose-b2b.yml
+++ b/docker-compose-b2b.yml
@@ -28,6 +28,7 @@ services:
       - memcached
     volumes:
       - ${DEVSTACK_WORKSPACE}/b2b-programs:/app:cached
+      - ${DEVSTACK_WORKSPACE}/src:/edx/src
       - ~/.ssh/:/root/.ssh
 
   router:
diff --git a/repo.sh b/repo.sh
index 3127ec0322..6fdb70c11e 100755
--- a/repo.sh
+++ b/repo.sh
@@ -24,6 +24,7 @@ repos=(
     "git@github.com:Edraak/edraak-programs.git"
     "git@github.com:Edraak/edraak-programs"
     "git@github.com:Edraak/edraak-2019-theme.git"
+	  "git@github.com:Edraak/programs-theme-white.git"
     "git@github.com:Edraak/shared-devstack-configs.git"
     "git@github.com:Edraak/state-manager.git"
 )
@@ -31,6 +32,7 @@ repos=(
 repo_alternative_directory=(
 	"https://github.com/Edraak/edraak-platform.git,edx-platform"
 	"git@github.com:Edraak/edraak-2019-theme.git,src/edraak-2019-theme"
+	"git@github.com:Edraak/programs-theme-white.git,src/progs-theme"
   "git@github.com:Edraak/shared-devstack-configs.git,src/edxapp-envs"
   "git@github.com:Edraak/edraak-programs,b2b-programs"
 )

From d414aa5516b01d37b853d5349f986d16a2eccc88 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 23 Jun 2021 16:46:47 +0300
Subject: [PATCH 087/137] Fix edx provisioner

---
 docker-compose-edx.yml | 8 ++++----
 provision-lms.sh       | 5 +----
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
index 09a8f8f61c..763af5eb26 100644
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -29,8 +29,8 @@ services:
       BOK_CHOY_LMS_PORT: 18003
       BOK_CHOY_CMS_PORT: 18031
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
-      NO_PYTHON_UNINSTALL: 1
-      NO_PREREQ_INSTALL: 1
+      NO_PYTHON_UNINSTALL: 0
+      NO_PREREQ_INSTALL: 0
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18000:18000"
@@ -60,8 +60,8 @@ services:
       BOK_CHOY_LMS_PORT: 18103
       BOK_CHOY_CMS_PORT: 18131
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
-      NO_PYTHON_UNINSTALL: 1
-      NO_PREREQ_INSTALL: 1
+      NO_PYTHON_UNINSTALL: 0
+      NO_PREREQ_INSTALL: 0
     image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
     ports:
       - "18010:18010"
diff --git a/provision-lms.sh b/provision-lms.sh
index 40073ad0c2..a3a29c27ca 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -21,10 +21,7 @@ done
 
 
 echo ${DOCKER_COMPOSE_FILES}
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 paver install_prereqs'
-
-#Installing prereqs crashes the process
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart lms
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 NO_PREREQ_INSTALL=0 paver install_prereqs'
 
 # Run edxapp migrations first since they are needed for the service users and OAuth clients
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'

From bd713c4f73dbedcfcd0d85ab4feb5527b72560e7 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Wed, 23 Jun 2021 16:59:51 +0300
Subject: [PATCH 088/137] Readme update

---
 README.rst | 113 ++++++++++++++++++++++++-----------------------------
 1 file changed, 52 insertions(+), 61 deletions(-)

diff --git a/README.rst b/README.rst
index e306f4db6c..f89b728199 100644
--- a/README.rst
+++ b/README.rst
@@ -1,19 +1,8 @@
-Open edX Devstack |Build Status|
+Edraak Devstack
 ================================
 
 Get up and running quickly with Open edX services.
 
-If you are seeking info on the Vagrant-based devstack, please see
-https://openedx.atlassian.net/wiki/display/OpenOPS/Running+Devstack. This
-project is meant to replace the traditional Vagrant-based devstack with a
-multi-container approach driven by `Docker Compose`_. It is still in the
-beta testing phase.
-
-Support
--------
-
-Tickets or issues should be filed in Jira under the platform project:
-https://openedx.atlassian.net/projects/PLAT/issues
 
 FYI
 ---
@@ -73,17 +62,37 @@ you should configure Docker with a sufficient
 amount of resources. We find that `configuring Docker for Mac`_ with
 a minimum of 2 CPUs and 6GB of memory works well.
 
-1. (Optional) Install the requirements inside of a `Python virtualenv`_.
+1. This repo requires .env file to be present and have few import flags set, copy
+one of the following and adjust .env file based on your needs before you start.
+
+Run all services might be longer to provision
+    .. code:: sh
+
+        cp .env.all .env
+
+Run only services needed by the b2b stack
+    .. code:: sh
+
+        cp .env.b2b .env
+
+Run only services needed by the core stack
+    .. code:: sh
+
+        cp .env.core .env
+
+You can provision the servies and then turn them on and off as you like
+
+2. (Optional) Install the requirements inside of a `Python virtualenv`_.
 
    .. code:: sh
 
        make requirements
 
-2. The Docker Compose file mounts a host volume for each service's executing
+3. The Docker Compose file mounts a host volume for each service's executing
    code. The host directory defaults to be a sibling of this directory. For
    example, if this repo is cloned to ``~/workspace/devstack``, host volumes
-   will be expected in ``~/workspace/course-discovery``,
-   ``~/workspace/ecommerce``, etc. These repos can be cloned with the command
+   will be expected in ``~/workspace/edraak-programs``,
+   ``~/workspace/marketing-site``, etc. These repos can be cloned with the command
    below.
 
    .. code:: sh
@@ -96,25 +105,24 @@ a minimum of 2 CPUs and 6GB of memory works well.
    Be sure to share the cloned directories in the Docker -> Preferences... ->
    File Sharing box.
 
-2. 2 options here you can either build the images your self (check the build section below) or use gcloud to configure docker access to GCR
+4. 2 options here you can either build the images your self (check the build
+section below) or use gcloud to configure docker access to GCR, make sure to login
+with an account that have access to GCR repos needed, consult your sysadmin to make
+sure you have the needed permission.
 
    .. code:: sh
 
-       gcloud auth configure-docker
+        gcloud auth login
+        gcloud auth configure-docker
 
-3. You have an option to use nfs on MacOS which will improve the performance significantly, to set it up ONLY ON MAC, do
-    .. code:: sh
-
-        make dev.nfs.setup
-
-3. Run the provision command, if you haven't already, to configure the various
+5. Run the provision command, if you haven't already, to configure the various
    services with superusers (for development without the auth service) and
    tenants (for multi-tenancy).
 
    **NOTE:** When running the provision command, databases for ecommerce and edxapp
    will be dropped and recreated.
 
-   The username and password for the superusers are both ``edx``. You can access
+   The username ``edx@example.com`` and password ``edx`` for the superusers . You can access
    the services directly via Django admin at the ``/admin/`` path, or login via
    single sign-on at ``/login/``.
 
@@ -124,19 +132,7 @@ a minimum of 2 CPUs and 6GB of memory works well.
 
        make dev.provision
 
-   Provision using `docker-sync`_:
-
-   .. code:: sh
-
-       make dev.sync.provision
-
-   Provision using `nfs`_:
-
-   .. code:: sh
-
-       make dev.nfs.provision
-
-4. Start the services. This command will mount the repositories under the
+6. Start the services. This command will mount the repositories under the
    DEVSTACK\_WORKSPACE directory.
 
    **NOTE:** it may take up to 60 seconds for the LMS to start, even after the ``make dev.up`` command outputs ``done``.
@@ -147,27 +143,29 @@ a minimum of 2 CPUs and 6GB of memory works well.
 
        make dev.up
 
-   Start using `docker-sync`_:
-
-   .. code:: sh
-
-       make dev.sync.up
 
-   Start using `nfs`_:
-
-   .. code:: sh
-
-       make dev.nfs.up
+# .env file content
 
+MOUNT_TYPE:
+    set to -nfs to enable NFS support or leave empty to use default docker engine
 
-After the services have started, if you need shell access to one of the
-services, run ``make <service>-shell``. For example to access the
-Catalog/Course Discovery Service, you can run:
+ENABLE_<SERVICE>:
+    Set to true or false wiether you want this serivce enabled/provisoined or not
 
 .. code:: sh
-
-    make discovery-shell
-
+    Services supported
+    PROGS
+    B2B
+    MKTG
+    EDX
+    STATE_MANAGER
+    JUDGE
+    ANALYTICS
+    AUTH
+    NOTIFIER
+
+
+# Make commands
 To see logs from containers running in detached mode, you can either use
 "Kitematic" (available from the "Docker for Mac" menu), or by running the
 following:
@@ -176,13 +174,6 @@ following:
 
     make logs
 
-To view the logs of a specific service container run ``make <service>-logs``.
-For example, to access the logs for Ecommerce, you can run:
-
-.. code:: sh
-
-    make ecommerce-logs
-
 To reset your environment and start provisioning from scratch, you can run:
 
 .. code:: sh

From 1cde4ae55215b12309a2515ed509fb1e07e7be66 Mon Sep 17 00:00:00 2001
From: Ali H <devalih@gmail.com>
Date: Thu, 24 Jun 2021 11:34:26 +0300
Subject: [PATCH 089/137] Create mongo users before provisioning any app

---
 provision.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/provision.sh b/provision.sh
index 3bc7d985c3..0f043f6d85 100755
--- a/provision.sh
+++ b/provision.sh
@@ -37,6 +37,9 @@ done
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
 sleep 10
 
+printf "Creating mongo usres"
+docker exec -i edx.devstack.mongo mongo < mongo-provision.js
+
 echo -e "MySQL ready"
 
 if $ENABLE_EDX; then

From 3ee043b83d331861a8a3de330cb28a05239045e5 Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Tue, 14 Sep 2021 11:55:27 +0300
Subject: [PATCH 090/137] Update expired dev certificate

---
 nginx/ssl/chained.crt | 44 ++++++++++++++++++------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)
 mode change 100755 => 100644 nginx/ssl/private.key

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index abaf4561fb..1cc44e566e 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFKjCCBBKgAwIBAgISBNN1XaUssNNisU0mLhoWzwUNMA0GCSqGSIb3DQEBCwUA
+MIIFKTCCBBGgAwIBAgISBMbXw4orwiYqqc4tdqKCqgHzMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTA2MTYwODE3NTVaFw0yMTA5MTQwODE3NTRaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM+c
-lSVGeTk+o4QX2LYkcJOTuru0CVfWRdMQCIYXVASB90bCtOVQRvbUJWuPC2VH7xEr
-il5t8qRVwMn42UBfPZV5KcIcmODkikM+h5C1LGhlow1pd9opIsGVNp93I26qhPbQ
-qYr8Hz7fxMibgbmiAcTnv52UIzFcRBEYjB9du3U79o60yVn3o+KDUfwHqfWR/nFD
-vCeGg8OcUA6Dlru8oixUX1Tklu6weNsULNbeWCzzuDG+Q2TaVgIuiMiJm3Bslh3k
-G+uAc9TQhBIJHK/XCE3Uzr6Z6oVdXzeP3EFVLIu2yQqx7s3gAQuKQDURQngIcCzV
-i3KNZqVxj7VceuBgSNcCAwEAAaOCAlMwggJPMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+EwJSMzAeFw0yMTA5MTQwNzQxMTdaFw0yMTEyMTMwNzQxMTZaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOmc
+js9UNoPwzLFTrk4fW4NXJA8qlu9VhKlan/l86STlH+wyqET1If/z1qnGMTzjhWLi
+BOtTr2d6tsb37w7aCX/8oBv+BQ5F6ajOnwrKl7EMcEXWDPLBTUyTtoNE2cnc+cqB
+z2uLK+pn+rS+yJjCr0CkVhZanyQ90CzCWqZlAluFouok6GjWWJ9MvdxmFjavuwD4
+bfVaW2/BGxfp3/0YRPZR24d9PfXnNyWy0ym2qMtP80Tqn9o+0Lo16jAp0OsXOXeo
+I++JaKiGdpoUcf9UCqVj0x3ScThrJqFXpvHlzFEqSPGTbsdu+dbD9reCJNRmIR9i
+n4pVSEd9XRMccei37zcCAwEAAaOCAlIwggJOMA4GA1UdDwEB/wQEAwIFoDAdBgNV
 HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQUST4vu5iNXtybMVB+gPAa1lEm1xIwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+FgQUJlbhfZUVpAUNUOpz9aNYYkFqj9gwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
 5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
 by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
 IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
 CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHYAlCC8
-Ho7VjWyIcx+CiyIsDdHaTV5sT5Q9YdtOL1hNosIAAAF6FBzlwwAABAMARzBFAiAV
-2wtpMRUPaIYVRXAN0pP5iyKGuqYY4Xvp3r0t3Vnk2QIhAIdCEZDaievjF6Utpcr9
-DAOhqzKIWSvk5ll0oRSgCy7xAHYAfT7y+I//iFVoJMLAyp5SiXkrxQ54CX8uapdo
-mX4i8NcAAAF6FBzl6gAABAMARzBFAiEAgDZ0TlSS77nehnVpftccokU1EYVSWZeF
-6dGRNMx0aAwCID+bEbjqAUy0MiuhpLSaczlp0jld22XIStd53pL8247GMA0GCSqG
-SIb3DQEBCwUAA4IBAQB+Rnj6PFNo1LbcJkhB98ahjAO3Wp6G5Mg7mapwOI6/s1oH
-C9lr/YNQguyRky06+kK1dh4W7asnYsPc9ZfWyrAH0vLK7fyQvFjo+0J9++yaYvn8
-MhumKAD6MkYqQKr56XpbLaO5mOojaLisIrUyYlj3SOMySX20udIv0qYSfDnC9xt5
-e3uRZgClw5L1C4ynRWGLx9n1xqiszjFBXCyqgRfxxPSllbw1V/gBDbizL5bs0lCP
-zASaDMBT2e4PgFbapB4qXxpaVARIlEfsqUYny0gC7rxXfM/kNQbmunMtZYE+bcAa
-uCZ6BEjBThqP7wPpSYT9kFcmgpCoURtoJGUKc7Lt
+cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYAlCC8
+Ho7VjWyIcx+CiyIsDdHaTV5sT5Q9YdtOL1hNosIAAAF743eziwAABAMARzBFAiAY
+FbqyYAzeWproLiLR4ExZZ8eD6StfVW9dzRooooFO0gIhAKTEkd1ZXAhLDePX1lEL
+4MNep5HEOsthkjBLSX9MJnmhAHUA9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyAL
+zE7xZOMAAAF743ezsQAABAMARjBEAiBwwEOB3PNmrvCEzsGNu1etH4t0MA9DmeI/
+jMNIZhncHQIgH4LsarAveD9Mo+qwJ54pY2HZqeUfPSHlR2iHS/L6+WcwDQYJKoZI
+hvcNAQELBQADggEBABi+FkPfacFP1SQM/0dsYkdvlgMMOGabD26cDfPwW+FF2qGe
+NRRpHDa/QFlsELm1dRJU8dyjafrnI9Dr208CPnkOROARKUJe1A22vHDW4QkcFvKV
+Qy5ervWctdRamK44/S4b96zE2seFtxBLd/F/b7wXAGtEtSGQ0BW7UJXtwla+IJky
+lc1AINio1vJb8/D6IQVdAcEPx3fIqW9aDPoy8S2YuC6SyUnTKVtm63HrRXEekBlq
+AyeGYIpETdDc3akA6aZBxZN/++QYdL3vbmYJz5dbsRMd+UxKvBflzvnkmZo+bB7B
+jcmIpeBC1i2KKjnpEG7NzhcBeUZQxRo/FedJ9XI=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
old mode 100755
new mode 100644
index e70ac1c57c..a6f6875c97
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDPnJUlRnk5PqOE
-F9i2JHCTk7q7tAlX1kXTEAiGF1QEgfdGwrTlUEb21CVrjwtlR+8RK4pebfKkVcDJ
-+NlAXz2VeSnCHJjg5IpDPoeQtSxoZaMNaXfaKSLBlTafdyNuqoT20KmK/B8+38TI
-m4G5ogHE57+dlCMxXEQRGIwfXbt1O/aOtMlZ96Pig1H8B6n1kf5xQ7wnhoPDnFAO
-g5a7vKIsVF9U5JbusHjbFCzW3lgs87gxvkNk2lYCLojIiZtwbJYd5BvrgHPU0IQS
-CRyv1whN1M6+meqFXV83j9xBVSyLtskKse7N4AELikA1EUJ4CHAs1YtyjWalcY+1
-XHrgYEjXAgMBAAECggEBAMJd6hQXwm4hgpysZqs/ulWvvOb2Srj9VimfnRtMw8/k
-jUimCQ2W9pknTFFCfny3t83vYX++l6fa0L9GRr7Ja7KA2ONuOoJx9C+4XtrPg1/J
-p7lqwFZypKNvus/YjkeRRSJ9f/0qxWXrwSO+0tikH9vky7QPeFNB+ke3H5hN/K5n
-X9mohkvlasW8YCQCVjqFyLxwuVBSsrjr37LClDzyFiW3kkEoVAtedCrGpOA97l/O
-bcbtFvUpPKS/zfEZ1LnCdWj/XzJoLVFEnrplLPFr723DH4RbTni7cLmIk/5+uOKw
-12WxzhgPtCQN183FTsB45Ri+7wyGGQyrfs0b7mWVtIECgYEA+ubhEkOZnT2JARMX
-PhR3LGSa0MOoldZCdAEj9TQpiiogRE353GAqBrVWFF65GuAw0nXNjMTLSZENIYGd
-lWa27a5jtBr8W6Dv5sQmUjxbaazq0hVUIMk7Mu2+WYXqjtvE+dnMox7euDiXoV39
-ZjzJjQs0KqsVj2uXa3+uo5WKW+cCgYEA09SFF1m+clhgahwD7A0MUgglyGvYLO55
-nfkaX7EJyw3hBoM54cc+CDsX5zTkTnMLLEZiYKo9EhdjpkJmaqkY+wRztDpuGVTd
-SxRKd/o/LvgFwL+GTDrVAu2A4J1DkK4mznIyVc5sfzMJmjxHKVzgXj4rVYymTDUt
-Qd1HuFf8jZECgYEAnySMxEnuiMb8PJtAVdcjVBwn+pzwNMInem8ywJgqdQGNX+XZ
-w0eXwJOKmvcOEBb9wLCKBWzZyLrhikwtiRMSmqXPhfDL+s6U/FmUOPshvGC6vTBc
-IUOicgZMg3omsiCByzyzyQ+Ok2kJ/IeicBPEf9sIZrwHu+WxsLTXL9ltXicCgYBo
-09LJK3BDxdhwqkyGlC50qfOIq1XfZmRo+M1EbagbBFNHlckfIipgiF3b3SDecbAl
-yO8GRzjRqyF1NYbZYbUrA5j+p6u0fXrFnNT9aqm55KN0L1OWhcbEHCSbAzhccNJj
-d7/RFsY6bFdkLFBK99tQyBNJ0sC5Fde/sHG9mE0zAQKBgAqpAEyxo6ExkVrugpzd
-lnW9CLGMly59VPvEL+F7GdIDxjdPQbAfFfsf/jobBNfdQ5DUSWup/GVbuKsARazD
-oFMJGzAWCmjVv8RGsbR2zeR1BbrBwYbct/e659rc1a4DL4KbmPT9lTK9X3hTWmGr
-kgl71fN+ER1DNooL37zZ4ZIp
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDpnI7PVDaD8Myx
+U65OH1uDVyQPKpbvVYSpWp/5fOkk5R/sMqhE9SH/89apxjE844Vi4gTrU69nerbG
+9+8O2gl//KAb/gUORemozp8KypexDHBF1gzywU1Mk7aDRNnJ3PnKgc9riyvqZ/q0
+vsiYwq9ApFYWWp8kPdAswlqmZQJbhaLqJOho1lifTL3cZhY2r7sA+G31WltvwRsX
+6d/9GET2UduHfT315zclstMptqjLT/NE6p/aPtC6NeowKdDrFzl3qCPviWiohnaa
+FHH/VAqlY9Md0nE4ayahV6bx5cxRKkjxk27HbvnWw/a3giTUZiEfYp+KVUhHfV0T
+HHHot+83AgMBAAECggEAByS2aTiWAirW14VLizACSF3dyGjw/JiM2fDfe22KY4pu
+E3bpFlK4m28FXWOmFcqPRZrLs7Z3Yp6qACOMt9OK/tLmwnReCzWwE21eB6JySQOs
+WzZUZwfqKTFLH3B3iGitarfVc+Bpk11imSxMTf+GBGACEeTrgNwzBWtcAkKMc+fv
+QgKg5hB2zGtWaC8eDRXaC2ui1meDmInqAdoqUC0jcIBzGXsji/JcnaTV+AfDZYF0
+ngMnqrVKxdE9YLlc0gL6tXDVrN3IbyjRVg54pNRn9lFoYPnDJTJIfGTFipfS4yq9
+6j3a5fhBkxlEE6kF6NlmqV3PSROJB9Okg0gZoBYJIQKBgQD5D864CmtxejeTySIs
+1miR5mtA+dYLetwFw8d8NM9/DA9L0MgzFtdZMG3DTQlq0pzLcVH42e3ME0xZrdG6
+paaz1XwhZfUiTnVWAAPWv7WD0YTgYjrbSZHu24UOT7GLbkC/miVv5mrscINljcxq
+jARUW8EPp59Pn3pTjt5a4TV3CwKBgQDwHpEXPg1IoPo7gna5UXjWKaqGJJsNAwJl
+EjI1fsYDBd3zG5hL4eJRcDrkUXgsb6YcJFwkdr2q1WjmnRNrLG1dNmnzgHNn9Lu7
+D51KmnBv/yEH46+WEObMoupdcPnQFtLqTT1OnSnsRKz/7UYiSHhYayv0LfmpiURm
+JBmx1PdUBQKBgARUHQCf1bw0JpEf9sMWutyGR6jqbqjmarqC642iEVUg7Ycgysnw
+hK+dIts5FIfRvz3d61HK39IjJ7mLRtDanioT9MNT1U3SVUG4YFi0HkB7PLb1nhY/
+khS3pflYszo8IU3zLOFj/Mm9Lttt+naDlnOs4I8YF7G3kNWw7vZfYaF/AoGAMfT6
+FM7ZLqonRahQESBNNql2i/AjviJJJkQR5CVbBxf6ZHDyT59QWccyyXvVt9EGy0YZ
+UZDOxzMdXxWBC8QzgLgodPvdhtxZDoMiI3pcOEDpW13Yky0zB5JBlm1B3DRTb2Hg
+hnGWXkyvfZOdCtbvCt5JR8Uk80vWyjVqjyAS0Q0CgYAtpIZSR2HAQT1Wmic1vm5Z
+b6fy8uf2KGE4X4PcHmRwWttZMjsSZ5BRJb/X487prEJCiwtR97NqiVw5DkRLr2F8
+Ii+d+NDjP/2bZB8Yt2sIU/tyVzxju/S6u7wGDhpXhGpSajV4agPO6XXyz0gMmo1d
+hxqmNXcHvI/p5dXbCyLKuQ==
 -----END PRIVATE KEY-----

From 2aca941ddadad3c6014eb352045447759a8b7ba6 Mon Sep 17 00:00:00 2001
From: Rowadz <38977667+MohammedAl-Rowad@users.noreply.github.com>
Date: Mon, 20 Sep 2021 13:25:53 +0300
Subject: [PATCH 091/137] Update docker-compose.yml

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index ada64a4fb2..55f6808f40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -46,7 +46,7 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    image: mysql:5.6
+    image: mysql:5.7
     ports:
        - "3306:3306"
     volumes:

From eb697d56e720ff9a8dc743db0b182a357999dced Mon Sep 17 00:00:00 2001
From: Wael Ghaith <waelghaith@Waels-MacBook-Pro.local>
Date: Tue, 26 Oct 2021 18:46:21 +0300
Subject: [PATCH 092/137] Delete node_modules folders

---
 provision-b2b.sh   | 1 +
 provision-mktg.sh  | 1 +
 provision-progs.sh | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/provision-b2b.sh b/provision-b2b.sh
index 1f28f8e269..d60a56d4e7 100755
--- a/provision-b2b.sh
+++ b/provision-b2b.sh
@@ -17,6 +17,7 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py
 echo "** b2b: Compiling assets **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
diff --git a/provision-mktg.sh b/provision-mktg.sh
index eb7ac378b0..5ca7e28e24 100755
--- a/provision-mktg.sh
+++ b/provision-mktg.sh
@@ -14,6 +14,7 @@ echo "** Marketing: Migrating databases **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Marketing: Compiling assets **"
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'yarn'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'npm run dev'
 
diff --git a/provision-progs.sh b/provision-progs.sh
index 27492e2890..3268e206de 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -16,7 +16,9 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.
 echo "** Progs: Compiling assets **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install'
+
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 

From ffdc6705fe1ae55852c38d6b3e0f7da203b5059b Mon Sep 17 00:00:00 2001
From: Wael Ghaith <waelghaith@Waels-MacBook-Pro.local>
Date: Tue, 26 Oct 2021 19:58:28 +0300
Subject: [PATCH 093/137] changes on provision-b2b.sh

---
 provision-b2b.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision-b2b.sh b/provision-b2b.sh
index d60a56d4e7..6b19895a28 100755
--- a/provision-b2b.sh
+++ b/provision-b2b.sh
@@ -17,7 +17,7 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py
 echo "** b2b: Compiling assets **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'rm -rf node_modules/'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'

From 11df825529bdcd2fb7e040a9e1eea7ca81af80dc Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Tue, 9 Nov 2021 21:58:18 +0200
Subject: [PATCH 094/137] Use mongo:4.2.17

---
 docker-compose.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 55f6808f40..3e6f257066 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,12 +29,10 @@ services:
        - "11211:11211"
 
   mongo:
-    # We use WiredTiger in all environments. In development environments we use small files
-    # to conserve disk space, and disable the journal for a minor performance gain.
-    # See https://docs.mongodb.com/v3.0/reference/program/mongod/#options for complete details.
-    command: mongod --smallfiles --nojournal --storageEngine wiredTiger
+    # We disable the journal for a minor performance gain.
+    command: mongod --nojournal
     container_name: edx.devstack.mongo
-    image: mongo:4.0.24
+    image: mongo:4.2.17
     ports:
       - "27017:27017"
     volumes:

From 358dfcbe35f4191ce1ae2f32fdc351254bc03872 Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Mon, 6 Dec 2021 11:36:22 +0200
Subject: [PATCH 095/137] Update dev certificates

---
 nginx/ssl/chained.crt | 44 ++++++++++++++++++------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 1cc44e566e..afe92c4c75 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFKTCCBBGgAwIBAgISBMbXw4orwiYqqc4tdqKCqgHzMA0GCSqGSIb3DQEBCwUA
+MIIFKzCCBBOgAwIBAgISBDiSJybP7xJSpOLMusNGZjeOMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMTA5MTQwNzQxMTdaFw0yMTEyMTMwNzQxMTZaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOmc
-js9UNoPwzLFTrk4fW4NXJA8qlu9VhKlan/l86STlH+wyqET1If/z1qnGMTzjhWLi
-BOtTr2d6tsb37w7aCX/8oBv+BQ5F6ajOnwrKl7EMcEXWDPLBTUyTtoNE2cnc+cqB
-z2uLK+pn+rS+yJjCr0CkVhZanyQ90CzCWqZlAluFouok6GjWWJ9MvdxmFjavuwD4
-bfVaW2/BGxfp3/0YRPZR24d9PfXnNyWy0ym2qMtP80Tqn9o+0Lo16jAp0OsXOXeo
-I++JaKiGdpoUcf9UCqVj0x3ScThrJqFXpvHlzFEqSPGTbsdu+dbD9reCJNRmIR9i
-n4pVSEd9XRMccei37zcCAwEAAaOCAlIwggJOMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+EwJSMzAeFw0yMTEyMDYwNzMxMjlaFw0yMjAzMDYwNzMxMjhaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANDp
+QF5cRflK7Bn2YVfhRElhZJOtvm2qSyK8aRaEOxLpelVNbx2RKgXce4aZpZClv2di
+MfahIut/U4FFZuzaYPQH8PDOSMMZv7Mc8BeJMgJ/grfFgJwlQMFpeBdTsDuaPxKY
+Oyj0cb65Q/ykpNZWDqjt4Xknrw0YH6ExFCZx3/WvROJOWykBITAqSxt2vkW/8Pqe
+AW2v5W/Jq2R6d9L1U/3EvQlVXXej27mtwHXKpRqIxC5fTu1HXR1UH/X2a/ftY58q
+KfoQFjVFFQNNtU7eWWI+qHtezV7GNiIKdEb9FtJW/eXbGRVK4EXeYElMSne2IleF
+7IXu5px1BF5KGH2By/ECAwEAAaOCAlQwggJQMA4GA1UdDwEB/wQEAwIFoDAdBgNV
 HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQUJlbhfZUVpAUNUOpz9aNYYkFqj9gwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+FgQUGpmokGl3ziTbSWIyRIYTNg2zUMEwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
 5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
 by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
 IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
 CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHYAlCC8
-Ho7VjWyIcx+CiyIsDdHaTV5sT5Q9YdtOL1hNosIAAAF743eziwAABAMARzBFAiAY
-FbqyYAzeWproLiLR4ExZZ8eD6StfVW9dzRooooFO0gIhAKTEkd1ZXAhLDePX1lEL
-4MNep5HEOsthkjBLSX9MJnmhAHUA9lyUL9F3MCIUVBgIMJRWjuNNExkzv98MLyAL
-zE7xZOMAAAF743ezsQAABAMARjBEAiBwwEOB3PNmrvCEzsGNu1etH4t0MA9DmeI/
-jMNIZhncHQIgH4LsarAveD9Mo+qwJ54pY2HZqeUfPSHlR2iHS/L6+WcwDQYJKoZI
-hvcNAQELBQADggEBABi+FkPfacFP1SQM/0dsYkdvlgMMOGabD26cDfPwW+FF2qGe
-NRRpHDa/QFlsELm1dRJU8dyjafrnI9Dr208CPnkOROARKUJe1A22vHDW4QkcFvKV
-Qy5ervWctdRamK44/S4b96zE2seFtxBLd/F/b7wXAGtEtSGQ0BW7UJXtwla+IJky
-lc1AINio1vJb8/D6IQVdAcEPx3fIqW9aDPoy8S2YuC6SyUnTKVtm63HrRXEekBlq
-AyeGYIpETdDc3akA6aZBxZN/++QYdL3vbmYJz5dbsRMd+UxKvBflzvnkmZo+bB7B
-jcmIpeBC1i2KKjnpEG7NzhcBeUZQxRo/FedJ9XI=
+cHMubGV0c2VuY3J5cHQub3JnMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYAQcjK
+sd8iRkoQxqE6CUKHXk4xixsD6+tLx2jwkGKWBvYAAAF9jt6N+AAABAMARzBFAiB7
+ugSg17Jx9RmClg9Y2SdylYzEXeUQ2V6R05psLP0OawIhAMTrzhYzDoAYjCZjirk5
+OKfFU8fzbw29UN+90gHenOD7AHcARqVV63X6kSAwtaKJafTzfREsQXS+/Um4havy
+/HD+bUcAAAF9jt6ODQAABAMASDBGAiEAmhgjM/Fc24npUpxdePgvSR6EhmTwKWkB
+jp0HPnuWMLMCIQDyHoy2vW9alyIylE84SemwcNy6BDAiQ+25tQmJVQR/DDANBgkq
+hkiG9w0BAQsFAAOCAQEASTiTcPFQ1iQVJR2bLN0HXDaTDrsq3GjQOKh3y76/bOfW
+K2rI0XS1usq+7g3CBwUHhnVqO7wIdsGAReBN5IYw5Az2cKOx6DblyG4jaZRWdejQ
+OjasrexefkfEmDkIBawyBVXYZKeBg4XsYKGR2IxenkuftGjUWkOHIWx36kfSRoGM
+iXeRC84kZLG97VKAJCUgxBijTJ+PCgJCKhj6VPhfy8+i3JvhbxMcyTYAN0I5Q9QM
+X25dHkLKCQGB9bZA6D0zCRkWGdfI8MGqcMLQyG7zj4YpN2887Jdri7izhPg6VgDE
+0pMIXmPyH7taMslFSP5CWN61PgHq5q9dKO7+/zA9mQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index a6f6875c97..54e5127765 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDpnI7PVDaD8Myx
-U65OH1uDVyQPKpbvVYSpWp/5fOkk5R/sMqhE9SH/89apxjE844Vi4gTrU69nerbG
-9+8O2gl//KAb/gUORemozp8KypexDHBF1gzywU1Mk7aDRNnJ3PnKgc9riyvqZ/q0
-vsiYwq9ApFYWWp8kPdAswlqmZQJbhaLqJOho1lifTL3cZhY2r7sA+G31WltvwRsX
-6d/9GET2UduHfT315zclstMptqjLT/NE6p/aPtC6NeowKdDrFzl3qCPviWiohnaa
-FHH/VAqlY9Md0nE4ayahV6bx5cxRKkjxk27HbvnWw/a3giTUZiEfYp+KVUhHfV0T
-HHHot+83AgMBAAECggEAByS2aTiWAirW14VLizACSF3dyGjw/JiM2fDfe22KY4pu
-E3bpFlK4m28FXWOmFcqPRZrLs7Z3Yp6qACOMt9OK/tLmwnReCzWwE21eB6JySQOs
-WzZUZwfqKTFLH3B3iGitarfVc+Bpk11imSxMTf+GBGACEeTrgNwzBWtcAkKMc+fv
-QgKg5hB2zGtWaC8eDRXaC2ui1meDmInqAdoqUC0jcIBzGXsji/JcnaTV+AfDZYF0
-ngMnqrVKxdE9YLlc0gL6tXDVrN3IbyjRVg54pNRn9lFoYPnDJTJIfGTFipfS4yq9
-6j3a5fhBkxlEE6kF6NlmqV3PSROJB9Okg0gZoBYJIQKBgQD5D864CmtxejeTySIs
-1miR5mtA+dYLetwFw8d8NM9/DA9L0MgzFtdZMG3DTQlq0pzLcVH42e3ME0xZrdG6
-paaz1XwhZfUiTnVWAAPWv7WD0YTgYjrbSZHu24UOT7GLbkC/miVv5mrscINljcxq
-jARUW8EPp59Pn3pTjt5a4TV3CwKBgQDwHpEXPg1IoPo7gna5UXjWKaqGJJsNAwJl
-EjI1fsYDBd3zG5hL4eJRcDrkUXgsb6YcJFwkdr2q1WjmnRNrLG1dNmnzgHNn9Lu7
-D51KmnBv/yEH46+WEObMoupdcPnQFtLqTT1OnSnsRKz/7UYiSHhYayv0LfmpiURm
-JBmx1PdUBQKBgARUHQCf1bw0JpEf9sMWutyGR6jqbqjmarqC642iEVUg7Ycgysnw
-hK+dIts5FIfRvz3d61HK39IjJ7mLRtDanioT9MNT1U3SVUG4YFi0HkB7PLb1nhY/
-khS3pflYszo8IU3zLOFj/Mm9Lttt+naDlnOs4I8YF7G3kNWw7vZfYaF/AoGAMfT6
-FM7ZLqonRahQESBNNql2i/AjviJJJkQR5CVbBxf6ZHDyT59QWccyyXvVt9EGy0YZ
-UZDOxzMdXxWBC8QzgLgodPvdhtxZDoMiI3pcOEDpW13Yky0zB5JBlm1B3DRTb2Hg
-hnGWXkyvfZOdCtbvCt5JR8Uk80vWyjVqjyAS0Q0CgYAtpIZSR2HAQT1Wmic1vm5Z
-b6fy8uf2KGE4X4PcHmRwWttZMjsSZ5BRJb/X487prEJCiwtR97NqiVw5DkRLr2F8
-Ii+d+NDjP/2bZB8Yt2sIU/tyVzxju/S6u7wGDhpXhGpSajV4agPO6XXyz0gMmo1d
-hxqmNXcHvI/p5dXbCyLKuQ==
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDQ6UBeXEX5SuwZ
+9mFX4URJYWSTrb5tqksivGkWhDsS6XpVTW8dkSoF3HuGmaWQpb9nYjH2oSLrf1OB
+RWbs2mD0B/DwzkjDGb+zHPAXiTICf4K3xYCcJUDBaXgXU7A7mj8SmDso9HG+uUP8
+pKTWVg6o7eF5J68NGB+hMRQmcd/1r0TiTlspASEwKksbdr5Fv/D6ngFtr+Vvyatk
+enfS9VP9xL0JVV13o9u5rcB1yqUaiMQuX07tR10dVB/19mv37WOfKin6EBY1RRUD
+TbVO3lliPqh7Xs1exjYiCnRG/RbSVv3l2xkVSuBF3mBJTEp3tiJXheyF7uacdQRe
+Shh9gcvxAgMBAAECggEAVswil1HlLL9pOxw3s4h/k7FoVUdBsFSppQP88YL8/E2P
+KzPh77npaMgDdpgNxvxmevC8a4jldkzPiA0qx0uwLpPCEnrSlmTzVdq3EkBJS+po
+iCwB1F5R+kn0wFRgC1N50yL2qXxuadyVl7lcV0UoEB3NqUXIoDseoR1ADv0PHQb1
+z/AGPhagKtdyIx2KhIVs32zap9paP0IABryMsRhYt1ilLjj5DUDqdV4gs1V4uJbx
+6MLJbq9lwGsUSydZ1zZS5W2cg7bdq+8srO5qg+tj7qdDDaIwDZ0Gt4Fq2DdMMbf/
+x2OcKy32NoX7V+S9eBKCTo3htFLPiwnjaGaEuJkP1QKBgQDxqntlOee3s+xViorN
+UjBxm37BndlQSmfexgnd2JWboMpncshVyHSfGDtPZQACpHvncE0eFygd1+zgM5wM
+k3pfvf3Tetou33V5DGSP3ndlCVgAqUOhoEc5C+USog5dovTAxtqpStdmVS7742Zv
+UvABeVfPKPCH/KinKNePxT+x7wKBgQDdTWl4sTyvWstVWuvLUzbh5zlndjYadPv3
+Y9CIZm2BQMm9vee3dQaRTzkqZdQjpl5yJfaRDw0baiMztDdVF5kQH3uwaX+U2wj7
+ec0H5UkWJ9AMECVdhNDMqZxusBwe2vkc+3gH7oiizhNTFMnMPmAFnJUZU/aO20dw
+JovceCjAHwKBgQDkUx1Yq1fpcX3F6CpyCMgqXi5pgdiTCmmOye8CgiH/su/ow0LS
+AZ1lvwAyaAuVc5B5PtotptVJNPvhbAFwxFnnYVsS1syTYp7bqkDMyPRnKmfR4Bo8
+93CzTjC05RXLlC3IgViQgFx4m9zTMatTXLnTurCi0lxHLwitPmJDvKoMUwKBgQCh
+kU3qjsN2ZrxCwdGarVNJVI4FajmP0U7Py/DIVLeoAQwI2ifdObQkzIk42gUqTeFw
+RyUfvLReCnxO2Ej5d/QI4GNmZW9+1vdU2hUFqbFVWpW66OLOxxPGCCKscSjmognz
+zehRKiZZbkiPhILb+cIS9sGoLzO4EoGycIH14UgnEwKBgQCU5wV5L+oQQk39YYKy
+dL9GoAxG6z8j/mxswu04UdVkb1qVyV2REQa06DttdO6GdjG8L8r1CutMFsY2GyVH
+lqqeoWubI2gj8YrpwMO86I51BGr9pzJxeGfSTNPW7YqC5cj3RauX/Utk1loCNeCm
+BdiDMTycV+l07e9qffzBnIp3EQ==
 -----END PRIVATE KEY-----

From c11365cbfb590d43df58c3978cd034bbaff5a6a9 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Sun, 26 Dec 2021 08:24:01 +0200
Subject: [PATCH 096/137] Remove expiered edx.org ppa from devstack docker
 image

---
 README.rst             | 4 ++--
 docker-compose-edx.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index f89b728199..ba8ec816af 100644
--- a/README.rst
+++ b/README.rst
@@ -380,9 +380,9 @@ BUILD COMMANDS:
 
 .. code:: sh
 
-    git checkout master
+    git checkout edraak.keep.branch/before_python_upgrade
     git pull
-    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
+    docker build -f docker/build/edxapp/Dockerfile . -t eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2 --build-arg BASE_IMAGE_TAG=hawthorn.master --no=cache
 
 .. code:: sh
 
diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
index 763af5eb26..d1a603aac5 100644
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -31,7 +31,7 @@ services:
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 0
       NO_PREREQ_INSTALL: 0
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2
     ports:
       - "18000:18000"
       - "19876:19876" # JS test debugging
@@ -62,7 +62,7 @@ services:
       EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
       NO_PYTHON_UNINSTALL: 0
       NO_PREREQ_INSTALL: 0
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3
+    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2
     ports:
       - "18010:18010"
       - "19877:19877" # JS test debugging

From ffe6db4864aa8603b2f426b9673d672b722ed501 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Tue, 4 Jan 2022 19:36:13 +0200
Subject: [PATCH 097/137] Add auth-provider to devstack

---
 Makefile                             |  5 +++
 docker-compose-auth-provider-nfs.yml | 14 +++++++++
 docker-compose-auth-provider.yml     | 46 ++++++++++++++++++++++++++++
 docker-compose.yml                   |  1 +
 nginx/auth-provider.conf             | 10 ++++++
 5 files changed, 76 insertions(+)
 create mode 100644 docker-compose-auth-provider-nfs.yml
 create mode 100644 docker-compose-auth-provider.yml
 create mode 100644 nginx/auth-provider.conf

diff --git a/Makefile b/Makefile
index 949efdb39b..ef1ede11e0 100644
--- a/Makefile
+++ b/Makefile
@@ -45,6 +45,11 @@ ifeq (${ENABLE_JUDGE}, true)
 	DOCKER_COMPOSE_FILES+=-f docker-compose-judge${MOUNT_TYPE}.yml
 endif
 
+ifeq (${ENABLE_AUTH}, true)
+	DOCKER_COMPOSE_FILES+=-f docker-compose-auth-provider.yml
+	DOCKER_COMPOSE_FILES+=-f docker-compose-auth-provider${MOUNT_TYPE}.yml
+endif
+
 export DOCKER_COMPOSE_FILES
 
 export DEVSTACK_WORKSPACE
diff --git a/docker-compose-auth-provider-nfs.yml b/docker-compose-auth-provider-nfs.yml
new file mode 100644
index 0000000000..b6c2ff0f02
--- /dev/null
+++ b/docker-compose-auth-provider-nfs.yml
@@ -0,0 +1,14 @@
+version: "2.1"
+
+services:
+  auth_provider:
+    volumes:
+      - auth-provider-nfs:/app
+
+volumes:
+  progs-nfs:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: addr=host.docker.internal,rw,nolock,hard,nointr,nfsvers=3
+      device: :${DEVSTACK_WORKSPACE}/edraak-auth-provider
diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml
new file mode 100644
index 0000000000..0a4925c7c6
--- /dev/null
+++ b/docker-compose-auth-provider.yml
@@ -0,0 +1,46 @@
+# This file contains all of the services for an edraak installation. See https://docs.docker.com/compose/compose-file/
+# for the appropriate syntax and definitions.
+#
+# Housekeeping Rules:
+# - Group third-party and edraak services separately
+# - Alphabetize services in the groups
+# - Alphabetize individual configuration options for each service
+# - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
+#   that might be running for the same service.
+
+version: "2.1"
+
+services:
+  auth-provider:
+    image: edraak.auth.provider:0.2
+    container_name: edraak.devstack.auth.provider
+    environment:
+      NO_PYTHON_UNINSTALL: 1
+      DJANGO_WATCHMAN_TIMEOUT: 30
+    stdin_open: true
+    tty: true
+    depends_on:
+      - mysql
+    ports:
+      - "18900:18900"
+    command: bash -c 'while true; do python /auth_provider/app/manage.py lms runserver 0.0.0.0:18900 --settings devstack_docker; sleep 2; done'
+    volumes:
+      - ${DEVSTACK_WORKSPACE}/auth_provider:/auth_provider/app:cached
+      - ${DEVSTACK_WORKSPACE}/auth_provider/lms/devstack.yml:/auth_provider/lms.yml
+      - auth_provider_media:/auth_provider/var/edxapp/media
+      - auth_provider_node_modules:/auth_provider/app/node_modules
+      - auth_provider_uploads:/auth_provider/uploads
+      - auth_provider_staticfiles:/auth_provider/staticfiles
+
+  router:
+    depends_on:
+      - auth-provider
+    volumes:
+      - ./nginx/auth-provider.conf:/etc/nginx/conf.d/auth-provider.conf
+      - ./nginx/b2b-redirects.conf:/etc/nginx/conf.d/redirects.conf
+
+volumes:
+  auth_provider_media:
+  auth_provider_node_modules:
+  auth_provider_uploads:
+  auth_provider_staticfiles:
diff --git a/docker-compose.yml b/docker-compose.yml
index 3e6f257066..83c4100cc2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -75,6 +75,7 @@ services:
           - b2b.edraak.dev
           - notify.edraak.dev
           - analytics.edraak.dev
+          - auth.edraak.dev
 
 volumes:
   elasticsearch_data:
diff --git a/nginx/auth-provider.conf b/nginx/auth-provider.conf
new file mode 100644
index 0000000000..ddbe7eed56
--- /dev/null
+++ b/nginx/auth-provider.conf
@@ -0,0 +1,10 @@
+# Auth Provider
+server {
+    server_name auth.edraak.dev;
+    include /etc/nginx/conf.d/includes/server.conf;
+
+    location / {
+        proxy_pass http://edraak.devstack.auth.provider:18900;
+        include /etc/nginx/conf.d/includes/proxy.conf;
+    }
+}

From dcd4233dc897744a5cee6440c958d6d375cd7978 Mon Sep 17 00:00:00 2001
From: Ahmad Abuwardeh <ahmad@Ahmads-MacBook-Pro.local>
Date: Sun, 9 Jan 2022 16:01:23 +0200
Subject: [PATCH 098/137] Change collect static command settings file for progs
 to static instead of dev

---
 provision-progs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/provision-progs.sh b/provision-progs.sh
index 3268e206de..daa683265a 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -20,7 +20,7 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_mo
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install'
 
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.static'
 
 echo "** Progs: Restarting **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart progs

From 93bb0c4506101f58293c6ded6ca73129febfce0c Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Mon, 10 Jan 2022 12:51:01 +0200
Subject: [PATCH 099/137] Fix nfs docker compose for auth-provider

---
 docker-compose-auth-provider-nfs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-auth-provider-nfs.yml b/docker-compose-auth-provider-nfs.yml
index b6c2ff0f02..4950a8c850 100644
--- a/docker-compose-auth-provider-nfs.yml
+++ b/docker-compose-auth-provider-nfs.yml
@@ -6,7 +6,7 @@ services:
       - auth-provider-nfs:/app
 
 volumes:
-  progs-nfs:
+  auth-provider-nfs:
     driver: local
     driver_opts:
       type: nfs

From 3c3e8284c42aef1ba90bbef98ce31d8dfbadf7f3 Mon Sep 17 00:00:00 2001
From: Shadi Naif <shadinaif@gmail.com>
Date: Thu, 13 Jan 2022 15:34:56 +0200
Subject: [PATCH 100/137] Change auth-provider image name

---
 docker-compose-auth-provider.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml
index 0a4925c7c6..5e964af171 100644
--- a/docker-compose-auth-provider.yml
+++ b/docker-compose-auth-provider.yml
@@ -12,7 +12,7 @@ version: "2.1"
 
 services:
   auth-provider:
-    image: edraak.auth.provider:0.2
+    image: eu.gcr.io/openedx-231314/edraak/auth.provider:v1.0
     container_name: edraak.devstack.auth.provider
     environment:
       NO_PYTHON_UNINSTALL: 1

From 29fc1d1061e93f1a5344bbfc74dbe068e6ccd8bd Mon Sep 17 00:00:00 2001
From: Mohammed Amarnah <m.amarnah@gmail.com>
Date: Sun, 16 Jan 2022 13:34:50 -0600
Subject: [PATCH 101/137] remove any existing nfs docker volumes before setting
 it up

---
 setup_native_nfs_docker_osx.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/setup_native_nfs_docker_osx.sh b/setup_native_nfs_docker_osx.sh
index 1d9f914266..bc3bf6414d 100755
--- a/setup_native_nfs_docker_osx.sh
+++ b/setup_native_nfs_docker_osx.sh
@@ -49,6 +49,12 @@ U=`id -u`
 G=`id -g`
 sudo chown -R "$U":"$G" .
 
+echo "== Removing any existing nfs volumes"
+VOLUMES=$(docker volume list | grep devstack | grep nfs | sed 's/local     //g')
+if [ ! -z "$VOLUMES" ]; then
+  docker volume rm $VOLUMES
+fi
+
 echo "== Setting up nfs..."
 LINE="/Users -alldirs -mapall=$U:$G localhost"
 FILE=/etc/exports

From c71babebfceddeaf771e0101c591bef29f7b0994 Mon Sep 17 00:00:00 2001
From: Mohammed Amarnah <m.amarnah@gmail.com>
Date: Mon, 17 Jan 2022 09:39:45 -0600
Subject: [PATCH 102/137] better filenames matching using regex

---
 setup_native_nfs_docker_osx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup_native_nfs_docker_osx.sh b/setup_native_nfs_docker_osx.sh
index bc3bf6414d..9a7d6fd93d 100755
--- a/setup_native_nfs_docker_osx.sh
+++ b/setup_native_nfs_docker_osx.sh
@@ -50,7 +50,7 @@ G=`id -g`
 sudo chown -R "$U":"$G" .
 
 echo "== Removing any existing nfs volumes"
-VOLUMES=$(docker volume list | grep devstack | grep nfs | sed 's/local     //g')
+VOLUMES=$(docker volume list | sed 's/local//' | sed 's/ //g' | grep '^devstack.*nfs$')
 if [ ! -z "$VOLUMES" ]; then
   docker volume rm $VOLUMES
 fi

From 79a5ea558834203337d1afbcb608af5efc906c76 Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Sun, 6 Mar 2022 12:08:46 +0300
Subject: [PATCH 103/137] Update dev certificates until June 2022

---
 nginx/ssl/chained.crt | 44 ++++++++++++++++++------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index afe92c4c75..72fb56a14b 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 54e5127765..b5a1904a74 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDQ6UBeXEX5SuwZ
-9mFX4URJYWSTrb5tqksivGkWhDsS6XpVTW8dkSoF3HuGmaWQpb9nYjH2oSLrf1OB
-RWbs2mD0B/DwzkjDGb+zHPAXiTICf4K3xYCcJUDBaXgXU7A7mj8SmDso9HG+uUP8
-pKTWVg6o7eF5J68NGB+hMRQmcd/1r0TiTlspASEwKksbdr5Fv/D6ngFtr+Vvyatk
-enfS9VP9xL0JVV13o9u5rcB1yqUaiMQuX07tR10dVB/19mv37WOfKin6EBY1RRUD
-TbVO3lliPqh7Xs1exjYiCnRG/RbSVv3l2xkVSuBF3mBJTEp3tiJXheyF7uacdQRe
-Shh9gcvxAgMBAAECggEAVswil1HlLL9pOxw3s4h/k7FoVUdBsFSppQP88YL8/E2P
-KzPh77npaMgDdpgNxvxmevC8a4jldkzPiA0qx0uwLpPCEnrSlmTzVdq3EkBJS+po
-iCwB1F5R+kn0wFRgC1N50yL2qXxuadyVl7lcV0UoEB3NqUXIoDseoR1ADv0PHQb1
-z/AGPhagKtdyIx2KhIVs32zap9paP0IABryMsRhYt1ilLjj5DUDqdV4gs1V4uJbx
-6MLJbq9lwGsUSydZ1zZS5W2cg7bdq+8srO5qg+tj7qdDDaIwDZ0Gt4Fq2DdMMbf/
-x2OcKy32NoX7V+S9eBKCTo3htFLPiwnjaGaEuJkP1QKBgQDxqntlOee3s+xViorN
-UjBxm37BndlQSmfexgnd2JWboMpncshVyHSfGDtPZQACpHvncE0eFygd1+zgM5wM
-k3pfvf3Tetou33V5DGSP3ndlCVgAqUOhoEc5C+USog5dovTAxtqpStdmVS7742Zv
-UvABeVfPKPCH/KinKNePxT+x7wKBgQDdTWl4sTyvWstVWuvLUzbh5zlndjYadPv3
-Y9CIZm2BQMm9vee3dQaRTzkqZdQjpl5yJfaRDw0baiMztDdVF5kQH3uwaX+U2wj7
-ec0H5UkWJ9AMECVdhNDMqZxusBwe2vkc+3gH7oiizhNTFMnMPmAFnJUZU/aO20dw
-JovceCjAHwKBgQDkUx1Yq1fpcX3F6CpyCMgqXi5pgdiTCmmOye8CgiH/su/ow0LS
-AZ1lvwAyaAuVc5B5PtotptVJNPvhbAFwxFnnYVsS1syTYp7bqkDMyPRnKmfR4Bo8
-93CzTjC05RXLlC3IgViQgFx4m9zTMatTXLnTurCi0lxHLwitPmJDvKoMUwKBgQCh
-kU3qjsN2ZrxCwdGarVNJVI4FajmP0U7Py/DIVLeoAQwI2ifdObQkzIk42gUqTeFw
-RyUfvLReCnxO2Ej5d/QI4GNmZW9+1vdU2hUFqbFVWpW66OLOxxPGCCKscSjmognz
-zehRKiZZbkiPhILb+cIS9sGoLzO4EoGycIH14UgnEwKBgQCU5wV5L+oQQk39YYKy
-dL9GoAxG6z8j/mxswu04UdVkb1qVyV2REQa06DttdO6GdjG8L8r1CutMFsY2GyVH
-lqqeoWubI2gj8YrpwMO86I51BGr9pzJxeGfSTNPW7YqC5cj3RauX/Utk1loCNeCm
-BdiDMTycV+l07e9qffzBnIp3EQ==
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHBXh2JdltQWiN
+EcrH0ns1EdZzbfOCPuLD0Qk9xXe2JAL9FD/pJLiMGGmoGSKhBGgeClwAtOdLtiC6
+M3LXARQKiaVz6ZkT+21BZXp41iseKvcWGytifKC/tUnIbEobWhKbxu/WiC1cwiZn
+cMvmx3FkZIXz50hkf69ouC7syOSq7Ga0c2MjExRffe7H2CgT5aMfk018GRyQQJt2
+zkATIGaOY4bz2uWvck0yutfG91V72tQDf1gAVA3P1iV90M++uLmESuY4kjOlBOAA
+a8l6MmfRQu2dMl8UI82zd8AB/o1QuBKhiuy1NwLutAuoJ8qDag7xkQa7BYflvHS2
+YA6nGTkpAgMBAAECggEACrXxqLIaxHV7sfPeLOjX9qAyIV4ud7j4rT8ntypUafoA
+KyyWz+5I/EkoDoLjyTSagdte3i7eL8Xqdvrj2ExXjsWfoOBWe6vRUm6qq6wi/+mi
+CI+HwzIf2JFiGiYxys0LKVUIfUww3MgaFwEMCCx9nsCGMP0meToh74nSBK4/GC+u
+cbqnAyG7KpdKddL4X176d2zMHQityKTRPaXg8awphPJ2H859N8/zxSp6kltYVSrY
+15BWnGZ4YzpGpvCqcPW15V+iJr2XXSTBvCNkeNNuSoquAh4lxBhiNzEpiLNQtnVF
+QPjKiJ1pTpZfzlnOxGX4n9AZNnxXGV4TrBW36ey0HQKBgQDxWg6iS7pzfGR+/taO
+fCLnEN7m8XtSB25BSqiV/TixQqZCAgCpC5ffmJjmoHl36TxH4oUg7x9PMcgNfncI
+bEADjMB/mF2IETw08+skM87g2PXrpMb+jP+G2dvlDIasrVT46Z22NSUmGSJhi624
+hnFkjcBzK0ptDYhDVkectUFXKwKBgQDTGbcUw0Jlfar2M08asW34Mwyx5RHdT11t
+9C1QsisfscrWTxO4hGmXi+NlATCo6bSvOqiehFERPRvSFZxPOX3yfrllgom61sTn
+FSFx8Wa2XlrCL0fkd07JrN7L8bR0SdIsWsyot2HIOIXOD0t2pU9mimBcgE2be5NG
+DL3vLRlG+wKBgFx1FXoS7KBlHNKRqXv4Dh7alal/BLEN66zTfvXGhbtSPwK2Za5c
+pJehi6F+BEptbQxUuI8/S405EtwogE0XuwYhG3VF1z7S62+VqZS6zBvSwZK+EwVc
+2l68gsKiI81usUiRpjsw7MRFiKg5rBkuV64fp4P3J5HTR0oUeWaNATT1AoGBAJdK
+kbzOp/JG21TxttrBmLfOFmYUbvY2YBZibmusFV30tRNcvxx5wZd8CS+lZ7NXM0h2
+eMyKtfLt4ddx54GcCZjWm5aVtJH0RE/9A+g+g0dmXhNXgWXK3+uH+nEdvB+vnHJv
+bMfqDalKYRMqQQI6PaqWt7LzvSsWqJkGnsUghEIrAoGBAONdX0tSY5gPQXbp8QTs
+JmtNbFHQXUGYJPkSfWri0s6DOLWqdaeBzEPMvvB6VKQWptyKxStqmgOgR16yHpjK
+kWGk8db7tjRkj0h4plxa7xO/Ywls3PwX9m7Oz6eXfxF7zb0C4CL9uTUPpS9BiIOq
+CJtTEQUf1TnuQlv/fQUhiBz9
 -----END PRIVATE KEY-----

From f10cd3bb273db37e9775a1565ced159a4d6bb375 Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Mon, 30 May 2022 15:59:23 +0300
Subject: [PATCH 104/137] Upgrade mongo to 4.4.14 to match staging and
 production

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 83c4100cc2..646f1d4ae2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     # We disable the journal for a minor performance gain.
     command: mongod --nojournal
     container_name: edx.devstack.mongo
-    image: mongo:4.2.17
+    image: mongo:4.4.14
     ports:
       - "27017:27017"
     volumes:

From 586178075d8edde1fe6a0eb706036018f0f94cae Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Sun, 5 Jun 2022 09:05:28 +0300
Subject: [PATCH 105/137] Update certificate until September 1st, 2022

---
 nginx/ssl/chained.crt | 44 ++++++++++++++++++------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 72fb56a14b..c6a5f7b73b 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFKTCCBBGgAwIBAgISAx6IWMlq+u6eh6h84PyTOiZUMA0GCSqGSIb3DQEBCwUA
+MIIFKzCCBBOgAwIBAgISBCc2kCUjZCGoA2T9nG6b/Hz7MA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMjAzMDYwNzQ5MzFaFw0yMjA2MDQwNzQ5MzBaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMcF
-eHYl2W1BaI0RysfSezUR1nNt84I+4sPRCT3Fd7YkAv0UP+kkuIwYaagZIqEEaB4K
-XAC050u2ILozctcBFAqJpXPpmRP7bUFlenjWKx4q9xYbK2J8oL+1SchsShtaEpvG
-79aILVzCJmdwy+bHcWRkhfPnSGR/r2i4LuzI5KrsZrRzYyMTFF997sfYKBPlox+T
-TXwZHJBAm3bOQBMgZo5jhvPa5a9yTTK618b3VXva1AN/WABUDc/WJX3Qz764uYRK
-5jiSM6UE4ABryXoyZ9FC7Z0yXxQjzbN3wAH+jVC4EqGK7LU3Au60C6gnyoNqDvGR
-BrsFh+W8dLZgDqcZOSkCAwEAAaOCAlIwggJOMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+EwJSMzAeFw0yMjA2MDUwNDU2NDBaFw0yMjA5MDMwNDU2MzlaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIk
+ZObLDfmgN21sxVnVi0wNzc3ipzm2z9PYAk+6KmC1p4++TccBgouH9xYNQux83Qog
+sZlk7TxsYt9XDXYzlf3xCnKmW9vB9IehntQgLfA9AdOfDKqlt6v+mAlLHLK+OoWm
+wAtdwQv1Vy5uT7jnMkS1ii5t10m0WFDmujHqGG1Xn+07SCiIlG0XSE1eNV/+yGpk
+miias1teigEUsMvIP7YVlVdogZEGw0iF1tS/Wfe6/WOtWd6cwZNJxVamWxt8tPMm
+2vNIpIFUHCjJ6g4WxIIZr+yK0UPs338i7RPRvTGf0rWlDusKa0+qtus/Cz4ovOOp
+eNWwYSMnGtEdBaP4Jy0CAwEAAaOCAlQwggJQMA4GA1UdDwEB/wQEAwIFoDAdBgNV
 HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQUGthsXIU8UmXYH3di2AaC4ofkyJ0wHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+FgQUVi4BFEQTKoT4usswiQAgu/mBYWIwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
 5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
 by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
 IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
 CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBAwYKKwYBBAHWeQIEAgSB9ASB8QDvAHUAQcjK
-sd8iRkoQxqE6CUKHXk4xixsD6+tLx2jwkGKWBvYAAAF/XmtoJwAABAMARjBEAiBS
-Dr6b4iwS8CiPqZkkY8AgNsM7UcFZGfBMkORZWhB4/QIgXgm7s0Z1j0omvKa05V/O
-OS5EwV76dvtL20J7QjVxNK8AdgBGpVXrdfqRIDC1oolp9PN9ESxBdL79SbiFq/L8
-cP5tRwAAAX9ea2hYAAAEAwBHMEUCIQDRprKHk/ck2Gl0sZmga8e1rmEWubd7y2yh
-kzg9pOiBWwIgU/ASOlBAoqOaB2qbNFCU8WbAW1Yd5ElTZCd05YNfVv8wDQYJKoZI
-hvcNAQELBQADggEBAH2BH49zQssYB+sn2+zF9c1GZ7PoIsibKBgWXtOWljgLunKb
-H+SkzIIBqJZ2644d6jGOEObItGgPEKZ4KROXkUbgUPl6/kuagEHQZBAGj2wKZ32F
-1uHLiXleHv2R7jvpXqng+DCruFTg89MvoDnO/a2LKPiXTg8r8q3ctZ8jklvMMWr0
-j4goQ4VphwSkxH6OLVCNjY9gfhaQjBaC1ePQzuVca1R7q99E5TpneqGwsdpKtaS8
-OuSZ5Aax0b4pszlV63muEzEooJZlV3FMsoGgjhexw4uY8GS9MxQMSBf9W8oA18ud
-s3xljS2XYNn5raVVrZyk6nz8q/a4p8g9jOPQKXo=
+cHMubGV0c2VuY3J5cHQub3JnMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYAQcjK
+sd8iRkoQxqE6CUKHXk4xixsD6+tLx2jwkGKWBvYAAAGBMm/bngAABAMARzBFAiAT
+rmXxy0GOqzssfs64uYyDHjSI2wJxmd2Utr0BYkhFKgIhAIsIM4LBx+tO31yTCWdv
+wiOZ+tnSnSSTzb6iz9xreEHZAHcAKXm+8J45OSHwVnOfY6V35b5XfZxgCvj5TV0m
+XCVdx4QAAAGBMm/baAAABAMASDBGAiEA9ufEORjAKE5puF8kqZuU1UaarBFBI2Ag
+BS2XeAP3NdgCIQDGkC3F1F+96S8/9UqdJReMj/8OOLB1X0j1Ikyg/tzXNzANBgkq
+hkiG9w0BAQsFAAOCAQEARmyy8Aq0f5+7t9Mb4anLU6ztD8g7omCuJcbTPB4s8phv
+0oJcJf4ieHL5kQ+z0LNjnFpXIuBLScFwGBOfkr9VUoY1XomoRKtzWEblDP4mOHzU
+rppZnYKBIbO1j4oswngG9vno+0GdfY4foohpZ/iOtRX9gyAQDk2m/hNXRc6aCBWZ
+exiuovFjGNpAwQ2CGjn+syH6vmOdkDF78knm8XsAlxucXmzvDbd8KWM4ZBkAKsoC
+GblKBoG8alUxyi3ysVH6VHiOBWjY+wwMQCEEPc237wyaAKFPyjVDwGp31uK5teeF
+Zu1XLj8zr4dZSH9uK4j1pXKEDwW0omfUR2nGeWh9EQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index b5a1904a74..da1f25a9a6 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDHBXh2JdltQWiN
-EcrH0ns1EdZzbfOCPuLD0Qk9xXe2JAL9FD/pJLiMGGmoGSKhBGgeClwAtOdLtiC6
-M3LXARQKiaVz6ZkT+21BZXp41iseKvcWGytifKC/tUnIbEobWhKbxu/WiC1cwiZn
-cMvmx3FkZIXz50hkf69ouC7syOSq7Ga0c2MjExRffe7H2CgT5aMfk018GRyQQJt2
-zkATIGaOY4bz2uWvck0yutfG91V72tQDf1gAVA3P1iV90M++uLmESuY4kjOlBOAA
-a8l6MmfRQu2dMl8UI82zd8AB/o1QuBKhiuy1NwLutAuoJ8qDag7xkQa7BYflvHS2
-YA6nGTkpAgMBAAECggEACrXxqLIaxHV7sfPeLOjX9qAyIV4ud7j4rT8ntypUafoA
-KyyWz+5I/EkoDoLjyTSagdte3i7eL8Xqdvrj2ExXjsWfoOBWe6vRUm6qq6wi/+mi
-CI+HwzIf2JFiGiYxys0LKVUIfUww3MgaFwEMCCx9nsCGMP0meToh74nSBK4/GC+u
-cbqnAyG7KpdKddL4X176d2zMHQityKTRPaXg8awphPJ2H859N8/zxSp6kltYVSrY
-15BWnGZ4YzpGpvCqcPW15V+iJr2XXSTBvCNkeNNuSoquAh4lxBhiNzEpiLNQtnVF
-QPjKiJ1pTpZfzlnOxGX4n9AZNnxXGV4TrBW36ey0HQKBgQDxWg6iS7pzfGR+/taO
-fCLnEN7m8XtSB25BSqiV/TixQqZCAgCpC5ffmJjmoHl36TxH4oUg7x9PMcgNfncI
-bEADjMB/mF2IETw08+skM87g2PXrpMb+jP+G2dvlDIasrVT46Z22NSUmGSJhi624
-hnFkjcBzK0ptDYhDVkectUFXKwKBgQDTGbcUw0Jlfar2M08asW34Mwyx5RHdT11t
-9C1QsisfscrWTxO4hGmXi+NlATCo6bSvOqiehFERPRvSFZxPOX3yfrllgom61sTn
-FSFx8Wa2XlrCL0fkd07JrN7L8bR0SdIsWsyot2HIOIXOD0t2pU9mimBcgE2be5NG
-DL3vLRlG+wKBgFx1FXoS7KBlHNKRqXv4Dh7alal/BLEN66zTfvXGhbtSPwK2Za5c
-pJehi6F+BEptbQxUuI8/S405EtwogE0XuwYhG3VF1z7S62+VqZS6zBvSwZK+EwVc
-2l68gsKiI81usUiRpjsw7MRFiKg5rBkuV64fp4P3J5HTR0oUeWaNATT1AoGBAJdK
-kbzOp/JG21TxttrBmLfOFmYUbvY2YBZibmusFV30tRNcvxx5wZd8CS+lZ7NXM0h2
-eMyKtfLt4ddx54GcCZjWm5aVtJH0RE/9A+g+g0dmXhNXgWXK3+uH+nEdvB+vnHJv
-bMfqDalKYRMqQQI6PaqWt7LzvSsWqJkGnsUghEIrAoGBAONdX0tSY5gPQXbp8QTs
-JmtNbFHQXUGYJPkSfWri0s6DOLWqdaeBzEPMvvB6VKQWptyKxStqmgOgR16yHpjK
-kWGk8db7tjRkj0h4plxa7xO/Ywls3PwX9m7Oz6eXfxF7zb0C4CL9uTUPpS9BiIOq
-CJtTEQUf1TnuQlv/fQUhiBz9
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCJGTmyw35oDdt
+bMVZ1YtMDc3N4qc5ts/T2AJPuipgtaePvk3HAYKLh/cWDULsfN0KILGZZO08bGLf
+Vw12M5X98QpyplvbwfSHoZ7UIC3wPQHTnwyqpber/pgJSxyyvjqFpsALXcEL9Vcu
+bk+45zJEtYoubddJtFhQ5rox6hhtV5/tO0goiJRtF0hNXjVf/shqZJoomrNbXooB
+FLDLyD+2FZVXaIGRBsNIhdbUv1n3uv1jrVnenMGTScVWplsbfLTzJtrzSKSBVBwo
+yeoOFsSCGa/sitFD7N9/Iu0T0b0xn9K1pQ7rCmtPqrbrPws+KLzjqXjVsGEjJxrR
+HQWj+CctAgMBAAECggEADLhhvBV11vM+bnb//0DUnakR4PmGx2tI9rJihGLIQAnm
+7q4jXnSk3wuLjvBTgDc2LGG0AT7xpFHdsJB9m08J9teCPbzUq/NrWC+ovnFVUTZO
+FlWHeO7et/A4efNn7/Yy02r3jkcYTPZIPgyQQKc1TfcvFJex0Wx1lOdpL7gM3a0Q
+3qtdSnZCBOrkcDAKZpaGiRGsfP7JIrjkPPOyifHZfBPXS4WpdqQKxHHRjF3JubyW
+czHURNI1fOgWsfMSuQ9ZOp/QciqckOBq+gPv+wt71S28s+9qP/s4piqSlujO3GwT
+dyFE5txaYyznWjqPTYvSvRVBOSi2pCI347+T+yG/wQKBgQDkIVTQv49NyJVKteiV
+9koKkQ0eDXDl4H7+gIQD/jWhyNYPI26hUgU7iQv6G0GCVACoPGJ6BAor2bDMsNb/
+aWnFFIAbVzDS4KIVobqArhFRTh0QkiA12IMcWQ6hhPWzEMbcQqZIW4ZfLlhPBWX6
+U6pPJ4KqeZe7JFAmftJACeuGaQKBgQDZ3Bo3oQqn3oV8ogr9km33s+OdGDnFwktG
+82S1DTi/Mq8MJKgj9EY+3ZubQL6zihLLct8d7+Mric8g0/fbv04PlpIOi5NNyHYt
+ffGaUpRcoMF9CF/76uh5BTdsvJAZjkAb0URoWzcvVTtcn0Pt+TZGGDPI2afc6a8C
+Rilm4syqJQKBgQDdfttJvuQVgq4pFsvXZoTnE4Sn7Cb0mu7SjdcfxV8vUL89fYp5
+iRhZgKunT3VgY80ri02V6HwzrS4y33QwEppGZqwnX5Wg+ceFtzxMmjVoOq6Pm0E4
+5poOGQ3SlzSzgpOB4hhu4qZpnabSOoyT603NgrAkcuB2LEDBz5q14KvUGQKBgD6l
+INDQOP0ualn9SoXBvmdUzeWVWr938Cd1w4agR6oLC/TE8ahtDGn1VVJeWrfLwz3H
+SUsVeNBDL1E0Qnho2Sx4UoVmMzRRqVHJfliu2ESOYTTv3JHW6YQrMNXOnu0KT3rw
+QOh1Gjg9HPW0QldCqw2a1gEyPSez9oQD4tHX85wVAoGAMSgk3NViK5fsyMqEdyeM
+jk47UJtxPbJrgaBdUtwwTEymAMFtewbiK/+7l7KMZK+AL8c2pUw3gPtTY5JiVKTD
+I/HC47knwro1LVw8i4eZ3I7FMwg6Nlerw5TankKjAbinaNZtJkoIwwzVgX2dzA4w
+byHdYcQtNHzFI9bdJQvC0iU=
 -----END PRIVATE KEY-----

From 34a1bdac2b048db88b3054197763346cf6a47900 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Mon, 6 Jun 2022 12:11:06 +0300
Subject: [PATCH 106/137] set correct python version for b2b and progs

---
 docker-compose-b2b.yml   | 2 +-
 docker-compose-progs.yml | 2 +-
 provision-b2b.sh         | 3 +++
 provision-progs.sh       | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docker-compose-b2b.yml b/docker-compose-b2b.yml
index c5a4319af9..187da8578f 100644
--- a/docker-compose-b2b.yml
+++ b/docker-compose-b2b.yml
@@ -17,7 +17,7 @@ services:
     environment:
       PROGS_CFG: /app/docker-b2b.json
       NODE_ENV: development
-    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8801 --settings=edraakprograms.dev; sleep 2; done'
+    command: bash -c 'while true; do python3.8 manage.py runserver 0.0.0.0:8801 --settings=edraakprograms.dev; sleep 2; done'
     container_name: edraak.devstack.b2b
     working_dir: /app
     ports:
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 926a624540..3ca970fa16 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -17,7 +17,7 @@ services:
     environment:
       PROGS_CFG: /app/docker.json
       NODE_ENV: development
-    command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
+    command: bash -c 'while true; do python3.8 manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done'
     container_name: edraak.devstack.programs
     working_dir: /app
     ports:
diff --git a/provision-b2b.sh b/provision-b2b.sh
index 6b19895a28..28ab550882 100755
--- a/provision-b2b.sh
+++ b/provision-b2b.sh
@@ -7,6 +7,9 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d b2b
 echo "** Creating databases **"
 echo "CREATE DATABASE IF NOT EXISTS b2b;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
+echo "** b2b: Setting correct python version **"
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1'
+
 echo "** b2b: Copy cacheed files to code dir **"
 #docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'cp -Rn /cache/* /app/.'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'pip install -r requirements.txt'
diff --git a/provision-progs.sh b/provision-progs.sh
index daa683265a..a82cf9464d 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -6,6 +6,10 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs
 echo "** Creating databases **"
 echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
+
+echo "** Progs: Setting correct python version **"
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1'
+
 echo "** Progs: Copy cacheed files to code dir **"
 #docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.'
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip install -r requirements.txt'

From ed623f1797fedf6b38cee00fe7396dffffa5a9b8 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Mon, 6 Jun 2022 15:11:32 +0300
Subject: [PATCH 107/137] set some services in env.all to false: -
 ENABLE_STATE_MANAGER - ENABLE_ANALYTICS - ENABLE_AUTH - ENABLE_NOTIFIER

---
 .env.all | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.all b/.env.all
index 434700aebd..a2b212d936 100644
--- a/.env.all
+++ b/.env.all
@@ -9,9 +9,9 @@ ENABLE_B2B=true
 ENABLE_MKTG=true
 ENABLE_EDX=true
 
-ENABLE_STATE_MANAGER=true
+ENABLE_STATE_MANAGER=false
 ENABLE_JUDGE=false
-ENABLE_ANALYTICS=true
-ENABLE_AUTH=true
-ENABLE_NOTIFIER=true
+ENABLE_ANALYTICS=false
+ENABLE_AUTH=false
+ENABLE_NOTIFIER=false
 

From ef4ab3346e36594159203df108036c39fa61d6a0 Mon Sep 17 00:00:00 2001
From: Umar Alkafaween <omar.ka923@gmail.com>
Date: Sun, 4 Sep 2022 11:43:55 +0300
Subject: [PATCH 108/137] Renew dev certificate until 3 December 2022

---
 nginx/ssl/chained.crt | 44 ++++++++++++++++++------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index c6a5f7b73b..c0dd3ea75c 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
-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
+cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUAQcjK
+sd8iRkoQxqE6CUKHXk4xixsD6+tLx2jwkGKWBvYAAAGDB6QNMgAABAMARjBEAiBe
+F6zAeuhUlPhk8skoKmss8PCZXnqIq3zWTqR0J/JADAIgVm9lIOBTC0J168uS829S
+efP4o3QqDfS+lSwHEfsvm9UAdwApeb7wnjk5IfBWc59jpXflvld9nGAK+PlNXSZc
+JV3HhAAAAYMHpA8fAAAEAwBIMEYCIQDN3TPZmEUg9U2P/p3AE9NI9VDtP4WCuiLd
+L8v55Ds0HQIhANwfxYTUnTuZSnUWSqXwES1tMiu5U4zRxzcUnB5WILfTMA0GCSqG
+SIb3DQEBCwUAA4IBAQCWv4ooKkSd7PGs0WFp9PWDoQorYEdqtLGIjFIrKA9ctafw
+0xl3kzQOGlbJKJoeCLeCLgjEobQ8iLCvGZ8s6tjYVMGDVARaQSHyshjZeQZeNjPX
+3WvhTWefCCI2BtTRMIAgyeHn/GUiWg9+t2gjhCCECfN1XUIYQHIvMgvHeuUVKnju
+5fG7hXS0XXJPq7cgdL9YfyUCxGmN8fet9a3rLICUVh1E4ONeAcFvZnkRzeNCjUAj
+pRYGoVejphUvdZ/EgFboO9rgaIjGRUHqggBvAuXaVzXLR1ZLfTAURtxxHi6Ktjdz
+V7FC45YdSdsuEAMHMBE/wzIC90gyW5d/aJ7d6QmS
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index da1f25a9a6..f73373d51c 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDCJGTmyw35oDdt
-bMVZ1YtMDc3N4qc5ts/T2AJPuipgtaePvk3HAYKLh/cWDULsfN0KILGZZO08bGLf
-Vw12M5X98QpyplvbwfSHoZ7UIC3wPQHTnwyqpber/pgJSxyyvjqFpsALXcEL9Vcu
-bk+45zJEtYoubddJtFhQ5rox6hhtV5/tO0goiJRtF0hNXjVf/shqZJoomrNbXooB
-FLDLyD+2FZVXaIGRBsNIhdbUv1n3uv1jrVnenMGTScVWplsbfLTzJtrzSKSBVBwo
-yeoOFsSCGa/sitFD7N9/Iu0T0b0xn9K1pQ7rCmtPqrbrPws+KLzjqXjVsGEjJxrR
-HQWj+CctAgMBAAECggEADLhhvBV11vM+bnb//0DUnakR4PmGx2tI9rJihGLIQAnm
-7q4jXnSk3wuLjvBTgDc2LGG0AT7xpFHdsJB9m08J9teCPbzUq/NrWC+ovnFVUTZO
-FlWHeO7et/A4efNn7/Yy02r3jkcYTPZIPgyQQKc1TfcvFJex0Wx1lOdpL7gM3a0Q
-3qtdSnZCBOrkcDAKZpaGiRGsfP7JIrjkPPOyifHZfBPXS4WpdqQKxHHRjF3JubyW
-czHURNI1fOgWsfMSuQ9ZOp/QciqckOBq+gPv+wt71S28s+9qP/s4piqSlujO3GwT
-dyFE5txaYyznWjqPTYvSvRVBOSi2pCI347+T+yG/wQKBgQDkIVTQv49NyJVKteiV
-9koKkQ0eDXDl4H7+gIQD/jWhyNYPI26hUgU7iQv6G0GCVACoPGJ6BAor2bDMsNb/
-aWnFFIAbVzDS4KIVobqArhFRTh0QkiA12IMcWQ6hhPWzEMbcQqZIW4ZfLlhPBWX6
-U6pPJ4KqeZe7JFAmftJACeuGaQKBgQDZ3Bo3oQqn3oV8ogr9km33s+OdGDnFwktG
-82S1DTi/Mq8MJKgj9EY+3ZubQL6zihLLct8d7+Mric8g0/fbv04PlpIOi5NNyHYt
-ffGaUpRcoMF9CF/76uh5BTdsvJAZjkAb0URoWzcvVTtcn0Pt+TZGGDPI2afc6a8C
-Rilm4syqJQKBgQDdfttJvuQVgq4pFsvXZoTnE4Sn7Cb0mu7SjdcfxV8vUL89fYp5
-iRhZgKunT3VgY80ri02V6HwzrS4y33QwEppGZqwnX5Wg+ceFtzxMmjVoOq6Pm0E4
-5poOGQ3SlzSzgpOB4hhu4qZpnabSOoyT603NgrAkcuB2LEDBz5q14KvUGQKBgD6l
-INDQOP0ualn9SoXBvmdUzeWVWr938Cd1w4agR6oLC/TE8ahtDGn1VVJeWrfLwz3H
-SUsVeNBDL1E0Qnho2Sx4UoVmMzRRqVHJfliu2ESOYTTv3JHW6YQrMNXOnu0KT3rw
-QOh1Gjg9HPW0QldCqw2a1gEyPSez9oQD4tHX85wVAoGAMSgk3NViK5fsyMqEdyeM
-jk47UJtxPbJrgaBdUtwwTEymAMFtewbiK/+7l7KMZK+AL8c2pUw3gPtTY5JiVKTD
-I/HC47knwro1LVw8i4eZ3I7FMwg6Nlerw5TankKjAbinaNZtJkoIwwzVgX2dzA4w
-byHdYcQtNHzFI9bdJQvC0iU=
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/Q4izT1+YI7Q/
+XA61tjcsiebsvQ0HsMbBUj9dKZNZeMhWBJzsJvkB+b5tnOYibNkGFXVi92xP/MwU
+TZJ7y6u9Sm4ArvN6ciPhOMFhPB09mbHnjsUALTOXCqDRmOJYnFOaGzQ7CbHwDkBj
+KKpsGqUcuZdxlo4uAZvWvqi+RYGnq1a++hTuy/YH3cGnoq0F3RFvq4S9P8a3I4tT
+SDUmPkCV3ng1Aq0BBQSZof2pNOw+PluJqapPt+cyzXZQcg/mk2hKFW9iwucn0xfb
+sFzIUrTRAVgUs7tVOnAu2G3DoHf1Kbf9PscE/IBERKOExo6CaygwdT2MI/qN72ZD
+5t3ZVFttAgMBAAECggEBALcW3vVHNitdgl5ksXAhTg/EstpM3vxNrPXC1gVIl1U+
+2gf9wnoNlLDfcftcBrFNoTLBt+1VDMpFJNcKqv72qSA677KXx1ufh9lBi1yZPySI
+zFTtxoe0vX4JHomF4KcSfrU29XjOfxddjSVe+EUj/IrS3rZNeS1xPM0FFmOOBd+J
+634N/q95cLk2uMD0hJ/2O0nn+mcuA5Cw+sDSULqQqT9bBhsumuOBGsbWLnHcxZoY
+0cd88GVvORTK0E4pum7/Tk/+jAijENzHXcTTRlv0KV5d70R+jMcjGcIw+X+/KL8x
+Usxf0L3jNHCjmQBpK9qXKuy1c+B+YIoogbkm2xZYOcECgYEA9CSAYICABGeR7Wg2
+FT7k8j/e6XgCUHQCuOWjvl/eJrNd4DpO3JTXvtMT2Xuj7EQIOPGNpe7Zy+aNuZuj
+Ji77NfJLsw14FQP3IP8Gt+OyqFK/GU+E1okc0a2/B8E+kGOQHzLYE+nJmggAPKcZ
+yIkymMLuOJhdLeTuJT6bewyjUZMCgYEAyI2THZ9cdhZwlDuVT4x9qH1qQ1Q46cO6
+28HguEXhSxzrQR52OK5ljyDpdbEUM4ctiKPum9cbvvZP6HqYKlFxKh6Kv19Zu78V
+ga7TQM611XGgy0NliSxJnt/bEIreDOvJ99yKfXKa9hXHZgA0Q6PwyN3jmPBwBol/
+mx0GW5BZvv8CgYEAnMYjudRKYImxZ2YX9KSil/zzw7BQrCES7nBoKYOeP/PGQIqw
+wWzC7cLVaD7BEKLPNOHIN9mc+hZew+Vxar+YiRfCDISFq9kUBJg/VC5fNz+Lf1FU
+1/7MBskvdmddKZMFpUMdBgyGbObeYBRdtiyD1Ry3pJgSnbn4QuplJSsEZQkCgYAd
+u394AMxAZYtDLqIwLO/kLtO2L6JQZcgqFFAwgYupCxyFhvKX7KL52TNDU4FfMkc5
+3rPdPsLKSNIH8UTl4TUZvXVsccJn5yhVFYoULZEfl7zy5YcEEyDHAQEFLtFEsSA8
+MuIFPxxiJ1BsetNEw+VKojq/zcWN8oyMfn0WzgvAGQKBgDGmPBjJXHei0JSca1X+
+6D79DSJXPFNtUVIf7tzUKtlNLrbJp9F5Ora5ZLUCpwZxY727TAf9GSHcNBjmbZAo
+bfJKW9etduhfrLyYPDPS0z3Ptz55M39NjLUqL0Iye06aXrPHQO7z40REH74ZqlXW
+y9ir8cfxhmGv/0bGSQmDKemj
 -----END PRIVATE KEY-----

From 7b90c3e2016d18de7fcd33b4fc6344977610dd25 Mon Sep 17 00:00:00 2001
From: qutaiba <qutaiba.rawashdeh@gmail.com>
Date: Wed, 19 Oct 2022 11:13:54 +0300
Subject: [PATCH 109/137] Add auth repo to the list of downloaded repos

---
 repo.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/repo.sh b/repo.sh
index 6fdb70c11e..265e5e1eb9 100755
--- a/repo.sh
+++ b/repo.sh
@@ -27,6 +27,7 @@ repos=(
 	  "git@github.com:Edraak/programs-theme-white.git"
     "git@github.com:Edraak/shared-devstack-configs.git"
     "git@github.com:Edraak/state-manager.git"
+    "git@github.com:Edraak/auth_provider.git"
 )
 
 repo_alternative_directory=(

From 55548dc2b902c4e00bcd69007138acd967d0d1c8 Mon Sep 17 00:00:00 2001
From: Mohammad Hussein <mohammad@Mohammads-MacBook-Pro.local>
Date: Thu, 1 Dec 2022 10:25:15 +0300
Subject: [PATCH 110/137] renewed certs

---
 nginx/ssl/chained.crt | 46 +++++++++++++++++++-------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index c0dd3ea75c..a6a7b97b1c 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-FgQUuAH6CBra0AfLgHzoksSQOz5EQlcwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+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
-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
+cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUArfe+
++nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooAAAGEzG33YQAABAMARjBEAiBN
+7/YatJmZIYdYVQlK/QYMVsBUWGEAJtWMsut9ushhAAIgXA7DgD5ETfplec2pZwrn
+eu/TdQyH9s4y9sw6h9NT7skAdwC3Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSeHQmB
+Je20mQAAAYTMbfkwAAAEAwBIMEYCIQCPbr++kLYxSsfiG+bp4FwugQ2zBxmBZykj
+2KScxOikjAIhAPy/KtlyzogwU9/aDp+dqWhoKthSG/x0LHndnkCKpcYSMA0GCSqG
+SIb3DQEBCwUAA4IBAQCZv5dCZxOiaKb/iH2CJsL44ZfP4Xke3XuIxg9m14g6Uba8
+A31b2QrF/w+j6SJOW8Ts716VgEyGYk2aKAFa+lGZ6CfCBySgotLigLJRLuCS/aal
+PYledGIAEPJ92Mx73zsBtIihAGAEb7LiiNGWVecI8siZogoFkebuTvZ/EmM8zsex
+0L3+aoghKv7Tc/4J3XMjSiDVFKmRGAVMNFv0WvT2aIs3juxd7ZS3BBhKNvQMJu5l
+Qf2oTNSqVrus+eW09l/P/PRoHj9RvQVaiHE/Lu31dpvHjWqSzq7wUqXruq6OjOBT
+/BdqeSxlPiQs08qoe4xDKqiPDNy2VsUK7YmnwOG1
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
@@ -88,4 +88,4 @@ MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
 WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
 he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
 Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
------END CERTIFICATE-----
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index f73373d51c..1fd28a73c2 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQC/Q4izT1+YI7Q/
-XA61tjcsiebsvQ0HsMbBUj9dKZNZeMhWBJzsJvkB+b5tnOYibNkGFXVi92xP/MwU
-TZJ7y6u9Sm4ArvN6ciPhOMFhPB09mbHnjsUALTOXCqDRmOJYnFOaGzQ7CbHwDkBj
-KKpsGqUcuZdxlo4uAZvWvqi+RYGnq1a++hTuy/YH3cGnoq0F3RFvq4S9P8a3I4tT
-SDUmPkCV3ng1Aq0BBQSZof2pNOw+PluJqapPt+cyzXZQcg/mk2hKFW9iwucn0xfb
-sFzIUrTRAVgUs7tVOnAu2G3DoHf1Kbf9PscE/IBERKOExo6CaygwdT2MI/qN72ZD
-5t3ZVFttAgMBAAECggEBALcW3vVHNitdgl5ksXAhTg/EstpM3vxNrPXC1gVIl1U+
-2gf9wnoNlLDfcftcBrFNoTLBt+1VDMpFJNcKqv72qSA677KXx1ufh9lBi1yZPySI
-zFTtxoe0vX4JHomF4KcSfrU29XjOfxddjSVe+EUj/IrS3rZNeS1xPM0FFmOOBd+J
-634N/q95cLk2uMD0hJ/2O0nn+mcuA5Cw+sDSULqQqT9bBhsumuOBGsbWLnHcxZoY
-0cd88GVvORTK0E4pum7/Tk/+jAijENzHXcTTRlv0KV5d70R+jMcjGcIw+X+/KL8x
-Usxf0L3jNHCjmQBpK9qXKuy1c+B+YIoogbkm2xZYOcECgYEA9CSAYICABGeR7Wg2
-FT7k8j/e6XgCUHQCuOWjvl/eJrNd4DpO3JTXvtMT2Xuj7EQIOPGNpe7Zy+aNuZuj
-Ji77NfJLsw14FQP3IP8Gt+OyqFK/GU+E1okc0a2/B8E+kGOQHzLYE+nJmggAPKcZ
-yIkymMLuOJhdLeTuJT6bewyjUZMCgYEAyI2THZ9cdhZwlDuVT4x9qH1qQ1Q46cO6
-28HguEXhSxzrQR52OK5ljyDpdbEUM4ctiKPum9cbvvZP6HqYKlFxKh6Kv19Zu78V
-ga7TQM611XGgy0NliSxJnt/bEIreDOvJ99yKfXKa9hXHZgA0Q6PwyN3jmPBwBol/
-mx0GW5BZvv8CgYEAnMYjudRKYImxZ2YX9KSil/zzw7BQrCES7nBoKYOeP/PGQIqw
-wWzC7cLVaD7BEKLPNOHIN9mc+hZew+Vxar+YiRfCDISFq9kUBJg/VC5fNz+Lf1FU
-1/7MBskvdmddKZMFpUMdBgyGbObeYBRdtiyD1Ry3pJgSnbn4QuplJSsEZQkCgYAd
-u394AMxAZYtDLqIwLO/kLtO2L6JQZcgqFFAwgYupCxyFhvKX7KL52TNDU4FfMkc5
-3rPdPsLKSNIH8UTl4TUZvXVsccJn5yhVFYoULZEfl7zy5YcEEyDHAQEFLtFEsSA8
-MuIFPxxiJ1BsetNEw+VKojq/zcWN8oyMfn0WzgvAGQKBgDGmPBjJXHei0JSca1X+
-6D79DSJXPFNtUVIf7tzUKtlNLrbJp9F5Ora5ZLUCpwZxY727TAf9GSHcNBjmbZAo
-bfJKW9etduhfrLyYPDPS0z3Ptz55M39NjLUqL0Iye06aXrPHQO7z40REH74ZqlXW
-y9ir8cfxhmGv/0bGSQmDKemj
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC+6wUC8i70kVZq
+xhzgemxRT40+uB7jxxGtJaIwLozQbQAPERcBXFBmQA9y9lxWJkVtSrfVS8vQyZW6
+ytvq+w0ljkgNtW/EdExJzf+vr6sLjsvb0JLohRD4IBnEzjnpj8GX9vH/SuYMwGdj
+39yXHG7mOifaDeWF/cReQI9HA64gBv0BEFENKhKr7dtxRZGEAiFtzs2DgcjZpNJ4
+Wd80KZTqTC9obHBa+dDjdJen7zj51Voa2JYiLMVk9uBxtYb0HUKq5FFPVR1OL17k
+9iFwdfQMSv/6GdVjR3Cf3Vnm3WSFNM6AUD7n1Ng9wIT6V3UYGurew4SpmgKoardf
+z0+uIzqzAgMBAAECggEAe1kQhdS+7ZgxAw84fPfbn7UMBqeinXtyOjIEVajdpZOm
+5BUgjep8r3NYB+iPw8E6PeB2YUJ1TlHPgT2rVGgbGFaSyvicW4rf9xc2yOVwVylN
+IJnjMIM4cXcb7wFmfTY519regxh7BWYR5n8t4BuosuqD8OflkOphwptndnQ0Pc/n
+x3lpZVFbaNVHXyvyifAp4fI3/TnzM5SZbSj/15i4abJW3EGTHvcBNzJM7feDINOC
+50T/OinsHO6TBYKxuHFpMW3dvvxjgQXkLmrD3VvdCrmcX63CuQ04s/ToJUERzxt+
+A70QDlGXpVFFz7gZo99KIueCndwQ6kZ7U/S3a4wJEQKBgQDrxl9rWw8rIDB05Hke
+7xxkdiTI5v0S+q90bQdlQCvumGRCXMZoGWPI/8FmK7ZEFpxNOowGPyFnexXZOz3d
+NiOn4+0LjEU641ugUgq+kTEkCREOKczxvedmcig1exSW/meBubw789dJTLly+6ei
+yTcsyRPsIJOItte/fUOYlqnhVwKBgQDPS5aj5g9XEcBfvU3F/jbv5fkQWylUGQaI
+LJvhhH/Ces8Gb2SYE0j0ioAH/vVqhEKqQtZlWi4X63usVz0OxqynOhZqF+L+9T+A
+TFUqWnOnksdduiKHS1zQC4zNfZaszfSg4Vr/um9CgJ1d/8/YVITVDvDSs58PjlnG
+hc/VUfRMBQKBgH34K+0I5s7M0PbzRv9PE6VdNgQc3ePxCiMzSXtAUPiWdSK7vMnL
+nvO6KdNz0VsJlZLxj/SacDeAnMjGjSQOk/hUn8bGuAphhQfgLZtpqY6uRW2Cydvy
+8Zpbrb39N6AA5r55xOdnPYQNORwE9qjTxuXnvPww34Jw5k6KF76D6NnbAoGBAKIR
+MNc3OOsT39l6QWH4nK72l8En5KnxXt/8MGsiklhUd6NKV9VlznYSCoM13F3Ixe4j
+j0dyN/NPkkNteTkiLz4W9gtAXaKDz3/ZLgSM7zsmUGSA8Bni2890GENYWwMDiqx1
+RBYHhpDxyRcCt1ckzS1eHv48nLEm1B2X5KOdDWiZAoGACLwe3KqxCtpc/H6IAh9n
+PUUKDa7+QDIYVm9ZMHuauWgpIOYvFG93S0VsHzzu871cP2hoQzeV2GrKtm4E6xlr
+bXWrJ3Ib94GegNbYwbMOzbE/xRT0A6AwsIu+X7YVnLp7ChRMKgQTQmzyW34jLi3x
+nxXhxtbAV+V9KRSgZwizCls=
 -----END PRIVATE KEY-----

From dc3e58b173ee3247f7c83ca1756b175c08913ac3 Mon Sep 17 00:00:00 2001
From: Mohammad Hussein <mohammad@Mohammads-MacBook-Pro.local>
Date: Thu, 1 Dec 2022 10:30:36 +0300
Subject: [PATCH 111/137] renewed certs

---
 nginx/ssl/chained.crt | 46 +++++++++++++++++++-------------------
 nginx/ssl/private.key | 52 +++++++++++++++++++++----------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index a6a7b97b1c..89508e2153 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIFKjCCBBKgAwIBAgISBJ5hgbttaCEL/+JMZH7L/QYCMA0GCSqGSIb3DQEBCwUA
+MIIFKzCCBBOgAwIBAgISA2Xn/uP2exUrfwSTg3aUctTgMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMjEyMDEwNTQ0MjlaFw0yMzAzMDEwNTQ0MjhaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL7r
-BQLyLvSRVmrGHOB6bFFPjT64HuPHEa0lojAujNBtAA8RFwFcUGZAD3L2XFYmRW1K
-t9VLy9DJlbrK2+r7DSWOSA21b8R0TEnN/6+vqwuOy9vQkuiFEPggGcTOOemPwZf2
-8f9K5gzAZ2Pf3JccbuY6J9oN5YX9xF5Aj0cDriAG/QEQUQ0qEqvt23FFkYQCIW3O
-zYOByNmk0nhZ3zQplOpML2hscFr50ON0l6fvOPnVWhrYliIsxWT24HG1hvQdQqrk
-UU9VHU4vXuT2IXB19AxK//oZ1WNHcJ/dWebdZIU0zoBQPufU2D3AhPpXdRga6t7D
-hKmaAqhqt1/PT64jOrMCAwEAAaOCAlMwggJPMA4GA1UdDwEB/wQEAwIFoDAdBgNV
+EwJSMzAeFw0yMjEyMDEwNjI4NTZaFw0yMzAzMDEwNjI4NTVaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnc
+WUQyZghF+W+UUahqr8fWsL/KNW/A0VklxdJFjco1BcL9gzBeGZFhReE8MsVjlN/1
+PJbl7vJ7W64fEDk5lI1SsJYv2hDui64mo7VNID/LfAyv1Wi323o2xuxJm0IjvL4C
+b/qV7HsNvE3u7hATDAXL5oR8h3+OKHE2M1UUD0ghaOQupcXqOTbkq3YUEE9fOoL2
+YBmV0up2LkCxYMsKXEfi6patcWLmge9tqj5CJSrzFPjyPqnBsz3EBC38E+XuX4No
+/JYCmZXL3IRM6uJtxBJDrbyp6wmvoKi8igFRnXmHhuEFiNKKS0lTTPmD9aq1wGVw
+gJDPtMJuTvgcXzKoREkCAwEAAaOCAlQwggJQMA4GA1UdDwEB/wQEAwIFoDAdBgNV
 HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQUmJTeRB4ouKFNBWO7+yRJtgnCymEwHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
+FgQUah5ot0NZUoMt3KFDMH0zpE3ZZGswHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
 5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
 by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
 IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
 CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBAYKKwYBBAHWeQIEAgSB9QSB8gDwAHUArfe+
-+nz/EMiLnT2cHj4YarRnKV3PsQwkyoWGNOvcgooAAAGEzG33YQAABAMARjBEAiBN
-7/YatJmZIYdYVQlK/QYMVsBUWGEAJtWMsut9ushhAAIgXA7DgD5ETfplec2pZwrn
-eu/TdQyH9s4y9sw6h9NT7skAdwC3Pvsk35xNunXyOcW6WPRsXfxCz3qfNcSeHQmB
-Je20mQAAAYTMbfkwAAAEAwBIMEYCIQCPbr++kLYxSsfiG+bp4FwugQ2zBxmBZykj
-2KScxOikjAIhAPy/KtlyzogwU9/aDp+dqWhoKthSG/x0LHndnkCKpcYSMA0GCSqG
-SIb3DQEBCwUAA4IBAQCZv5dCZxOiaKb/iH2CJsL44ZfP4Xke3XuIxg9m14g6Uba8
-A31b2QrF/w+j6SJOW8Ts716VgEyGYk2aKAFa+lGZ6CfCBySgotLigLJRLuCS/aal
-PYledGIAEPJ92Mx73zsBtIihAGAEb7LiiNGWVecI8siZogoFkebuTvZ/EmM8zsex
-0L3+aoghKv7Tc/4J3XMjSiDVFKmRGAVMNFv0WvT2aIs3juxd7ZS3BBhKNvQMJu5l
-Qf2oTNSqVrus+eW09l/P/PRoHj9RvQVaiHE/Lu31dpvHjWqSzq7wUqXruq6OjOBT
-/BdqeSxlPiQs08qoe4xDKqiPDNy2VsUK7YmnwOG1
+cHMubGV0c2VuY3J5cHQub3JnMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYAb1N2
+rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAGEzJan/wAABAMARzBFAiA1
+5MSeD3LUibUj9rNxw3GFoWUBhCJg9BgLK9xavY8UbgIhAITgl+yl1Vs+LO/JNfef
+XZjDcx5xizTlSGFIDgy6+nGbAHcA6D7Q2j71BjUy51covIlryQPTy9ERa+zraeF3
+fW0GvW4AAAGEzJanxQAABAMASDBGAiEAzA47XRuUYX/TBsu+63fIyHYUfGPXNGjZ
+2BowS0AuvEQCIQDKbYzlZPMHigx+2J/mRADUSg5EXQFDJyMPuuNwBYRGtjANBgkq
+hkiG9w0BAQsFAAOCAQEAYuRqa8EuEyhrWemeyHitsXnNBQW4v/gPJZvwRUCrHckS
+BLhe5Cf9PpCVeBoTxttYMi9kQVK+GvBwlHUAAC+qs/dA+/MbDtRM/5AcEFUJk4Oj
+66tXVtngUYs32XfOkBUOsv3TgqJeSq+3n0UzzNF6g6N4Xg5dixGCwSdvREjG5Ch3
+6GD3JZcpl5oTi9AJ9ECPC6ftEpQwx63dhqIEmSjl6ZI/UaN5xEpx6zy8pUZ/9bTM
+QAbmIRSFf3vPC8P5JSE3NE6iJgyDptaE4DMG5fJjBJ8bu4jrcEA7HfPwN/ceVCYZ
+pV/Qik4OYu78NoVk7HYQIyyTncbD3Er7OoQVLURKFw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
@@ -88,4 +88,4 @@ MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
 WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
 he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
 Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
------END CERTIFICATE-----
\ No newline at end of file
+-----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 1fd28a73c2..2888c7141f 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,28 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQC+6wUC8i70kVZq
-xhzgemxRT40+uB7jxxGtJaIwLozQbQAPERcBXFBmQA9y9lxWJkVtSrfVS8vQyZW6
-ytvq+w0ljkgNtW/EdExJzf+vr6sLjsvb0JLohRD4IBnEzjnpj8GX9vH/SuYMwGdj
-39yXHG7mOifaDeWF/cReQI9HA64gBv0BEFENKhKr7dtxRZGEAiFtzs2DgcjZpNJ4
-Wd80KZTqTC9obHBa+dDjdJen7zj51Voa2JYiLMVk9uBxtYb0HUKq5FFPVR1OL17k
-9iFwdfQMSv/6GdVjR3Cf3Vnm3WSFNM6AUD7n1Ng9wIT6V3UYGurew4SpmgKoardf
-z0+uIzqzAgMBAAECggEAe1kQhdS+7ZgxAw84fPfbn7UMBqeinXtyOjIEVajdpZOm
-5BUgjep8r3NYB+iPw8E6PeB2YUJ1TlHPgT2rVGgbGFaSyvicW4rf9xc2yOVwVylN
-IJnjMIM4cXcb7wFmfTY519regxh7BWYR5n8t4BuosuqD8OflkOphwptndnQ0Pc/n
-x3lpZVFbaNVHXyvyifAp4fI3/TnzM5SZbSj/15i4abJW3EGTHvcBNzJM7feDINOC
-50T/OinsHO6TBYKxuHFpMW3dvvxjgQXkLmrD3VvdCrmcX63CuQ04s/ToJUERzxt+
-A70QDlGXpVFFz7gZo99KIueCndwQ6kZ7U/S3a4wJEQKBgQDrxl9rWw8rIDB05Hke
-7xxkdiTI5v0S+q90bQdlQCvumGRCXMZoGWPI/8FmK7ZEFpxNOowGPyFnexXZOz3d
-NiOn4+0LjEU641ugUgq+kTEkCREOKczxvedmcig1exSW/meBubw789dJTLly+6ei
-yTcsyRPsIJOItte/fUOYlqnhVwKBgQDPS5aj5g9XEcBfvU3F/jbv5fkQWylUGQaI
-LJvhhH/Ces8Gb2SYE0j0ioAH/vVqhEKqQtZlWi4X63usVz0OxqynOhZqF+L+9T+A
-TFUqWnOnksdduiKHS1zQC4zNfZaszfSg4Vr/um9CgJ1d/8/YVITVDvDSs58PjlnG
-hc/VUfRMBQKBgH34K+0I5s7M0PbzRv9PE6VdNgQc3ePxCiMzSXtAUPiWdSK7vMnL
-nvO6KdNz0VsJlZLxj/SacDeAnMjGjSQOk/hUn8bGuAphhQfgLZtpqY6uRW2Cydvy
-8Zpbrb39N6AA5r55xOdnPYQNORwE9qjTxuXnvPww34Jw5k6KF76D6NnbAoGBAKIR
-MNc3OOsT39l6QWH4nK72l8En5KnxXt/8MGsiklhUd6NKV9VlznYSCoM13F3Ixe4j
-j0dyN/NPkkNteTkiLz4W9gtAXaKDz3/ZLgSM7zsmUGSA8Bni2890GENYWwMDiqx1
-RBYHhpDxyRcCt1ckzS1eHv48nLEm1B2X5KOdDWiZAoGACLwe3KqxCtpc/H6IAh9n
-PUUKDa7+QDIYVm9ZMHuauWgpIOYvFG93S0VsHzzu871cP2hoQzeV2GrKtm4E6xlr
-bXWrJ3Ib94GegNbYwbMOzbE/xRT0A6AwsIu+X7YVnLp7ChRMKgQTQmzyW34jLi3x
-nxXhxtbAV+V9KRSgZwizCls=
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCp3FlEMmYIRflv
+lFGoaq/H1rC/yjVvwNFZJcXSRY3KNQXC/YMwXhmRYUXhPDLFY5Tf9TyW5e7ye1uu
+HxA5OZSNUrCWL9oQ7ouuJqO1TSA/y3wMr9Vot9t6NsbsSZtCI7y+Am/6lex7DbxN
+7u4QEwwFy+aEfId/jihxNjNVFA9IIWjkLqXF6jk25Kt2FBBPXzqC9mAZldLqdi5A
+sWDLClxH4uqWrXFi5oHvbao+QiUq8xT48j6pwbM9xAQt/BPl7l+DaPyWApmVy9yE
+TOribcQSQ628qesJr6CovIoBUZ15h4bhBYjSiktJU0z5g/WqtcBlcICQz7TCbk74
+HF8yqERJAgMBAAECggEAY7/IlCncjUM6ZfH9uh9ctsg254oBs2zSA74Q25iI2ZQl
+nApv/flknmE3PjuxvQTrqlFDkYHZvn/+qNQJHPHZcNx8YtYbAxJy6IQ8Yv210IDY
+ikK/2k0OEEkWrC/VgxOlhRe9VrSwONsqF8IV/06QIt9IscjHcXqz+TfREUdEaiBu
++SdHo5NNYLf/1mF6d80XsqNFQlknivcE9C4afuJX3OjKRUb+VYu1PlewkLwJtVgU
+2f9q0ct1Y2uNu3okxZk7b360nHQHXOh462daobFY7vV2JZhxuJqg2r9bYXxbHY0y
+9yLfgQgZO+o72cP7RM1mBRKbqWuEAg7puEZ7gDLgAQKBgQDgfK8TO3cObf72o1Ni
+ZWcDy1iCK+vm4g24jrYodOsex4y7VDWbvSaasbhNwe9hCGGGzt9O3SfkCpJd1k5O
+uYRjaS2myu2YXivekRLMuXrxazFs5Q6PTP4fEl5UUt1w1bnU7jAmYosH9CEzqyzK
+hSp2dC3m268JkE1ZFSnIQpuKSQKBgQDBtJPNRS91hh4feaZtAsHK08zorh+Q4E60
+Ywf12iCh1AnGR+1tWBi5y7sWzINVnQQH7l2rqeqpEPHCLhDu4b3AEnLByKFD422P
+NldwRpbFgbZbv4zV3rHlRmK+zwkyVZprejzvXM2BikD14PJVijG5VG8Ru1vwlwRE
+KBka1nbqAQKBgD8/whA4I+5D3Z9eGyNRELpH89MRTvEJZfZG91nkv043yRYKvuP3
+YkYZpqT57Fk5hEj4RoCw3QlqVRztQbj6mitsOfmRmWnhtpiJ5XMbG2Gj4xQcYYLM
+nZjhkwRNKKke/rHYvmZCQ4vlI+mr4/3XkUQ4raoq4WFfb/uWc+RBqBNJAoGAeKo9
+fByCEOrILwE/3B5gjDHeLn/xZ/Vi8dnS5qLHuyd0I1FBJOFBHdQ8qloh4h4amboy
+HbKOXF0SzMyXfcefxVt4oyCQ3NJ6uEC4vVcrqsM/zu2HFN9R4Co1bvlXmERdGmCe
+PtmHpw9xoflL3F9m1DU1r00QW9InNTHpWZ+JmgECgYA9A9rstJDzWivegsLDReWk
+pJ1+5kspqHPjATIqcPjEG5ibZ+AxvZOLTAGvlYLiL8GZZAWnQaiWTY786wY4Dk/g
+Cug5bhkBbcW7TdXOPOJSRQXVIRNPDfQUTh6/5E0SlC26dYUY488yZYaMIEF/xALM
+bYhcUW7LknXFUvBv8YmIaA==
 -----END PRIVATE KEY-----

From b17234766d9f71d12b37f116cdaab5b77f505009 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Wed, 1 Mar 2023 12:49:53 +0300
Subject: [PATCH 112/137] renew edraak.dev ssl cert

---
 nginx/ssl/chained.crt | 50 ++++++++++++++++++++-----------------------
 nginx/ssl/private.key | 29 +++----------------------
 2 files changed, 26 insertions(+), 53 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 89508e2153..2a6620a751 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,32 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIFKzCCBBOgAwIBAgISA2Xn/uP2exUrfwSTg3aUctTgMA0GCSqGSIb3DQEBCwUA
+MIIEYDCCA0igAwIBAgISBN2Se+qknjuPcCklAN6vfaoUMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMjEyMDEwNjI4NTZaFw0yMzAzMDEwNjI4NTVaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKnc
-WUQyZghF+W+UUahqr8fWsL/KNW/A0VklxdJFjco1BcL9gzBeGZFhReE8MsVjlN/1
-PJbl7vJ7W64fEDk5lI1SsJYv2hDui64mo7VNID/LfAyv1Wi323o2xuxJm0IjvL4C
-b/qV7HsNvE3u7hATDAXL5oR8h3+OKHE2M1UUD0ghaOQupcXqOTbkq3YUEE9fOoL2
-YBmV0up2LkCxYMsKXEfi6patcWLmge9tqj5CJSrzFPjyPqnBsz3EBC38E+XuX4No
-/JYCmZXL3IRM6uJtxBJDrbyp6wmvoKi8igFRnXmHhuEFiNKKS0lTTPmD9aq1wGVw
-gJDPtMJuTvgcXzKoREkCAwEAAaOCAlQwggJQMA4GA1UdDwEB/wQEAwIFoDAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDAYDVR0TAQH/BAIwADAdBgNVHQ4E
-FgQUah5ot0NZUoMt3KFDMH0zpE3ZZGswHwYDVR0jBBgwFoAUFC6zF7dYVsuuUAlA
-5h+vnYsUwsYwVQYIKwYBBQUHAQEESTBHMCEGCCsGAQUFBzABhhVodHRwOi8vcjMu
-by5sZW5jci5vcmcwIgYIKwYBBQUHMAKGFmh0dHA6Ly9yMy5pLmxlbmNyLm9yZy8w
-IwYDVR0RBBwwGoIMKi5lZHJhYWsuZGV2ggplZHJhYWsuZGV2MEwGA1UdIARFMEMw
-CAYGZ4EMAQIBMDcGCysGAQQBgt8TAQEBMCgwJgYIKwYBBQUHAgEWGmh0dHA6Ly9j
-cHMubGV0c2VuY3J5cHQub3JnMIIBBQYKKwYBBAHWeQIEAgSB9gSB8wDxAHYAb1N2
-rDHwMRnYmQCkURX/dxUcEdkCwQApBo2yCJo32RMAAAGEzJan/wAABAMARzBFAiA1
-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
+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
+d5zvqXqgJHCAlU/hQh63xrEhafY=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 2888c7141f..bb04842028 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,28 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCp3FlEMmYIRflv
-lFGoaq/H1rC/yjVvwNFZJcXSRY3KNQXC/YMwXhmRYUXhPDLFY5Tf9TyW5e7ye1uu
-HxA5OZSNUrCWL9oQ7ouuJqO1TSA/y3wMr9Vot9t6NsbsSZtCI7y+Am/6lex7DbxN
-7u4QEwwFy+aEfId/jihxNjNVFA9IIWjkLqXF6jk25Kt2FBBPXzqC9mAZldLqdi5A
-sWDLClxH4uqWrXFi5oHvbao+QiUq8xT48j6pwbM9xAQt/BPl7l+DaPyWApmVy9yE
-TOribcQSQ628qesJr6CovIoBUZ15h4bhBYjSiktJU0z5g/WqtcBlcICQz7TCbk74
-HF8yqERJAgMBAAECggEAY7/IlCncjUM6ZfH9uh9ctsg254oBs2zSA74Q25iI2ZQl
-nApv/flknmE3PjuxvQTrqlFDkYHZvn/+qNQJHPHZcNx8YtYbAxJy6IQ8Yv210IDY
-ikK/2k0OEEkWrC/VgxOlhRe9VrSwONsqF8IV/06QIt9IscjHcXqz+TfREUdEaiBu
-+SdHo5NNYLf/1mF6d80XsqNFQlknivcE9C4afuJX3OjKRUb+VYu1PlewkLwJtVgU
-2f9q0ct1Y2uNu3okxZk7b360nHQHXOh462daobFY7vV2JZhxuJqg2r9bYXxbHY0y
-9yLfgQgZO+o72cP7RM1mBRKbqWuEAg7puEZ7gDLgAQKBgQDgfK8TO3cObf72o1Ni
-ZWcDy1iCK+vm4g24jrYodOsex4y7VDWbvSaasbhNwe9hCGGGzt9O3SfkCpJd1k5O
-uYRjaS2myu2YXivekRLMuXrxazFs5Q6PTP4fEl5UUt1w1bnU7jAmYosH9CEzqyzK
-hSp2dC3m268JkE1ZFSnIQpuKSQKBgQDBtJPNRS91hh4feaZtAsHK08zorh+Q4E60
-Ywf12iCh1AnGR+1tWBi5y7sWzINVnQQH7l2rqeqpEPHCLhDu4b3AEnLByKFD422P
-NldwRpbFgbZbv4zV3rHlRmK+zwkyVZprejzvXM2BikD14PJVijG5VG8Ru1vwlwRE
-KBka1nbqAQKBgD8/whA4I+5D3Z9eGyNRELpH89MRTvEJZfZG91nkv043yRYKvuP3
-YkYZpqT57Fk5hEj4RoCw3QlqVRztQbj6mitsOfmRmWnhtpiJ5XMbG2Gj4xQcYYLM
-nZjhkwRNKKke/rHYvmZCQ4vlI+mr4/3XkUQ4raoq4WFfb/uWc+RBqBNJAoGAeKo9
-fByCEOrILwE/3B5gjDHeLn/xZ/Vi8dnS5qLHuyd0I1FBJOFBHdQ8qloh4h4amboy
-HbKOXF0SzMyXfcefxVt4oyCQ3NJ6uEC4vVcrqsM/zu2HFN9R4Co1bvlXmERdGmCe
-PtmHpw9xoflL3F9m1DU1r00QW9InNTHpWZ+JmgECgYA9A9rstJDzWivegsLDReWk
-pJ1+5kspqHPjATIqcPjEG5ibZ+AxvZOLTAGvlYLiL8GZZAWnQaiWTY786wY4Dk/g
-Cug5bhkBbcW7TdXOPOJSRQXVIRNPDfQUTh6/5E0SlC26dYUY488yZYaMIEF/xALM
-bYhcUW7LknXFUvBv8YmIaA==
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/l1eacgHB6arpbrX
+0mNE6nLrPoKhHgxMSZYckm+CHxOhRANCAASJ5ZqI4eqvmTmhPq7BXaAN7KBCaKoc
+9cvVfvP2J4QPdJ58LXM2/KX7iEr6UuryMO4T8pPWF/xRjTVUoSRNNdmy
 -----END PRIVATE KEY-----

From 17268785099d17684eedfcf65da7b57929049344 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Sun, 4 Jun 2023 15:26:26 +0300
Subject: [PATCH 113/137] update the ssl certificate for edraak.dev

---
 nginx/ssl/chained.crt | 40 ++++++++++++++++++++--------------------
 nginx/ssl/private.key |  8 ++++----
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 2a6620a751..b260cb310f 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,28 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIIEYDCCA0igAwIBAgISBN2Se+qknjuPcCklAN6vfaoUMA0GCSqGSIb3DQEBCwUA
+MIIEXzCCA0egAwIBAgISBCc4WefryYbzXD4RvhEUlKhuMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMzAzMDEwNjQ4MDdaFw0yMzA1MzAwNjQ4MDZaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABInlmojh6q+Z
-OaE+rsFdoA3soEJoqhz1y9V+8/YnhA90nnwtczb8pfuISvpS6vIw7hPyk9YX/FGN
-NVShJE012bKjggJUMIICUDAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFPORDyjs3ESv
-wQhaW4obfYItKlvXMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
+EwJSMzAeFw0yMzA2MDQxMTIyMTNaFw0yMzA5MDIxMTIyMTJaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIszmegHRAg/
+jaE/YbP+Wa4IHzfttnIJUdagbs7CtnVDdtLdy2STvxTXD1aG1H8/9d6rpDPz7aws
+beMK7Khs39mjggJTMIICTzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBXBy4rdftNj
+j948W9oDetkOTNZWMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
 CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn
 MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
 DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjBMBgNVHSAERTBDMAgGBmeBDAECATA3
 BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNy
-eXB0Lm9yZzCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AHoyjFTYty22IOo44FIe
-6YQWcDIThU070ivBOlejUutSAAABhpwkkLQAAAQDAEgwRgIhAJyHTAHjmm7Lkq81
-5kWW2qJxmyAxkcnEBBTKxeo8ZOebAiEAh5/Nbi29GxKt3enQ0vfbpMHEWeUAnMxj
-Ira6ycs+qXcAdgCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYac
-JJD7AAAEAwBHMEUCID0ILYe9suKLa2itbsKCD+EfCrk6kPICddQ4S9LRC38gAiEA
-wobTnZFhoAAcqixYwSHBPm6/kQM4b76hGQPy02lp1FkwDQYJKoZIhvcNAQELBQAD
-ggEBAKqc5QZQjog43PNBvCliCRlcVR24ng/NT+fo/qpFteNr9a5a4xMzd8VOGo4H
-N+KtREE4byzzguxFu61mDD/mlrJvmg8/OTa9+ix8hsv7g3qafuggzrDVKcBs1jPA
-1p5NWgAHdVE1QsV4xsHK6N6hGlpk8BDtw2GHlvklGsZ2gsRytCyZAcZYQnm5ejLt
-pIfILukYNWxKVh26ByvROJ/O6FA7pLHvPYBEt5lqdSGuEfSXS5eZkdi9M07fBRrt
-uRuYPyUAXn+zRg5VOcCwAB7igKVnNlGxcUGXPLxVqRUOueYYe33RGTOgKCfaIhQf
-d5zvqXqgJHCAlU/hQh63xrEhafY=
+eXB0Lm9yZzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe
+6YQWcDIThU070ivBOlejUutSAAABiIZbp4gAAAQDAEgwRgIhAP4wAsfHHCftL5hS
+G2ypje9ePf0CeKdnCfvERDyzYk/7AiEAq1m+99faVqYiY/HfDolG7uhh/swWBWS0
+mXIXV8OA+nYAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYiG
+W6e4AAAEAwBGMEQCIAywYUbRi+LVi2wQN2impTKe/Z/XBU1XrpVw7slCZnnnAiBH
+MHTfEjXjbdHMURr4RDv+s97zG6QrQM1X5caKk/87eDANBgkqhkiG9w0BAQsFAAOC
+AQEAm6laj5xCCPv+UK1FMcKkX4fgvoiEOM0uyuTf6KJID9CEiU9N0knq3SUdcCB2
+YY/gi/zjI98Tbe30p9XcsAQ0Rk+v9Of+0K9o5vxDwfO0looA3asswkLrkv5hJdc8
+lqy4hlXybXCEUrWWs+4tDgvWFDwk6PmmyN7fD8Rpqra4V+5UaWF1z/UV4fOWKJ6a
+WR1BZtWR6Sm1bISHr4ntXbegHkb4YF0vULVynggd6sUBFrV23JJAqtbF1l8JE4BM
+7VZwUA+Oqcc9gvewKdO1Fcz1wAKo2ynsYl4SvxgPhYYBhFowgrS8qcKRvtsAcgfY
+z/hkCEycWnV0OxjmWkrbsqz0Ug==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
@@ -84,4 +84,4 @@ MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
 WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
 he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
 Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
------END CERTIFICATE-----
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index bb04842028..45721ef557 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg/l1eacgHB6arpbrX
-0mNE6nLrPoKhHgxMSZYckm+CHxOhRANCAASJ5ZqI4eqvmTmhPq7BXaAN7KBCaKoc
-9cvVfvP2J4QPdJ58LXM2/KX7iEr6UuryMO4T8pPWF/xRjTVUoSRNNdmy
------END PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzManMvW833pjdvg2
+NY0TsA8/XLBXcd+2i6qwMRjg7bqhRANCAASLM5noB0QIP42hP2Gz/lmuCB837bZy
+CVHWoG7OwrZ1Q3bS3ctkk78U1w9WhtR/P/Xeq6Qz8+2sLG3jCuyobN/Z
+-----END PRIVATE KEY-----
\ No newline at end of file

From af9dfc20249dfa959aff459fbc4d31cbb251b42f Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Sun, 3 Sep 2023 16:45:15 +0300
Subject: [PATCH 114/137] update dev ssl

---
 nginx/ssl/chained.crt | 41 ++++++++++++++++++++---------------------
 nginx/ssl/private.key |  6 +++---
 2 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index b260cb310f..0d542aeb19 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,28 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEXzCCA0egAwIBAgISBCc4WefryYbzXD4RvhEUlKhuMA0GCSqGSIb3DQEBCwUA
+MIIEJjCCAw6gAwIBAgISA1/67GlBj8V6Hc04lSEX1OZlMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMzA2MDQxMTIyMTNaFw0yMzA5MDIxMTIyMTJaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIszmegHRAg/
-jaE/YbP+Wa4IHzfttnIJUdagbs7CtnVDdtLdy2STvxTXD1aG1H8/9d6rpDPz7aws
-beMK7Khs39mjggJTMIICTzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFBXBy4rdftNj
-j948W9oDetkOTNZWMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
+EwJSMzAeFw0yMzA5MDMxMjM1MzZaFw0yMzEyMDIxMjM1MzVaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMM0hNZCozOo
+JXTy9sMFz80DdK6BWbBT421kAMk57AsGcBRFpkm4MCRZsVgeSndhjWxpzTXlWwau
+r3ntrDqlqEajggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFyb1UY1HYro
+EmlAtKYO9TQb/U01MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
 CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn
 MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
-DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjBMBgNVHSAERTBDMAgGBmeBDAECATA3
-BgsrBgEEAYLfEwEBATAoMCYGCCsGAQUFBwIBFhpodHRwOi8vY3BzLmxldHNlbmNy
-eXB0Lm9yZzCCAQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe
-6YQWcDIThU070ivBOlejUutSAAABiIZbp4gAAAQDAEgwRgIhAP4wAsfHHCftL5hS
-G2ypje9ePf0CeKdnCfvERDyzYk/7AiEAq1m+99faVqYiY/HfDolG7uhh/swWBWS0
-mXIXV8OA+nYAdQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYiG
-W6e4AAAEAwBGMEQCIAywYUbRi+LVi2wQN2impTKe/Z/XBU1XrpVw7slCZnnnAiBH
-MHTfEjXjbdHMURr4RDv+s97zG6QrQM1X5caKk/87eDANBgkqhkiG9w0BAQsFAAOC
-AQEAm6laj5xCCPv+UK1FMcKkX4fgvoiEOM0uyuTf6KJID9CEiU9N0knq3SUdcCB2
-YY/gi/zjI98Tbe30p9XcsAQ0Rk+v9Of+0K9o5vxDwfO0looA3asswkLrkv5hJdc8
-lqy4hlXybXCEUrWWs+4tDgvWFDwk6PmmyN7fD8Rpqra4V+5UaWF1z/UV4fOWKJ6a
-WR1BZtWR6Sm1bISHr4ntXbegHkb4YF0vULVynggd6sUBFrV23JJAqtbF1l8JE4BM
-7VZwUA+Oqcc9gvewKdO1Fcz1wAKo2ynsYl4SvxgPhYYBhFowgrS8qcKRvtsAcgfY
-z/hkCEycWnV0OxjmWkrbsqz0Ug==
+DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC
+AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe6YQWcDIThU07
+0ivBOlejUutSAAABiltBicMAAAQDAEgwRgIhANAcFtbc5md28G5nQXdHWdicIhfA
+n6JL0JKsHUp2C58oAiEAsG4BH58txrosAgjueclJl9xCMFlWezH2RTDVuRTiumQA
+dQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYpbQY0cAAAEAwBG
+MEQCIBeIlE6Vhd1eECa5Fu7wSOmQyQUaDjkFXSwCzIF7kf8IAiALX9Pu4OmTtYEW
+nUpDf+MLUiL+a7hk/e6Pn906zEjYHjANBgkqhkiG9w0BAQsFAAOCAQEASrnShuM1
+EI2OSyu0ueyGy583Gspdg7VfJEQDJ/CJhB28fOi9j+Wk1DXbyAVue/BnTkuvi7qD
+RNAoZlJZYrgZh8DUsUF5CotSFN/nSP/BPz0uoNq3FgOONdkGnajU5CrlN6QyepBw
+Lt+niee7TEtFhfAeExx4MKKuHSjSpykVxsAAtIb3ajasBTPTSRvJ/duMpCN75Of5
+bD61h95THrUdemYKB6FzZl74aS6DSR42G/IrBr9WIVwW0k1TQYMZzRCD///Y0gD3
+LX9qaW7rQW/CcS+m5DdF9sqWRXJsrif8A15sk/Z7dJfLDCTYScNmpJXvCXovhCMa
+Z3XexdsbmW2jDw==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 45721ef557..1081b5d04b 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgzManMvW833pjdvg2
-NY0TsA8/XLBXcd+2i6qwMRjg7bqhRANCAASLM5noB0QIP42hP2Gz/lmuCB837bZy
-CVHWoG7OwrZ1Q3bS3ctkk78U1w9WhtR/P/Xeq6Qz8+2sLG3jCuyobN/Z
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQNZY0eEC9/iEQZaf
+eIFULluFS+J0jYwN4tYwdyv+k+2hRANCAATDNITWQqMzqCV08vbDBc/NA3SugVmw
+U+NtZADJOewLBnAURaZJuDAkWbFYHkp3YY1sac015VsGrq957aw6pahG
 -----END PRIVATE KEY-----
\ No newline at end of file

From b0d50a68724d73570bc59dc8e31056c8a8819c5d Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Mon, 4 Dec 2023 12:46:58 +0300
Subject: [PATCH 115/137] update dev ssl

---
 nginx/ssl/chained.crt | 38 +++++++++++++++++++-------------------
 nginx/ssl/private.key |  6 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 0d542aeb19..fad4133e93 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEJjCCAw6gAwIBAgISA1/67GlBj8V6Hc04lSEX1OZlMA0GCSqGSIb3DQEBCwUA
+MIIEJTCCAw2gAwIBAgISA8n51Qr42+SxER7VQnpvlYIpMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMzA5MDMxMjM1MzZaFw0yMzEyMDIxMjM1MzVaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABMM0hNZCozOo
-JXTy9sMFz80DdK6BWbBT421kAMk57AsGcBRFpkm4MCRZsVgeSndhjWxpzTXlWwau
-r3ntrDqlqEajggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFFyb1UY1HYro
-EmlAtKYO9TQb/U01MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
+EwJSMzAeFw0yMzEyMDQwODQ0MzBaFw0yNDAzMDMwODQ0MjlaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIjLTeyG9fpQ
+h21O49lu5wof22z9hK6vg9VQ3g3FsxJrKEviz6yYvTyqhWJJuUAIWp9QAs9bD6Ch
+WiuG2sSFiYejggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLSyXyllDgUi
+7eWIZN3rCBEZbYN1MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
 CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn
 MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
 DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC
-AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB3AHoyjFTYty22IOo44FIe6YQWcDIThU07
-0ivBOlejUutSAAABiltBicMAAAQDAEgwRgIhANAcFtbc5md28G5nQXdHWdicIhfA
-n6JL0JKsHUp2C58oAiEAsG4BH58txrosAgjueclJl9xCMFlWezH2RTDVuRTiumQA
-dQCt9776fP8QyIudPZwePhhqtGcpXc+xDCTKhYY069yCigAAAYpbQY0cAAAEAwBG
-MEQCIBeIlE6Vhd1eECa5Fu7wSOmQyQUaDjkFXSwCzIF7kf8IAiALX9Pu4OmTtYEW
-nUpDf+MLUiL+a7hk/e6Pn906zEjYHjANBgkqhkiG9w0BAQsFAAOCAQEASrnShuM1
-EI2OSyu0ueyGy583Gspdg7VfJEQDJ/CJhB28fOi9j+Wk1DXbyAVue/BnTkuvi7qD
-RNAoZlJZYrgZh8DUsUF5CotSFN/nSP/BPz0uoNq3FgOONdkGnajU5CrlN6QyepBw
-Lt+niee7TEtFhfAeExx4MKKuHSjSpykVxsAAtIb3ajasBTPTSRvJ/duMpCN75Of5
-bD61h95THrUdemYKB6FzZl74aS6DSR42G/IrBr9WIVwW0k1TQYMZzRCD///Y0gD3
-LX9qaW7rQW/CcS+m5DdF9sqWRXJsrif8A15sk/Z7dJfLDCTYScNmpJXvCXovhCMa
-Z3XexdsbmW2jDw==
+AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s
+gdm7v6s52IRzAAABjDQ3Bg8AAAQDAEcwRQIhAL6b7hfsFReKUgHTx4aTJKKXOIRp
+DVqVITSBA4oymYQLAiBrCx8bvUEQ0noihjl3lGWdZCpLqNQLfSqfhtJpO5kmeQB1
+AKLiv9Ye3i8vB6DWTm03p9xlQ7DGtS6i2reK+Jpt9RfYAAABjDQ3BicAAAQDAEYw
+RAIgTWmUQKDXzreUKpf/k5MDWhwj+YfBZiE8EbVxZn/UxZACIBhOqIAObI+tkXb6
+P5tDl20po55Sewipl8wh5rTSSxuxMA0GCSqGSIb3DQEBCwUAA4IBAQBviO+eIcoH
+/+iW8afRapggKC2Y8+F+Jmjw20BrWfkVldIRVoUjnmIbp/3RZNvgqR4UWmcGihyF
+a3B0feVrg85s2LK6aEkOO1hN6VRJrBSJHaiXRZsWsm1u7MK8/9hYxzfTUWrlE54v
+9uIIpTP/8s46ruoUX3HVRkifxiFL1SFl1W/HufpcE6yA4vxM5ACC7NZsFAyUQ4Hy
+JRZOHTdjdSOi21AwwsIBmRLZH6n8GSTw205iCUZVttHkV3BOkxHV7YiB2FImz9zP
+UFkm5bNr7wQbAgSNBOxxwV3VBp5c2iQoqcnvY12uu/VKzkVit7jsDskR5ZiDIkgM
+sGxnQJ6tF2Fx
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 1081b5d04b..ff70c94bb8 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgQNZY0eEC9/iEQZaf
-eIFULluFS+J0jYwN4tYwdyv+k+2hRANCAATDNITWQqMzqCV08vbDBc/NA3SugVmw
-U+NtZADJOewLBnAURaZJuDAkWbFYHkp3YY1sac015VsGrq957aw6pahG
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgW5WmjZ+T/wIth4Cg
+eH69yzzFGkg+TWO2J5KpL1jLEx+hRANCAASIy03shvX6UIdtTuPZbucKH9ts/YSu
+r4PVUN4NxbMSayhL4s+smL08qoViSblACFqfUALPWw+goVorhtrEhYmH
 -----END PRIVATE KEY-----
\ No newline at end of file

From 84f0288be9638eddb3860570e79ffd2943b5bd6c Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Sun, 3 Mar 2024 14:14:46 +0300
Subject: [PATCH 116/137] hmalabeh/new_ssl_dev_cert_03_Mar_2024

---
 nginx/ssl/chained.crt | 69 ++++++++++++-------------------------------
 nginx/ssl/private.key |  6 ++--
 2 files changed, 22 insertions(+), 53 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index fad4133e93..0d7c5e704a 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEJTCCAw2gAwIBAgISA8n51Qr42+SxER7VQnpvlYIpMA0GCSqGSIb3DQEBCwUA
+MIIEJjCCAw6gAwIBAgISBDNj4gej7OO8Ctbkgw2BwFEvMA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yMzEyMDQwODQ0MzBaFw0yNDAzMDMwODQ0MjlaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABIjLTeyG9fpQ
-h21O49lu5wof22z9hK6vg9VQ3g3FsxJrKEviz6yYvTyqhWJJuUAIWp9QAs9bD6Ch
-WiuG2sSFiYejggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFLSyXyllDgUi
-7eWIZN3rCBEZbYN1MB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
+EwJSMzAeFw0yNDAzMDMxMDEwMDRaFw0yNDA2MDExMDEwMDNaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNSP8c/XUmNf
+yy2B3xJtY4O1uJEL4x27HOURBjX0KIWWrMh9utdqV9Sc0+lUGnB1yy18fsMR/1dM
+2UpXDA/seXOjggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCLldLOHhNLL
+48k7I0ExzdTiTc3DMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
 CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn
 MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
 DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC
-AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s
-gdm7v6s52IRzAAABjDQ3Bg8AAAQDAEcwRQIhAL6b7hfsFReKUgHTx4aTJKKXOIRp
-DVqVITSBA4oymYQLAiBrCx8bvUEQ0noihjl3lGWdZCpLqNQLfSqfhtJpO5kmeQB1
-AKLiv9Ye3i8vB6DWTm03p9xlQ7DGtS6i2reK+Jpt9RfYAAABjDQ3BicAAAQDAEYw
-RAIgTWmUQKDXzreUKpf/k5MDWhwj+YfBZiE8EbVxZn/UxZACIBhOqIAObI+tkXb6
-P5tDl20po55Sewipl8wh5rTSSxuxMA0GCSqGSIb3DQEBCwUAA4IBAQBviO+eIcoH
-/+iW8afRapggKC2Y8+F+Jmjw20BrWfkVldIRVoUjnmIbp/3RZNvgqR4UWmcGihyF
-a3B0feVrg85s2LK6aEkOO1hN6VRJrBSJHaiXRZsWsm1u7MK8/9hYxzfTUWrlE54v
-9uIIpTP/8s46ruoUX3HVRkifxiFL1SFl1W/HufpcE6yA4vxM5ACC7NZsFAyUQ4Hy
-JRZOHTdjdSOi21AwwsIBmRLZH6n8GSTw205iCUZVttHkV3BOkxHV7YiB2FImz9zP
-UFkm5bNr7wQbAgSNBOxxwV3VBp5c2iQoqcnvY12uu/VKzkVit7jsDskR5ZiDIkgM
-sGxnQJ6tF2Fx
+AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ADtTd3U+LbmAToswWwb+QDtn2E/D9Me9
+AA0tcm/h+tQXAAABjgQBtfYAAAQDAEcwRQIhAPvdax1FyK3Gu8MmVpaAW3Bwm3eJ
+z6oDWGhhDQQDv5AxAiA1q9oD9IPd+Ib5gzEBX1H5iV5LcnquRfPxt2pSDRxb1wB2
+AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABjgQBtfMAAAQDAEcw
+RQIhAOBPkeII5PTgQl81RWm+E46odK3C8tob82aZdAcq1VQtAiA2BajG9cXWAroS
+/E0q4pDP9MdJ5LbX4gEtJiMkhyLn8jANBgkqhkiG9w0BAQsFAAOCAQEAns1U2PjE
+jnDbK3iQoVU3skn2NSqr1u7qtaiQOSs9rrwxVYYKd9qzkUud3luLvH689V+AgrzQ
+++9OFPMkCgNIax6po9pcy4ylTnCm7xHAMhjw8BrY1PW0Vdsw65xef/ltEyU6PWGG
+VsuN3b559QtFpx61FZEwy9niMIX3mznOavVSLjleWf1/1g+l0A83BTJQBgfyenN6
+NVT5YzyIvh5m9c+hZf6Mr98nmF3qFU76V1KswKnOGeg8Ffd6ZhY3w8q5EJ0/puYt
+Q9QtfhKJ2MPyJGBgfUqFqA+ilkLysBFQD8GulEB2tp3qfwEWcQz4vGn1ATX6prNr
+Rcp08/yIO7w3zg==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
@@ -52,35 +52,4 @@ hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
 HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
 MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
 nLRbwHOoq7hHwg==
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIFYDCCBEigAwIBAgIQQAF3ITfU6UK47naqPGQKtzANBgkqhkiG9w0BAQsFADA/
-MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT
-DkRTVCBSb290IENBIFgzMB4XDTIxMDEyMDE5MTQwM1oXDTI0MDkzMDE4MTQwM1ow
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwggIiMA0GCSqGSIb3DQEB
-AQUAA4ICDwAwggIKAoICAQCt6CRz9BQ385ueK1coHIe+3LffOJCMbjzmV6B493XC
-ov71am72AE8o295ohmxEk7axY/0UEmu/H9LqMZshftEzPLpI9d1537O4/xLxIZpL
-wYqGcWlKZmZsj348cL+tKSIG8+TA5oCu4kuPt5l+lAOf00eXfJlII1PoOK5PCm+D
-LtFJV4yAdLbaL9A4jXsDcCEbdfIwPPqPrt3aY6vrFk/CjhFLfs8L6P+1dy70sntK
-4EwSJQxwjQMpoOFTJOwT2e4ZvxCzSow/iaNhUd6shweU9GNx7C7ib1uYgeGJXDR5
-bHbvO5BieebbpJovJsXQEOEO3tkQjhb7t/eo98flAgeYjzYIlefiN5YNNnWe+w5y
-sR2bvAP5SQXYgd0FtCrWQemsAXaVCg/Y39W9Eh81LygXbNKYwagJZHduRze6zqxZ
-Xmidf3LWicUGQSk+WT7dJvUkyRGnWqNMQB9GoZm1pzpRboY7nn1ypxIFeFntPlF4
-FQsDj43QLwWyPntKHEtzBRL8xurgUBN8Q5N0s8p0544fAQjQMNRbcTa0B7rBMDBc
-SLeCO5imfWCKoqMpgsy6vYMEG6KDA0Gh1gXxG8K28Kh8hjtGqEgqiNx2mna/H2ql
-PRmP6zjzZN7IKw0KKP/32+IVQtQi0Cdd4Xn+GOdwiK1O5tmLOsbdJ1Fu/7xk9TND
-TwIDAQABo4IBRjCCAUIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-SwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vYXBwcy5pZGVudHJ1
-c3QuY29tL3Jvb3RzL2RzdHJvb3RjYXgzLnA3YzAfBgNVHSMEGDAWgBTEp7Gkeyxx
-+tvhS5B1/8QVYIWJEDBUBgNVHSAETTBLMAgGBmeBDAECATA/BgsrBgEEAYLfEwEB
-ATAwMC4GCCsGAQUFBwIBFiJodHRwOi8vY3BzLnJvb3QteDEubGV0c2VuY3J5cHQu
-b3JnMDwGA1UdHwQ1MDMwMaAvoC2GK2h0dHA6Ly9jcmwuaWRlbnRydXN0LmNvbS9E
-U1RST09UQ0FYM0NSTC5jcmwwHQYDVR0OBBYEFHm0WeZ7tuXkAXOACIjIGlj26Ztu
-MA0GCSqGSIb3DQEBCwUAA4IBAQAKcwBslm7/DlLQrt2M51oGrS+o44+/yQoDFVDC
-5WxCu2+b9LRPwkSICHXM6webFGJueN7sJ7o5XPWioW5WlHAQU7G75K/QosMrAdSW
-9MUgNTP52GE24HGNtLi1qoJFlcDyqSMo59ahy2cI2qBDLKobkx/J3vWraV0T9VuG
-WCLKTVXkcGdtwlfFRjlBz4pYg1htmf5X6DYO8A4jqv2Il9DjXA6USbW1FzXSLr9O
-he8Y4IWS6wY7bCkjCWDcRQJMEhg76fsO3txE+FiYruq9RUWhiF1myv4Q6W+CyBFC
-Dfvp7OOGAN6dEOM4+qR9sdjoSYKEBpsr6GtPAQw4dy753ec5
 -----END CERTIFICATE-----
\ No newline at end of file
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index ff70c94bb8..1a5ed2454a 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgW5WmjZ+T/wIth4Cg
-eH69yzzFGkg+TWO2J5KpL1jLEx+hRANCAASIy03shvX6UIdtTuPZbucKH9ts/YSu
-r4PVUN4NxbMSayhL4s+smL08qoViSblACFqfUALPWw+goVorhtrEhYmH
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1dFdIrdOE7LBxRh+
+yOiGub9+RPGmImABH7e9FZu24jehRANCAATUj/HP11JjX8stgd8SbWODtbiRC+Md
+uxzlEQY19CiFlqzIfbrXalfUnNPpVBpwdcstfH7DEf9XTNlKVwwP7Hlz
 -----END PRIVATE KEY-----
\ No newline at end of file

From eed4355f2321957f3dfd85fdde88b213ef032fb2 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Mon, 1 Apr 2024 10:41:23 +0300
Subject: [PATCH 117/137]  upgrade devstack to use mysql8 mongo

---
 docker-compose-mktg.yml  |  2 +-
 docker-compose-progs.yml |  2 +-
 docker-compose.yml       | 15 ++++++++++++++-
 provision-lms.sh         |  2 +-
 provision-mktg.sh        |  2 +-
 provision-progs.sh       |  2 +-
 provision.sh             | 11 +++++++++--
 7 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml
index 53cf5de570..d33f6e99dd 100644
--- a/docker-compose-mktg.yml
+++ b/docker-compose-mktg.yml
@@ -22,7 +22,7 @@ services:
     ports:
       - "18500:8500"
     depends_on:
-      - mysql
+      - mysql8
       - memcached
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 3ca970fa16..59501c10b4 100644
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -23,7 +23,7 @@ services:
     ports:
       - "18800:8800"
     depends_on:
-      - mysql
+      - mysql8
       - mongo
       - memcached
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index 646f1d4ae2..8cace14056 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
     # We disable the journal for a minor performance gain.
     command: mongod --nojournal
     container_name: edx.devstack.mongo
-    image: mongo:4.4.14
+    image: mongo:6.0.14
     ports:
       - "27017:27017"
     volumes:
@@ -50,6 +50,18 @@ services:
     volumes:
       - mysql_data:/var/lib/mysql
 
+  mysql8:
+    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password
+    container_name: edx.devstack.mysql8
+    environment:
+      MYSQL_ROOT_PASSWORD: ""
+      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+    image: mysql:8.0.31
+    ports:
+      - "3307:3306"
+    volumes:
+      - mysql8_data:/var/lib/mysql
+
   router:
     image: nginx
     container_name: edraak_dev_router
@@ -81,4 +93,5 @@ volumes:
   elasticsearch_data:
   mongo_data:
   mysql_data:
+  mysql8_data:
   devpi_data:
diff --git a/provision-lms.sh b/provision-lms.sh
index a3a29c27ca..3c4eb8b777 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -7,7 +7,7 @@ apps=( lms studio )
 echo "** Edx **"
 echo -e "${GREEN}Creating databases and users...${NC}"
 docker exec -i edx.devstack.mysql mysql -uroot mysql < provision.sql
-docker exec -i edx.devstack.mongo mongo < mongo-provision.js
+docker exec -i edx.devstack.mongo mongosh < mongo-provision.js
 
 # Load database dumps for the largest databases to save time
 ./load-db.sh edxapp
diff --git a/provision-mktg.sh b/provision-mktg.sh
index 5ca7e28e24..1b8dcd0a71 100755
--- a/provision-mktg.sh
+++ b/provision-mktg.sh
@@ -4,7 +4,7 @@ echo "** Bring Marketing up **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg
 
 echo "** Creating databases **"
-echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
+echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql
 
 echo "** Marketing: Copy cacheed files to code dir **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.'
diff --git a/provision-progs.sh b/provision-progs.sh
index a82cf9464d..d4dbd726b3 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -4,7 +4,7 @@ echo "** Bring progs up **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs
 
 echo "** Creating databases **"
-echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
+echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql
 
 
 echo "** Progs: Setting correct python version **"
diff --git a/provision.sh b/provision.sh
index 0f043f6d85..7cfbbf2e81 100755
--- a/provision.sh
+++ b/provision.sh
@@ -23,7 +23,7 @@ if [ "$MOUNT_TYPE" = "-nfs" ]; then
 fi
 
 # Bring the databases online.
-docker-compose up -d mysql mongo
+docker-compose up -d mysql mongo mysql8
 
 # Ensure the MySQL server is online and usable
 echo "Waiting for MySQL"
@@ -33,12 +33,19 @@ do
   sleep 1
 done
 
+echo "Waiting for MySQL8"
+until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
+do
+  printf "."
+  sleep 1
+done
+
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
 sleep 10
 
 printf "Creating mongo usres"
-docker exec -i edx.devstack.mongo mongo < mongo-provision.js
+docker exec -i edx.devstack.mongo mongosh < mongo-provision.js
 
 echo -e "MySQL ready"
 

From 4ccd98ab875afb92a5f1ead29e689cb9aee71e6f Mon Sep 17 00:00:00 2001
From: qutaiba <qutaiba.rawashdeh@gmail.com>
Date: Wed, 17 Apr 2024 10:28:23 +0300
Subject: [PATCH 118/137] Update memcached image version

---
 docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 646f1d4ae2..cfa2f89a9e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,12 +19,12 @@ services:
        - "9200:9200"
        - "9300:9300"
     volumes:
-      - elasticsearch_data:/usr/share/elasticsearch/data
+      - elasticsearch_data:/usr/share/elasticsearch/datamake
       - elasticsearch_data:/usr/share/elasticsearch/logs
 
   memcached:
     container_name: edx.devstack.memcached
-    image: memcached:1.4.24
+    image: memcached:1.4
     ports:
        - "11211:11211"
 

From e63f914ac9d338332312baa211975c7fde0979f8 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Wed, 17 Apr 2024 12:44:31 +0300
Subject: [PATCH 119/137] changes to work on ubuntu 22

---
 provision-mktg.sh  | 4 ++--
 provision-progs.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/provision-mktg.sh b/provision-mktg.sh
index 1b8dcd0a71..acafa4eaa2 100755
--- a/provision-mktg.sh
+++ b/provision-mktg.sh
@@ -8,10 +8,10 @@ echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstac
 
 echo "** Marketing: Copy cacheed files to code dir **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip install -r requirements.txt'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt'
 
 echo "** Marketing: Migrating databases **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Marketing: Compiling assets **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/'
diff --git a/provision-progs.sh b/provision-progs.sh
index d4dbd726b3..93f583e40c 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -12,10 +12,10 @@ docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alterna
 
 echo "** Progs: Copy cacheed files to code dir **"
 #docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip install -r requirements.txt'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt'
 
 echo "** Progs: Migrating databases **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev'
 
 echo "** Progs: Compiling assets **"
 docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass'

From 3cf6eaaf7e67d657201ecc6187639f403679b2d5 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Sun, 2 Jun 2024 10:39:31 +0300
Subject: [PATCH 120/137] Renew the SSL certificate for edraak.dev

---
 nginx/ssl/chained.crt | 38 +++++++++++++++++++-------------------
 nginx/ssl/private.key |  6 +++---
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 0d7c5e704a..4ce63648e0 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,27 +1,27 @@
 -----BEGIN CERTIFICATE-----
-MIIEJjCCAw6gAwIBAgISBDNj4gej7OO8Ctbkgw2BwFEvMA0GCSqGSIb3DQEBCwUA
+MIIEJTCCAw2gAwIBAgISBDEV9m6QbkODt+5KEYaFkb8+MA0GCSqGSIb3DQEBCwUA
 MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yNDAzMDMxMDEwMDRaFw0yNDA2MDExMDEwMDNaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNSP8c/XUmNf
-yy2B3xJtY4O1uJEL4x27HOURBjX0KIWWrMh9utdqV9Sc0+lUGnB1yy18fsMR/1dM
-2UpXDA/seXOjggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFCLldLOHhNLL
-48k7I0ExzdTiTc3DMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
+EwJSMzAeFw0yNDA2MDIwNjM0NDFaFw0yNDA4MzEwNjM0NDBaMBcxFTATBgNVBAMM
+DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAxqq7gRS0la
+YiTBvIYkGPlm7gvKtYExoCII1dCBtdcTneso325cE2Wa0se+3PtB+/YPhSyzT307
+5e/KWuwdC5CjggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFM4YaiQLzNEB
+RJGr20/26HBKmqJcMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
 CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn
 MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
 DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC
-AQQGCisGAQQB1nkCBAIEgfUEgfIA8AB2ADtTd3U+LbmAToswWwb+QDtn2E/D9Me9
-AA0tcm/h+tQXAAABjgQBtfYAAAQDAEcwRQIhAPvdax1FyK3Gu8MmVpaAW3Bwm3eJ
-z6oDWGhhDQQDv5AxAiA1q9oD9IPd+Ib5gzEBX1H5iV5LcnquRfPxt2pSDRxb1wB2
-AO7N0GTV2xrOxVy3nbTNE6Iyh0Z8vOzew1FIWUZxH7WbAAABjgQBtfMAAAQDAEcw
-RQIhAOBPkeII5PTgQl81RWm+E46odK3C8tob82aZdAcq1VQtAiA2BajG9cXWAroS
-/E0q4pDP9MdJ5LbX4gEtJiMkhyLn8jANBgkqhkiG9w0BAQsFAAOCAQEAns1U2PjE
-jnDbK3iQoVU3skn2NSqr1u7qtaiQOSs9rrwxVYYKd9qzkUud3luLvH689V+AgrzQ
-++9OFPMkCgNIax6po9pcy4ylTnCm7xHAMhjw8BrY1PW0Vdsw65xef/ltEyU6PWGG
-VsuN3b559QtFpx61FZEwy9niMIX3mznOavVSLjleWf1/1g+l0A83BTJQBgfyenN6
-NVT5YzyIvh5m9c+hZf6Mr98nmF3qFU76V1KswKnOGeg8Ffd6ZhY3w8q5EJ0/puYt
-Q9QtfhKJ2MPyJGBgfUqFqA+ilkLysBFQD8GulEB2tp3qfwEWcQz4vGn1ATX6prNr
-Rcp08/yIO7w3zg==
+AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s
+gdm7v6s52IRzAAABj9ffOloAAAQDAEcwRQIgYS8PTlAhogJiw0lTpFRPNIyGKTyZ
+K0sxW7t9TYjg4osCIQC0rv+P6gEVgyy7xYBEOu1qS1T3CwmKFa2wfiFt6MbUZAB1
+ABmYEHEJ8NZSLjCA0p4/ZLuDbijM+Q9Sju7fzko/FrTKAAABj9ffOnMAAAQDAEYw
+RAIgXA6RKRmEO9FztPr7lg88OLvw5JD0GfXYgqdZj6zMMQ0CIHQQOTA027+XOlxm
+xH/Mng0FkgW54uEN/Ksm6SveNYykMA0GCSqGSIb3DQEBCwUAA4IBAQBb7Bs7MqQT
+JtGyxVTS3Gyt7d86kfc2EOz2RAsPIrREvy28ZvsrC7+Gh0eBzzeK4E0wBbs4R9+O
+nQghMHVefPpXBIyxmyytJHzyy3FWKbob5uu5PQAFnPy2OtDB9g3ZKSkMV7gfYqwZ
+pMev72tTCraw+rhC88mlQvhyh/4uLEvrnqs4sZcRJLx/fF/qcknzwDdnp8beGHUp
+m8SO+aKh3EbO4sLrNxn2CYPcJ+c5xKaLIGUdK+zNUoaHKIUrQRe94sqm+zccCgAb
+qW2rhU7A3m1Ec3vzQ6EX//zq3IdcpD5Dg4NvFbUPjVAizNtJ2TWpjEiNMikTQtod
+t3SNwy59Jgv4
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 1a5ed2454a..dd8e7abe4b 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg1dFdIrdOE7LBxRh+
-yOiGub9+RPGmImABH7e9FZu24jehRANCAATUj/HP11JjX8stgd8SbWODtbiRC+Md
-uxzlEQY19CiFlqzIfbrXalfUnNPpVBpwdcstfH7DEf9XTNlKVwwP7Hlz
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgDdaPLqtkejR2yT/7
++aYMMiFWjA2f+OajmkunMr8Gw2WhRANCAAQMaqu4EUtJWmIkwbyGJBj5Zu4LyrWB
+MaAiCNXQgbXXE53rKN9uXBNlmtLHvtz7Qfv2D4Uss099O+XvylrsHQuQ
 -----END PRIVATE KEY-----
\ No newline at end of file

From 7a298a8f49baf392cd19100e1767852bbb923e16 Mon Sep 17 00:00:00 2001
From: apple <apple@apples-MacBook-Pro.local>
Date: Mon, 5 Aug 2024 00:22:30 +0300
Subject: [PATCH 121/137] edraak_DevStack

---
 provision.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/provision.sh b/provision.sh
index 7cfbbf2e81..6cc12d16f3 100755
--- a/provision.sh
+++ b/provision.sh
@@ -49,11 +49,6 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js
 
 echo -e "MySQL ready"
 
-if $ENABLE_EDX; then
-  ./provision-lms.sh
-  # Nothing special needed for studio
-  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
-fi
 
 
 if $ENABLE_PROGS; then
@@ -81,3 +76,8 @@ fi
 docker image prune -f
 
 echo -e "${GREEN}Provisioning complete!${NC}"
+if $ENABLE_EDX; then
+  ./provision-lms.sh
+  # Nothing special needed for studio
+  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
+

From d10c9d96f1f561ff0d7d0af886923bd0f4680dff Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Sun, 4 Aug 2024 12:49:21 +0300
Subject: [PATCH 122/137] Revert "edraak_DevStack"

This reverts commit 7a298a8f49baf392cd19100e1767852bbb923e16.
---
 provision.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/provision.sh b/provision.sh
index 6cc12d16f3..7cfbbf2e81 100755
--- a/provision.sh
+++ b/provision.sh
@@ -49,6 +49,11 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js
 
 echo -e "MySQL ready"
 
+if $ENABLE_EDX; then
+  ./provision-lms.sh
+  # Nothing special needed for studio
+  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
+fi
 
 
 if $ENABLE_PROGS; then
@@ -76,8 +81,3 @@ fi
 docker image prune -f
 
 echo -e "${GREEN}Provisioning complete!${NC}"
-if $ENABLE_EDX; then
-  ./provision-lms.sh
-  # Nothing special needed for studio
-  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
-

From 3fb7305abb00093f3967e1a5ab67b4f5b9899396 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Sun, 1 Sep 2024 12:16:35 +0300
Subject: [PATCH 123/137] update dev ssl

---
 nginx/ssl/chained.crt | 94 ++++++++++++++++++++-----------------------
 nginx/ssl/private.key |  8 ++--
 2 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 4ce63648e0..3b6423d079 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,55 +1,47 @@
 -----BEGIN CERTIFICATE-----
-MIIEJTCCAw2gAwIBAgISBDEV9m6QbkODt+5KEYaFkb8+MA0GCSqGSIb3DQEBCwUA
-MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
-EwJSMzAeFw0yNDA2MDIwNjM0NDFaFw0yNDA4MzEwNjM0NDBaMBcxFTATBgNVBAMM
-DCouZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABAxqq7gRS0la
-YiTBvIYkGPlm7gvKtYExoCII1dCBtdcTneso325cE2Wa0se+3PtB+/YPhSyzT307
-5e/KWuwdC5CjggIZMIICFTAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYB
-BQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFM4YaiQLzNEB
-RJGr20/26HBKmqJcMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYfr52LFMLGMFUG
-CCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8ubGVuY3Iub3Jn
-MCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
-DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCC
-AQMGCisGAQQB1nkCBAIEgfQEgfEA7wB2AEiw42vapkc0D+VqAvqdMOscUgHLVt0s
-gdm7v6s52IRzAAABj9ffOloAAAQDAEcwRQIgYS8PTlAhogJiw0lTpFRPNIyGKTyZ
-K0sxW7t9TYjg4osCIQC0rv+P6gEVgyy7xYBEOu1qS1T3CwmKFa2wfiFt6MbUZAB1
-ABmYEHEJ8NZSLjCA0p4/ZLuDbijM+Q9Sju7fzko/FrTKAAABj9ffOnMAAAQDAEYw
-RAIgXA6RKRmEO9FztPr7lg88OLvw5JD0GfXYgqdZj6zMMQ0CIHQQOTA027+XOlxm
-xH/Mng0FkgW54uEN/Ksm6SveNYykMA0GCSqGSIb3DQEBCwUAA4IBAQBb7Bs7MqQT
-JtGyxVTS3Gyt7d86kfc2EOz2RAsPIrREvy28ZvsrC7+Gh0eBzzeK4E0wBbs4R9+O
-nQghMHVefPpXBIyxmyytJHzyy3FWKbob5uu5PQAFnPy2OtDB9g3ZKSkMV7gfYqwZ
-pMev72tTCraw+rhC88mlQvhyh/4uLEvrnqs4sZcRJLx/fF/qcknzwDdnp8beGHUp
-m8SO+aKh3EbO4sLrNxn2CYPcJ+c5xKaLIGUdK+zNUoaHKIUrQRe94sqm+zccCgAb
-qW2rhU7A3m1Ec3vzQ6EX//zq3IdcpD5Dg4NvFbUPjVAizNtJ2TWpjEiNMikTQtod
-t3SNwy59Jgv4
+MIIDhTCCAwugAwIBAgISA3vnnyo74p8gg0E3ReOVYTfIMAoGCCqGSM49BAMDMDIx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
+NTAeFw0yNDA5MDEwODA3MjFaFw0yNDExMzAwODA3MjBaMBcxFTATBgNVBAMMDCou
+ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPvQrUK0nbVCOUja
+8JXVae1f1pg1BJa4rV9lX/7xqgmRHr1gXjOYRKbLzB9c9F7tx5egrJm536To7cbX
+ckG4ZOWjggIaMIICFjAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFDpczHNGEqoLxaP2
+cJlxHSqUfTeNMB8GA1UdIwQYMBaAFJ8rX888IU+dBLftKyzExnCL0tcNMFUGCCsG
+AQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL2U1Lm8ubGVuY3Iub3JnMCIG
+CCsGAQUFBzAChhZodHRwOi8vZTUuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqCDCou
+ZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATCCAQQG
+CisGAQQB1nkCBAIEgfUEgfIA8AB2ABmYEHEJ8NZSLjCA0p4/ZLuDbijM+Q9Sju7f
+zko/FrTKAAABkazVZREAAAQDAEcwRQIhANhePDKQCEaTAL+XyIeZER3SEY0zzr3W
+1niKeAcrfaOKAiBayERKMYozCwMPOOgFiHMiwyxxpjwjD6sOIQbwDmyfAwB2AEiw
+42vapkc0D+VqAvqdMOscUgHLVt0sgdm7v6s52IRzAAABkazVZU0AAAQDAEcwRQIh
+AOtiTs8EUhriQDR3gyO0zH3akV/OjyMZ3fJlWH/H8Z0rAiBEOxXYt7ZPxbDb9TR4
+Bx9JYM+xGLsuYxLMkqQSOWSZFTAKBggqhkjOPQQDAwNoADBlAjByWN52h8IgEDCL
+qB7ZGqT/pOwAyCezEfDC2MREp6x+5euk+bOPCGGySaZ0fTkFbcECMQDDynpc2IYi
+1Jd26Q3PAnpaIxRG+JDNA/c9FGVr13ivRfSplrFHAnf6LOHoeag+AWQ=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
+MIIEVzCCAj+gAwIBAgIRAIOPbGPOsTmMYgZigxXJ/d4wDQYJKoZIhvcNAQELBQAw
 TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
-WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
-R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
-sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
-NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
-Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
-/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
-FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
-AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
-Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
-gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
-PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
-ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
-CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
-lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
-avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
-yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
-yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
-hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
-HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
-MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
-nLRbwHOoq7hHwg==
------END CERTIFICATE-----
\ No newline at end of file
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
+WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCRTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNCzqK
+a2GOtu/cX1jnxkJFVKtj9mZhSAouWXW0gQI3ULc/FnncmOyhKJdyIBwsz9V8UiBO
+VHhbhBRrwJCuhezAUUE8Wod/Bk3U/mDR+mwt4X2VEIiiCFQPmRpM5uoKrNijgfgw
+gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSfK1/PPCFPnQS37SssxMZw
+i9LXDTAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
+BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
+Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C
+2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+
+bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG
+6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV
+XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO
+koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq
+cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI
+E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e
+K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX
+GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL
+sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd
+VQD9F6Na/+zmXCc=
+-----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index dd8e7abe4b..bb92a298d0 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgDdaPLqtkejR2yT/7
-+aYMMiFWjA2f+OajmkunMr8Gw2WhRANCAAQMaqu4EUtJWmIkwbyGJBj5Zu4LyrWB
-MaAiCNXQgbXXE53rKN9uXBNlmtLHvtz7Qfv2D4Uss099O+XvylrsHQuQ
------END PRIVATE KEY-----
\ No newline at end of file
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJEN1jddZXcKev4eL
+tuUkAqz+VbIgFxQyg3bPi7XmsnuhRANCAAT70K1CtJ21QjlI2vCV1WntX9aYNQSW
+uK1fZV/+8aoJkR69YF4zmESmy8wfXPRe7ceXoKyZud+k6O3G13JBuGTl
+-----END PRIVATE KEY-----

From b795341a08da8e0fb64aff45ab70eb281d0ab834 Mon Sep 17 00:00:00 2001
From: qutaiba <qutaiba.rawashdeh@gmail.com>
Date: Mon, 23 Sep 2024 11:15:44 +0300
Subject: [PATCH 124/137] Update marketing make file to include build, push
 image and yarn comman

---
 mktg.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mktg.mk b/mktg.mk
index b4ac8bb84d..bf717dfcab 100644
--- a/mktg.mk
+++ b/mktg.mk
@@ -24,10 +24,10 @@ mktg.help:
 
 
 mktg.build:
-	docker build -t eu.gcr.io/openedx-231314/edraak/marketing -f ../marketing-site/Dockerfile ../marketing-site
+	docker build -t eu.gcr.io/openedx-231314/edraak/marketing:latest -f ../marketing-site/Dockerfile ../marketing-site
 
 mktg.pushimage:
-	docker push eu.gcr.io/openedx-231314/edraak/marketing
+	docker push eu.gcr.io/openedx-231314/edraak/marketing:latest
 
 mktg.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
@@ -44,6 +44,9 @@ mktg.install_pip:
 mktg.install_npm:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install
 
+mktg.install_yarn:
+	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg yarn
+
 mktg.copy_cache:
 	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app
 

From c8046aed0d0a714f84352d362c8093bf98f725f3 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Sun, 1 Dec 2024 12:22:47 +0300
Subject: [PATCH 125/137] Renew ssl cert for edraak.dev December 2024

---
 nginx/ssl/chained.crt | 70 +++++++++++++++++++++----------------------
 nginx/ssl/private.key |  6 ++--
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 3b6423d079..aaccb02368 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,47 +1,47 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEVzCCAj+gAwIBAgIRAIOPbGPOsTmMYgZigxXJ/d4wDQYJKoZIhvcNAQELBQAw
+MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
 TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
 cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
 WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCRTUwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNCzqK
-a2GOtu/cX1jnxkJFVKtj9mZhSAouWXW0gQI3ULc/FnncmOyhKJdyIBwsz9V8UiBO
-VHhbhBRrwJCuhezAUUE8Wod/Bk3U/mDR+mwt4X2VEIiiCFQPmRpM5uoKrNijgfgw
+RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G
+h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV
+6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw
 gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSfK1/PPCFPnQS37SssxMZw
-i9LXDTAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj
+v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
 AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
 BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
-Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAH3KdNEVCQdqk0LKyuNImTKdRJY1C
-2uw2SJajuhqkyGPY8C+zzsufZ+mgnhnq1A2KVQOSykOEnUbx1cy637rBAihx97r+
-bcwbZM6sTDIaEriR/PLk6LKs9Be0uoVxgOKDcpG9svD33J+G9Lcfv1K9luDmSTgG
-6XNFIN5vfI5gs/lMPyojEMdIzK9blcl2/1vKxO8WGCcjvsQ1nJ/Pwt8LQZBfOFyV
-XP8ubAp/au3dc4EKWG9MO5zcx1qT9+NXRGdVWxGvmBFRAajciMfXME1ZuGmk3/GO
-koAM7ZkjZmleyokP1LGzmfJcUd9s7eeu1/9/eg5XlXd/55GtYjAM+C4DG5i7eaNq
-cm2F+yxYIPt6cbbtYVNJCGfHWqHEQ4FYStUyFnv8sjyqU8ypgZaNJ9aVcWSICLOI
-E1/Qv/7oKsnZCWJ926wU6RqG1OYPGOi1zuABhLw61cuPVDT28nQS/e6z95cJXq0e
-K1BcaJ6fJZsmbjRgD5p3mvEf5vdQM7MCEvU0tHbsx2I5mHHJoABHb8KVBgWp/lcX
-GWiWaeOyB7RP+OfDtvi2OsapxXiV7vNVs7fMlrRjY1joKaqmmycnBvAq14AEbtyL
-sVfOS66B8apkeFX2NY4XPEYV4ZSCe8VHPrdrERk2wILG3T/EGmSIkCYVUMSnjmJd
-VQD9F6Na/+zmXCc=
+Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc
+MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL
+pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp
+eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH
+pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7
+s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu
+h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv
+YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8
+ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0
+LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+
+EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY
+Ig46v9mFmBvyH04=
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index bb92a298d0..db3e649902 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgJEN1jddZXcKev4eL
-tuUkAqz+VbIgFxQyg3bPi7XmsnuhRANCAAT70K1CtJ21QjlI2vCV1WntX9aYNQSW
-uK1fZV/+8aoJkR69YF4zmESmy8wfXPRe7ceXoKyZud+k6O3G13JBuGTl
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9ErXtEsDvvV8fy1c
+nUfZEYEUeVVMXOSxDArQNsAJiX+hRANCAATKzeot16Z1Qb2cRQRfMvI34bYmcnnm
+kgF5BkCpdAbofTqIq01d224u0QYskj1BPmHyowsHoSnV45PneWDFw36d
 -----END PRIVATE KEY-----

From 52dcb9f5b58a7981a191b1a4638e4b32cef525b3 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Mon, 3 Mar 2025 11:46:21 +0300
Subject: [PATCH 126/137] update dev ssl

---
 nginx/ssl/chained.crt | 32 ++++++++++++++++----------------
 nginx/ssl/private.key |  6 +++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index aaccb02368..16145a86ea 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,23 +1,23 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
-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
+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
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index db3e649902..9a4108817a 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg9ErXtEsDvvV8fy1c
-nUfZEYEUeVVMXOSxDArQNsAJiX+hRANCAATKzeot16Z1Qb2cRQRfMvI34bYmcnnm
-kgF5BkCpdAbofTqIq01d224u0QYskj1BPmHyowsHoSnV45PneWDFw36d
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg6NnaBmyHoMN/qkYq
+ddg4PurCSgmAqTNG9DcwdGyORZShRANCAATN9ZcTezEQyPzfXANg+L4oZOEBR+9K
+GHtpi2HQznuAbbwHsRfKQa6JMY0CR9Qh19HOPQPpfUmNtI+PRAJ8PJuX
 -----END PRIVATE KEY-----

From 80ee4d16b32dd518449c96eb35ef61b6b6d0af01 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Tue, 27 May 2025 11:03:30 +0300
Subject: [PATCH 127/137] update dev ssl

---
 nginx/ssl/chained.crt | 37 +++++++++++++++++++------------------
 nginx/ssl/private.key |  6 +++---
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 16145a86ea..84b45dbb75 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,23 +1,24 @@
 -----BEGIN CERTIFICATE-----
-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
+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
-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
+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
+sKuy
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
 MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 9a4108817a..f36114f636 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg6NnaBmyHoMN/qkYq
-ddg4PurCSgmAqTNG9DcwdGyORZShRANCAATN9ZcTezEQyPzfXANg+L4oZOEBR+9K
-GHtpi2HQznuAbbwHsRfKQa6JMY0CR9Qh19HOPQPpfUmNtI+PRAJ8PJuX
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgV1FsDi5uRr39v9kQ
+pIEowp1OmwzI7m9H2fol/MgsEuqhRANCAAQOfj8c+zA610YUWrvox9BsNI+II6bs
+J+L6n/2DcKsqhDy7oVy0W1tROFgtHqGXDbBXk4L1vkwLjQzb+SA8m0fB
 -----END PRIVATE KEY-----

From 4b90f09977be1e820f501e10e85715250086072a Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Wed, 14 May 2025 10:43:06 +0300
Subject: [PATCH 128/137] changes for docker upgrade and mac m series

---
 Makefile                                      | 39 ++++++++++---------
 course-generator/create-courses.sh            |  2 +-
 destroy.sh                                    |  2 +-
 docker-compose-auth-provider.yml              |  2 +-
 docker-compose-edx.yml                        |  2 +-
 docker-compose-mktg.yml                       |  4 +-
 docker-compose-progs.yml                      |  4 +-
 docker-compose.yml                            | 33 ++++++++--------
 healthchecks.sh                               | 12 +++---
 mktg.mk                                       | 20 +++++-----
 .../add_replace_sensitive_column.sql          | 18 +++++++++
 .../add_verify_student_constraint.sql         | 20 ++++++++++
 programs/provision.sh                         |  2 +-
 progs.mk                                      | 22 +++++------
 provision-b2b.sh                              | 24 ++++++------
 provision-forum.sh                            |  4 +-
 provision-lms.sh                              | 31 ++++++++++-----
 provision-mktg.sh                             | 18 ++++-----
 provision-progs.sh                            | 26 ++++++-------
 provision-state-manager-api.sh                | 10 ++---
 provision.sh                                  | 16 ++++----
 provision.sql                                 | 18 ++++++---
 setup_native_nfs_docker_osx.sh                |  2 +-
 23 files changed, 193 insertions(+), 138 deletions(-)
 mode change 100644 => 100755 Makefile
 mode change 100644 => 100755 docker-compose-auth-provider.yml
 mode change 100644 => 100755 docker-compose-edx.yml
 mode change 100644 => 100755 docker-compose-mktg.yml
 mode change 100644 => 100755 docker-compose-progs.yml
 mode change 100644 => 100755 docker-compose.yml
 mode change 100644 => 100755 mktg.mk
 create mode 100644 mysql8_edx_fix/add_replace_sensitive_column.sql
 create mode 100644 mysql8_edx_fix/add_verify_student_constraint.sql
 mode change 100644 => 100755 progs.mk
 mode change 100644 => 100755 provision.sql

diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index ef1ede11e0..15eb5bb69c
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@
 .DEFAULT_GOAL := help
 .PHONY: requirements
 
-DEVSTACK_WORKSPACE ?= $(shell pwd)/..
+export DEVSTACK_WORKSPACE=$(abspath ../)
 include .env
 
 OS := $(shell uname)
@@ -52,7 +52,7 @@ endif
 
 export DOCKER_COMPOSE_FILES
 
-export DEVSTACK_WORKSPACE
+#export DEVSTACK_WORKSPACE
 export COMPOSE_PROJECT_NAME
 
 include *.mk
@@ -80,6 +80,7 @@ dev.checkout: ## Check out "masters" otherwise
 	./repo.sh checkout
 
 dev.clone: ## Clone service repos to the parent directory
+	@echo "DEVSTACK_WORKSPACE ${DEVSTACK_WORKSPACE}"
 	./repo.sh clone
 
 dev.provision.run: ## Provision all services with local mounted directories
@@ -107,7 +108,7 @@ dev.editable-envs:  ## Copy env files outside the docker containers so it's edit
 	@make studio-restart
 
 dev.up: | check-memory ## Bring up all services with host volumes
-	docker-compose ${DOCKER_COMPOSE_FILES} up -d
+	docker compose ${DOCKER_COMPOSE_FILES} up -d
 
 edraak.dev.up.hacks:
 	@# Start: Edraak hacks
@@ -126,25 +127,25 @@ provision: | dev.provision
 
 stop: ## Stop all services
 	(test -d .docker-sync && docker-sync stop) || true ## Ignore failure here
-	docker-compose ${DOCKER_COMPOSE_FILES} stop
+	docker compose ${DOCKER_COMPOSE_FILES} stop
 
 down: ## Remove all service containers and networks
-	docker-compose ${DOCKER_COMPOSE_FILES} down
+	docker compose ${DOCKER_COMPOSE_FILES} down
 
 destroy: ## Remove all devstack-related containers, networks, and volumes
 	./destroy.sh
 
 logs: ## View logs from containers running in detached mode
-	docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail 10
+	docker compose ${DOCKER_COMPOSE_FILES} logs -f --tail 10
 
 %-logs: ## View the logs of the specified service container
-	docker-compose ${DOCKER_COMPOSE_FILES} logs -f --tail=500 $*
+	docker compose ${DOCKER_COMPOSE_FILES} logs -f --tail=500 $*
 
 pull:
-	docker-compose ${DOCKER_COMPOSE_FILES} pull --parallel
+	docker compose ${DOCKER_COMPOSE_FILES} pull
 
 validate: ## Validate the devstack configuration
-	docker-compose ${DOCKER_COMPOSE_FILES} config
+	docker compose ${DOCKER_COMPOSE_FILES} config
 
 backup: ## Write all data volumes to the host.
 	docker run --rm --volumes-from edx.devstack.mysql -v $$(pwd)/.dev/backups:/backup debian:jessie tar zcvf /backup/mysql.tar.gz /var/lib/mysql
@@ -161,7 +162,7 @@ restore:  ## Restore all data volumes from the host. WARNING: THIS WILL OVERWRIT
 
 
 # TODO: Print out help for this target. Even better if we can iterate over the
-# services in docker-compose.yml, and print the actual service names.
+# services in docker compose.yml, and print the actual service names.
 %-shell: ## Run a shell on the specified service container
 	docker exec -it edx.devstack.$* /bin/bash
 
@@ -249,39 +250,39 @@ vnc-passwords: ## Get the VNC passwords for the Chrome and Firefox Selenium cont
 	@docker logs edx.devstack.firefox 2>&1 | grep "VNC password" | tail -1
 
 devpi-password: ## Get the root devpi password for the devpi container
-	docker-compose exec devpi bash -c "cat /data/server/.serverpassword"
+	docker compose exec devpi bash -c "cat /data/server/.serverpassword"
 
 mysql-shell: ## Run a shell on the mysql container
-	docker-compose exec mysql bash
+	docker compose exec mysql bash
 
 mysql-shell-edxapp: ## Run a mysql shell on the edxapp database
-	docker-compose exec mysql bash -c "mysql edxapp"
+	docker compose exec mysql bash -c "mysql edxapp"
 
 mongo-shell: ## Run a shell on the mongo container
-	docker-compose exec mongo bash
+	docker compose exec mongo bash
 
 ### analytics pipeline commands
 
 dev.provision.analytics_pipeline: | check-memory dev.provision.analytics_pipeline.run stop.analytics_pipeline stop ## Provision analyticstack dev environment with all services stopped
 
 dev.provision.analytics_pipeline.run:
-	DOCKER_COMPOSE_FILES="-f docker-compose.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh
+	DOCKER_COMPOSE_FILES="-f docker compose.yml -f docker compose-host.yml -f docker compose-analytics-pipeline.yml" ./provision-analytics-pipeline.sh
 
 analytics-pipeline-shell: ## Run a shell on the analytics pipeline container
 	docker exec -it edx.devstack.analytics_pipeline env TERM=$(TERM) /edx/app/analytics_pipeline/devstack.sh open
 
 dev.up.analytics_pipeline: | check-memory ## Bring up analytics pipeline services
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml -f docker-compose-host.yml up -d analyticspipeline
+	docker compose -f docker compose.yml -f docker compose-analytics-pipeline.yml -f docker compose-host.yml up -d analyticspipeline
 
 pull.analytics_pipeline: ## Update analytics pipeline docker images
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml pull --parallel
+	docker compose -f docker compose.yml -f docker compose-analytics-pipeline.yml pull --parallel
 
 analytics-pipeline-devstack-test: ## Run analytics pipeline tests in travis build
 	docker exec -u hadoop -i edx.devstack.analytics_pipeline bash -c 'sudo chown -R hadoop:hadoop /edx/app/analytics_pipeline && source /edx/app/hadoop/.bashrc && make develop-local && make docker-test-acceptance-local ONLY_TESTS=edx.analytics.tasks.tests.acceptance.test_internal_reporting_database && make docker-test-acceptance-local ONLY_TESTS=edx.analytics.tasks.tests.acceptance.test_user_activity'
 
 stop.analytics_pipeline: ## Stop analytics pipeline services
-	docker-compose -f docker-compose.yml -f docker-compose-analytics-pipeline.yml stop
-	docker-compose up -d mysql      ## restart mysql as other containers need it
+	docker compose -f docker compose.yml -f docker compose-analytics-pipeline.yml stop
+	docker compose up -d mysql      ## restart mysql as other containers need it
 
 hadoop-application-logs-%: ## View hadoop logs by application Id
 	docker exec -it edx.devstack.analytics_pipeline.nodemanager yarn logs -applicationId $*
diff --git a/course-generator/create-courses.sh b/course-generator/create-courses.sh
index eea96f6589..16b76b2390 100755
--- a/course-generator/create-courses.sh
+++ b/course-generator/create-courses.sh
@@ -8,7 +8,7 @@ echo "Parsing options"
 container_error=false
 for arg in "$@"; do
     if [ $arg == "--studio" ]; then
-        if [ ! "$(docker-compose exec lms bash -c 'echo "Course will be created for studio"; exit $?')" ]; then
+        if [ ! "$(docker compose exec lms bash -c 'echo "Course will be created for studio"; exit $?')" ]; then
             echo "Issue with studio container"
             container_error=true
         else
diff --git a/destroy.sh b/destroy.sh
index aaf7d7bd14..94520e3326 100755
--- a/destroy.sh
+++ b/destroy.sh
@@ -5,5 +5,5 @@ set -e
 read -p "This will delete all data in your devstack. Would you like to proceed? [y/n] " -r
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
-    docker-compose -f docker-compose.yml -f docker-compose-watchers.yml -f docker-compose-state-manager.yml -f docker-compose-host.yml -f docker-compose-analytics-pipeline.yml down -v
+    docker compose -f docker compose.yml -f docker compose-watchers.yml -f docker compose-state-manager.yml -f docker compose-host.yml -f docker compose-analytics-pipeline.yml down -v
 fi
diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml
old mode 100644
new mode 100755
index 5e964af171..994a9bce70
--- a/docker-compose-auth-provider.yml
+++ b/docker-compose-auth-provider.yml
@@ -8,7 +8,7 @@
 # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
-version: "2.1"
+version: '3.3'
 
 services:
   auth-provider:
diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
old mode 100644
new mode 100755
index d1a603aac5..2b92fdda09
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -8,7 +8,7 @@
 # - Every service's container name should be prefixed with "edx.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
-version: "2.1"
+version: '3.3'
 
 services:
 
diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml
old mode 100644
new mode 100755
index d33f6e99dd..b61f45466e
--- a/docker-compose-mktg.yml
+++ b/docker-compose-mktg.yml
@@ -8,7 +8,7 @@
 # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
-version: "2.1"
+version: '3.3'
 
 services:
 
@@ -22,7 +22,7 @@ services:
     ports:
       - "18500:8500"
     depends_on:
-      - mysql8
+      - mysql
       - memcached
     volumes:
       - ${DEVSTACK_WORKSPACE}/marketing-site:/app
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
old mode 100644
new mode 100755
index 59501c10b4..37e306ae8e
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -8,7 +8,7 @@
 # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
-version: "2.1"
+version: '3.3'
 
 services:
 
@@ -23,7 +23,7 @@ services:
     ports:
       - "18800:8800"
     depends_on:
-      - mysql8
+      - mysql
       - mongo
       - memcached
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
old mode 100644
new mode 100755
index a0807c2803..ada91d9021
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@
 # - Every service's container name should be prefixed with "edraak.devstack." to avoid conflicts with other containers
 #   that might be running for the same service.
 
-version: "2.1"
+version: '3.3'
 
 services:
 
@@ -38,29 +38,29 @@ services:
     volumes:
       - mongo_data:/data/db
 
-  mysql:
-    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
-    container_name: edx.devstack.mysql
-    environment:
-      MYSQL_ROOT_PASSWORD: ""
-      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-    image: mysql:5.7
-    ports:
-       - "3306:3306"
-    volumes:
-      - mysql_data:/var/lib/mysql
+#  mysql:
+#    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
+#    container_name: edx.devstack.mysql
+#    environment:
+#      MYSQL_ROOT_PASSWORD: ""
+#      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
+#    image: mysql:5.7
+#    ports:
+#       - "3306:3306"
+#    volumes:
+#      - mysql_data:/var/lib/mysql
 
-  mysql8:
+  mysql:
     command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password
-    container_name: edx.devstack.mysql8
+    container_name: edx.devstack.mysql
     environment:
       MYSQL_ROOT_PASSWORD: ""
       MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
     image: mysql:8.0.31
     ports:
-      - "3307:3306"
+      - "3306:3306"
     volumes:
-      - mysql8_data:/var/lib/mysql
+      - mysql_data:/var/lib/mysql
 
   router:
     image: nginx
@@ -93,5 +93,4 @@ volumes:
   elasticsearch_data:
   mongo_data:
   mysql_data:
-  mysql8_data:
   devpi_data:
diff --git a/healthchecks.sh b/healthchecks.sh
index 8f98dfe855..8e0cbcee1f 100755
--- a/healthchecks.sh
+++ b/healthchecks.sh
@@ -3,34 +3,34 @@ set -x
 echo "Checking LMS heartbeat:"
 curl http://localhost:18000/heartbeat
 if [ $? -ne 0 ]; then
-    docker-compose logs
+    docker compose logs
     exit 2
 fi
 echo
 echo "Checking Studio heartbeat:"
 curl http://localhost:18010/heartbeat # Studio
 if [ $? -ne 0 ]; then
-    docker-compose logs
+    docker compose logs
     exit 2
 fi
 echo
 echo "Checking ecommerce health:"
 curl http://localhost:18130/health/ # Ecommerce
 if [ $? -ne 0 ]; then
-    docker-compose logs
+    docker compose logs
     exit 2
 fi
 echo
 echo "Checking discovery health:"
 curl http://localhost:18381/health/ # Discovery
 if [ $? -ne 0 ]; then
-    docker-compose logs
+    docker compose logs
     exit 2
 fi
 echo
 echo "Checking forum health:"
 curl http://localhost:44567/heartbeat # Forums
 if [ $? -ne 0 ]; then
-    docker-compose logs
+    docker compose logs
     exit 2
-fi
\ No newline at end of file
+fi
diff --git a/mktg.mk b/mktg.mk
old mode 100644
new mode 100755
index bf717dfcab..1eda295e8a
--- a/mktg.mk
+++ b/mktg.mk
@@ -30,33 +30,33 @@ mktg.pushimage:
 	docker push eu.gcr.io/openedx-231314/edraak/marketing:latest
 
 mktg.migrate: ## Kill the Marketing Django development server. The watcher process will restart it.
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev'
 
 mktg.langs_push:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_push --settings=marketingsite.envs.dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_push --settings=marketingsite.envs.dev
 
 mktg.langs_pull:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg python manage.py langs_pull --settings=marketingsite.envs.dev
 
 mktg.install_pip:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg pip install -r requirements.txt
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg pip install -r requirements.txt
 
 mktg.install_npm:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm install
 
 mktg.install_yarn:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg yarn
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg yarn
 
 mktg.copy_cache:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg cp -Rnv /cache/node_modules /cache/.compiled /app
 
 mktg.dev:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev
 
 mktg.watch:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch
 
 mktg.install_all: | mktg.install_pip mktg.install_npm mktg.dev mktg.migrate
 
 mktg.fix-npm:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'chown -R root ~/.npm'
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'chown -R root ~/.npm'
diff --git a/mysql8_edx_fix/add_replace_sensitive_column.sql b/mysql8_edx_fix/add_replace_sensitive_column.sql
new file mode 100644
index 0000000000..5e0a910689
--- /dev/null
+++ b/mysql8_edx_fix/add_replace_sensitive_column.sql
@@ -0,0 +1,18 @@
+USE edxapp;
+
+SET @column_exists := (
+  SELECT COUNT(*) FROM information_schema.columns
+  WHERE table_schema = 'edxapp'
+    AND table_name = 'enterprise_enterprisecustomer'
+    AND column_name = 'replace_sensitive_sso_username'
+);
+
+SET @ddl := IF(
+  @column_exists = 0,
+  'ALTER TABLE enterprise_enterprisecustomer ADD COLUMN replace_sensitive_sso_username TINYINT(1) DEFAULT 0;',
+  'SELECT "Column already exists";'
+);
+
+PREPARE stmt FROM @ddl;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/mysql8_edx_fix/add_verify_student_constraint.sql b/mysql8_edx_fix/add_verify_student_constraint.sql
new file mode 100644
index 0000000000..6fbb392b9b
--- /dev/null
+++ b/mysql8_edx_fix/add_verify_student_constraint.sql
@@ -0,0 +1,20 @@
+USE edxapp;
+
+-- Check if the constraint already exists
+SET @index_exists := (
+  SELECT COUNT(*) FROM information_schema.statistics
+  WHERE table_schema = 'edxapp'
+    AND table_name = 'verify_student_skippedreverification'
+    AND index_name = 'unique_skippedreverification'
+);
+
+-- Add the constraint only if it's missing
+SET @ddl := IF(
+  @index_exists = 0,
+  'ALTER TABLE verify_student_skippedreverification ADD UNIQUE INDEX unique_skippedreverification (user_id, course_id);',
+  'SELECT "Constraint already exists"'
+);
+
+PREPARE stmt FROM @ddl;
+EXECUTE stmt;
+DEALLOCATE PREPARE stmt;
diff --git a/programs/provision.sh b/programs/provision.sh
index 8ce3d1567a..c6a6aebe75 100755
--- a/programs/provision.sh
+++ b/programs/provision.sh
@@ -42,7 +42,7 @@ docker_exec() {
     /edx/app/$app/$repo/manage.py $cmd
     "
 
-    docker-compose exec "$service" bash -c "$CMDS"
+    docker compose exec "$service" bash -c "$CMDS"
 }
 
 provision_ida() {
diff --git a/progs.mk b/progs.mk
old mode 100644
new mode 100755
index 0eabe7b2ea..ca8ee15fda
--- a/progs.mk
+++ b/progs.mk
@@ -32,37 +32,37 @@ progs.pushimage:
 	docker push eu.gcr.io/openedx-231314/edraak/progs
 
 progs.migrate:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev
 
 progs.langs_push:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev
 
 progs.langs_pull:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_pull --settings=edraakprograms.dev
 
 progs.install_pip:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs pip install -r requirements.txt
 
 progs.install_npm:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm install
 
 progs.copy_cache:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs cp -Rnv /cache/node_modules /cache/.compiled /app
 
 progs.dev:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev
 
 progs.watch:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
 
 progs.install_all: | progs.install_pip progs.install_npm progs.dev progs.migrate
 
 progs.watch_js:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run dev:watch
 
 progs.watch_css:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs npm run watch-scss
 
 progs.fix-npm:
-	docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
 
diff --git a/provision-b2b.sh b/provision-b2b.sh
index 28ab550882..749538c90c 100755
--- a/provision-b2b.sh
+++ b/provision-b2b.sh
@@ -1,29 +1,29 @@
 set -e
 
 echo "** bring b2b container up **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d b2b
+docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d b2b
 
 
 echo "** Creating databases **"
 echo "CREATE DATABASE IF NOT EXISTS b2b;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
 echo "** b2b: Setting correct python version **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1'
 
 echo "** b2b: Copy cacheed files to code dir **"
-#docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'pip install -r requirements.txt'
+#docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'cp -Rn /cache/* /app/.'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'pip install -r requirements.txt'
 
 echo "** b2b: Migrating databases **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py migrate --settings=edraakprograms.dev'
 
 echo "** b2b: Compiling assets **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'rm -rf node_modules/'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm rebuild node-sass'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'chown -R root ~/.npm'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'rm -rf node_modules/'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm install'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'npm run dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec b2b bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.dev'
 
 echo "** b2b: Restarting **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart b2b
+docker compose `echo ${DOCKER_COMPOSE_FILES}` restart b2b
diff --git a/provision-forum.sh b/provision-forum.sh
index 793a799b73..1405b2d6ff 100755
--- a/provision-forum.sh
+++ b/provision-forum.sh
@@ -2,5 +2,5 @@ set -e
 set -o pipefail
 set -x
 
-docker-compose $DOCKER_COMPOSE_FILES up -d forum
-docker-compose exec forum bash -c 'source /edx/app/forum/ruby_env && cd /edx/app/forum/cs_comments_service && bundle install --deployment --path /edx/app/forum/.gem/'
+docker compose $DOCKER_COMPOSE_FILES up -d forum
+docker compose exec forum bash -c 'source /edx/app/forum/ruby_env && cd /edx/app/forum/cs_comments_service && bundle install --deployment --path /edx/app/forum/.gem/'
diff --git a/provision-lms.sh b/provision-lms.sh
index 3c4eb8b777..e1553f338d 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -16,35 +16,46 @@ docker exec -i edx.devstack.mongo mongosh < mongo-provision.js
 # Bring edxapp containers online
 for app in "${apps[@]}"; do
     echo ${DOCKER_COMPOSE_FILES}
-    docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d $app
+    docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d $app
 done
 
 
 echo ${DOCKER_COMPOSE_FILES}
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 NO_PREREQ_INSTALL=0 paver install_prereqs'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && NO_PYTHON_UNINSTALL=1 NO_PREREQ_INSTALL=0 paver install_prereqs'
+
+docker cp ./mysql8_edx_fix/add_replace_sensitive_column.sql edx.devstack.mysql:/add_replace_sensitive_column.sql
+docker compose exec mysql bash -c "mysql -u root edxapp < /add_replace_sensitive_column.sql"
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c  'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && python manage.py lms migrate enterprise 0042 --fake --settings=devstack_docker'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && python manage.py lms migrate enterprise 0046 --fake --settings=devstack_docker'
+
+docker cp ./mysql8_edx_fix/add_verify_student_constraint.sql edx.devstack.mysql:/add_verify_student_constraint.sql
+docker compose exec mysql bash -c "mysql -u root edxapp < /add_verify_student_constraint.sql"
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && python manage.py lms migrate verify_student 0006 --fake --settings=devstack_docker'
+
+
 
 # Run edxapp migrations first since they are needed for the service users and OAuth clients
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_db --settings devstack_docker'
 
 # Create a superuser for edxapp
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell  --settings=devstack_docker'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user edx edx@example.com --superuser --staff'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && echo "from django.contrib.auth import get_user_model; User = get_user_model(); user = User.objects.get(username=\"edx\"); user.set_password(\"edx\"); user.save()" | python /edx/app/edxapp/edx-platform/manage.py lms shell  --settings=devstack_docker'
 
 # Create an enterprise service user for edxapp
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker manage_user enterprise_worker enterprise_worker@example.com'
 
 # Enable the LMS-E-Commerce integration
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'source /edx/app/edxapp/edxapp_env && python /edx/app/edxapp/edx-platform/manage.py lms --settings=devstack_docker configure_commerce'
 
 # Create demo course and users
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c '/edx/app/edx_ansible/venvs/edx_ansible/bin/ansible-playbook /edx/app/edx_ansible/edx_ansible/playbooks/demo.yml -v -c local -i "127.0.0.1," --extra-vars="COMMON_EDXAPP_SETTINGS=devstack_docker"'
 
 # Fix missing vendor file by clearing the cache
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec lms bash -c 'rm /edx/app/edxapp/edx-platform/.prereqs_cache/Node_prereqs.sha1'
 
 # Create static assets for both LMS and Studio
 for app in "${apps[@]}"; do
-    docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
+    docker compose `echo ${DOCKER_COMPOSE_FILES}` exec $app bash -c 'source /edx/app/edxapp/edxapp_env && cd /edx/app/edxapp/edx-platform && paver update_assets --settings devstack_docker'
 done
 
 # Provision a retirement service account user
diff --git a/provision-mktg.sh b/provision-mktg.sh
index acafa4eaa2..fdf4d638cf 100755
--- a/provision-mktg.sh
+++ b/provision-mktg.sh
@@ -1,22 +1,22 @@
 set -e
 
 echo "** Bring Marketing up **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg
+docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d mktg
 
 echo "** Creating databases **"
-echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql
+echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
 echo "** Marketing: Copy cacheed files to code dir **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt'
 
 echo "** Marketing: Migrating databases **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev'
 
 echo "** Marketing: Compiling assets **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'yarn'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'npm run dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'yarn'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'npm run dev'
 
 echo "** Marketing: Restarting **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart mktg
+docker compose `echo ${DOCKER_COMPOSE_FILES}` restart mktg
diff --git a/provision-progs.sh b/provision-progs.sh
index 93f583e40c..e9cd061c64 100755
--- a/provision-progs.sh
+++ b/provision-progs.sh
@@ -1,30 +1,30 @@
 set -e
 
 echo "** Bring progs up **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs
+docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d progs
 
 echo "** Creating databases **"
-echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql8 mysql -uroot mysql
+echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devstack.mysql mysql -uroot mysql
 
 
 echo "** Progs: Setting correct python version **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1'
 
 echo "** Progs: Copy cacheed files to code dir **"
-#docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt'
+#docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt'
 
 echo "** Progs: Migrating databases **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev'
 
 echo "** Progs: Compiling assets **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'chown -R root ~/.npm'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'rm -rf node_modules/'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm install'
 
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.static'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm run dev'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py collectstatic --ignore="*.less" --ignore="*.scss" --noinput --clear --settings=edraakprograms.static'
 
 echo "** Progs: Restarting **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart progs
+docker compose `echo ${DOCKER_COMPOSE_FILES}` restart progs
diff --git a/provision-state-manager-api.sh b/provision-state-manager-api.sh
index ff9b308d2a..fb94246e8e 100755
--- a/provision-state-manager-api.sh
+++ b/provision-state-manager-api.sh
@@ -1,8 +1,8 @@
 set -e
 
 echo "** state-manager-api: starting **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-api
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-mysql
+docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-api
+docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d state-manager-mysql
 
 echo "Waiting for state-manager-mysql"
 until docker exec -i edraak.devstack.state_manager_mysql mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
@@ -15,9 +15,9 @@ done
 sleep 5
 
 echo "** state-manager-api: Create/Upgrade DB **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask create-db'
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask db upgrade'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask create-db'
+docker compose `echo ${DOCKER_COMPOSE_FILES}` exec state-manager-api bash -c 'flask db upgrade'
 
 
 echo "** state-manager-api: Restarting **"
-docker-compose `echo ${DOCKER_COMPOSE_FILES}` restart state-manager-api
+docker compose `echo ${DOCKER_COMPOSE_FILES}` restart state-manager-api
diff --git a/provision.sh b/provision.sh
index 7cfbbf2e81..9137444d7a 100755
--- a/provision.sh
+++ b/provision.sh
@@ -23,7 +23,7 @@ if [ "$MOUNT_TYPE" = "-nfs" ]; then
 fi
 
 # Bring the databases online.
-docker-compose up -d mysql mongo mysql8
+docker compose up -d mysql mongo
 
 # Ensure the MySQL server is online and usable
 echo "Waiting for MySQL"
@@ -33,12 +33,12 @@ do
   sleep 1
 done
 
-echo "Waiting for MySQL8"
-until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-do
-  printf "."
-  sleep 1
-done
+#echo "Waiting for MySQL8"
+#until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
+#do
+#  printf "."
+#  sleep 1
+#done
 
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
@@ -52,7 +52,7 @@ echo -e "MySQL ready"
 if $ENABLE_EDX; then
   ./provision-lms.sh
   # Nothing special needed for studio
-  docker-compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
+  docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
 fi
 
 
diff --git a/provision.sql b/provision.sql
old mode 100644
new mode 100755
index 60692a4f42..cb25769f16
--- a/provision.sql
+++ b/provision.sql
@@ -1,21 +1,27 @@
 CREATE DATABASE IF NOT EXISTS credentials;
-GRANT ALL ON credentials.* TO 'credentials001'@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS 'credentials001'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+GRANT ALL ON credentials.* TO 'credentials001'@'%';
 
 CREATE DATABASE IF NOT EXISTS discovery;
-GRANT ALL ON discovery.* TO 'discov001'@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS 'discov001'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+GRANT ALL ON discovery.* TO 'discov001'@'%';
 
 CREATE DATABASE IF NOT EXISTS ecommerce;
-GRANT ALL ON ecommerce.* TO 'ecomm001'@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS 'ecomm001'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+GRANT ALL ON ecommerce.* TO 'ecomm001'@'%';
 
 CREATE DATABASE IF NOT EXISTS edxmktg;
-GRANT ALL ON edxmktg.* TO 'edxmktg001'@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS 'edxmktg001'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+GRANT ALL ON edxmktg.* TO 'edxmktg001'@'%';
 
 CREATE DATABASE IF NOT EXISTS notes;
-GRANT ALL ON notes.* TO 'notes001'@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS 'notes001'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+GRANT ALL ON notes.* TO 'notes001'@'%';
 
 CREATE DATABASE IF NOT EXISTS edxapp;
 CREATE DATABASE IF NOT EXISTS edxapp_csmh;
-GRANT ALL ON edxapp.* TO 'edxapp001'@'%' IDENTIFIED BY 'password';
+CREATE USER IF NOT EXISTS 'edxapp001'@'%' IDENTIFIED WITH mysql_native_password BY 'password';
+GRANT ALL ON edxapp.* TO 'edxapp001'@'%';
 GRANT ALL ON edxapp_csmh.* TO 'edxapp001'@'%';
 
 FLUSH PRIVILEGES;
diff --git a/setup_native_nfs_docker_osx.sh b/setup_native_nfs_docker_osx.sh
index 9a7d6fd93d..6abdab8d9a 100755
--- a/setup_native_nfs_docker_osx.sh
+++ b/setup_native_nfs_docker_osx.sh
@@ -39,7 +39,7 @@ open -a Docker
 while ! docker ps > /dev/null 2>&1 ; do sleep 2; done
 
 echo "== Stopping running docker containers..."
-docker-compose down > /dev/null 2>&1
+docker compose down > /dev/null 2>&1
 docker volume prune -f > /dev/null
 
 osascript -e 'quit app "Docker"'

From d6d63033c73d568a922fded45964bd94ba8659f1 Mon Sep 17 00:00:00 2001
From: qrawashdeh <qrawashdeh@qrf.org>
Date: Wed, 18 Jun 2025 14:32:47 +0300
Subject: [PATCH 129/137] docker build for m chips and disable studio and devpi

---
 docker-compose-auth-provider.yml |  2 +-
 docker-compose-edx.yml           | 80 ++++++++++++++++----------------
 docker-compose-mktg.yml          |  2 +-
 docker-compose-progs.yml         |  2 +-
 docker-compose.yml               | 24 +++++-----
 provision-lms.sh                 |  2 +-
 provision.sh                     |  2 +-
 7 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml
index 994a9bce70..3a58cde46c 100755
--- a/docker-compose-auth-provider.yml
+++ b/docker-compose-auth-provider.yml
@@ -12,7 +12,7 @@ version: '3.3'
 
 services:
   auth-provider:
-    image: eu.gcr.io/openedx-231314/edraak/auth.provider:v1.0
+    image: eu.gcr.io/openedx-231314/edraak/auth.provider:20250617-113934-m
     container_name: edraak.devstack.auth.provider
     environment:
       NO_PYTHON_UNINSTALL: 1
diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
index 2b92fdda09..ffb2261705 100755
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -17,7 +17,7 @@ services:
     command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py lms runserver 0.0.0.0:18000 --settings devstack_docker; sleep 2; done'
     container_name: edx.devstack.lms
     depends_on:
-      - devpi
+      #- devpi
       - mysql
       - memcached
       - mongo
@@ -44,36 +44,36 @@ services:
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
       - ~/.ssh/:/root/.ssh
 
-  studio:
-    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
-    container_name: edx.devstack.studio
-    depends_on:
-      - devpi
-      - mysql
-      - memcached
-      - mongo
-    # Allows attachment to the Studio service using 'docker attach <containerID>'.
-    stdin_open: true
-    tty: true
-    environment:
-      BOK_CHOY_HOSTNAME: edx.devstack.studio
-      BOK_CHOY_LMS_PORT: 18103
-      BOK_CHOY_CMS_PORT: 18131
-      EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
-      NO_PYTHON_UNINSTALL: 0
-      NO_PREREQ_INSTALL: 0
-    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2
-    ports:
-      - "18010:18010"
-      - "19877:19877" # JS test debugging
-      - "18103:18103"
-      - "18131:18131"
-    volumes:
-      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
-      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
-      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
-      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
-      - ~/.ssh/:/root/.ssh
+#  studio:
+#    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
+#    container_name: edx.devstack.studio
+#    depends_on:
+#      - devpi
+#      - mysql
+#      - memcached
+#      - mongo
+#    # Allows attachment to the Studio service using 'docker attach <containerID>'.
+#    stdin_open: true
+#    tty: true
+#    environment:
+#      BOK_CHOY_HOSTNAME: edx.devstack.studio
+#      BOK_CHOY_LMS_PORT: 18103
+#      BOK_CHOY_CMS_PORT: 18131
+#      EDXAPP_TEST_MONGO_HOST: edx.devstack.mongo
+#      NO_PYTHON_UNINSTALL: 0
+#      NO_PREREQ_INSTALL: 0
+#    image: eu.gcr.io/openedx-231314/edraak/edxapp:hawthorn.edraak.v3.2
+#    ports:
+#      - "18010:18010"
+#      - "19877:19877" # JS test debugging
+#      - "18103:18103"
+#      - "18131:18131"
+#    volumes:
+#      - edxapp_studio_assets:/edx/var/edxapp/staticfiles/
+#      - ${DEVSTACK_WORKSPACE}/edx-platform:/edx/app/edxapp/edx-platform:cached
+#      - edxapp_node_modules:/edx/app/edxapp/edx-platform/node_modules
+#      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
+#      - ~/.ssh/:/root/.ssh
 
 #  forum:
 #    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
@@ -89,19 +89,19 @@ services:
 #      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
 #      - ~/.ssh/:/root/.ssh
 
-  devpi:
-    container_name: edx.devstack.devpi
-    image: edxops/devpi:${OPENEDX_RELEASE:-latest}
-    ports:
-      - "3141:3141"
-    volumes:
-      - devpi_data:/data
+#  devpi:
+#    container_name: edx.devstack.devpi
+#    image: edxops/devpi:${OPENEDX_RELEASE:-latest}
+#    ports:
+#      - "3141:3141"
+#    volumes:
+#      - devpi_data:/data
 
 
   router:
     depends_on:
       - lms
-      - studio
+      #- studio
 #      - mktg
       - progs
     volumes:
@@ -110,5 +110,5 @@ services:
 
 volumes:
   edxapp_lms_assets:
-  edxapp_studio_assets:
+  #edxapp_studio_assets:
   edxapp_node_modules:
diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml
index b61f45466e..b294723dfd 100755
--- a/docker-compose-mktg.yml
+++ b/docker-compose-mktg.yml
@@ -13,7 +13,7 @@ version: '3.3'
 services:
 
   mktg:
-    image: eu.gcr.io/openedx-231314/edraak/marketing
+    image: eu.gcr.io/openedx-231314/edraak/marketing:20250519-122918-m
     environment:
       NODE_ENV: development
     command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done'
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 37e306ae8e..83583ba064 100755
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -13,7 +13,7 @@ version: '3.3'
 services:
 
   progs:
-    image: eu.gcr.io/openedx-231314/edraak/progs
+    image: eu.gcr.io/openedx-231314/edraak/progs:20250519-123649-m
     environment:
       PROGS_CFG: /app/docker.json
       NODE_ENV: development
diff --git a/docker-compose.yml b/docker-compose.yml
index ada91d9021..65428d9a6f 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,19 +12,19 @@ version: '3.3'
 
 services:
 
-  elasticsearch:
-    container_name: edx.devstack.elasticsearch
-    image: edxops/elasticsearch:devstack
-    ports:
-       - "9200:9200"
-       - "9300:9300"
-    volumes:
-      - elasticsearch_data:/usr/share/elasticsearch/datamake
-      - elasticsearch_data:/usr/share/elasticsearch/logs
+#  elasticsearch:
+#    container_name: edx.devstack.elasticsearch
+#    image: edxops/elasticsearch:devstack
+#    ports:
+#       - "9200:9200"
+#       - "9300:9300"
+#    volumes:
+#      - elasticsearch_data:/usr/share/elasticsearch/datamake
+#      - elasticsearch_data:/usr/share/elasticsearch/logs
 
   memcached:
     container_name: edx.devstack.memcached
-    image: memcached:1.4
+    image: memcached:1.6
     ports:
        - "11211:11211"
 
@@ -90,7 +90,7 @@ services:
           - auth.edraak.dev
 
 volumes:
-  elasticsearch_data:
+  #elasticsearch_data:
   mongo_data:
   mysql_data:
-  devpi_data:
+  #devpi_data:
diff --git a/provision-lms.sh b/provision-lms.sh
index e1553f338d..844ac56522 100755
--- a/provision-lms.sh
+++ b/provision-lms.sh
@@ -2,7 +2,7 @@ set -e
 set -o pipefail
 set -x
 
-apps=( lms studio )
+apps=( lms )
 
 echo "** Edx **"
 echo -e "${GREEN}Creating databases and users...${NC}"
diff --git a/provision.sh b/provision.sh
index 9137444d7a..823bbe1187 100755
--- a/provision.sh
+++ b/provision.sh
@@ -52,7 +52,7 @@ echo -e "MySQL ready"
 if $ENABLE_EDX; then
   ./provision-lms.sh
   # Nothing special needed for studio
-  docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
+  #docker compose `echo ${DOCKER_COMPOSE_FILES}` up -d studio
 fi
 
 

From c410cc61c32839d96fb36b862ca236dc77499572 Mon Sep 17 00:00:00 2001
From: qrawashdeh <qrawashdeh@qrf.org>
Date: Sun, 22 Jun 2025 11:23:44 +0300
Subject: [PATCH 130/137] change to the images that works on Intel and M series

---
 docker-compose-auth-provider.yml | 2 +-
 docker-compose-mktg.yml          | 2 +-
 docker-compose-progs.yml         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose-auth-provider.yml b/docker-compose-auth-provider.yml
index 3a58cde46c..a66eb014db 100755
--- a/docker-compose-auth-provider.yml
+++ b/docker-compose-auth-provider.yml
@@ -12,7 +12,7 @@ version: '3.3'
 
 services:
   auth-provider:
-    image: eu.gcr.io/openedx-231314/edraak/auth.provider:20250617-113934-m
+    image: eu.gcr.io/openedx-231314/edraak/auth.provider:20250618-160217-m
     container_name: edraak.devstack.auth.provider
     environment:
       NO_PYTHON_UNINSTALL: 1
diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml
index b294723dfd..1c8c7d5cb5 100755
--- a/docker-compose-mktg.yml
+++ b/docker-compose-mktg.yml
@@ -13,7 +13,7 @@ version: '3.3'
 services:
 
   mktg:
-    image: eu.gcr.io/openedx-231314/edraak/marketing:20250519-122918-m
+    image: eu.gcr.io/openedx-231314/edraak/marketing:20250618-153829-m
     environment:
       NODE_ENV: development
     command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done'
diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml
index 83583ba064..ef737ac043 100755
--- a/docker-compose-progs.yml
+++ b/docker-compose-progs.yml
@@ -13,7 +13,7 @@ version: '3.3'
 services:
 
   progs:
-    image: eu.gcr.io/openedx-231314/edraak/progs:20250519-123649-m
+    image: eu.gcr.io/openedx-231314/edraak/progs:20250618-155233-m
     environment:
       PROGS_CFG: /app/docker.json
       NODE_ENV: development

From 446548659d3bea60207ca8cf42a12a605d1c0511 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Wed, 2 Jul 2025 11:12:41 +0300
Subject: [PATCH 131/137] cleanup

---
 docker-compose-edx.yml | 18 +++++++++++++++---
 docker-compose.yml     | 20 ++++++--------------
 provision.sh           |  7 -------
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/docker-compose-edx.yml b/docker-compose-edx.yml
index ffb2261705..d2fbb5f483 100755
--- a/docker-compose-edx.yml
+++ b/docker-compose-edx.yml
@@ -44,6 +44,8 @@ services:
       - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
       - ~/.ssh/:/root/.ssh
 
+# This been commented out cuz it's no longer needed in the local development
+#
 #  studio:
 #    command: bash -c 'source /edx/app/edxapp/edxapp_env && while true; do python /edx/app/edxapp/edx-platform/manage.py cms runserver 0.0.0.0:18010 --settings devstack_docker; sleep 200000; done'
 #    container_name: edx.devstack.studio
@@ -75,6 +77,8 @@ services:
 #      - ${DEVSTACK_WORKSPACE}/src:/edx/src:cached
 #      - ~/.ssh/:/root/.ssh
 
+# This been commented out cuz it's no longer needed in the local development
+#
 #  forum:
 #    command: bash -c 'source /edx/app/forum/ruby_env && source /edx/app/forum/devstack_forum_env && cd /edx/app/forum/cs_comments_service && bundle install && while true; do ruby app.rb -o 0.0.0.0 ; sleep 200000; done'
 #    container_name: edx.devstack.forum
@@ -89,6 +93,8 @@ services:
 #      - ${DEVSTACK_WORKSPACE}/cs_comments_service:/edx/app/forum/cs_comments_service:cached
 #      - ~/.ssh/:/root/.ssh
 
+# This been commented out cuz it's no longer needed in the local development
+#
 #  devpi:
 #    container_name: edx.devstack.devpi
 #    image: edxops/devpi:${OPENEDX_RELEASE:-latest}
@@ -101,14 +107,20 @@ services:
   router:
     depends_on:
       - lms
-      #- studio
-#      - mktg
       - progs
+
+# This been commented out cuz it's no longer needed in the local development
+#
+#      - studio
+#      - mktg
     volumes:
       - ./nginx/edx.conf:/etc/nginx/conf.d/edx.conf
 
 
 volumes:
   edxapp_lms_assets:
-  #edxapp_studio_assets:
   edxapp_node_modules:
+
+  # This been commented out cuz it's no longer needed in the local development
+  #
+  #edxapp_studio_assets:
diff --git a/docker-compose.yml b/docker-compose.yml
index 65428d9a6f..a003aff624 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,8 @@ version: '3.3'
 
 services:
 
+# This been commented out cuz it's no longer needed in the local development
+#
 #  elasticsearch:
 #    container_name: edx.devstack.elasticsearch
 #    image: edxops/elasticsearch:devstack
@@ -38,18 +40,6 @@ services:
     volumes:
       - mongo_data:/data/db
 
-#  mysql:
-#    command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci
-#    container_name: edx.devstack.mysql
-#    environment:
-#      MYSQL_ROOT_PASSWORD: ""
-#      MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
-#    image: mysql:5.7
-#    ports:
-#       - "3306:3306"
-#    volumes:
-#      - mysql_data:/var/lib/mysql
-
   mysql:
     command: mysqld --character-set-server=utf8 --collation-server=utf8_general_ci --default-authentication-plugin=mysql_native_password
     container_name: edx.devstack.mysql
@@ -90,7 +80,9 @@ services:
           - auth.edraak.dev
 
 volumes:
-  #elasticsearch_data:
   mongo_data:
   mysql_data:
-  #devpi_data:
+# This been commented out cuz it's no longer needed in the local development
+#
+#  elasticsearch_data:
+#  devpi_data:
diff --git a/provision.sh b/provision.sh
index 823bbe1187..977330ab44 100755
--- a/provision.sh
+++ b/provision.sh
@@ -33,13 +33,6 @@ do
   sleep 1
 done
 
-#echo "Waiting for MySQL8"
-#until docker exec -i edx.devstack.mysql8 mysql -uroot -se "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = 'root')" &> /dev/null
-#do
-#  printf "."
-#  sleep 1
-#done
-
 # In the event of a fresh MySQL container, wait a few seconds for the server to restart
 # This can be removed once https://github.com/docker-library/mysql/issues/245 is resolved.
 sleep 10

From 6d6bf9957472f7e6ae5f8c869b8161b0a9518548 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Mon, 25 Aug 2025 11:38:35 +0300
Subject: [PATCH 132/137] Renew the dev cert

---
 nginx/ssl/chained.crt | 72 +++++++++++++++++++++----------------------
 nginx/ssl/private.key |  6 ++--
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index 84b45dbb75..a28e54d465 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIDjzCCAxagAwIBAgISBQQdx1YV2jrl7vwy9kZu0F1ZMAoGCCqGSM49BAMDMDIx
+MIIDkjCCAxigAwIBAgISBU2yI22unsW/2Cmy7tkcSslIMAoGCCqGSM49BAMDMDIx
 CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
-NjAeFw0yNTA1MjcwNzAyNTJaFw0yNTA4MjUwNzAyNTFaMBcxFTATBgNVBAMMDCou
-ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABA5+Pxz7MDrXRhRa
-u+jH0Gw0j4gjpuwn4vqf/YNwqyqEPLuhXLRbW1E4WC0eoZcNsFeTgvW+TAuNDNv5
-IDybR8GjggIlMIICITAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFF8VjIHYJVwXXXNH
-DeEndiY61EUTMB8GA1UdIwQYMBaAFJMnRpgDqVFojpjWxEJI2yO/WJTSMDIGCCsG
-AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U2LmkubGVuY3Iub3JnLzAj
+NzAeFw0yNTA4MjUwNzM0MzBaFw0yNTExMjMwNzM0MjlaMBcxFTATBgNVBAMMDCou
+ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABN3crHaiPklqaEPj
+F2+0elpUhHG4/juhZd4PjJJ0dktpXxdOHzgl1KbYCtoUSHC1MeFjafuciM1UJAe0
+8pObDpGjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC9A4F5mY4zvHy7i
+aMwaLbQ0SXWEMB8GA1UdIwQYMBaAFK5IntyHHUSgb9qi5WB0BHjCnACAMDIGCCsG
+AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U3LmkubGVuY3Iub3JnLzAj
 BgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwEwYDVR0gBAwwCjAI
-BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U2LmMubGVuY3Iub3Jn
-LzkwLmNybDCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB1AN3cyjSV1+EWBeeVMvrH
-n/g9HFDf2wA6FBJ2Ciysu8gqAAABlxDCrJIAAAQDAEYwRAIgVYY4OEPLlxpjN8C3
-XN+s+qXeKVfxk5W6TByPJSwvtbMCIHynieCHCSRUgPSeZKDEqBvx1NL2VPIxXr2v
-XcoBBTwLAHYAzPsPaoVxCWX+lZtTzumyfCLphVwNl422qX5UwP5MDbAAAAGXEMK0
-NAAABAMARzBFAiEA9Z6W7H/VVm1aaaOLk+TbkD2g5RXNltrhDFJyvPYcCrQCIGEC
-b2FWxzrxwAW3z3Ybrsw/f0rjVLkXJvpPOnZw+juRMAoGCCqGSM49BAMDA2cAMGQC
-MCTIyIRGiZu9b0wPZK9hniYZDLHnliHhDLNCZEgqanCbaR3z8SWru35PjV2lyfLT
-6QIwCe+tcjDzZ6jbkMe3esNGQ7CSMQ+KCSP0GnA/tUc3Fzd9iwIZ0kxM02qsvvH2
-sKuy
+BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U3LmMubGVuY3Iub3Jn
+LzczLmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AKRCxQZJYGFUjw/U6pz7
+ei0mRU2HqX8v30VZ9idPOoRUAAABmOBb+KkAAAQDAEgwRgIhAKYTMZp09bBKmdkN
+58+3pSVoJN5Rsz8QgycqOmzcDkdTAiEA5FCi0LOI/9QabjrKTX/9/WrTOfdMteQs
+RQud5Ob8H7wAdgDM+w9qhXEJZf6Vm1PO6bJ8IumFXA2XjbapflTA/kwNsAAAAZjg
+W/jEAAAEAwBHMEUCICZyP559MOrIK/muOI2pjBouxGo6Pzwmov7jXF0gqLIgAiEA
+hPyxqzq/7SoxPlFneAn8oWw8obk584ziDQ4E024xgXIwCgYIKoZIzj0EAwMDaAAw
+ZQIwRPCgJjL3b022Nx6J+TdthLMOaIugaoeKiTxRV5KCTUdiGVa6hHUubE58M+oJ
+DRcCAjEAwIY4xRF/QVCsxiV2B8oOK9i9gXLLF5AU10ebRxF4MXa0GGcKB2i4rCCc
+ayd8FMGr
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEVzCCAj+gAwIBAgIRALBXPpFzlydw27SHyzpFKzgwDQYJKoZIhvcNAQELBQAw
+MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw
 TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
 cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
 WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCRTYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATZ8Z5G
-h/ghcWCoJuuj+rnq2h25EqfUJtlRFLFhfHWWvyILOR/VvtEKRqotPEoJhC6+QJVV
-6RlAN2Z17TJOdwRJ+HB7wxjnzvdxEP6sdNgA1O1tHHMWMxCcOrLqbGL0vbijgfgw
+RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST
+CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef
+QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw
 gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSTJ0aYA6lRaI6Y1sRCSNsj
-v1iU0jAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4
+wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
 AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
 BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
-Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAfYt7SiA1sgWGCIpunk46r4AExIRc
-MxkKgUhNlrrv1B21hOaXN/5miE+LOTbrcmU/M9yvC6MVY730GNFoL8IhJ8j8vrOL
-pMY22OP6baS1k9YMrtDTlwJHoGby04ThTUeBDksS9RiuHvicZqBedQdIF65pZuhp
-eDcGBcLiYasQr/EO5gxxtLyTmgsHSOVSBcFOn9lgv7LECPq9i7mfH3mpxgrRKSxH
-pOoZ0KXMcB+hHuvlklHntvcI0mMMQ0mhYj6qtMFStkF1RpCG3IPdIwpVCQqu8GV7
-s8ubknRzs+3C/Bm19RFOoiPpDkwvyNfvmQ14XkyqqKK5oZ8zhD32kFRQkxa8uZSu
-h4aTImFxknu39waBxIRXE4jKxlAmQc4QjFZoq1KmQqQg0J/1JF8RlFvJas1VcjLv
-YlvUB2t6npO6oQjB3l+PNf0DpQH7iUx3Wz5AjQCi6L25FjyE06q6BZ/QlmtYdl/8
-ZYao4SRqPEs/6cAiF+Qf5zg2UkaWtDphl1LKMuTNLotvsX99HP69V2faNyegodQ0
-LyTApr/vT01YPE46vNsDLgK+4cL6TrzC/a4WcmF5SRJ938zrv/duJHLXQIku5v0+
-EwOy59Hdm0PT/Er/84dDV0CSjdR/2XuZM3kpysSKLgD1cKiDA+IRguODCxfO9cyY
-Ig46v9mFmBvyH04=
+Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD
+aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF
+h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG
+yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr
+OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o
+yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S
+M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ
+UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq
+Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I
+tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ
+YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty
++VUwFj9tmWxyR/M=
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index f36114f636..9b2edcfc39 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgV1FsDi5uRr39v9kQ
-pIEowp1OmwzI7m9H2fol/MgsEuqhRANCAAQOfj8c+zA610YUWrvox9BsNI+II6bs
-J+L6n/2DcKsqhDy7oVy0W1tROFgtHqGXDbBXk4L1vkwLjQzb+SA8m0fB
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZ7Xe96u25s9+ygh0
+QcA4OZp0R6GzDJlJxOmJa6rRyq+hRANCAATd3Kx2oj5JamhD4xdvtHpaVIRxuP47
+oWXeD4ySdHZLaV8XTh84JdSm2AraFEhwtTHhY2n7nIjNVCQHtPKTmw6R
 -----END PRIVATE KEY-----

From 94484ed83e67bf128dc44ee7371d521611f22a64 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Sun, 23 Nov 2025 11:38:22 +0300
Subject: [PATCH 133/137] Update SSL certificate

---
 nginx/ssl/chained.crt | 84 +++++++++++++++++++++----------------------
 nginx/ssl/private.key |  6 ++--
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index a28e54d465..cc9f2108f6 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,48 +1,48 @@
 -----BEGIN CERTIFICATE-----
-MIIDkjCCAxigAwIBAgISBU2yI22unsW/2Cmy7tkcSslIMAoGCCqGSM49BAMDMDIx
+MIIDkzCCAxigAwIBAgISBStj03jNkC9tVx2W3TlU61I4MAoGCCqGSM49BAMDMDIx
 CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
-NzAeFw0yNTA4MjUwNzM0MzBaFw0yNTExMjMwNzM0MjlaMBcxFTATBgNVBAMMDCou
-ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABN3crHaiPklqaEPj
-F2+0elpUhHG4/juhZd4PjJJ0dktpXxdOHzgl1KbYCtoUSHC1MeFjafuciM1UJAe0
-8pObDpGjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFC9A4F5mY4zvHy7i
-aMwaLbQ0SXWEMB8GA1UdIwQYMBaAFK5IntyHHUSgb9qi5WB0BHjCnACAMDIGCCsG
-AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U3LmkubGVuY3Iub3JnLzAj
+ODAeFw0yNTExMjMwNzM1MjVaFw0yNjAyMjEwNzM1MjRaMBcxFTATBgNVBAMMDCou
+ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNs7Buu92wdfjXIQ
+FoyPEvq5C7oeXx2L1YncgWvYMe5Ymct7bcSdhP4F2O3+FW+8Q0uBuoho1xlNFKl8
+zClyzUOjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFB3+ihBmD/OU/jaC
+0+PFboCBVDlsMB8GA1UdIwQYMBaAFI8NE6L2Ln7RUGwzGDhdWY4jcpHKMDIGCCsG
+AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U4LmkubGVuY3Iub3JnLzAj
 BgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwEwYDVR0gBAwwCjAI
-BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U3LmMubGVuY3Iub3Jn
-LzczLmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB3AKRCxQZJYGFUjw/U6pz7
-ei0mRU2HqX8v30VZ9idPOoRUAAABmOBb+KkAAAQDAEgwRgIhAKYTMZp09bBKmdkN
-58+3pSVoJN5Rsz8QgycqOmzcDkdTAiEA5FCi0LOI/9QabjrKTX/9/WrTOfdMteQs
-RQud5Ob8H7wAdgDM+w9qhXEJZf6Vm1PO6bJ8IumFXA2XjbapflTA/kwNsAAAAZjg
-W/jEAAAEAwBHMEUCICZyP559MOrIK/muOI2pjBouxGo6Pzwmov7jXF0gqLIgAiEA
-hPyxqzq/7SoxPlFneAn8oWw8obk584ziDQ4E024xgXIwCgYIKoZIzj0EAwMDaAAw
-ZQIwRPCgJjL3b022Nx6J+TdthLMOaIugaoeKiTxRV5KCTUdiGVa6hHUubE58M+oJ
-DRcCAjEAwIY4xRF/QVCsxiV2B8oOK9i9gXLLF5AU10ebRxF4MXa0GGcKB2i4rCCc
-ayd8FMGr
+BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVuY3Iub3Jn
+LzU3LmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB2AMs49xWJfIShRF9bwd37
+yW7ymlnNRwppBYWwyxTDFFjnAAABmq/ZKUQAAAQDAEcwRQIgMtX4A3z30bQGLlP8
+mbWoYWwBVVvlthqcyFn7kqhRsxUCIQDwQAMJgczX0pvRCrLuXWQ4ghq4IjqWhH44
+AuVtQumE6QB3AA5XlLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABmq/Z
+KS8AAAQDAEgwRgIhAOlhcixmpWt5kjLcvforx5lA0EM2enFP5CHC7tt8Wap3AiEA
+lKoFwRBqv+fAWf90cxHduiiQiPQrIiKexqPmJyCahN8wCgYIKoZIzj0EAwMDaQAw
+ZgIxAJV4f/mKlz4z2LULc9dnd6fG2nILfLTCjJAJWOfVCTADiCL31Pk9EnyqoPvg
+08MucAIxAM7hcHyWeFjyFGIeuYfZq0lsXLEz4EU9ttYS3cWP/Fx2EK/3Pv7YtlPe
+vFZBcYT6jQ==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
-WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST
-CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef
-QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw
-gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4
-wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
-AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
-BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
-Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD
-aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF
-h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG
-yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr
-OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o
-yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S
-M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ
-UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq
-Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I
-tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ
-YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty
-+VUwFj9tmWxyR/M=
+MIIEVjCCAj6gAwIBAgIQY5WTY8JOcIJxWRi/w9ftVjANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
+Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
+Fw0yNzAzMTIyMzU5NTlaMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
+bmNyeXB0MQswCQYDVQQDEwJFODB2MBAGByqGSM49AgEGBSuBBAAiA2IABNFl8l7c
+S7QMApzSsvru6WyrOq44ofTUOTIzxULUzDMMNMchIJBwXOhiLxxxs0LXeb5GDcHb
+R6EToMffgSZjO9SNHfY9gjMy9vQr5/WWOrQTZxh7az6NSNnq3u2ubT6HTKOB+DCB
+9TAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFI8NE6L2Ln7RUGwzGDhdWY4j
+cpHKMB8GA1UdIwQYMBaAFHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEB
+BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzATBgNVHSAE
+DDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veDEuYy5sZW5j
+ci5vcmcvMA0GCSqGSIb3DQEBCwUAA4ICAQBnE0hGINKsCYWi0Xx1ygxD5qihEjZ0
+RI3tTZz1wuATH3ZwYPIp97kWEayanD1j0cDhIYzy4CkDo2jB8D5t0a6zZWzlr98d
+AQFNh8uKJkIHdLShy+nUyeZxc5bNeMp1Lu0gSzE4McqfmNMvIpeiwWSYO9w82Ob8
+otvXcO2JUYi3svHIWRm3+707DUbL51XMcY2iZdlCq4Wa9nbuk3WTU4gr6LY8MzVA
+aDQG2+4U3eJ6qUF10bBnR1uuVyDYs9RhrwucRVnfuDj29CMLTsplM5f5wSV5hUpm
+Uwp/vV7M4w4aGunt74koX71n4EdagCsL/Yk5+mAQU0+tue0JOfAV/R6t1k+Xk9s2
+HMQFeoxppfzAVC04FdG9M+AC2JWxmFSt6BCuh3CEey3fE52Qrj9YM75rtvIjsm/1
+Hl+u//Wqxnu1ZQ4jpa+VpuZiGOlWrqSP9eogdOhCGisnyewWJwRQOqK16wiGyZeR
+xs/Bekw65vwSIaVkBruPiTfMOo0Zh4gVa8/qJgMbJbyrwwG97z/PRgmLKCDl8z3d
+tA0Z7qq7fta0Gl24uyuB05dqI5J1LvAzKuWdIjT1tP8qCoxSE/xpix8hX2dt3h+/
+jujUgFPFZ0EVZ0xSyBNRF3MboGZnYXFUxpNjTWPKpagDHJQmqrAcDmWJnMsFY3jS
+u1igv3OefnWjSQ==
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 9b2edcfc39..a84417e1a8 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgZ7Xe96u25s9+ygh0
-QcA4OZp0R6GzDJlJxOmJa6rRyq+hRANCAATd3Kx2oj5JamhD4xdvtHpaVIRxuP47
-oWXeD4ySdHZLaV8XTh84JdSm2AraFEhwtTHhY2n7nIjNVCQHtPKTmw6R
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgabDEaDqXqUOQDk6t
+NVS1XsbKvNT+M2r/k14IkVW4uTOhRANCAATbOwbrvdsHX41yEBaMjxL6uQu6Hl8d
+i9WJ3IFr2DHuWJnLe23EnYT+Bdjt/hVvvENLgbqIaNcZTRSpfMwpcs1D
 -----END PRIVATE KEY-----

From 6961049e7a6e1794ce02c76570e00581d3dcc1d8 Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Sun, 23 Nov 2025 11:38:39 +0300
Subject: [PATCH 134/137] Update some make commands

---
 mktg.mk  | 2 +-
 progs.mk | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mktg.mk b/mktg.mk
index 1eda295e8a..5b2c3d561b 100755
--- a/mktg.mk
+++ b/mktg.mk
@@ -54,7 +54,7 @@ mktg.dev:
 	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npm run dev
 
 mktg.watch:
-	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watch
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg npx gulp watcher
 
 mktg.install_all: | mktg.install_pip mktg.install_npm mktg.dev mktg.migrate
 
diff --git a/progs.mk b/progs.mk
index ca8ee15fda..ca6931721e 100755
--- a/progs.mk
+++ b/progs.mk
@@ -34,6 +34,9 @@ progs.pushimage:
 progs.migrate:
 	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py migrate --settings=edraakprograms.dev
 
+progs.makemigrations:
+	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py makemigrations --settings=edraakprograms.dev
+
 progs.langs_push:
 	docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs python manage.py langs_push --settings=edraakprograms.dev
 

From eeca6e0d6fc57da974814f0d398a3ba7dfc1c10e Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Sun, 30 Nov 2025 15:33:55 +0300
Subject: [PATCH 135/137] update_doc

---
 README.rst | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index ba8ec816af..d35c3ba013 100644
--- a/README.rst
+++ b/README.rst
@@ -115,7 +115,26 @@ sure you have the needed permission.
         gcloud auth login
         gcloud auth configure-docker
 
-5. Run the provision command, if you haven't already, to configure the various
+5. Clean up any Docker artifacts (containers, images, and volumes) to ensure a
+   fresh start.
+
+   .. code:: sh
+
+       docker system prune -a
+
+   .. note::
+
+      The prune command removes all stopped containers, unused networks,
+      dangling images, and build cache. Review Docker's documentation if you
+      need to keep specific resources.
+
+6. Pull the required images.
+
+   .. code:: sh
+
+       make pull
+
+7. Run the provision command, if you haven't already, to configure the various
    services with superusers (for development without the auth service) and
    tenants (for multi-tenancy).
 
@@ -132,7 +151,19 @@ sure you have the needed permission.
 
        make dev.provision
 
-6. Start the services. This command will mount the repositories under the
+   .. note::
+
+      The first run of ``make dev.provision`` is expected to fail. After the
+      initial failure, update ``.env`` to disable EDX, then rerun the provision
+      command. When the migration finishes, stop any running containers before
+      starting the development stack again.
+
+   .. code:: sh
+
+       make dev.provision
+       make stop
+
+8. Start the services. This command will mount the repositories under the
    DEVSTACK\_WORKSPACE directory.
 
    **NOTE:** it may take up to 60 seconds for the LMS to start, even after the ``make dev.up`` command outputs ``done``.
@@ -146,6 +177,31 @@ sure you have the needed permission.
 
 # .env file content
 
+When copying the ``.env`` file for a fresh setup, it should resemble the
+configuration below. Adjust service flags as needed—particularly
+``ENABLE_EDX`` if you need to disable the service after the first migration
+attempt.
+
+.. code:: sh
+
+   ## env ##
+   PROGS_CFG=/app/docker.json
+
+   # Change mount type to "-nfs" to enable nfs, otherwise leave it empty
+   MOUNT_TYPE=
+
+   # Enable disable services
+   ENABLE_PROGS=true
+   ENABLE_B2B=false
+   ENABLE_MKTG=true
+   ENABLE_EDX=true
+
+   ENABLE_STATE_MANAGER=false
+   ENABLE_JUDGE=false
+   ENABLE_ANALYTICS=false
+   ENABLE_AUTH=true
+   ENABLE_NOTIFIER=false
+
 MOUNT_TYPE:
     set to -nfs to enable NFS support or leave empty to use default docker engine
 

From 9bd78055ca122f2f3d25b9a6239969be527140bb Mon Sep 17 00:00:00 2001
From: HusamAjour <husamaj278@gmail.com>
Date: Mon, 23 Feb 2026 12:00:57 +0300
Subject: [PATCH 136/137] renew ssl cert for february 2026

---
 nginx/ssl/chained.crt | 85 +++++++++++++++++++++----------------------
 nginx/ssl/private.key |  6 +--
 2 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index cc9f2108f6..f1a74a21ef 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,48 +1,47 @@
 -----BEGIN CERTIFICATE-----
-MIIDkzCCAxigAwIBAgISBStj03jNkC9tVx2W3TlU61I4MAoGCCqGSM49BAMDMDIx
+MIIDhjCCAwygAwIBAgISBkk3w7qzrw1RBhqqFGJQo3LQMAoGCCqGSM49BAMDMDIx
 CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQDEwJF
-ODAeFw0yNTExMjMwNzM1MjVaFw0yNjAyMjEwNzM1MjRaMBcxFTATBgNVBAMMDCou
-ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABNs7Buu92wdfjXIQ
-FoyPEvq5C7oeXx2L1YncgWvYMe5Ymct7bcSdhP4F2O3+FW+8Q0uBuoho1xlNFKl8
-zClyzUOjggInMIICIzAOBgNVHQ8BAf8EBAMCB4AwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYEFB3+ihBmD/OU/jaC
-0+PFboCBVDlsMB8GA1UdIwQYMBaAFI8NE6L2Ln7RUGwzGDhdWY4jcpHKMDIGCCsG
-AQUFBwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL2U4LmkubGVuY3Iub3JnLzAj
-BgNVHREEHDAaggwqLmVkcmFhay5kZXaCCmVkcmFhay5kZXYwEwYDVR0gBAwwCjAI
-BgZngQwBAgEwLQYDVR0fBCYwJDAioCCgHoYcaHR0cDovL2U4LmMubGVuY3Iub3Jn
-LzU3LmNybDCCAQUGCisGAQQB1nkCBAIEgfYEgfMA8QB2AMs49xWJfIShRF9bwd37
-yW7ymlnNRwppBYWwyxTDFFjnAAABmq/ZKUQAAAQDAEcwRQIgMtX4A3z30bQGLlP8
-mbWoYWwBVVvlthqcyFn7kqhRsxUCIQDwQAMJgczX0pvRCrLuXWQ4ghq4IjqWhH44
-AuVtQumE6QB3AA5XlLzzrqk+MxssmQez95Dfm8I9cTIl3SGpJaxhxU4hAAABmq/Z
-KS8AAAQDAEgwRgIhAOlhcixmpWt5kjLcvforx5lA0EM2enFP5CHC7tt8Wap3AiEA
-lKoFwRBqv+fAWf90cxHduiiQiPQrIiKexqPmJyCahN8wCgYIKoZIzj0EAwMDaQAw
-ZgIxAJV4f/mKlz4z2LULc9dnd6fG2nILfLTCjJAJWOfVCTADiCL31Pk9EnyqoPvg
-08MucAIxAM7hcHyWeFjyFGIeuYfZq0lsXLEz4EU9ttYS3cWP/Fx2EK/3Pv7YtlPe
-vFZBcYT6jQ==
+NzAeFw0yNjAyMjMwNzMyNDdaFw0yNjA1MjQwNzMyNDZaMBcxFTATBgNVBAMMDCou
+ZWRyYWFrLmRldjBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABDiNe92BPQFPK/n4
++OTF/IWAOcNJIk/frSDFu8IrQ1iRpAXu1dA5GWzuudITwXQ1MyWBOMfwuPdn84Oa
+ghbMsHajggIbMIICFzAOBgNVHQ8BAf8EBAMCB4AwEwYDVR0lBAwwCgYIKwYBBQUH
+AwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU1VkqMXdpoigpk1gq2s4UbKNhoEEw
+HwYDVR0jBBgwFoAUrkie3IcdRKBv2qLlYHQEeMKcAIAwMgYIKwYBBQUHAQEEJjAk
+MCIGCCsGAQUFBzAChhZodHRwOi8vZTcuaS5sZW5jci5vcmcvMCMGA1UdEQQcMBqC
+DCouZWRyYWFrLmRldoIKZWRyYWFrLmRldjATBgNVHSAEDDAKMAgGBmeBDAECATAt
+BgNVHR8EJjAkMCKgIKAehhxodHRwOi8vZTcuYy5sZW5jci5vcmcvODEuY3JsMIIB
+AwYKKwYBBAHWeQIEAgSB9ASB8QDvAHUAyzj3FYl8hKFEX1vB3fvJbvKaWc1HCmkF
+hbDLFMMUWOcAAAGciZ/OvAAABAMARjBEAiAVYoGTGP/V4tIL1R9hUWw8mV9iH9Z7
+MUM6TOgcKteJQAIgRLYGFIwOyIAOoyAU0M2FRpjGxVfsfjJsQ9ZGJaOD8JcAdgCW
+l2S/VViXrfdDh2g3CEJ36fA61fak8zZuRqQ/D8qpxgAAAZyJn871AAAEAwBHMEUC
+IDePzebmWLNbT8zzAIBLPocERfInRxX85hK64IO+cbdEAiEAsbV9qbhDTrAXii6c
+GzSBSWey01MG/XJ4Db8zVvb0mOYwCgYIKoZIzj0EAwMDaAAwZQIwOSNql4rMtLfa
+bTFYM4GM/KYQTTe3yG0I19TdnuZXQdB/RAHMct8CCUjId4ARTtf/AjEA2Jp4FVPI
+AQ8ATL13r+FN7LFOVf4E0EKjCdTMrntzaJbM6XR7pWJknql49kKcUlhf
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEVjCCAj6gAwIBAgIQY5WTY8JOcIJxWRi/w9ftVjANBgkqhkiG9w0BAQsFADBP
-MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
-Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNDAzMTMwMDAwMDBa
-Fw0yNzAzMTIyMzU5NTlaMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBF
-bmNyeXB0MQswCQYDVQQDEwJFODB2MBAGByqGSM49AgEGBSuBBAAiA2IABNFl8l7c
-S7QMApzSsvru6WyrOq44ofTUOTIzxULUzDMMNMchIJBwXOhiLxxxs0LXeb5GDcHb
-R6EToMffgSZjO9SNHfY9gjMy9vQr5/WWOrQTZxh7az6NSNnq3u2ubT6HTKOB+DCB
-9TAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFI8NE6L2Ln7RUGwzGDhdWY4j
-cpHKMB8GA1UdIwQYMBaAFHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEB
-BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzATBgNVHSAE
-DDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veDEuYy5sZW5j
-ci5vcmcvMA0GCSqGSIb3DQEBCwUAA4ICAQBnE0hGINKsCYWi0Xx1ygxD5qihEjZ0
-RI3tTZz1wuATH3ZwYPIp97kWEayanD1j0cDhIYzy4CkDo2jB8D5t0a6zZWzlr98d
-AQFNh8uKJkIHdLShy+nUyeZxc5bNeMp1Lu0gSzE4McqfmNMvIpeiwWSYO9w82Ob8
-otvXcO2JUYi3svHIWRm3+707DUbL51XMcY2iZdlCq4Wa9nbuk3WTU4gr6LY8MzVA
-aDQG2+4U3eJ6qUF10bBnR1uuVyDYs9RhrwucRVnfuDj29CMLTsplM5f5wSV5hUpm
-Uwp/vV7M4w4aGunt74koX71n4EdagCsL/Yk5+mAQU0+tue0JOfAV/R6t1k+Xk9s2
-HMQFeoxppfzAVC04FdG9M+AC2JWxmFSt6BCuh3CEey3fE52Qrj9YM75rtvIjsm/1
-Hl+u//Wqxnu1ZQ4jpa+VpuZiGOlWrqSP9eogdOhCGisnyewWJwRQOqK16wiGyZeR
-xs/Bekw65vwSIaVkBruPiTfMOo0Zh4gVa8/qJgMbJbyrwwG97z/PRgmLKCDl8z3d
-tA0Z7qq7fta0Gl24uyuB05dqI5J1LvAzKuWdIjT1tP8qCoxSE/xpix8hX2dt3h+/
-jujUgFPFZ0EVZ0xSyBNRF3MboGZnYXFUxpNjTWPKpagDHJQmqrAcDmWJnMsFY3jS
-u1igv3OefnWjSQ==
+MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw
+TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
+cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
+WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
+RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST
+CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef
+QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw
+gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
+ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4
+wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
+AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
+BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
+Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD
+aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF
+h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG
+yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr
+OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o
+yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S
+M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ
+UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq
+Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I
+tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ
+YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty
++VUwFj9tmWxyR/M=
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index a84417e1a8..989959efd1 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgabDEaDqXqUOQDk6t
-NVS1XsbKvNT+M2r/k14IkVW4uTOhRANCAATbOwbrvdsHX41yEBaMjxL6uQu6Hl8d
-i9WJ3IFr2DHuWJnLe23EnYT+Bdjt/hVvvENLgbqIaNcZTRSpfMwpcs1D
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSEKoWZ6cNHlT0/C3
+jIn0t0vcIhE1zbvS1++AL+XJdYyhRANCAAQ4jXvdgT0BTyv5+PjkxfyFgDnDSSJP
+360gxbvCK0NYkaQF7tXQORls7rnSE8F0NTMlgTjH8Lj3Z/ODmoIWzLB2
 -----END PRIVATE KEY-----

From 9c80b8622de731d90eda170c531bb4d03013f497 Mon Sep 17 00:00:00 2001
From: hmalabehqrf <hmalabeh@qrf.org>
Date: Mon, 1 Jun 2026 09:23:50 +0300
Subject: [PATCH 137/137] update_ssl_01_05_2026

---
 nginx/ssl/chained.crt | 120 +++++++++++++++++++++++++++---------------
 nginx/ssl/private.key |   6 +--
 2 files changed, 80 insertions(+), 46 deletions(-)

diff --git a/nginx/ssl/chained.crt b/nginx/ssl/chained.crt
index f1a74a21ef..6f82c16d06 100644
--- a/nginx/ssl/chained.crt
+++ b/nginx/ssl/chained.crt
@@ -1,47 +1,81 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+p32QsqAiAA==
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIEVzCCAj+gAwIBAgIRAKp18eYrjwoiCWbTi7/UuqEwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjQwMzEzMDAwMDAw
-WhcNMjcwMzEyMjM1OTU5WjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCRTcwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARB6AST
-CFh/vjcwDMCgQer+VtqEkz7JANurZxLP+U9TCeioL6sp5Z8VRvRbYk4P1INBmbef
-QHJFHCxcSjKmwtvGBWpl/9ra8HW0QDsUaJW2qOJqceJ0ZVFT3hbUHifBM/2jgfgw
-gfUwDgYDVR0PAQH/BAQDAgGGMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcD
-ATASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBSuSJ7chx1EoG/aouVgdAR4
-wpwAgDAfBgNVHSMEGDAWgBR5tFnme7bl5AFzgAiIyBpY9umbbjAyBggrBgEFBQcB
-AQQmMCQwIgYIKwYBBQUHMAKGFmh0dHA6Ly94MS5pLmxlbmNyLm9yZy8wEwYDVR0g
-BAwwCjAIBgZngQwBAgEwJwYDVR0fBCAwHjAcoBqgGIYWaHR0cDovL3gxLmMubGVu
-Y3Iub3JnLzANBgkqhkiG9w0BAQsFAAOCAgEAjx66fDdLk5ywFn3CzA1w1qfylHUD
-aEf0QZpXcJseddJGSfbUUOvbNR9N/QQ16K1lXl4VFyhmGXDT5Kdfcr0RvIIVrNxF
-h4lqHtRRCP6RBRstqbZ2zURgqakn/Xip0iaQL0IdfHBZr396FgknniRYFckKORPG
-yM3QKnd66gtMst8I5nkRQlAg/Jb+Gc3egIvuGKWboE1G89NTsN9LTDD3PLj0dUMr
-OIuqVjLB8pEC6yk9enrlrqjXQgkLEYhXzq7dLafv5Vkig6Gl0nuuqjqfp0Q1bi1o
-yVNAlXe6aUXw92CcghC9bNsKEO1+M52YY5+ofIXlS/SEQbvVYYBLZ5yeiglV6t3S
-M6H+vTG0aP9YHzLn/KVOHzGQfXDP7qM5tkf+7diZe7o2fw6O7IvN6fsQXEQQj8TJ
-UXJxv2/uJhcuy/tSDgXwHM8Uk34WNbRT7zGTGkQRX0gsbjAea/jYAoWv0ZvQRwpq
-Pe79D/i7Cep8qWnA+7AE/3B3S/3dEEYmc0lpe1366A/6GEgk3ktr9PEoQrLChs6I
-tu3wnNLB2euC8IKGLQFpGtOO/2/hiAKjyajaBP25w1jF0Wl8Bbqne3uZ2q1GyPFJ
-YRmT7/OXpmOH/FVLtwS+8ng1cAmpCujPwteJZNcDG0sF2n/sc0+SQf49fdyUK0ty
-+VUwFj9tmWxyR/M=
+MIICizCCAhGgAwIBAgIQXd1w3TH4AchcGGp6BLgK/jAKBggqhkjOPQQDAzAuMQsw
+CQYDVQQGEwJVUzENMAsGA1UEChMESVNSRzEQMA4GA1UEAxMHUm9vdCBZRTAeFw0y
+NTA5MDMwMDAwMDBaFw0yODA5MDIyMzU5NTlaMDMxCzAJBgNVBAYTAlVTMRYwFAYD
+VQQKEw1MZXQncyBFbmNyeXB0MQwwCgYDVQQDEwNZRTEwdjAQBgcqhkjOPQIBBgUr
+gQQAIgNiAAQHZVB1/mimla2hfSurylScjPMZaOJXLz/NnAc2sylm8WDyhU9Ccp+z
+ASQi5vSwGGJjSGklkD9fdPR8GpyDIOIjCEfrnbt/v+ZSEPLLEGbaM6EccDbN7p9x
+teIm2Avf+ryjge4wgeswDgYDVR0PAQH/BAQDAgGGMBMGA1UdJQQMMAoGCCsGAQUF
+BwMBMBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFLsgykcL/tflnPmPCSqj
+jDdFsbzYMB8GA1UdIwQYMBaAFKPIJlqOoUzQNWP8myPIOq5W809WMDIGCCsGAQUF
+BwEBBCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3llLmkubGVuY3Iub3JnLzATBgNV
+HSAEDDAKMAgGBmeBDAECATAnBgNVHR8EIDAeMBygGqAYhhZodHRwOi8veWUuYy5s
+ZW5jci5vcmcvMAoGCCqGSM49BAMDA2gAMGUCMQDgjUEahFT/h3DRakqiPZpLvPgf
+Zwkt6K2EOMmh1nvEzl83eMLYcod4GCl3b0J1Nn0CMBNYmEQJb4CEG5WoOe7aRn/L
+VKu6saHmHEynI7ysIPd8zQsK1HdmhlHKlw9Z5GpGvA==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICpjCCAiugAwIBAgIRAIchZfw0tuX7qK3Vs3BftTowCgYIKoZIzj0EAwMwTzEL
+MAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNo
+IEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDIwHhcNMjYwNTEzMDAwMDAwWhcN
+MzIwOTAyMjM1OTU5WjAuMQswCQYDVQQGEwJVUzENMAsGA1UEChMESVNSRzEQMA4G
+A1UEAxMHUm9vdCBZRTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDwS/6vhrcVqcbBo
++wgdI3fwn9x7DNJJOY/lTOti0vkwuRN87RhEhTH17E7XyFjWsPYhIPt/wzOqxTd2
+b+4ZJNy9ID04YywF9U5zasDVyGSNErVNtz8uSGh5izW87j77GaOB6zCB6DAOBgNV
+HQ8BAf8EBAMCAQYwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUo8gmWo6hTNA1Y/ybI8g6rlbzT1YwHwYDVR0jBBgwFoAUfEKW
+rt5LSDv6kviejM9ti6lyN5UwMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAChhZo
+dHRwOi8veDIuaS5sZW5jci5vcmcvMBMGA1UdIAQMMAowCAYGZ4EMAQIBMCcGA1Ud
+HwQgMB4wHKAaoBiGFmh0dHA6Ly94Mi5jLmxlbmNyLm9yZy8wCgYIKoZIzj0EAwMD
+aQAwZgIxAMU19WCtmxVND8UHBZRoma49Z7jPs64Dma0eTu1OChVbB/2J7GV3nvYK
+Ax54uk1G9QIxAO0miLVJu8PLNiXXXkiE/gsK3CTRTF/aeo4bMX42Zw40csRU6AC2
+6hSW1/IWaas6dg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIEcDCCAligAwIBAgIQbI8dxyfHEX97r4U6yYD5zTANBgkqhkiG9w0BAQsFADBP
+MQswCQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFy
+Y2ggR3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMTAeFw0yNjA1MTMwMDAwMDBa
+Fw0zMjA5MDIyMzU5NTlaME8xCzAJBgNVBAYTAlVTMSkwJwYDVQQKEyBJbnRlcm5l
+dCBTZWN1cml0eSBSZXNlYXJjaCBHcm91cDEVMBMGA1UEAxMMSVNSRyBSb290IFgy
+MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEzZvVn4CDCuwJSvMWSj5cz3es3mcFDR0H
+ttwW+1qLFNvicWDEukWVEYmO6gbf9yoWHKS5xcUy4APgHoIYOIvXRdgKam7mAHf7
+AlF9ItgKbppbd9/w+kHsOdx1ymgHDB/qo4H1MIHyMA4GA1UdDwEB/wQEAwIBBjAd
+BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUfEKWrt5LSDv6kviejM9ti6lyN5UwHwYDVR0jBBgwFoAUebRZ5nu2
+5eQBc4AIiMgaWPbpm24wMgYIKwYBBQUHAQEEJjAkMCIGCCsGAQUFBzAChhZodHRw
+Oi8veDEuaS5sZW5jci5vcmcvMBMGA1UdIAQMMAowCAYGZ4EMAQIBMCcGA1UdHwQg
+MB4wHKAaoBiGFmh0dHA6Ly94MS5jLmxlbmNyLm9yZy8wDQYJKoZIhvcNAQELBQAD
+ggIBAD2/e9frmMxNpCV03qUHegg+MV2wz9644YoXdqtH8RyWYcBO7xfjjGEXdU1e
+/o0OkEFiynUCOSIk/vLLo7ttz6CPAeNlWfC0XNkoGeWgK6jjXvozBaGuGH5n0Ufo
+shMeWTuURqNN5G00sSXDTBrpp2+mgvdZQjb8K11TYMA25QA+YHNfbIEL0BniAhKS
+2gsnJjSzrdZLI+EZ7SEyqdR2rkjd1KutLDU+n3TFyxjniZVGur4YlhMP3mY/dV95
+IruAkkjOZier6hGBdEgZXXvaCz9u9iVEadsIE75pAGL8oHV5vxdARDiotRpul1IN
+/UZwzAbrfUFcw1HkAcYD/mlZfnQ2ieCF2MS7j3Vhv7JPDKp45fmykmzYNSrumRW0
+upFFKDBOoF7hsOb7oLyHS+Uft6jOUfOrogj8YUx38hKb2K20r42OgsSdDdxdeYWc
+MS3Sb6mwJeSZEYxJ2gaXnDSPaKhhrNkYwljyVQyr4Nq+MEJytXNTnHqaAcrNwZlV
+pcJL1KBnMrMjP7eanvUwL3FYj3cF17jtboLt7gLoi4+2rWZFvn+w54jmd/FIuhhZ
+cEaU/wvU6BUNMtcVquVGHp7itQeDth5j+XL3j4WJ2SABwzUl6OeYdgpIt/ITZa+p
+TT0mQ/r5XyA4MEAiabn7XJjvCERlF2dcn2wqJw+CreTkkQ2R
 -----END CERTIFICATE-----
diff --git a/nginx/ssl/private.key b/nginx/ssl/private.key
index 989959efd1..b577126ba5 100644
--- a/nginx/ssl/private.key
+++ b/nginx/ssl/private.key
@@ -1,5 +1,5 @@
 -----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgSEKoWZ6cNHlT0/C3
-jIn0t0vcIhE1zbvS1++AL+XJdYyhRANCAAQ4jXvdgT0BTyv5+PjkxfyFgDnDSSJP
-360gxbvCK0NYkaQF7tXQORls7rnSE8F0NTMlgTjH8Lj3Z/ODmoIWzLB2
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgUCDfmBaU0DMCp/sT
+0YtT20/s3a4lGb1fWN/saVim6l6hRANCAARidtEg6BLG/amWPIMZve1OSvbuxe3F
+a5vKxL0tGVlQp/bUEeFoKpdCMac4fwbYyBXVpy92h6AoqMSLBqYsbuHJ
 -----END PRIVATE KEY-----