Skip to content
Snippets Groups Projects
Commit ec4e5f1f authored by Martin Bergemann's avatar Martin Bergemann :speech_balloon:
Browse files

Merge branch 'update_web_registry' into 'master'

Update web registry

See merge request !25
parents a4ec9e4d 9e5c054e
No related branches found
No related tags found
1 merge request!25Update web registry
Pipeline #19733 passed
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
-v {{ core_base_dir_location }}:{{ core_base_dir_location }}:ro -v {{ core_base_dir_location }}:{{ core_base_dir_location }}:ro
-e EVALUATION_SYSTEM_CONFIG_FILE={{core_root_dir}}/freva/evaluation_system.conf -e EVALUATION_SYSTEM_CONFIG_FILE={{core_root_dir}}/freva/evaluation_system.conf
--name {{web_name}} --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: > - 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/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 -v /opt/freva/{{project_name}}/web_service/server-cert.crt:/etc/ssl/certs/server-cert.crt:z
......
...@@ -6,9 +6,9 @@ if [ -z $1 ];then ...@@ -6,9 +6,9 @@ if [ -z $1 ];then
exit 1 exit 1
fi fi
python manage.py migrate --fake contenttypes /opt/condaenv/python manage.py migrate --fake contenttypes
python manage.py migrate --fake-initial --noinput /opt/condaenv/python manage.py migrate --fake-initial --noinput
python manage.py createsuperuser \ /opt/condaenv/python manage.py createsuperuser \
--noinput \ --noinput \
--username freva-admin \ --username freva-admin \
--email $DJANGO_SUPERUSER_EMAIL || echo 0 --email $DJANGO_SUPERUSER_EMAIL || echo 0
__version__ = "2205.1.1" __version__ = "2205.1.2"
AVAILABLE_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"] AVAILABLE_PYTHON_VERSIONS = ["3.7", "3.8", "3.9", "3.10"]
AVAILABLE_CONDA_ARCHS = [ AVAILABLE_CONDA_ARCHS = [
"Linux-x86_64", "Linux-x86_64",
......
...@@ -347,7 +347,7 @@ class WebScreen(BaseForm): ...@@ -347,7 +347,7 @@ class WebScreen(BaseForm):
allowed_group=( allowed_group=(
self.add_widget_intelligent( self.add_widget_intelligent(
npyscreen.TitleText, 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"), value=cfg.get("allowed_group", "my_freva"),
), ),
True, True,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment