From f970e8be88e77ce2bc37212546fbc84e455dd4fe Mon Sep 17 00:00:00 2001 From: Thomas NOEL Date: Tue, 24 Apr 2018 14:37:14 +0200 Subject: [PATCH] settings: mellon is now in chrono and combo by default (#23373) --- roles/app-setup/templates/chrono-settings.j2 | 5 ----- roles/app-setup/templates/combo-settings.j2 | 5 ----- 2 files changed, 10 deletions(-) diff --git a/roles/app-setup/templates/chrono-settings.j2 b/roles/app-setup/templates/chrono-settings.j2 index d5c69d9..a3cf9fe 100644 --- a/roles/app-setup/templates/chrono-settings.j2 +++ b/roles/app-setup/templates/chrono-settings.j2 @@ -1,10 +1,5 @@ {% extends "app-settings-base.j2" %} -{% block app_custom_before %} -# SAML2 authentication -INSTALLED_APPS += ('mellon',) -{% endblock %} - {% block app_custom_after %} # disable django-mellon autologin MELLON_OPENED_SESSION_COOKIE_NAME = None diff --git a/roles/app-setup/templates/combo-settings.j2 b/roles/app-setup/templates/combo-settings.j2 index 5c592ae..f7a8db0 100644 --- a/roles/app-setup/templates/combo-settings.j2 +++ b/roles/app-setup/templates/combo-settings.j2 @@ -1,10 +1,5 @@ {% extends "app-settings-base.j2" %} -{% block app_custom_before %} -# SAML2 authentication -INSTALLED_APPS += ('mellon',) -{% endblock %} - {% block app_custom_after %} # add custom hobo agent module INSTALLED_APPS = ('hobo.agent.combo', ) + INSTALLED_APPS -- 2.17.0