diff --git a/assets/playbooks/web-server-playbook.yml b/assets/playbooks/web-server-playbook.yml index 32e8760629da2ba9e453f6436703a8450e51f35a..ceb356344bc6aa265c580891088c309f7d36a036 100644 --- a/assets/playbooks/web-server-playbook.yml +++ b/assets/playbooks/web-server-playbook.yml @@ -39,7 +39,7 @@ -v {{ core_base_dir_location }}:{{ core_base_dir_location }}:ro -e EVALUATION_SYSTEM_CONFIG_FILE={{core_root_dir}}/freva/evaluation_system.conf --name {{web_name}} - -t registry.gitlab.dkrz.de/freva/freva_web/freva_web:production_dockers + -t registry.gitlab.dkrz.de/freva/freva_web/freva_web:main - docker_apache_cmd: > -v /opt/freva/{{project_name}}/web_service/freva_web.conf:/usr/local/apache2/conf/httpd.conf:z -v /opt/freva/{{project_name}}/web_service/server-cert.crt:/etc/ssl/certs/server-cert.crt:z diff --git a/assets/web/setup_web.sh b/assets/web/setup_web.sh index fff6df3f38c2f8fd4412d38d3f3794c17230851a..286526dfea8ccb43e8e7a8cab9af2c65e772c66a 100644 --- a/assets/web/setup_web.sh +++ b/assets/web/setup_web.sh @@ -6,9 +6,9 @@ if [ -z $1 ];then exit 1 fi -python manage.py migrate --fake contenttypes -python manage.py migrate --fake-initial --noinput -python manage.py createsuperuser \ +/opt/condaenv/python manage.py migrate --fake contenttypes +/opt/condaenv/python manage.py migrate --fake-initial --noinput +/opt/condaenv/python manage.py createsuperuser \ --noinput \ --username freva-admin \ --email $DJANGO_SUPERUSER_EMAIL || echo 0 diff --git a/src/freva_deployment/__init__.py b/src/freva_deployment/__init__.py index d509bd892d8193f4e871c1b1815f926aacbe5ac9..6517744b99c84dd7404b00932efe0ac01f71a171 100644 --- a/src/freva_deployment/__init__.py +++ b/src/freva_deployment/__init__.py @@ -1,4 +1,4 @@ -__version__ = "2205.1.1" +__version__ = "2205.1.2" AVAILABLE_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] AVAILABLE_CONDA_ARCHS = [ "Linux-x86_64", diff --git a/src/freva_deployment/ui/deployment_tui/deploy_forms.py b/src/freva_deployment/ui/deployment_tui/deploy_forms.py index 4495371b60b7af77b2f08ea274ef9a934dc5d232..35ed1b572d03f1eb51831ce3b1ae83c55d27645b 100644 --- a/src/freva_deployment/ui/deployment_tui/deploy_forms.py +++ b/src/freva_deployment/ui/deployment_tui/deploy_forms.py @@ -347,7 +347,7 @@ class WebScreen(BaseForm): allowed_group=( self.add_widget_intelligent( npyscreen.TitleText, - name=f"{self.num}Unix group(s) allowed to log on to the web:", + name=f"{self.num}Unix group allowed to log on to the web:", value=cfg.get("allowed_group", "my_freva"), ), True,