From 22098a5739647a65f265a22a252f1bc8778e1253 Mon Sep 17 00:00:00 2001 From: Jocelyn Jaubert Date: Mon, 4 Nov 2024 20:18:20 +0100 Subject: [PATCH] Migration matomo+mobilizon sur osm41 (cluster moji) --- group_vars/cluster-ovh | 10 +--------- host_vars/proxy.moji.vm.openstreetmap.fr/proxy | 11 +++++++++++ hosts | 10 +++++----- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/group_vars/cluster-ovh b/group_vars/cluster-ovh index 4a7eb18..01f412d 100644 --- a/group_vars/cluster-ovh +++ b/group_vars/cluster-ovh @@ -16,12 +16,4 @@ proxy: logname: "api-pic4carto" websites: "api-pic4carto.openstreetmap.fr" target: "10.1.0.145" - - - logname: "stats" - websites: "stats.openstreetmap.fr" - target: "10.1.0.160" - redirect_to_https: True - - - logname: "mobilizon" - websites: "mobilizon.openstreetmap.fr" - target: "10.1.0.181" + diff --git a/host_vars/proxy.moji.vm.openstreetmap.fr/proxy b/host_vars/proxy.moji.vm.openstreetmap.fr/proxy index 621a4bc..72432a9 100644 --- a/host_vars/proxy.moji.vm.openstreetmap.fr/proxy +++ b/host_vars/proxy.moji.vm.openstreetmap.fr/proxy @@ -78,6 +78,12 @@ host_proxy: websites: "petitereine.openstreetmap.fr" target: "10.1.0.157" dedicated_certbot_cert: True + - + logname: "stats" + websites: "stats.openstreetmap.fr" + target: "10.1.0.160" + redirect_to_https: True + dedicated_certbot_cert: True - logname: "educosm" websites: "educosm.openstreetmap.fr" @@ -118,6 +124,11 @@ host_proxy: websites: "cadastre.openstreetmap.fr" target: "10.1.0.180" dedicated_certbot_cert: True + - + logname: "mobilizon" + websites: "mobilizon.openstreetmap.fr" + target: "10.1.0.181" + dedicated_certbot_cert: True - logname: "notes-heatmap" websites: "notes-heatmap.openstreetmap.fr" diff --git a/hosts b/hosts index 3797b01..eba0351 100644 --- a/hosts +++ b/hosts @@ -53,7 +53,7 @@ peertube.vm.openstreetmap.fr vm_host=osm42.openstreetmap.fr # osm155.openstreetm petitereine.vm.openstreetmap.fr vm_host=osm43.openstreetmap.fr # osm157.openstreetmap.fr mail.openstreetmap.fr vm_host=osm28.openstreetmap.fr # osm159.openstreetmap.fr vm_host=osm28.openstreetmap.fr -osm160.openstreetmap.fr vm_host=osm28.openstreetmap.fr +matomo.vm.openstreetmap.fr vm_host=osm40.openstreetmap.fr # osm160.openstreetmap.fr bano.vm.openstreetmap.fr vm_host=osm11.openstreetmap.fr # osm162.openstreetmap.fr educosm.vm.openstreetmap.fr vm_host=osm40.openstreetmap.fr # osm164.openstreetmap.fr osm165.openstreetmap.fr vm_host=osm11.openstreetmap.fr @@ -71,7 +71,7 @@ tile-vect.vm.openstreetmap.fr vm_host=osm14.openstreetmap.fr # osm177.openstreet osmose-jupyter.vm.openstreetmap.fr vm_host=osm14.openstreetmap.fr # osm178.openstreetmap.fr comcommaker.vm.openstreetmap.fr vm_host=osm11.openstreetmap.fr # osm179.openstreetmap.fr cadastre.vm.openstreetmap.fr vm_host=osm40.openstreetmap.fr # osm180.openstreetmap.fr -mobilizon.vm.openstreetmap.fr vm_host=osm26.openstreetmap.fr # osm181.openstreetmap.fr +mobilizon.vm.openstreetmap.fr vm_host=osm40.openstreetmap.fr # osm181.openstreetmap.fr cadastre-joker.vm.openstreetmap.fr vm_host=osm14.openstreetmap.fr # osm182.openstreetmap.fr stable-data.vm.openstreetmap.fr vm_host=osm11.openstreetmap.fr # osm183.openstreetmap.fr backuppc2.vm.openstreetmap.fr vm_host=osm14.openstreetmap.fr # osm184.openstreetmap.fr @@ -290,9 +290,9 @@ osm147.openstreetmap.fr overpass_version="v0.7.54" osm148.openstreetmap.fr overpass_version="v0.7.54" [proxmox-backup] -osm26.openstreetmap.fr proxmox_backup_exclude="118 127 132 134 142 144 155 157 164 168 175 176 180 186 194 201 999" proxmox_backup_target="proxmox-backup@osm32.openstreetmap.fr:backups/cluster-ovh" -osm27.openstreetmap.fr proxmox_backup_exclude="118 127 132 134 142 144 155 157 164 168 175 176 180 186 194 201 999" proxmox_backup_target="proxmox-backup@osm32.openstreetmap.fr:backups/cluster-ovh" -osm28.openstreetmap.fr proxmox_backup_exclude="118 127 132 134 142 144 155 157 164 168 175 176 180 186 194 201 999" proxmox_backup_target="proxmox-backup@osm32.openstreetmap.fr:backups/cluster-ovh" +osm26.openstreetmap.fr proxmox_backup_exclude="118 127 132 134 142 144 155 157 164 168 175 176 180 181 186 194 201 999" proxmox_backup_target="proxmox-backup@osm32.openstreetmap.fr:backups/cluster-ovh" +osm27.openstreetmap.fr proxmox_backup_exclude="118 127 132 134 142 144 155 157 164 168 175 176 180 181 186 194 201 999" proxmox_backup_target="proxmox-backup@osm32.openstreetmap.fr:backups/cluster-ovh" +osm28.openstreetmap.fr proxmox_backup_exclude="118 127 132 134 142 144 155 157 164 168 175 176 180 181 186 194 201 999" proxmox_backup_target="proxmox-backup@osm32.openstreetmap.fr:backups/cluster-ovh" osm32.openstreetmap.fr proxmox_backup_host=true osm39.openstreetmap.fr proxmox_backup_exclude="101 118 144 186 209 400 999 9000" proxmox_backup_target="osm32.openstreetmap.fr:backups/cluster-moji" osm40.openstreetmap.fr proxmox_backup_exclude="101 118 144 186 209 400 999 9000" proxmox_backup_target="osm32.openstreetmap.fr:backups/cluster-moji"