← Back to branch summary

~suligap/canonical-identity-provider/charm-de-oops

« back to all changes in this revision

Viewing changes to templates/settings.py.j2

  • Committer: Ubuntu One Auto Copilot
  • Author(s): Maximiliano Bertacchini
  • Date: 2018-09-05 14:29:31 UTC
  • mfrom: (86.1.1 add-openid_session_ttl)
  • Revision ID: otto-copilot@canonical.com-20180905142931-52k31prtmu5va26q
Add openid_session_ttl option (if set, overrides the project's settings.OPENID_SESSION_TTL).

Merged from https://code.launchpad.net/~maxiberta/canonical-is-charms/canonical-identity-provider_add-openid_session_ttl/+merge/354121

Show diffs side-by-side

added added

removed removed

Lines of Context:
templates/settings.py.j2
99
99
OOPSES['template']['reporter'] = '{{ oops_reporter }}'
100
100
OPENID_LAUNCHPAD_STAFF_TEAMS = {{ openid_launchpad_staff_teams }}
101
101
OPENID_LAUNCHPAD_TEAMS_MAPPING = {{ openid_launchpad_teams_mapping }}
 
102
{% if openid_token_ttl %}
 
103
OPENID_TOKEN_TTL = {{ openid_token_ttl }}
 
104
{% endif %}
102
105
{% if deployment != 'production' %}
103
106
# enable test consumer
104
107
TESTING=True