From 316800b8108c8bfe3f3ce5cf321b8fb4773e7377 Mon Sep 17 00:00:00 2001
From: mg <michael.grote@posteo.de>
Date: Sun, 11 Jun 2023 21:25:03 +0200
Subject: [PATCH] remove apt-cacher-ng (#533)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: https://git.mgrote.net/mg/homeserver/pulls/533
---
 .drone.yml                                | 13 ++++++++++---
 docker-compose/acng/docker-compose.yml.j2 | 17 -----------------
 group_vars/all.yml                        |  2 +-
 host_vars/docker10.grote.lan.yml          |  8 --------
 4 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 docker-compose/acng/docker-compose.yml.j2

diff --git a/.drone.yml b/.drone.yml
index 4ab5936f..a577393c 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,15 +4,22 @@ type: docker
 name: default
 
 steps:
-  - name: run gitleaks
+  - name: gitleaks
     image: plugins/gitleaks
     settings:
       path: .
+    when:
+      event:
+        exclude:
+          - tag
 
   - name: lint
     image: pipelinecomponents/ansible-lint
     environment:
-      http_proxy: http://docker10.grote.lan:9999
       DEBIAN_FRONTEND: noninteractive
     commands:
-      - ansible-lint --show-relpath  .
+      - ansible-lint --show-relpath -v --offline .
+    when:
+      event:
+        exclude:
+          - tag
diff --git a/docker-compose/acng/docker-compose.yml.j2 b/docker-compose/acng/docker-compose.yml.j2
deleted file mode 100644
index 765387bf..00000000
--- a/docker-compose/acng/docker-compose.yml.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-version: '3'
-services:
-  apt-cacher-ng:
-    container_name: apt-cacher-ng
-    restart: always
-    image: registry.mgrote.net/apt-cacher-ng:master
-    ports:
-      - "9999:9999"
-    volumes:
-      - /mnt/acng_cache:/var/cache/apt-cacher-ng
-    environment:
-      USER: acng-admin
-      PASS: {{ lookup('keepass', 'acng_webinterface', 'password') }}
-      VERBOSE: 1 # 0/1
-      THRESHOLD: 60 # package housekeeping threshold
-    labels:
-      com.centurylinklabs.watchtower.enable: true
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 35c13728..e23ff7ad 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -116,7 +116,7 @@
   postfix_smtp_server_port: 587
   postfix_smtp_use_tls: "yes"
   ### mgrote.apt_manage_sources
-  manage_sources_apt_proxy: "192.168.2.43:9999" # als IP da apt warum auch immer >10s braucht den Namen aufzulösen
+  manage_sources_apt_proxy: ""
   ### mgrote.tmux
   tmux_conf_destination: "/home/mg/.tmux.conf"
   tmux_bashrc_destination: "/home/mg/.bashrc"
diff --git a/host_vars/docker10.grote.lan.yml b/host_vars/docker10.grote.lan.yml
index b1bba85d..82794c9c 100644
--- a/host_vars/docker10.grote.lan.yml
+++ b/host_vars/docker10.grote.lan.yml
@@ -23,12 +23,6 @@
          filesystem: xfs
          mount: true
          mntp: /mnt/oci-registry
-       - lvname: acng_cache
-         size: 10G
-         create: true
-         filesystem: xfs
-         mount: true
-         mntp: /mnt/acng_cache
   manage_lvm: true
   pvresize_to_max: true
   ### mgrote.restic
@@ -70,8 +64,6 @@
       state: present
     - name: blocky
       state: present
-    - name: acng
-      state: present
     - name: registry
       state: present
       network: traefik