From 7257a7f114d893ed550963fa81667745c666ba8c Mon Sep 17 00:00:00 2001
From: tolerryan <105945216+tolerryan@users.noreply.github.com>
Date: Tue, 8 Apr 2025 23:21:05 -0500
Subject: [PATCH] deb cache setup

---
 debcache.tf                             |  2 +-
 roles/ind/debcache/cron.vars            | 18 ------
 roles/ind/debcache/debcache-install.yml | 76 +++++--------------------
 3 files changed, 14 insertions(+), 82 deletions(-)

diff --git a/debcache.tf b/debcache.tf
index b9bc319..9855200 100644
--- a/debcache.tf
+++ b/debcache.tf
@@ -26,7 +26,7 @@ resource "proxmox_lxc" "debcache" {
         key = "0"
         slot = 0
         storage = "IntelSSD"
-        mp      = "/data"
+        mp      = "/var/cache/apt-cacher-ng"
         size    = "200G"
     }
 
diff --git a/roles/ind/debcache/cron.vars b/roles/ind/debcache/cron.vars
index 03471df..e69de29 100644
--- a/roles/ind/debcache/cron.vars
+++ b/roles/ind/debcache/cron.vars
@@ -1,18 +0,0 @@
----
-cronjob:
-
-  - name: appdata
-    job_name: "Daily /home/docker/  Backup"
-    job_minute: "0"
-    job_hour: "3"
-    job_day: "*"
-    user: "root"
-    job_command: "/home/docker/restic.sh --backup /home/docker/ "
-  
-  - name: weeklydb
-    job_name: "Weekly /home/docker/ verification"
-    job_minute: "10"
-    job_hour: "6"
-    job_day: "1"
-    user: "root"
-    job_command: "/home/docker/restic.sh --verify /home/docker/"
\ No newline at end of file
diff --git a/roles/ind/debcache/debcache-install.yml b/roles/ind/debcache/debcache-install.yml
index 04069b9..4f85a11 100644
--- a/roles/ind/debcache/debcache-install.yml
+++ b/roles/ind/debcache/debcache-install.yml
@@ -11,15 +11,6 @@
     - name: Upgrade-packages.yml - update packages
       include: ../../lib/upgrade-packages.yml
     
-    - name: Install-docker.yml - setting up docker
-      include: ../../lib/install-docker.yml
-
-    - name: Install Restic and setup 
-      include:  ../../lib/setup-restic.yml
-
-    - name: Setup Restic Cron jobs
-      include: ../../lib/setup-restic-cron.yml
-
     - name: Install nfs Packages
       apt:
         name:
@@ -35,63 +26,22 @@
         state: present
         update_cache: yes
 
-    - name: Setup Service
-      copy:
-        dest: /etc/systemd/system/debcache.service
-        content: |
-          [Unit]
-          Description=Docker Compose service
-          Requires=docker.service
-          After=docker.service
+    - name: Pre-configure apt-cacher-ng to enable tunnel
+      ansible.builtin.debconf:
+        name: apt-cacher-ng
+        question: apt-cacher-ng/tunnelenable
+        value: true
+        vtype: boolean
 
-          [Service]
-          Type=oneshot
-          RemainAfterExit=yes
-          WorkingDirectory=/home/docker
-          ExecStart=/usr/bin/docker compose --env-file ./docker-compose.env -f docker-compose.yml up -d
-          ExecStop=/usr/bin/docker compose --env-file ./docker-compose.env -f docker-compose.yml down
+    - name: Install apt-cacher-ng
+      apt:
+        name:
+          - apt-cacher-ng
+        state: present
+        update_cache: no
 
-          [Install]
-          WantedBy=multi-user.target
-        owner: root
-        group: root
-        mode: '0644'
-
-    - name: Write docker-compose.yml 
-      ansible.builtin.copy:
-        src: docker-compose.yml
-        dest: /home/docker/docker-compose.yml
-        owner: docker
-        group: docker
-        mode: u=rw,g=r,o=r
-
-    - name: Write docker-compose.env
-      ansible.builtin.copy:
-        src: docker-compose.env
-        dest: /home/docker/docker-compose.env
-        owner: docker
-        group: docker
-        mode: u=rw,g=r,o=r
-
-    - name: Check if docker config directory exists
-      stat:
-        path: /home/docker/data
-      register: data_stat
-
-    - name: Restore docker config Dir
-      shell: |
-        restic --password-file /home/restic/.resticpassword -r sftp:misamisa://home/restic/$(hostname) --target / restore latest
-      args:
-        chdir: /home/docker/
-        creates: /home/docker/data
-      when: not data_stat.stat.exists or not data_stat.stat.isdir
-      
-    - name: Reload systemd daemon
-      systemd:
-        daemon_reload: yes
-        
     - name: Start downloader Service
       systemd:
-        name: debcache
+        name: apt-cacher-ng
         state: started
         enabled: yes
\ No newline at end of file