Merge branch 't39542-fix-apps-domains-reconf' into 'main'

Fix manager and monitor domains reconfiguration | refs #39542

See merge request sys/ansible-public!91

roles/nudgis/manager/handlers/main.yml

@@ -5,6 +5,11 @@
     name: nginx
     state: restarted
 
+- name: "Reload nginx"
+  ansible.builtin.service:
+    name: nginx
+    state: reloaded
+
 - name: "Restart skyreach"
   ansible.builtin.service:
     name: skyreach

roles/nudgis/manager/tasks/configure/domain.yml

 ---
 
-- name: "Configure domain"
+- name: "Retrieve currently configured domain"
+  ansible.builtin.command:
+    cmd: grep -m1 -oP 'server_name \K[^;\s]+' /etc/nginx/sites-available/skyreach.conf
+  changed_when: false
+  register: current_domain
+
+- name: "Configure domain in nginx vhost"
+  notify: "Reload nginx"
   ansible.builtin.replace:
+    path: /etc/nginx/sites-available/skyreach.conf
+    regexp: '(server_name.* ){{ current_domain.stdout }}(.*;)$'
+    replace: '\1{{ manager_domain }}\2'
+
+- name: "Configure domain in install.ini"
+  ansible.builtin.lineinfile:
     path: /etc/skyreach/install.ini
-    regexp: '^(\s*)#?\s*{{ item.name }}\s*=.*$'
-    replace: '\1{{ item.name }} = {{ item.value }}'
-  loop:
-    - { name: 'DOMAIN', value: '{{ manager_domain }}' }
+    regexp: '\s*#?\s*DOMAIN\s*=.*'
+    line: 'DOMAIN = {{ manager_domain }}'
+
+- name: "Configure domain as local in the hosts file"
+  ansible.builtin.replace:
+    path: /etc/hosts
+    regexp: '^(127\.0\.0\.1.* ){{ current_domain.stdout }}( .*|$)'
+    replace: '\1{{ manager_domain }}\2'
 
-# /!\ Does not alter the already created instances /!\
+- name: "Configure domain in settings_override.py"
+  ansible.builtin.lineinfile:
+    path: /home/skyreach/skyreach_data/private/settings_override.py
+    regexp: '^#?\s*SITE_URL\s*=.*$'
+    line: "SITE_URL = 'https://{{ manager_domain }}'"
+    backrefs: true
 
 ...

roles/nudgis/monitor/server/handlers/main.yml

@@ -5,6 +5,16 @@
     name: nginx
     state: restarted
 
+- name: "Reload nginx"
+  ansible.builtin.service:
+    name: nginx
+    state: reloaded
+
+- name: "Reload webmonitor service"
+  ansible.builtin.service:
+    name: webmonitor
+    state: reloaded
+
 - name: "Wait for munin cron to end"
   ansible.builtin.wait_for:
     path: /var/run/munin/munin-update.lock

roles/nudgis/monitor/server/tasks/configure/domain.yml

 ---
 
-- name: "Configure domain"
+- name: "Retrieve currently configured domain"
+  ansible.builtin.command:
+    cmd: grep -m1 -oP 'server_name \K[^;\s]+' /etc/nginx/sites-available/webmonitor.conf
+  changed_when: false
+  register: current_domain
+
+- name: "Configure domain in nginx vhost"
+  notify: "Reload nginx"
   ansible.builtin.replace:
+    path: /etc/nginx/sites-available/webmonitor.conf
+    regexp: '(server_name.* ){{ current_domain.stdout }}(.*;)$'
+    replace: '\1{{ monitor_domain }}\2'
+
+- name: "Configure domain in install.ini"
+  ansible.builtin.lineinfile:
     path: /etc/webmonitor/install.ini
-    regexp: '^(\s*)#?\s*{{ item.name }}\s*=.*$'
-    replace: '\1{{ item.name }} = {{ item.value }}'
-  loop:
-    - { name: 'DOMAIN', value: '{{ monitor_domain }}' }
+    regexp: '\s*#?\s*DOMAIN\s*=.*'
+    line: 'DOMAIN = {{ monitor_domain }}'
 
-# /!\ Does not alter the already created instances /!\
+- name: "Configure domain as local in the hosts file"
+  ansible.builtin.replace:
+    path: /etc/hosts
+    regexp: '^(127\.0\.0\.1.* ){{ current_domain.stdout }}( .*|$)'
+    replace: '\1{{ monitor_domain }}\2'
+ 
+- name: "Configure domain in settings_override.py"
+  notify: "Reload webmonitor service"
+  ansible.builtin.lineinfile:
+    path: /home/webmonitor/webmonitor/private/settings_override.py
+    regexp: '^#?\s*SITE_URL\s*=.*$'
+    line: "SITE_URL = 'https://{{ monitor_domain }}'"
+    backrefs: true
 
 ...