diff --git a/monitoring.yml b/monitoring.yml index 7918cef28b159e4ef3ad083f3fbff804291e533d..9f6cc8ddc7c249b83fc065a9248d7d269b92e017 100644 --- a/monitoring.yml +++ b/monitoring.yml @@ -10,11 +10,7 @@ targets: ['localhost:9090'] prometheus_ups_snmp_targets: - targets: [pulsar.adm.crans.org] - - # Debian non-free mirror - debian_mirror: http://mirror.adm.crans.org/debian roles: - - debian-non-free - prometheus - prometheus-alertmanager diff --git a/roles/debian-apt-sources/templates/apt/sources.list.j2 b/roles/debian-apt-sources/templates/apt/sources.list.j2 index ad448e64c7da3c320db73a1c5c666c7d038f5651..e3eb66e4d3635abd938444852cecc6b385f2a09e 100644 --- a/roles/debian-apt-sources/templates/apt/sources.list.j2 +++ b/roles/debian-apt-sources/templates/apt/sources.list.j2 @@ -1,14 +1,10 @@ # {{ ansible_managed }} # Mises à jour de sécurité -deb {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main -deb-src {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main +deb {{ debian_mirror }}-security {{ ansible_lsb.codename }}/updates main contrib non-free # Dépôt classique -deb {{ debian_mirror }} {{ ansible_lsb.codename }} main -deb-src {{ debian_mirror }} {{ ansible_lsb.codename }} main +deb {{ debian_mirror }} {{ ansible_lsb.codename }} main contrib non-free # Dépôt pour mises à jour fréquentes (volatile) -deb {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main -deb-src {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main - +deb {{ debian_mirror }} {{ ansible_lsb.codename }}-updates main contrib non-free diff --git a/roles/debian-non-free/tasks/main.yml b/roles/debian-non-free/tasks/main.yml deleted file mode 100644 index 1cea26783aef0688c738d59131cbf9664602c123..0000000000000000000000000000000000000000 --- a/roles/debian-non-free/tasks/main.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Add Debian non-free repository - apt_repository: - repo: deb {{ debian_mirror }} {{ ansible_lsb.codename }} non-free - state: present