ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged in feature/Fix-Vite-Env-Azure (pull request #123) 

Feature/Fix Vite Env Azure

Approved-by: Christian Cueni
This commit is contained in:
Lorenz Padberg 2023-06-01 14:29:03 +00:00
parent 1b9abaa568 69445b546c
commit 281b016df0
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
caprover_deploy.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# script should fail when any process returns non zero code # script should fail when any process returns non zero code
set -ev set -e
function generate_default_app_name() { function generate_default_app_name() {
local branch_name=$(git rev-parse --abbrev-ref HEAD) local branch_name=$(git rev-parse --abbrev-ref HEAD)
@ -25,8 +25,6 @@ function generate_default_app_name() {
# take app name as first argument or use the default generated app name # take app name as first argument or use the default generated app name
APP_NAME=${1:-$(generate_default_app_name)} APP_NAME=${1:-$(generate_default_app_name)}
echo "Deploy to $APP_NAME"
VITE_SENTRY_ENV="development" VITE_SENTRY_ENV="development"
if [[ "$APP_NAME" == "myvbv" ]]; then if [[ "$APP_NAME" == "myvbv" ]]; then
@ -38,8 +36,19 @@ elif [[ "$APP_NAME" == "myvbv-stage" ]]; then
elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then
VITE_LOGOUT_REDIRECT="https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch" VITE_LOGOUT_REDIRECT="https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://vbv-lernwelt.control.iterativ.ch"
VITE_SENTRY_ENV="development" VITE_SENTRY_ENV="development"
elif [[ "$APP_NAME" == "prod-azure" ]]; then
VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://my.vbv-afa.ch/"
VITE_SENTRY_ENV="production"
fi fi
echo "Deploy to $APP_NAME"
echo "VITE_SENTRY_ENV: $VITE_SENTRY_ENV"
echo "VITE_LOGOUT_REDIRECT: $VITE_LOGOUT_REDIRECT"
export VITE_SENTRY_ENV=$VITE_SENTRY_ENV
export VITE_LOGOUT_REDIRECT=$VITE_LOGOUT_REDIRECT
# create client for django # create client for django
npm run build npm run build
python server/manage.py collectstatic --no-input python server/manage.py collectstatic --no-input

BIN
env_secrets/production_azure.json
View File

Binary file not shown.

12
server/vbv_lernwelt/core/create_default_users.py
View File

@ -1,5 +1,9 @@
from django.contrib.auth.hashers import make_password from django.contrib.auth.hashers import make_password
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from environs import Env
env = Env()
env.read_env()
from vbv_lernwelt.core.constants import ( from vbv_lernwelt.core.constants import (
ADMIN_USER_ID, ADMIN_USER_ID,
@ -91,9 +95,11 @@ def create_default_users(user_model=User, group_model=Group, default_password=No
student_user.groups.add(student_group) student_user.groups.add(student_group)
student_user.save() student_user.save()
def _create_admin_user(email, first_name, last_name, avatar_url="", id=None): def _create_admin_user(
email, first_name, last_name, avatar_url="", id=None, password=default_password
):
admin_user, created = _get_or_create_user( admin_user, created = _get_or_create_user(
user_model=user_model, username=email, password=default_password, id=id user_model=user_model, username=email, password=password, id=id
) )
admin_user.is_superuser = True admin_user.is_superuser = True
admin_user.is_staff = True admin_user.is_staff = True
@ -108,6 +114,7 @@ def create_default_users(user_model=User, group_model=Group, default_password=No
first_name="Info", first_name="Info",
last_name="Iterativ", last_name="Iterativ",
avatar_url="/static/avatars/avatar_iterativ.png", avatar_url="/static/avatars/avatar_iterativ.png",
password=env("IT_DEFAULT_ADMIN_PASSWORD", default_password),
) )
_create_admin_user( _create_admin_user(
@ -116,6 +123,7 @@ def create_default_users(user_model=User, group_model=Group, default_password=No
last_name="Adminson", last_name="Adminson",
avatar_url="/static/avatars/avatar_iterativ.png", avatar_url="/static/avatars/avatar_iterativ.png",
id=ADMIN_USER_ID, id=ADMIN_USER_ID,
password=env("IT_DEFAULT_ADMIN_PASSWORD", default_password),
) )
for user_data in default_users: for user_data in default_users: