diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb42024..b916ae0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,7 @@ deploy: <<: *deploy stage: deploy script: - - ssh -t cloud@$DEPLOYHOST "export ADMIN_PWD=$DJANGO_ADMIN_PWD && cd django/eoa-django-test && git pull && sh scripts/start_deploy.sh " + - ssh -t cloud@$DEPLOYHOST "export ADMIN_PWD=$DJANGO_ADMIN_PWD && echo $ADMIN_PWD && cd django/eoa-django-test && git pull && sh scripts/start_deploy.sh " environment: name: production url: http://141.5.105.187:8000/publications/studies/312/index.html diff --git a/scripts/loaddjango.sh b/scripts/loaddjango.sh index f80d793..34fe212 100755 --- a/scripts/loaddjango.sh +++ b/scripts/loaddjango.sh @@ -12,7 +12,7 @@ python manage.py migrate eoa yes "y" | python manage.py makemigrations yes "y" | python manage.py migrate # Create superuser with pwd from env variable -echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.filter(email='admin@example.com', is_superuser=True).delete(); User.objects.create_superuser('admin', 'admin@example.com', str($ADMIN_PWD))" | python manage.py shell +echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.filter(email='admin@example.com', is_superuser=True).delete(); User.objects.create_superuser('admin', 'admin@example.com',"$ADMIN_PWD")" | python manage.py shell # Import Bärnighausen file python manage.py tei_import -f baernighausen.xml