From 5d6f03b88b019645a3d1ebb1b88c135cd5b0e8e5 Mon Sep 17 00:00:00 2001
From: Robin Sonnabend <robin@fsmpi.rwth-aachen.de>
Date: Mon, 9 Apr 2018 20:30:20 +0200
Subject: [PATCH] Update protokollsystem
---
protokollsystem/tasks/main.yml | 11 +++++++++++
protokollsystem/templates/config.py.j2 | 8 +++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/protokollsystem/tasks/main.yml b/protokollsystem/tasks/main.yml
index 744e548..4bcbafc 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 9cea0c4..57e0880 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 %}
]
--
GitLab