From b494eaf358325a0f0c5422599ad44022259fd889 Mon Sep 17 00:00:00 2001 From: vincent Date: Sun, 5 Nov 2023 19:08:17 +0100 Subject: [PATCH] big bang ducamps.win -> ducamps.eu --- ansible/group_vars/VPS/mount | 2 +- ansible/group_vars/all/sssd | 2 +- ansible/group_vars/all/users | 4 ++-- ansible/group_vars/homelab/mount | 18 ++++++++-------- ansible/roles/requirements.yml | 36 ++++++++++++++++---------------- consul_service/syno.json | 8 +++---- nomad-job/chainetv.nomad | 6 +++--- nomad-job/dashboard.nomad | 6 +++--- nomad-job/decom/matrix.nomad | 18 ++++++++-------- nomad-job/decom/nextcloud.nomad | 8 +++---- nomad-job/decom/plex.nomad | 4 ++-- nomad-job/decom/torrent.nomad | 6 +++--- nomad-job/decom/wikijs.nomad | 6 +++--- nomad-job/drone-runner.nomad | 2 +- nomad-job/drone.nomad | 12 +++++------ nomad-job/filestash.nomad | 8 +++---- nomad-job/ghostfolio.nomad | 4 ++-- nomad-job/gitea.nomad | 16 +++++++------- nomad-job/grafana.nomad | 8 +++---- nomad-job/homeassistant.nomad | 6 +++--- nomad-job/jellyfin.nomad | 18 ++++++++-------- nomad-job/pacoloco.nomad | 4 ++-- nomad-job/paperless-ng.nomad | 10 ++++----- nomad-job/pihole.nomad | 2 +- nomad-job/radicale.nomad | 6 +++--- nomad-job/rutorrent.nomad | 8 +++---- nomad-job/supysonic.nomad | 8 +++---- nomad-job/traefik-ingress.nomad | 2 +- nomad-job/tt-rss.nomad | 10 ++++----- nomad-job/vaultwarden.nomad | 8 +++---- nomad-job/vikunja.nomad | 14 ++++++------- nomad-job/www.nomad | 10 ++++----- terraform/dns/records.tf | 15 +++++++++---- 33 files changed, 151 insertions(+), 144 deletions(-) diff --git a/ansible/group_vars/VPS/mount b/ansible/group_vars/VPS/mount index 8bed2cc..ea37f12 100644 --- a/ansible/group_vars/VPS/mount +++ b/ansible/group_vars/VPS/mount @@ -1,6 +1,6 @@ systemd_mounts: diskstation_nomad: - share: diskstation.ducamps.win:/volume2/nomad + share: diskstation.lan.ducamps.eu:/volume2/nomad mount: /mnt/diskstation/nomad type: nfs options: diff --git a/ansible/group_vars/all/sssd b/ansible/group_vars/all/sssd index 2f30f16..8d34011 100644 --- a/ansible/group_vars/all/sssd +++ b/ansible/group_vars/all/sssd @@ -1,5 +1,5 @@ sssd_configure: true # sssd_configure is False by default - by default nothing is done by this role. ldap_search_base: "dc=ducamps,dc=win" -ldap_uri: "ldaps://ldap.ducamps.win" +ldap_uri: "ldaps://ldap.ducamps.eu" ldap_sudo_search_base: "ou=sudoers,dc=ducamps,dc=win" diff --git a/ansible/group_vars/all/users b/ansible/group_vars/all/users index 16bdf83..e4af800 100644 --- a/ansible/group_vars/all/users +++ b/ansible/group_vars/all/users @@ -2,7 +2,7 @@ user: name: vincent home: /home/vincent uid: 1024 - mail: vincent@ducamps.win + mail: vincent@ducamps.eu groups: - docker authorized_keys: @@ -35,7 +35,7 @@ system_user: user_custom_host: - - host: "git.ducamps.win" + - host: "git.ducamps.eu" user: "git" keyfile: "~/.ssh/id_gitea" diff --git a/ansible/group_vars/homelab/mount b/ansible/group_vars/homelab/mount index fd48504..0c976f8 100644 --- a/ansible/group_vars/homelab/mount +++ b/ansible/group_vars/homelab/mount @@ -1,13 +1,13 @@ systemd_mounts: diskstation_git: - share: diskstation.ducamps.win:/volume2/git + share: diskstation.lan.ducamps.eu:/volume2/git mount: /mnt/diskstation/git type: nfs options: - " " automount: true diskstation_CardDav: - share: diskstation.ducamps.win:/volume2/CardDav + share: diskstation.lan.ducamps.eu:/volume2/CardDav mount: /mnt/diskstation/CardDav type: nfs options: @@ -21,49 +21,49 @@ systemd_mounts: - " " automount: true diskstation_home: - share: diskstation.ducamps.win:/volume2/homes/admin + share: diskstation.lan.ducamps.eu:/volume2/homes/admin mount: /mnt/diskstation/home type: nfs options: - " " automount: true diskstation_photo: - share: diskstation.ducamps.win:/volume2/photo + share: diskstation.lan.ducamps.eu:/volume2/photo mount: /mnt/diskstation/photo type: nfs options: - " " automount: true diskstation_music: - share: diskstation.ducamps.win:/volume2/music + share: diskstation.lan.ducamps.eu:/volume2/music mount: /mnt/diskstation/music type: nfs options: - " " automount: true diskstation_media: - share: diskstation.ducamps.win:/volume1/media + share: diskstation.lan.ducamps.eu:/volume1/media mount: /mnt/diskstation/media type: nfs options: - " " automount: true diskstation_ebook: - share: diskstation.ducamps.win:/volume2/ebook + share: diskstation.lan.ducamps.eu:/volume2/ebook mount: /mnt/diskstation/ebook type: nfs options: - " " automount: true diskstation_archMirror: - share: diskstation.ducamps.win:/volume2/archMirror + share: diskstation.lan.ducamps.eu:/volume2/archMirror mount: /mnt/diskstation/archMirror type: nfs options: - " " automount: true diskstation_nomad: - share: diskstation.ducamps.win:/volume2/nomad + share: diskstation.lan.ducamps.eu:/volume2/nomad mount: /mnt/diskstation/nomad type: nfs options: diff --git a/ansible/roles/requirements.yml b/ansible/roles/requirements.yml index 04e4379..c3d77c8 100644 --- a/ansible/roles/requirements.yml +++ b/ansible/roles/requirements.yml @@ -1,41 +1,41 @@ --- -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-arch-provissionning.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-arch-provissionning.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-role-postgresql.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-role-postgresql.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-role-sssd +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-role-sssd scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible_bootstrap.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible_bootstrap.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/autofs.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/autofs.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/cronie.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/cronie.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/docker.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/docker.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/hass-client-control.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/hass-client-control.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/msmtp.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/msmtp.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/rsyncd.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/rsyncd.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/system.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/system.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/user_config.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/user_config.git scm: git - src: git@github.com:vincentDcmps/ansible-role-wireguard.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-consul.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-consul.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-hashicorp-vault.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-hashicorp-vault.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-nomad.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-nomad.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/mpd.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/mpd.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-dhcpd.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-dhcpd.git scm: git -- src: ssh://git@git.ducamps.win:2222/ansible-roles/ansible-user.git +- src: ssh://git@git.ducamps.eu:2222/ansible-roles/ansible-user.git scm: git - src: git@github.com:vincentDcmps/ansible-role-nfs.git scm: git diff --git a/consul_service/syno.json b/consul_service/syno.json index 81e0fa0..f79f185 100644 --- a/consul_service/syno.json +++ b/consul_service/syno.json @@ -6,14 +6,14 @@ "tags": [ "homer.enable=true", "homer.name=Diskstation", - "homer.url=https://syno.ducamps.win", - "homer.logo=https://syno.ducamps.win/webman/resources/images/icon_dsm_96.png", + "homer.url=https://syno.ducamps.eu", + "homer.logo=https://syno.ducamps.eu/webman/resources/images/icon_dsm_96.png", "homer.service=Application", "homer.target=_blank", "traefik.enable=true", - "traefik.http.routers.syno.rule=Host(`syno.ducamps.win`)", - "traefik.http.routers.syno.tls.domains[0].sans=syno.ducamps.win", + "traefik.http.routers.syno.rule=Host(`syno.ducamps.eu`)", + "traefik.http.routers.syno.tls.domains[0].sans=syno.ducamps.eu", "traefik.http.routers.syno.tls.certresolver=myresolver", "traefik.http.routers.syno.entrypoints=web,websecure" ] diff --git a/nomad-job/chainetv.nomad b/nomad-job/chainetv.nomad index 582397e..5b4057c 100644 --- a/nomad-job/chainetv.nomad +++ b/nomad-job/chainetv.nomad @@ -25,11 +25,11 @@ job "chainetv" { "homer.service=Application", "homer.icon=fas fa-tv", "homer.target=_blank", - "homer.url=https://www.ducamps.win/${NOMAD_JOB_NAME}", + "homer.url=https://www.ducamps.eu/${NOMAD_JOB_NAME}", "traefik.enable=true", - "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`www.ducamps.win`)&&PathPrefix(`/chainetv`)", - "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=www.ducamps.win", + "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`www.ducamps.eu`)&&PathPrefix(`/chainetv`)", + "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=www.ducamps.eu", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", "traefik.http.routers.${NOMAD_JOB_NAME}.middlewares=chainetv,chainetvStrip", diff --git a/nomad-job/dashboard.nomad b/nomad-job/dashboard.nomad index 012bd53..7f2dc18 100644 --- a/nomad-job/dashboard.nomad +++ b/nomad-job/dashboard.nomad @@ -22,8 +22,8 @@ job "dashboard" { port = "http" tags = [ "traefik.enable=true", - "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", - "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", + "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.eu`)", + "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.eu", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", "traefik.http.routers.${NOMAD_JOB_NAME}.entrypoints=web,websecure", ] @@ -109,7 +109,7 @@ links: - name: "notebook" icon: "fas fa-book" target: "_blank" # optional html tag target attribute - url: "https://www.ducamps.win/notebook/" + url: "https://www.ducamps.eu/notebook/" services: - name: Application icon: "fas fa-heartbeet" diff --git a/nomad-job/decom/matrix.nomad b/nomad-job/decom/matrix.nomad index 265f9a4..8cd845f 100644 --- a/nomad-job/decom/matrix.nomad +++ b/nomad-job/decom/matrix.nomad @@ -27,8 +27,8 @@ job "matrix" { port = "dendrite" tags = [ "traefik.enable=true", - "traefik.http.routers.${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_TASK_NAME}.ducamps.win`)", - "traefik.http.routers.${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_TASK_NAME}.ducamps.win", + "traefik.http.routers.${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_TASK_NAME}.ducamps.eu`)", + "traefik.http.routers.${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_TASK_NAME}.ducamps.eu", "traefik.http.routers.${NOMAD_TASK_NAME}.tls.certresolver=myresolver", @@ -53,7 +53,7 @@ job "matrix" { version: 2 global: - server_name: dendrite.ducamps.win + server_name: dendrite.ducamps.eu private_key: matrix_key.pem @@ -238,15 +238,15 @@ template { port = "element" tags = [ "traefik.enable=true", - "traefik.http.routers.${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_TASK_NAME}.ducamps.win`)", - "traefik.http.routers.${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_TASK_NAME}.ducamps.win", + "traefik.http.routers.${NOMAD_TASK_NAME}.rule=Host(`${NOMAD_TASK_NAME}.ducamps.eu`)", + "traefik.http.routers.${NOMAD_TASK_NAME}.tls.domains[0].sans=${NOMAD_TASK_NAME}.ducamps.eu", "traefik.http.routers.${NOMAD_TASK_NAME}.tls.certresolver=myresolver", "homer.enable=true", "homer.name=element", "homer.service=Application", - "homer.logo=https://${NOMAD_TASK_NAME}.ducamps.win", + "homer.logo=https://${NOMAD_TASK_NAME}.ducamps.eu", "homer.target=_blank", - "homer.url=https://${NOMAD_TASK_NAME}.ducamps.win", + "homer.url=https://${NOMAD_TASK_NAME}.ducamps.eu", ] @@ -262,8 +262,8 @@ template { { "default_server_config": { "m.homeserver": { - "base_url": "https://dendrite.ducamps.win", - "server_name": "dendrite.ducamps.win" + "base_url": "https://dendrite.ducamps.eu", + "server_name": "dendrite.ducamps.eu" }, "m.identity_server": { "base_url": "https://vector.im" diff --git a/nomad-job/decom/nextcloud.nomad b/nomad-job/decom/nextcloud.nomad index 9f0ff5a..2aed869 100644 --- a/nomad-job/decom/nextcloud.nomad +++ b/nomad-job/decom/nextcloud.nomad @@ -30,11 +30,11 @@ job "nextcloud" { port = "http" tags = [ "traefik.enable=true", - "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`file.ducamps.win`)", - "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=file.ducamps.win", + "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`file.ducamps.eu`)", + "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=file.ducamps.eu", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", "traefik.http.routers.${NOMAD_JOB_NAME}_insecure.entrypoints=web", - "traefik.http.routers.${NOMAD_JOB_NAME}_insecure.rule=Host(`file.ducamps.win`)", + "traefik.http.routers.${NOMAD_JOB_NAME}_insecure.rule=Host(`file.ducamps.eu`)", "traefik.http.routers.${NOMAD_JOB_NAME}_insecure.middlewares=httpsRedirect", "traefik.http.middlewares.httpsRedirect.redirectscheme.scheme=https", @@ -62,7 +62,7 @@ job "nextcloud" { POSTGRES_PASSWORD="{{ .Data.data.POSTGRES_PASSWORD }}" NEXTCLOUD_ADMIN_USER="vincent" NEXTCLOUD_ADMIN_PASSWORD="{{ .Data.data.ADMIN_PASSWORD }}" - NEXTCLOUD_TRUSTED_DOMAINS="file.ducamps.win" + NEXTCLOUD_TRUSTED_DOMAINS="file.ducamps.eu" POSTGRES_HOST="active.db.service.consul" {{end}} EOH diff --git a/nomad-job/decom/plex.nomad b/nomad-job/decom/plex.nomad index 95ce053..a6fcdaa 100644 --- a/nomad-job/decom/plex.nomad +++ b/nomad-job/decom/plex.nomad @@ -25,8 +25,8 @@ job "plex" { port = "http" tags = [ "traefik.enable=true", - "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", - "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", + "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.eu`)", + "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.eu", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", diff --git a/nomad-job/decom/torrent.nomad b/nomad-job/decom/torrent.nomad index 1f8a8d9..5cfaca1 100644 --- a/nomad-job/decom/torrent.nomad +++ b/nomad-job/decom/torrent.nomad @@ -25,12 +25,12 @@ job "torrent" { tags = [ "homer.enable=true", "homer.name=torrent", - "homer.url=https://torrent.ducamps.win", + "homer.url=https://torrent.ducamps.eu", "homer.service=Application", "homer.logo=https://cdn.icon-icons.com/icons2/2429/PNG/512/bittorrent_logo_icon_147310.png", "traefik.enable=true", - "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", - "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", + "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.eu`)", + "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.eu", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", diff --git a/nomad-job/decom/wikijs.nomad b/nomad-job/decom/wikijs.nomad index 4f72732..1aa4577 100644 --- a/nomad-job/decom/wikijs.nomad +++ b/nomad-job/decom/wikijs.nomad @@ -32,11 +32,11 @@ job "wikijs" { "homer.subtitle=projet Infotech", "homer.logo=https://repository-images.githubusercontent.com/65848095/7655d480-b066-11e9-991b-81088c474331", "homer.target=_blank", - "homer.url=https://${NOMAD_JOB_NAME}.ducamps.win", + "homer.url=https://${NOMAD_JOB_NAME}.ducamps.eu", "traefik.enable=true", - "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.win`)", - "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.win", + "traefik.http.routers.${NOMAD_JOB_NAME}.rule=Host(`${NOMAD_JOB_NAME}.ducamps.eu`)", + "traefik.http.routers.${NOMAD_JOB_NAME}.tls.domains[0].sans=${NOMAD_JOB_NAME}.ducamps.eu", "traefik.http.routers.${NOMAD_JOB_NAME}.tls.certresolver=myresolver", diff --git a/nomad-job/drone-runner.nomad b/nomad-job/drone-runner.nomad index 5a84cc2..bbf58dd 100644 --- a/nomad-job/drone-runner.nomad +++ b/nomad-job/drone-runner.nomad @@ -27,7 +27,7 @@ job "drone-runner" { template { data = <