richie 3.1.3.dev7__tar.gz → 3.1.3.dev11__tar.gz

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/CHANGELOG.md

@@ -12,6 +12,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 - Hide courses that are not `is_listed` in public pages
 - Replace order groups by computed properties coming from Joanie
+- Allow configuration of the `STORAGES` setting via environment variables
 
 ### Fixed
 
@@ -87,6 +88,17 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - Added new page extension `MainMenuEntry`
 - Add explicit error when a user tries to delete a credit card
   that is still in use
+- Added org_dockerhub, nginx_image_name, nginx_image_tag
+    and elasticsearch_image_name parameters to cookiecutter
+- Added in the activate script the possibility to select 
+    the database and the languages that the activating site
+    will support. It also reflects in changes in the docker
+    compose file in order to run the site with the selected database.
+- Improved create demo site script to multilingual generation.
+
+### Fixed
+
+- Fix frontend translation of Enroll now for external LMS backend
 
 ### Changed
 

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.1.3.dev7
+Version: 3.1.3.dev11
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/cookiecutter.json

@@ -1,5 +1,9 @@
 {
     "organization": null,
+    "org_dockerhub": "fundocker",
+    "nginx_image_name": "fundocker/openshift-nginx",
+    "nginx_image_tag": "1.13",
+    "elasticsearch_image_name": "fundocker/openshift-elasticsearch:6.6.2",
     "_copy_without_render": [
         ".circleci",
         "bin/activate",

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/.circleci/src/jobs/@docker.yml

@@ -75,39 +75,39 @@ hub:
           - run:
               name: Tag app image
               command: |
-                docker images fundocker/<< parameters.image_name >>
+                docker images {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>
                 # Display either:
                 # - DOCKER_TAG: main (Git branch)
                 # or
                 # - DOCKER_TAG: 1.1.2 (Git tag v1.1.2)
                 echo "DOCKER_TAG: ${DOCKER_TAG}"
-                docker tag << parameters.site >>:production fundocker/<< parameters.image_name >>:${DOCKER_TAG}
+                docker tag << parameters.site >>:production {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>:${DOCKER_TAG}
                 if [[ -n "$CIRCLE_TAG" ]]; then
-                    docker tag << parameters.site >>:production fundocker/<< parameters.image_name >>:latest
+                    docker tag << parameters.site >>:production {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>:latest
                 fi
-                docker images | grep -E "^fundocker/<< parameters.image_name >>\s*(${DOCKER_TAG}.*|latest|main)"
+                docker images | grep -E "^{{cookiecutter.org_dockerhub}}/<< parameters.image_name >>\s*(${DOCKER_TAG}.*|latest|main)"
           - run:
               name: Tag nginx image
               command: |
-                docker images fundocker/<< parameters.image_name >>-nginx
+                docker images {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>-nginx
                 echo "DOCKER_TAG: ${DOCKER_TAG}"
-                docker tag << parameters.site >>-nginx:production fundocker/<< parameters.image_name >>-nginx:${DOCKER_TAG}
+                docker tag << parameters.site >>-nginx:production {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>-nginx:${DOCKER_TAG}
                 if [[ -n "$CIRCLE_TAG" ]]; then
-                    docker tag << parameters.site >>-nginx:production fundocker/<< parameters.image_name >>-nginx:latest
+                    docker tag << parameters.site >>-nginx:production {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>-nginx:latest
                 fi
-                docker images | grep -E "^fundocker/<< parameters.image_name >>-nginx\s*(${DOCKER_TAG}.*|latest|main)"
+                docker images | grep -E "^{{cookiecutter.org_dockerhub}}/<< parameters.image_name >>-nginx\s*(${DOCKER_TAG}.*|latest|main)"
           # Publish images
           - run:
               name: Publish app image
               command: |
-                docker push fundocker/<< parameters.image_name >>:${DOCKER_TAG}
+                docker push {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>:${DOCKER_TAG}
                 if [[ -n "$CIRCLE_TAG" ]]; then
-                  docker push fundocker/<< parameters.image_name >>:latest
+                  docker push {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>:latest
                 fi
           - run:
               name: Publish nginx image
               command: |
-                docker push fundocker/<< parameters.image_name >>-nginx:${DOCKER_TAG}
+                docker push {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>-nginx:${DOCKER_TAG}
                 if [[ -n "$CIRCLE_TAG" ]]; then
-                  docker push fundocker/<< parameters.image_name >>-nginx:latest
+                  docker push {{cookiecutter.org_dockerhub}}/<< parameters.image_name >>-nginx:latest
                 fi

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/.cookiecutter_default.yml

@@ -0,0 +1,6 @@
+default_context:
+    _organization: {{cookiecutter.organization}}
+    _org_dockerhub: {{cookiecutter.org_dockerhub}}
+    _nginx_image_name: {{cookiecutter.nginx_image_name}}
+    _nginx_image_tag: {{cookiecutter.nginx_image_tag}}
+    _elasticsearch_image_name: {{cookiecutter.elasticsearch_image_name}}

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/Dockerfile

@@ -1,5 +1,5 @@
-ARG NGINX_IMAGE_NAME=fundocker/openshift-nginx
-ARG NGINX_IMAGE_TAG=1.13
+ARG NGINX_IMAGE_NAME={{cookiecutter.nginx_image_name}}
+ARG NGINX_IMAGE_TAG={{cookiecutter.nginx_image_tag}}
 ARG STATIC_ROOT=/data/static
 ARG SITE
 

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/Makefile

@@ -1,3 +1,9 @@
+# -- Load .env file
+ifneq (,$(wildcard .env))
+	include .env
+  	export $(shell sed 's/=.*//' .env)
+endif
+
 # -- Terminal colors
 COLOR_INFO    = \033[0;36m
 COLOR_RESET   = \033[0m
@@ -13,15 +19,13 @@ COMPOSE              = \
   NGINX_IMAGE_TAG="$(NGINX_IMAGE_TAG)" \
   DOCKER_USER="$(DOCKER_UID):$(DOCKER_GID)" \
   docker compose
+COMPOSE_UP_WAIT      = $(COMPOSE) up -d --wait --wait-timeout 60
 COMPOSE_RUN          = $(COMPOSE) run --rm
 COMPOSE_RUN_APP      = $(COMPOSE_RUN) app-dev
 COMPOSE_EXEC         = $(COMPOSE) exec
 COMPOSE_EXEC_APP     = $(COMPOSE_EXEC) app-dev
 COMPOSE_TEST_RUN     = $(COMPOSE) run --rm -e DJANGO_CONFIGURATION=Test
 COMPOSE_TEST_RUN_APP = $(COMPOSE_TEST_RUN) app-dev
-WAIT_DB              = $(COMPOSE_RUN) dockerize -wait tcp://db:5432 -timeout 60s
-WAIT_ES              = $(COMPOSE_RUN) dockerize -wait tcp://elasticsearch:9200 -timeout 60s
-WAIT_SENTINEL        = $(COMPOSE_RUN) dockerize -wait tcp://redis-sentinel:26379 -wait tcp://redis-primary:6379 -timeout 20s
 
 # -- Node
 
@@ -44,7 +48,7 @@ bootstrap: \
   env.d/aws \
   env.d/development \
   data/media/$(RICHIE_SITE)/.keep \
-  data/db/$(RICHIE_SITE) \
+  data/${ACTIVATED_DB}/$(RICHIE_SITE) \
   stop \
   build-front \
   build \
@@ -68,7 +72,7 @@ generate-site: ## generate a new site using cookiecutter
 .PHONY: generate-site
 
 add-site: generate-site ## add a new site to the site factory
-	@echo "RICHIE_SITE=$(shell ls -td sites/* | head -1 | cut -f2 -d'/')" > .env
+	@bin/activate
 .PHONY: add-site
 
 .env: ## site should be activated
@@ -84,7 +88,7 @@ build: .env ## build all containers
 reset: .env ## Remove database and local files
 	$(COMPOSE) stop
 	rm -Ir data/* || exit 0
-	$(COMPOSE) rm db
+	$(COMPOSE) rm ${ACTIVATED_DB}
 .PHONY: reset
 
 down: .env ## stop & remove containers
@@ -96,11 +100,9 @@ logs: .env ## display app logs (follow mode)
 .PHONY: logs
 
 run: .env ## start the wsgi (production) or development server
-	@$(COMPOSE) up -V -d redis-sentinel
-	@$(WAIT_SENTINEL)
-	@$(COMPOSE) up -d nginx
-	@$(COMPOSE) up -d app-dev
-	@$(WAIT_DB)
+	@$(COMPOSE_UP_WAIT) -V redis-sentinel
+	@$(COMPOSE_UP_WAIT) nginx
+	@$(COMPOSE_UP_WAIT) app-dev
 .PHONY: run
 
 stop: .env ## stop the development server
@@ -179,8 +181,7 @@ check: .env ## perform django checks
 .PHONY: check
 
 demo-site: .env ## create a demo site
-	@$(COMPOSE) up -d db
-	@$(WAIT_DB)
+	@$(COMPOSE_UP_WAIT) ${ACTIVATED_DB}
 	@$(MANAGE) flush
 	@$(MANAGE) create_demo_site
 	@${MAKE} search-index
@@ -255,20 +256,20 @@ i18n-front: .env ## Extract and compile translation files used for react-intl
 .PHONY: i18n-front
 
 migrate: .env ## perform database migrations
-	@$(COMPOSE) up -d db
-	@$(WAIT_DB)
+	@echo "Start and wait for ${ACTIVATED_DB} to be up..."
+	@$(COMPOSE_UP_WAIT) ${ACTIVATED_DB}
 	@$(MANAGE) migrate
 .PHONY: migrate
 
 search-index: .env ## (re)generate the Elasticsearch index
-	@$(COMPOSE) up -d elasticsearch
-	@$(WAIT_ES)
+	@echo "Start and wait for ${ACTIVATED_DB} & elasticsearch to be up..."
+	@$(COMPOSE_UP_WAIT) elasticsearch
 	@$(MANAGE) bootstrap_elasticsearch
 .PHONY: search-index
 
-superuser: .env ## create a DjangoCMS superuser
-	@$(COMPOSE) up -d db
-	@$(WAIT_DB)
+superuser: .env ## Create an admin user with password "admin"
+	@echo "Start and wait for ${ACTIVATED_DB} to be up..."
+	@$(COMPOSE_UP_WAIT) ${ACTIVATED_DB}
 	@$(MANAGE) createsuperuser
 .PHONY: superuser
 
@@ -278,8 +279,7 @@ ci-check: .env ## run django check management command on productin image
 .PHONY: ci-check
 
 ci-migrate: .env ## run django migrate command on production image
-	@$(COMPOSE) up -d db
-	@$(WAIT_DB)
+	@$(COMPOSE) up -d ${ACTIVATED_DB}
 	$(COMPOSE_RUN) app python manage.py migrate
 .PHONY: ci-migrate
 
@@ -306,13 +306,13 @@ data/media/$(RICHIE_SITE)/.keep: .env
 	@mkdir -p data/media/$(RICHIE_SITE)
 	@touch data/media/$(RICHIE_SITE)/.keep
 
-data/db/$(RICHIE_SITE): .env
-	@echo 'Preparing db volume...'
-	@mkdir -p data/db/$(RICHIE_SITE)
+data/${ACTIVATED_DB}/$(RICHIE_SITE): .env
+	@echo 'Preparing ${ACTIVATED_DB} volume...'
+	@mkdir -p data/${ACTIVATED_DB}/$(RICHIE_SITE)
 
 env.d/development:
 	cp env.d/development.dist env.d/development
 
 help:
-	@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+	@egrep -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m  %-30s\033[0m %s\n", $$1, $$2}'
 .PHONY: help

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/bin/activate

@@ -0,0 +1,158 @@
+#!/usr/bin/env bash
+
+# shellcheck source=bin/_config.sh
+source "$(dirname "${BASH_SOURCE[0]}")/_config.sh"
+
+declare prompt
+declare -a sites
+declare -i default=1
+declare -i choice
+declare -i n_sites
+declare -a databases=("postgresql" "mysql" "sqlite")
+# Note that the ports respect the sequence of the databases
+# list, which means that it is necessary to identify the port
+# in accordance with the position of the database name
+declare -a databases_ports=("5472" "3306" "")
+declare -i database_choice
+declare -i n_databases
+declare -A languages=(
+    ["Portuguese"]='("pt", "Portuguese")'
+    ["French"]='("fr", "French (France)")'
+    ["Spanish"]='("es", "Spanish")'
+    ["Russian"]='("ru", "Russian")'
+    ["Vietnamese"]='("vi", "Vietnamese")'
+    ["Arabic (Saudi Arabia)"]='("ar", "Arabic (Saudi Arabia)")'
+    ["Korean"]='("ko", "Korean")'
+)
+declare -A selected_languages=(
+    ["English"]='("en", "English")'
+)
+ordered_languages=(
+    "English"
+    "Portuguese (Portugal)"
+    "French (France)"
+    "Spanish"
+    "Russian"
+    "Vietnamese"
+    "Arabic (Saudi Arabia)"
+    "Korean"
+)
+ordered_languages_choices=""
+
+# List sites by looking in the "sites" directory
+# and store them in an array
+read -r -a sites <<< "$(
+    find "${SITES_DIRECTORY}" -maxdepth 1 -mindepth 1  -type d |
+    sed 's|'"${SITES_DIRECTORY}\/"'||' |
+    xargs
+)"
+n_sites=${#sites[@]}
+n_databases=${#databases[@]}
+
+if [[ n_sites -eq 0 ]]; then
+    (>&2 echo "You should first add a site to the project by running: make add-site")
+    exit 10
+fi
+
+if [[ n_sites -eq 1 ]]; then
+    # If there is only one site, activate it
+    echo "RICHIE_SITE=${sites[0]}" > .env
+else
+    prompt="Select an available site to activate:\\n"
+    for (( i=0; i<n_sites; i++ )); do
+        prompt+="[$((i+1))] ${sites[$i]}"
+        if [[ $((i+1)) -eq ${default} ]]; then
+            prompt+=" (default)"
+        fi
+        prompt+="\\n"
+    done
+    prompt+="Your choice: "
+    read -r -p "$(echo -e "${prompt}")" choice
+
+    if [[ ${choice} -gt n_sites ]]; then
+        (>&2 echo "Invalid choice ${choice} (should be <= ${n_sites})")
+        exit 10
+    fi
+
+    if [[ ${choice} -le 0 ]]; then
+        choice=${default}
+    fi
+fi
+
+prompt="Select an available database to activate:\\n"
+for (( i=0; i<n_databases; i++ )); do
+    prompt+="[$((i+1))] ${databases[$i]}"
+    if [[ $((i+1)) -eq ${default} ]]; then
+        prompt+=" (default)"
+    fi
+    prompt+="\\n"
+done
+prompt+="Your choice: "
+read -r -p "$(echo -e "${prompt}")" database_choice
+
+if [[ ${database_choice} -le 0 ]]; then
+    database_choice=${default}
+fi
+
+while true; do
+    echo "Do you want to set up languages for this site? (y/n)"
+    read -r setup_languages
+    if [[ "$setup_languages" != "y" && "$setup_languages" != "n" ]]; then
+        echo "Please enter 'y' or 'n'."
+    else
+        if [[ "$setup_languages" != "y" ]]; then
+            echo "Skipping language setup."
+            break
+        else
+            echo "Select the languages this site will support:"
+            for language in "${!languages[@]}"; do
+                while true; do
+                    read -p "Enable $language? (y/n): " answer
+                    if [[ "$answer" != "y" && "$answer" != "n" ]]; then
+                        echo "Please enter 'y' or 'n'."
+                    else
+                        if [[ "$answer" == "y" ]]; then
+                            selected_languages["$language"]="${languages["$language"]}"
+                        fi
+                        break
+                    fi
+                done
+            done
+
+            for language in "${ordered_languages[@]}"; do
+                if [[ -n "${selected_languages["$language"]}" ]]; then
+                    if [[ -z $ordered_languages_choices ]]; then
+                        ordered_languages_choices="${selected_languages["$language"]}"
+                    else
+                        ordered_languages_choices="$ordered_languages_choices, ${selected_languages["$language"]}"
+                    fi
+                fi
+            done
+            break
+        fi
+    fi
+done
+
+# Activate the chosen site
+# Set the database and port
+echo "RICHIE_SITE=${sites[$((choice-1))]}" > .env
+echo "ACTIVATED_DB=${databases[$((database_choice-1))]}" >> .env
+echo "DB_PORT=${databases_ports[$((database_choice-1))]}" >> .env
+
+if [[ "$setup_languages" == "y" ]]; then
+    # Set the LANGUAGES variables in the .env file
+    echo "LANGUAGES=($ordered_languages_choices)" >> .env
+    break
+fi
+
+echo """
+Site activated successfully!
+
+The configurations are set in the .env file
+
+Please, if you set up languages, note that  you
+can change the languages order in the .env file
+according to your needs. English is the default
+language and if the site will not suport it, you
+can remove it from there.
+"""

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose-mysql.yml

@@ -0,0 +1,17 @@
+services:
+  mysql:
+    image: mysql:8.0
+    ports:
+      - "3306:3306"
+    environment:
+      - MYSQL_ALLOW_EMPTY_PASSWORD=yes
+      - MYSQL_ROOT_PASSWORD=
+      - MYSQL_DATABASE=richie_${RICHIE_SITE:?}
+    command: --default-authentication-plugin=caching_sha2_password
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+      interval: 1s
+      timeout: 2s
+      retries: 300
+    volumes:
+      - ./data/db/${RICHIE_SITE:?}:/var/lib/mysql

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose-postgresql.yml

@@ -0,0 +1,14 @@
+services:
+  postgresql:
+    image: postgres:16.4
+    ports:
+      - "5472:5432"
+    env_file:
+      - env.d/postgresql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 1s
+      timeout: 2s
+      retries: 300
+    volumes:
+      - ./data/db/${RICHIE_SITE:?}:/var/lib/postgresql/data

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose-sqlite.yml

@@ -0,0 +1 @@
+# This file is empty on purpose!

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/docker-compose.yml

@@ -1,24 +1,20 @@
+include:
+  - docker-compose-${ACTIVATED_DB}.yml
 services:
-  db:
-    image: postgres:16.4
-    environment:
-      - POSTGRES_DB=richie_${RICHIE_SITE:?}
-    env_file:
-      - "env.d/development"
-    ports:
-      - "5440:5432"
-    volumes:
-      - ./data/db/${RICHIE_SITE:?}:/var/lib/postgresql/data
-
   elasticsearch:
-    image: fundocker/openshift-elasticsearch:6.6.2
+    image: {{cookiecutter.elasticsearch_image_name}}
     environment:
       - discovery.type=single-node
     env_file:
       - "env.d/development"
+      - "env.d/${ACTIVATED_DB}"
     ports:
       - "9220:9200"
-
+    healthcheck:
+      test: ["CMD", "echo", "''", ">", "/dev/tcp/127.0.0.1/9200", "||", "exit", "1"]
+      interval: 1s
+      timeout: 2s
+      retries: 300
   app-dev:
     build:
       context: .
@@ -28,11 +24,13 @@ services:
         SITE: ${RICHIE_SITE:?}
     image: "${RICHIE_SITE:?}:development"
     environment:
-      - DB_NAME=richie_${RICHIE_SITE:?}
       - DJANGO_SETTINGS_MODULE=${RICHIE_SITE:?}.settings
       - DJANGO_CONFIGURATION=Development
       - RICHIE_ES_INDICES_PREFIX=richie_${RICHIE_SITE:?}
-    env_file: env.d/development
+    env_file:
+      - ".env"
+      - "env.d/development"
+      - "env.d/${ACTIVATED_DB}"
     networks:
       - default
       - lms_outside
@@ -42,7 +40,7 @@ services:
       - "./sites/${RICHIE_SITE:?}/src/backend:/app"
       - "./data/media/${RICHIE_SITE:?}:/data/media"
     depends_on:
-      - "db"
+      - "${ACTIVATED_DB}"
       - "elasticsearch"
       - "redis-sentinel"
     user: ${DOCKER_USER:-1000}
@@ -58,18 +56,20 @@ services:
     # unique and avoid collisions in parallel builds.
     image: "${RICHIE_SITE:?}:production"
     environment:
-      - DB_NAME=richie_${RICHIE_SITE:?}
       - DJANGO_SETTINGS_MODULE=${RICHIE_SITE:?}.settings
       - DJANGO_CONFIGURATION=ContinuousIntegration
       - RICHIE_ES_INDICES_PREFIX=richie_${RICHIE_SITE:?}
-    env_file: env.d/development
+    env_file:
+      - ".env"
+      - "env.d/development"
+      - "env.d/${ACTIVATED_DB}"
     networks:
       - default
       - lms_outside
     volumes:
       - ./data/media/${RICHIE_SITE:?}:/data/media
     depends_on:
-      - "db"
+      - "${ACTIVATED_DB}"
       - "elasticsearch"
       - "redis-sentinel"
     user: ${DOCKER_USER:-1000}
@@ -80,8 +80,8 @@ services:
       target: nginx
       args:
         DOCKER_USER: ${DOCKER_USER:-1000}
-        NGINX_IMAGE_NAME: ${NGINX_IMAGE_NAME:-fundocker/openshift-nginx}
-        NGINX_IMAGE_TAG: ${NGINX_IMAGE_TAG:-1.13}
+        NGINX_IMAGE_NAME: ${NGINX_IMAGE_NAME:-{{cookiecutter.nginx_image_name}}}
+        NGINX_IMAGE_TAG: ${NGINX_IMAGE_TAG:-{{cookiecutter.nginx_image_tag}}}
         SITE: ${RICHIE_SITE:?}
     image: "${RICHIE_SITE:?}-nginx:production"
     ports:

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/development.dist

@@ -8,18 +8,6 @@ DJANGO_ALLOWED_HOSTS=*
 # Elastic search
 RICHIE_ES_HOST=elasticsearch
 
-# PostgreSQL db container configuration
-POSTGRES_DB=richie
-POSTGRES_USER=fun
-POSTGRES_PASSWORD=pass
-
-# App database configuration
-DB_HOST=db
-DB_NAME=richie
-DB_USER=fun
-DB_PASSWORD=pass
-DB_PORT=5432
-
 # LMS Backend
 EDX_BACKEND=richie.apps.courses.lms.base.BaseLMSBackend
 EDX_BASE_URL=http://localhost:8073

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/mysql

@@ -0,0 +1,12 @@
+# Mysql db container configuration
+MYSQL_ROOT_PASSWORD=
+MYSQL_ALLOW_EMPTY_PASSWORD=yes
+MYSQL_DATABASE=richie_${RICHIE_SITE}
+
+# App database configuration
+DB_ENGINE=django.db.backends.mysql
+DB_HOST=mysql
+DB_NAME=richie_${RICHIE_SITE}
+DB_USER=root
+DB_PASSWORD=
+DB_PORT=3306

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/env.d/postgresql

@@ -0,0 +1,12 @@
+# Postgresql db container configuration
+POSTGRES_DB=richie_${RICHIE_SITE}
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=pass
+
+# App database configuration
+DB_ENGINE=django.db.backends.postgresql_psycopg2
+DB_HOST=postgresql
+DB_NAME=richie_${RICHIE_SITE}
+DB_USER=postgres
+DB_PASSWORD=pass
+DB_PORT=5432

richie-3.1.3.dev11/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/template/cookiecutter.json

@@ -0,0 +1,11 @@
+{
+    "_organization": null,
+    "_org_dockerhub": null,
+    "_nginx_image_name": null,
+    "_nginx_image_tag": null,
+    "_elasticsearch_image_name": null,
+    "site": null,
+    "domain": null,
+    "second_lang_code": "Enter the code of the second language",
+    "second_lang_name": "Enter in english the name of the second language"
+}

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/template/{{cookiecutter.site}}/requirements/base.txt

@@ -6,5 +6,6 @@ dockerflow==2022.8.0
 gunicorn==23.0.0
 psycopg2-binary==2.9.9
 richie==3.1.2
+mysqlclient==2.2.6
 unidecode==1.3.6 # required by django-check-seo
 sentry-sdk==2.11.0

{richie-3.1.3.dev7 → richie-3.1.3.dev11}/cookiecutter/{{cookiecutter.organization}}-richie-site-factory/template/{{cookiecutter.site}}/requirements/dev.txt

@@ -1,7 +1,7 @@
 bandit==1.7.5
 black==24.3.0
-Faker==13.2.0
-factory-boy==3.2.1
+Faker==35.2.0
+factory-boy==3.3.3
 flake8==6.0.0
 flake8-pyproject==1.2.3
 isort==5.12.0