Add rewrite to apache to serve on a correct fqdn

defaults/main.yml

@@ -60,11 +60,11 @@ adjutant_service_publicuri_proto: "{{ openstack_service_publicuri_proto | defaul
 adjutant_service_adminuri_proto: "{{ openstack_service_adminuri_proto | default(adjutant_service_proto) }}"
 adjutant_service_internaluri_proto: "{{ openstack_service_internaluri_proto | default(adjutant_service_proto) }}"
 adjutant_service_publicuri: "{{ adjutant_service_publicuri_proto }}://{{ external_lb_vip_address }}:{{ adjutant_service_port }}"
-adjutant_service_publicurl: "{{ adjutant_service_publicuri }}/"
+adjutant_service_publicurl: "{{ adjutant_service_publicuri }}/v1/"
 adjutant_service_adminuri: "{{ adjutant_service_adminuri_proto }}://{{ internal_lb_vip_address }}:{{ adjutant_service_port }}"
-adjutant_service_adminurl: "{{ adjutant_service_adminuri }}/"
+adjutant_service_adminurl: "{{ adjutant_service_adminuri }}/v1/"
 adjutant_service_internaluri: "{{ adjutant_service_internaluri_proto }}://{{ internal_lb_vip_address }}:{{ adjutant_service_port }}"
-adjutant_service_internalurl: "{{ adjutant_service_internaluri }}/"
+adjutant_service_internalurl: "{{ adjutant_service_internaluri }}/v1/"
 
 #: Set this to false to disable API service through Apache + mod_wsgi
 adjutant_use_mod_wsgi: true

tasks/adjutant_apache.yml

@@ -75,11 +75,16 @@
   notify:
     - Restart Apache
 
-- name: Enable/disable mod_ssl for apache2
+- name: Enable/disable mods for apache2
   apache2_module:
-    name: ssl
-    state: "{{ adjutant_ssl | bool | ternary('present', 'absent') }}"
+    name: "{{ item.name }}"
+    state: "{{ item.state }}"
   when:
     - ansible_pkg_mgr == 'apt'
+  with_items:
+    - name: ssl
+      state: "{{ adjutant_ssl | bool | ternary('present', 'absent') }}"
+    - name: rewrite
+      state: present
   notify:
     - Restart Apache

templates/adjutant-httpd.conf.j2

@@ -1,6 +1,10 @@
 # {{ ansible_managed }}
 
 <VirtualHost *:{{ adjutant_service_port }}>
+    RewriteEngine On
+    RewriteCond "%{HTTP_HOST}" "!(.*){{ ansible_hostname }}(.*)" [NC]
+    RewriteRule "^/?(.*)"      "{{ adjutant_service_internaluri_proto }}://{{ ansible_hostname }}:{{ adjutant_service_port }}/$1" [L,R,NE]
+
     WSGIDaemonProcess     adjutant lang='en_US.UTF-8' locale='en_US.UTF-8' user={{ adjutant_system_user_name }} group={{ adjutant_system_group_name }} processes={{ adjutant_wsgi_processes }} threads={{ adjutant_wsgi_threads }} display-name=%{GROUP}
     WSGIProcessGroup      adjutant
     WSGIScriptAlias       / /var/www/cgi-bin/adjutant/adjutant-api