acng --> acng2 (#433)

Co-authored-by: Michael Grote <michael.grote@posteo.de>
Reviewed-on: #433

.drone.yml

@@ -12,7 +12,7 @@ steps:
   - name: lint
     image: pipelinecomponents/ansible-lint
     environment:
-      http_proxy: http://acng.grote.lan:9999
+      http_proxy: http://acng2.grote.lan:9999
       DEBIAN_FRONTEND: noninteractive
     commands:
       - ansible-lint --show-relpath  .

docker-compose/homer/assets/mgmt.yml

@@ -49,7 +49,7 @@ services:
         subtitle: "Selbstbau"
       - name: "Apt-Cacher-NG"
         logo: "assets/icons/acng.jpg"
-        url: "http://acng.grote.lan:9999/acng-report.html"
+        url: "http://acng2.grote.lan:9999/acng-report.html"
         target: "_blank"
         subtitle: "apt"
       - name: "gitea"

docker-compose/miniflux/filter.txt

@@ -18,6 +18,7 @@ golem.de::Fußball
 golem.de::Anzeige
 golem.de::Aus dem Verlag:
 golem.de::Fifa
+theycantalk.com::Tinyview
 golem.de::(g+)
 golem.de::in aller Kürze
 golem.de::In eigener Sache

docker-compose/munin/docker-compose.yml.j2

@@ -18,7 +18,7 @@ services:
       - CRONDELAY=5
       - 'NODES=
       fileserver2.grote.lan:fileserver2.grote.lan
-      acng.grote.lan:acng.grote.lan
+      acng2.grote.lan:acng2.grote.lan
       ansible2.grote.lan:ansible2.grote.lan
       pve5.grote.lan:pve5.grote.lan
       dokuwiki2.grote.lan:dokuwiki2.grote.lan

group_vars/acng.yml

@@ -1,19 +1,10 @@
 ---
-  ### mrlesmithjr.ansible-manage-lvm
-  lvm_groups:
-   - vgname: vg_acng
-     disks:
-       - /dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi1
-     create: true
-     lvnames:
-       - lvname: lv_acng
-         size: +100%FREE
-         create: true
-         filesystem: xfs
-         mount: true
-         mntp: /var/cache/apt-cacher-ng
-  manage_lvm: true
-  pvresize_to_max: true
+  ### PROXMOX
+  # acng2 ist ein LXC-Container; der Container ist "privileged" damit der Bind-Mount die richtigen Rechte bekommt
+
+  ### mgrote.apt_manage_sources
+  manage_sources_apt_proxy: "" # weil der Apt-Cacher-NG sich nicht selbst als Quelle nehmen kann
+
   ### oefenweb.ufw
   ufw_rules:
     - rule: allow
@@ -66,7 +57,7 @@
       src: https://git.mgrote.net/mg/mirror-munin-contrib/raw/branch/master/plugins/http/http_response
       config: |
         [http_response]
-        env.sites http://acng.grote.lan:9999/acng-report.html
+        env.sites http://acng2.grote.lan:9999/acng-report.html
         env.max_time 20
         env.short_label true
         env.follow_redirect true

group_vars/all.yml

@@ -122,7 +122,7 @@
   postfix_smtp_server_port: 587
   postfix_smtp_use_tls: "yes"
   ### mgrote.apt_manage_sources
-  manage_sources_apt_proxy: "acng.grote.lan:9999"
+  manage_sources_apt_proxy: "acng2.grote.lan:9999"
   ### mgrote.tmux
   tmux_conf_destination: "/home/mg/.tmux.conf"
   tmux_bashrc_destination: "/home/mg/.bashrc"

group_vars/fileserver.yml

@@ -1,4 +1,7 @@
 ---
+  ### PROXMOX
+  # fileserver2 ist ein LXC-Container; der Container ist "privileged" damit der Bind-Mount die richtigen Rechte bekommt
+  
   ### oefenweb.ufw
   ufw_rules:
     - rule: allow

host_vars/pve5.grote.lan.yml

@@ -27,7 +27,11 @@
     - dataset: rpool/ROOT/pve-1
       state: present
       refreservation: 10G
-
+    # rpool - Data
+    - dataset: rpool/data
+      state: present
+    - dataset: rpool/data/acng
+      state: present
     # rpool - VMs
     - dataset: rpool/vm
       state: present
@@ -155,10 +159,14 @@
       recursive: 'no'
       snapshots: true
       template: 'pve3tage'
+    - path: rpool/data/acng
+      recursive: 'no'
+      snapshots: true
+      template: '3tage'
 
   ### mgrote.cv4pve-autosnap
   cv4pve_api_user: root@pam!cv4pve-autosnap
-  cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token_pve2', 'password') }}"
+  cv4pve_api_token: "{{ lookup('keepass', 'cv4pve_api_token', 'password') }}"
   cv4pve_vmid: all,-127,-112,-116,-101,-102,-106 # k3s* wieder in snaps aktivieren!
   cv4pve_keep_snapshots: 5
   cv4pve_dl_link: "https://github.com/Corsinvest/cv4pve-autosnap/releases/download/v1.10.0/cv4pve-autosnap-linux-x64.zip"
@@ -221,6 +229,10 @@
       mp_nr: 16
       mp_path_host: /hdd_data_raidz/vm
       mp_path_guest: /shares_vm
+    - vmid: 106
+      mp_nr: 1
+      mp_path_host: /rpool/data/acng
+      mp_path_guest: /var/cache/apt-cacher-ng
 
   ### mgrote.munin-node
   munin_node_plugins:

inventory

@@ -11,7 +11,7 @@ all:
         dnsmasq.grote.lan:
     acng:
       hosts:
-        acng.grote.lan:
+        acng2.grote.lan:
     ansible:
       hosts:
         ansible2.grote.lan:
@@ -35,7 +35,6 @@ all:
         proxmoxprod:
           hosts:
             pve5.grote.lan:
-      children:
         proxmoxtest:
           hosts:
             pve5-test.grote.lan:
@@ -50,7 +49,7 @@ all:
       hosts:
         dokuwiki2.grote.lan:
         fileserver2.grote.lan:
-        acng.grote.lan:
+        acng2.grote.lan:
         ansible2.grote.lan:
         pve5.grote.lan:
         gitea.grote.lan:

playbooks/base/apt_sources.yml

@@ -3,3 +3,4 @@
     roles:
       - role: mgrote.apt_manage_sources
         tags: "apt_sources"
+        when: "not 'acng2.grote.lan' in inventory_hostname"

roles/mgrote.acng/tasks/main.yml

@@ -1,9 +1,22 @@
 ---
-  - name: install apt-cacher-ng packages
+  - name: ensure directories exists
     become: yes
-    ansible.builtin.package:
-      name: apt-cacher-ng
-      state: present
+    ansible.builtin.file:
+      path: "{{ item }}"
+      state: directory
+    loop:
+      - /etc/apt-cacher-ng
+      - /var/cache/apt-cacher-ng
+
+  - name: ensure directories have the right permissions
+    become: yes
+    ansible.builtin.file:
+      path: "{{ item }}"
+      state: directory
+      owner: apt-cacher-ng
+      group: apt-cacher-ng
+    loop:
+      - /var/cache/apt-cacher-ng
 
   - name: templating acng.conf
     become: yes
@@ -13,6 +26,12 @@
       mode: 0664
     notify: acng_starten_aktivieren
 
+  - name: install apt-cacher-ng packages
+    become: yes
+    ansible.builtin.package:
+      name: apt-cacher-ng
+      state: present
+
   - name: templating security.conf
     become: yes
     ansible.builtin.template:

roles/mgrote.apt_manage_sources/defaults/main.yml

@@ -3,7 +3,7 @@
   manage_sources_apt_repo_key_url: http://download.proxmox.com/debian/proxmox-ve-release-6.x.gpg # url zum key für no-subscription-repo
   manage_sources_apt_repo_key_path: /etc/apt/trusted.gpg.d/proxmox-ve-release-6.x.gpg # pfad lokal zum key für no-subscription-repo
   manage_sources_apt_repo_no_subscription: deb http://download.proxmox.com/debian/pve bullseye pve-no-subscription # url zum für no-subscription-repo, manage_sources_apt_proxy_url wird aus der variable entnommen
-  manage_sources_apt_proxy: acng.grote.lan:9999 # url+Port vom proxy
+  manage_sources_apt_proxy: acng2.grote.lan:9999 # url+Port vom proxy
 #  manage_sources_extra_repos: # Extra Repositories
 #    - name: vivaldi # optional
 #      url: deb [arch=amd64] https://repo.vivaldi.com/stable/deb/ stable main