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

Try to fix freshmaker server_name handling.

Browse source
This commit is contained in:
Ralph Bean 2018-02-09 16:29:50 +00:00
parent ab1f81b0ce
commit 86c78df3f9
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
playbooks/groups/freshmaker.yml
View file

@ -61,7 +61,7 @@
- role: freshmaker/frontend - role: freshmaker/frontend
# TLS is terminated for us at the proxy layer (like for every other app). # TLS is terminated for us at the proxy layer (like for every other app).
freshmaker_force_ssl: False freshmaker_force_ssl: False
freshmaker_servername: {{inventory_hostname}} freshmaker_servername: null
handlers: handlers:
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"
@ -78,7 +78,8 @@
roles: roles:
- fedmsg/base - fedmsg/base
- freshmaker/backend - role: freshmaker/backend
freshmaker_servername: freshmaker{{env_suffix}}.fedoraproject.org
- role: keytab/service - role: keytab/service
service: freshmaker service: freshmaker

2
roles/freshmaker/base/templates/etc/freshmaker/config.py.j2
View file

@ -256,4 +256,6 @@ class ProdConfiguration(BaseConfiguration):
ADMINS = {{ freshmaker_admins }} ADMINS = {{ freshmaker_admins }}
LOG_LEVEL = "{{ freshmaker_log_level }}" LOG_LEVEL = "{{ freshmaker_log_level }}"
{% if freshmaker_servername %}
SERVER_NAME = "{{ freshmaker_servername }}" SERVER_NAME = "{{ freshmaker_servername }}"
{% else %}

2
roles/freshmaker/frontend/templates/etc/httpd/conf.d/freshmaker.conf.j2
View file

@ -8,7 +8,7 @@ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
WSGIDaemonProcess freshmaker user=fedmsg group=fedmsg processes={{wsgi_procs}} threads={{wsgi_threads}} home=/usr/share/freshmaker WSGIDaemonProcess freshmaker user=fedmsg group=fedmsg processes={{wsgi_procs}} threads={{wsgi_threads}} home=/usr/share/freshmaker
WSGIScriptAlias /{{ freshmaker_endpoint }} /usr/share/freshmaker/freshmaker.wsgi WSGIScriptAlias /{{ freshmaker_endpoint }} /usr/share/freshmaker/freshmaker.wsgi
{% if freshmaker_servername != inventory_hostname %} {% if freshmaker_servername != inventory_hostname and freshmaker_servername != None %}
# Redirect from the hostname of this machine to user-visible hostname. # Redirect from the hostname of this machine to user-visible hostname.
RewriteEngine On RewriteEngine On
<If "%{HTTP_HOST} == '{{ inventory_hostname }}'"> <If "%{HTTP_HOST} == '{{ inventory_hostname }}'">