From 5aeefd730e022331b6791c05ad929e2665777223 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <ynerant@crans.org>
Date: Thu, 25 Feb 2021 00:56:44 +0100
Subject: [PATCH] [root] Sputnik is using deb.debian.org
Signed-off-by: Yohann D'ANELLO <ynerant@crans.org>
---
group_vars/{crans_server => all}/borg.yml | 0
group_vars/crans_server/vars.yml | 6 ------
group_vars/ovh/vars.yml | 5 +++++
.../templates/apt/sources.list.d/bullseye.list.j2 | 2 +-
roles/prometheus-nginx-exporter/templates/nginx/status.j2 | 2 +-
5 files changed, 7 insertions(+), 8 deletions(-)
rename group_vars/{crans_server => all}/borg.yml (100%)
create mode 100644 group_vars/ovh/vars.yml
diff --git a/group_vars/crans_server/borg.yml b/group_vars/all/borg.yml
similarity index 100%
rename from group_vars/crans_server/borg.yml
rename to group_vars/all/borg.yml
diff --git a/group_vars/crans_server/vars.yml b/group_vars/crans_server/vars.yml
index f2463107..b195184f 100644
--- a/group_vars/crans_server/vars.yml
+++ b/group_vars/crans_server/vars.yml
@@ -1,9 +1,3 @@
-ldap:
- local: False
- servers: ["172.16.1.1"]
- base: "dc=crans,dc=org"
-
-
# Parameters for debian and ubuntu mirror
debian_mirror: http://mirror.adm.crans.org/debian
ubuntu_mirror: http://mirror.adm.crans.org/ubuntu
diff --git a/group_vars/ovh/vars.yml b/group_vars/ovh/vars.yml
new file mode 100644
index 00000000..ad05e346
--- /dev/null
+++ b/group_vars/ovh/vars.yml
@@ -0,0 +1,5 @@
+# Parameters for debian and ubuntu mirror
+debian_mirror: http://deb.debian.org/debian
+ubuntu_mirror: http://deb.debian.org/ubuntu
+debian_components: main contrib non-free
+ubuntu_components: main restricted universe multiverse
diff --git a/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2 b/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2
index e8bbe8d2..61c03736 100644
--- a/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2
+++ b/roles/borgbackup-client/templates/apt/sources.list.d/bullseye.list.j2
@@ -1,3 +1,3 @@
{{ ansible_header | comment }}
-deb http://{{ mirror.name }}/debian bullseye main
+deb {{ debian_mirror }} bullseye main
diff --git a/roles/prometheus-nginx-exporter/templates/nginx/status.j2 b/roles/prometheus-nginx-exporter/templates/nginx/status.j2
index 863b4b27..b9ed48c0 100644
--- a/roles/prometheus-nginx-exporter/templates/nginx/status.j2
+++ b/roles/prometheus-nginx-exporter/templates/nginx/status.j2
@@ -1,7 +1,7 @@
{{ ansible_header | comment }}
server {
- listen [::1]:8080;
+ listen [::1]:6424;
location = /stub_status {
stub_status;
}
--
GitLab