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

More cleanup

This commit is contained in:
Daniel Egger 2023-06-01 22:57:24 +02:00
parent a67a06d69b
commit 975d9cfdc2
6 changed files with 8 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
caprover_deploy.sh
View File

@ -25,34 +25,11 @@ 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)}
if [[ "$APP_NAME" == "myvbv" ]]; then
VITE_LOGOUT_REDIRECT="https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv.iterativ.ch/"
https://edumgr.b2clogin.com/edumgr.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/
VITE_SENTRY_ENV="production"
elif [[ "$APP_NAME" == "myvbv-stage" ]]; then
VITE_LOGOUT_REDIRECT="https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/b2c_1_signupandsignin/oauth2/v2.0/logout/?post_logout_redirect_uri=https://myvbv-stage.iterativ.ch/"
https://vbvtst.b2clogin.com/vbvtst.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/
VITE_SENTRY_ENV="stage"
elif [[ "$APP_NAME" == "vbv-lernwelt" ]]; then
VITE_OAUTH_API_BASE_URL= https://vbvdev.b2clogin.com/vbvdev.onmicrosoft.com/B2C_1_SignUpAndSignIn_v3/oauth2/v2.0/
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"
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
echo "Deploy to $APP_NAME" 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 VITE_APP_ENVIRONMENT=dev python server/manage.py collectstatic --no-input
if [[ "$APP_NAME" == "prod-azure" ]]; then if [[ "$APP_NAME" == "prod-azure" ]]; then
# build and push azure docker container # build and push azure docker container

13
client/src/main.ts
View File

@ -14,10 +14,9 @@ declare module "pinia" {
} }
} }
if ( const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local";
window.location.href.indexOf("localhost") >= 0 ||
window.location.href.indexOf("127.0.0.1") >= 0 if (appEnv === "local") {
) {
log.setLevel("trace"); log.setLevel("trace");
} else { } else {
log.setLevel("warn"); log.setLevel("warn");
@ -28,12 +27,10 @@ const app = createApp(App);
Sentry.init({ Sentry.init({
app, app,
environment: import.meta.env.VITE_APP_ENVIRONMENT || "local", environment: appEnv,
dsn: "https://2df6096a4fd94bd6b4802124d10e4b8d@o8544.ingest.sentry.io/4504157846372352", dsn: "https://2df6096a4fd94bd6b4802124d10e4b8d@o8544.ingest.sentry.io/4504157846372352",
tracesSampleRate: 0.0, tracesSampleRate: 0.0,
enabled: enabled: appEnv.startsWith("prod") || appEnv.startsWith("stage"),
import.meta.env.VITE_APP_ENVIRONMENT.startsWith("prod") ||
import.meta.env.VITE_APP_ENVIRONMENT.startsWith("stage"),
}); });
// todo: define lang setup // todo: define lang setup

4
client/src/router/guards.ts
View File

@ -15,8 +15,8 @@ export const updateLoggedIn: NavigationGuard = async () => {
export const redirectToLoginIfRequired: NavigationGuard = (to) => { export const redirectToLoginIfRequired: NavigationGuard = (to) => {
const userStore = useUserStore(); const userStore = useUserStore();
if (loginRequired(to) && !userStore.loggedIn) { if (loginRequired(to) && !userStore.loggedIn) {
const sentryEnv = import.meta.env.VITE_APP_ENVIRONMENT; const appEnv = import.meta.env.VITE_APP_ENVIRONMENT || "local";
const ssoLogin = sentryEnv.startsWith("prod") || sentryEnv.startsWith("stage"); const ssoLogin = appEnv.startsWith("prod") || appEnv.startsWith("stage");
return ssoLogin ? `/login?next=${to.fullPath}` : `/login-local?next=${to.fullPath}`; return ssoLogin ? `/login?next=${to.fullPath}` : `/login-local?next=${to.fullPath}`;
} }
}; };

2
compose/django/docker_start.sh
View File

@ -10,5 +10,3 @@ python /app/manage.py collectstatic --no-input --no-post-process
python /app/manage.py reset_schema python /app/manage.py reset_schema
/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:7555 --chdir=/app -k uvicorn.workers.UvicornWorker

3
env/bitbucket/prepare_for_deployment.sh vendored
View File

@ -12,9 +12,6 @@ export PATH="$PWD/vbvvenv/bin:$PATH"
docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN docker login --username=iterativ --password=$DOCKER_PASSWORD_TOKEN
# only used for `python manage.py collectstatic` so value doesn't matter
export VITE_APP_ENVIRONMENT=dev
pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt pip install -r $BITBUCKET_CLONE_DIR/server/requirements/requirements-dev.txt
npm install -g caprover npm install -g caprover

BIN
env_secrets/prod-azure.json
View File

Binary file not shown.