Update the Mailman role after addition of fedorahosted

This commit is contained in:
Aurélien Bompard 2015-08-21 10:42:41 +00:00
parent c21cb22894
commit 5b5c83d4de
10 changed files with 24 additions and 12 deletions

View file

@ -10,6 +10,6 @@
{% else %}
'url': 'https://apps.fedoraproject.org/js/data.js',
{% endif %}
'position': 'bottom-right'
'position': 'bottom-left'
});
</script>

View file

@ -1,3 +1,2 @@
basedir: {{ mailman_webui_basedir }}
confdir: {{ mailman_webui_confdir }}
domain: {{ mailman_url }}

View file

@ -21,7 +21,9 @@ ADMINS = (
# Hosts/domain names that are valid for this site; required if DEBUG is False
# See https://docs.djangoproject.com/en/1.5/ref/settings/#allowed-hosts
ALLOWED_HOSTS = [
"{{ mailman_url }}",
{% for host in mailman_domains %}
"{{ host }}",
{% endfor %}
".fedoraproject.org",
"discuss.arquillian.org",
"localhost", # Archiving API from Mailman
@ -30,7 +32,9 @@ ALLOWED_HOSTS = [
# And for BrowserID too, see
# http://django-browserid.rtfd.org/page/user/settings.html#django.conf.settings.BROWSERID_AUDIENCES
BROWSERID_AUDIENCES = [
"https://{{ mailman_url }}",
{% for host in mailman_domains %}
"{{ host }}",
{% endfor %}
]
# Mailman API credentials
@ -108,7 +112,7 @@ DATABASES = {
USE_X_FORWARDED_HOST = True
# In the Fedora infra, requests are systematically redirected to HTTPS, so put
# something always true here:
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SERVER', 'lists.fedoraproject.org') # It's always that, even on staging
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SCHEME', 'https')
# Internationalization
# https://docs.djangoproject.com/en/1.6/topics/i18n/