Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of /git/ansible

Browse source 
* 'master' of /git/ansible:
  The proxy SSL header is always the same, even on staging
  HyperKitty: use libravatar
  Remove old crufty fedmsg_certs.
This commit is contained in:
Adam Miller 2015-08-07 21:07:00 +00:00
commit 51db873a8d
3 changed files with 5 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
inventory/host_vars/branched-composer.phx2.fedoraproject.org
View file

@ -7,12 +7,3 @@ volgroup: /dev/vg_bvirthost08
kojipkgs_url: kojipkgs.fedoraproject.org kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
- service: shell
owner: root
group: root
- service: bodhi
owner: root
group: masher

9
inventory/host_vars/rawhide-composer.phx2.fedoraproject.org
View file

@ -6,12 +6,3 @@ volgroup: /dev/vg_bvirthost06
kojipkgs_url: kojipkgs.fedoraproject.org kojipkgs_url: kojipkgs.fedoraproject.org
kojihub_url: koji.fedoraproject.org/kojihub kojihub_url: koji.fedoraproject.org/kojihub
kojihub_scheme: https kojihub_scheme: https
# These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs:
- service: shell
owner: root
group: root
- service: bodhi
owner: root
group: masher

10
roles/mailman/templates/settings.py.j2
View file

@ -108,7 +108,7 @@ DATABASES = {
USE_X_FORWARDED_HOST = True USE_X_FORWARDED_HOST = True
# In the Fedora infra, requests are systematically redirected to HTTPS, so put # In the Fedora infra, requests are systematically redirected to HTTPS, so put
# something always true here: # something always true here:
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SERVER', '{{ mailman_url }}') SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_SERVER', 'lists.fedoraproject.org') # It's always that, even on staging
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/1.6/topics/i18n/ # https://docs.djangoproject.com/en/1.6/topics/i18n/
@ -253,17 +253,17 @@ SOCIAL_AUTH_PIPELINE = (
# https://github.com/twaddington/django-gravatar # https://github.com/twaddington/django-gravatar
# #
# Gravatar base url. # Gravatar base url.
#GRAVATAR_URL = 'http://cdn.libravatar.org/' GRAVATAR_URL = 'http://cdn.libravatar.org/'
# Gravatar base secure https url. # Gravatar base secure https url.
#GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/' GRAVATAR_SECURE_URL = 'https://seccdn.libravatar.org/'
# Gravatar size in pixels. # Gravatar size in pixels.
#GRAVATAR_DEFAULT_SIZE = '80' #GRAVATAR_DEFAULT_SIZE = '80'
# An image url or one of the following: 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'. # An image url or one of the following: 'mm', 'identicon', 'monsterid', 'wavatar', 'retro'.
#GRAVATAR_DEFAULT_IMAGE = 'mm' GRAVATAR_DEFAULT_IMAGE = 'retro'
# One of the following: 'g', 'pg', 'r', 'x'. # One of the following: 'g', 'pg', 'r', 'x'.
#GRAVATAR_DEFAULT_RATING = 'g' #GRAVATAR_DEFAULT_RATING = 'g'
# True to use https by default, False for plain http. # True to use https by default, False for plain http.
#GRAVATAR_DEFAULT_SECURE = True GRAVATAR_DEFAULT_SECURE = True
# #
# django-compressor # django-compressor