diff --git a/protokollsystem/tasks/main.yml b/protokollsystem/tasks/main.yml index 744e5489a010f4793782250bbe2ea8ae76df5fee..4bcbafc263e06eeca3edf06875157cdc6a1aee7f 100644 --- a/protokollsystem/tasks/main.yml +++ b/protokollsystem/tasks/main.yml @@ -76,6 +76,17 @@ - protokollsystem - webservices +- name: check our config + command: "{{protokolle_web_root}}/bin/python {{protokolle_web_root}}/configproxy.py check --log-level warning" + args: + chdir: "{{protokolle_web_root}}" + become: yes + become_user: "{{protokolle_user}}" + changed_when: no + tags: + - protokollsystem + - webservices + - name: ensure data model upgrades are applied command: "{{protokolle_web_root}}/bin/python {{protokolle_web_root}}/server.py db upgrade" args: diff --git a/protokollsystem/templates/config.py.j2 b/protokollsystem/templates/config.py.j2 index 9cea0c454412dfab2f7eb40d8be5d8cb9504912a..57e0880931701a48243858f72d5cc75e851cde7b 100644 --- a/protokollsystem/templates/config.py.j2 +++ b/protokollsystem/templates/config.py.j2 @@ -29,9 +29,8 @@ CELERY_ACCEPT_CONTENT = ["pickle"] SENTRY_DSN = "{{protokolle_sentry_dsn}}" {% endif %} -# This breaks at least the installation at AStA (as of March 18th 2018) -#SERVER_NAME = "{{ protokolle_url_root }}" -#PREFERRED_URL_SCHEME = "{{ protokolle_url_proto }}" +SERVER_NAME = "{{ protokolle_url_root }}" +PREFERRED_URL_SCHEME = "{{ protokolle_url_proto }}" URL_ROOT = "{{ protokolle_url_root }}" URL_PROTO = "{{ protokolle_url_proto }}" URL_PATH = "{{ protokolle_url_path }}" @@ -97,8 +96,7 @@ AUTH_BACKENDS = [ domain="{{ auth.domain }}", user_dn="{{ auth.user_dn }}", group_dn="{{ auth.group_dn }}", - ca_cert="{{ auth.ca_cert }}", - obsolete={{ auth.obsolete }}), + ca_cert="{{ auth.ca_cert }}"), {% endfor %} ]