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

Just set inventory_hostname to freshmaker_servername for now.

Browse source
This commit is contained in:
Ralph Bean 2018-02-02 17:25:46 +00:00
parent 24dbc5cf4d
commit ab1f81b0ce
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
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: freshmaker{{env_suffix}}.fedoraproject.org freshmaker_servername: {{inventory_hostname}}
handlers: handlers:
- import_tasks: "{{ handlers_path }}/restart_services.yml" - import_tasks: "{{ handlers_path }}/restart_services.yml"

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

@ -8,13 +8,13 @@ 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 %}
### 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 }}'">
##RewriteRule (.*) "%{REQUEST_SCHEME}://{{ freshmaker_servername }}%{REQUEST_URI}" [R,L] RewriteRule (.*) "%{REQUEST_SCHEME}://{{ freshmaker_servername }}%{REQUEST_URI}" [R,L]
##</If> </If>
##{% endif %} {% endif %}
{% if env == 'staging' %} {% if env == 'staging' %}
OIDCOAuthClientID {{ freshmaker_stg_oidc_client_id }} OIDCOAuthClientID {{ freshmaker_stg_oidc_client_id }}