switch form apt-cacher-ng to approx

1 files changed, 11 insertions, 34 deletions

diff --git a/inventory/host_vars/ch-repo.yml b/inventory/host_vars/ch-repo.yml
index cbba6599..f76eddfd 100644
--- a/inventory/host_vars/ch-repo.yml
+++ b/inventory/host_vars/ch-repo.yml
@@ -53,45 +53,22 @@ lvm_groups:
     - /dev/sdb
 
 
-apt_cacher_ng_storage:
+approx_storage:
   type: lvm
   vg: storage
-  lv: apt-cacher-ng
+  lv: approx
   size: 15G
   fs: ext4
 
-apt_cacher_ng_hostname: apt.chaos-at-home.org
-
-apt_cacher_ng_remaps:
-  debian:
-    path: /debian
-    backends:
-    - http://debian.anexia.at/debian
-  debian-security:
-    path: /debian-security
-    backends:
-    - http://debian.anexia.at/debian-security
-  debian-archive:
-    path: /debian-archive
-    backends:
-    - http://archive.debian.org/debian
-  ubuntu:
-    path: /ubuntu
-    backends:
-    - http://ubuntu.anexia.at/ubuntu
-  kali:
-    path: /kali
-    backends:
-    - http://http.kali.org/kali
-  raspios:
-    path: /raspios
-    backends:
-    - http://archive.raspberrypi.com/debian
-
-apt_cacher_ng_admin_auth:
-  username: admin
-  password: "{{ vault_apt_cacher_ng_admin_auth_password }}"
+approx_hostname: apt.chaos-at-home.org
 
+approx_backends:
+  debian: http://debian.anexia.at/debian
+  debian-security: http://debian.anexia.at/debian-security
+  debian-archive: http://archive.debian.org/debian
+  ubuntu: http://ubuntu.anexia.at/ubuntu
+  kali: http://http.kali.org/kali
+  raspios: http://archive.raspberrypi.com/debian
 
 
 prometheus_job_multitarget_blackbox__probe:
@@ -100,5 +77,5 @@ prometheus_job_multitarget_blackbox__probe:
     target: "{{ network_zones.svc.prefix | ansible.utils.ipaddr(network_zones.svc.offsets[inventory_hostname]) | ansible.utils.ipaddr('address') }}:{{ ansible_port | default(22) }}"
     module: ssh_banner
   - instance: "http-apt.chaos-at-home.org"
-    target: "http://{{ apt_cacher_ng_hostname }}/acng-report.html"
+    target: "http://{{ approx_hostname }}"
     module: "http_2xx"