From 68cbcda77580b1f857801e4e1f07f7989fa36b9e Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Thu, 22 Oct 2020 23:18:34 +0200
Subject: [PATCH] fixing all repos with apt-cacher.lan

---
 base/packages/common.sls                      |  4 +++
 base/packages/repo/debian.sls                 | 30 +++++++++++--------
 hardware/espressobin/repo.sls                 |  2 +-
 .../raspberrypi/{repo/init.sls => repo.sls}   |  3 +-
 4 files changed, 24 insertions(+), 15 deletions(-)
 rename hardware/raspberrypi/{repo/init.sls => repo.sls} (68%)

diff --git a/base/packages/common.sls b/base/packages/common.sls
index c2d4e6e..7f37f9a 100644
--- a/base/packages/common.sls
+++ b/base/packages/common.sls
@@ -58,3 +58,7 @@ common-removed:
       - exim4-base
       - exim4-config
       - exim4-daemon-light
+      - command-not-found
+
+
+
diff --git a/base/packages/repo/debian.sls b/base/packages/repo/debian.sls
index cc24278..cdfcc22 100644
--- a/base/packages/repo/debian.sls
+++ b/base/packages/repo/debian.sls
@@ -10,24 +10,28 @@
 repo_debian:
   pkgrepo.managed:
     - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free'
-    - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/debian.list
     - clean_file: True
 
+repo_debian-updates:
+  pkgrepo.managed:
+    - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-updates main contrib non-free'
+    - file: /etc/apt/sources.list.d/debian-updates.list
+    - clean_file: True
+
+repo_debian-security:
+  pkgrepo.managed:
+    - name: 'deb http://{{ cache_url}}deb.debian.org/debian-security {{ grains['oscodename'] }}/updates main contrib non-free'
+    - file: /etc/apt/sources.list.d/debian-security.list
+    - clean_file: True
+
 repo_debian-backports:
   pkgrepo.managed:
     - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
-
-repo_debian-security:
-  pkgrepo.managed:
-    - name: 'deb http://{{ cache_url}}security.debian.org/debian-security {{ grains['oscodename'] }}/updates main contrib non-free'
-    - file: /etc/apt/sources.list.d/debian-security.list
-    - clean_file: True
-
-#apt-update:
-#  cmd.run:
-#    - name: apt update -y
-#    - listen:
-#      - pkgrepo: repo_maketank
+    
+repo_default:
+  file.absent:
+    - name: /etc/apt/sources.list
+    
\ No newline at end of file
diff --git a/hardware/espressobin/repo.sls b/hardware/espressobin/repo.sls
index c8f3352..148bdb0 100644
--- a/hardware/espressobin/repo.sls
+++ b/hardware/espressobin/repo.sls
@@ -9,7 +9,7 @@
 
 repo_armbian:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url }}apt.armbian.com {{ grains['oscodename'] }} main {{ grains['oscodename'] }}-utils {{ grains['oscodename'] }}-desktop'
+    - name: 'deb http://{{ cache_url }}mirrors.dotsrc.org/armbian-apt {{ grains['oscodename'] }} main {{ grains['oscodename'] }}-utils {{ grains['oscodename'] }}-desktop'
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/armbian.list
     - clean_file: True
\ No newline at end of file
diff --git a/hardware/raspberrypi/repo/init.sls b/hardware/raspberrypi/repo.sls
similarity index 68%
rename from hardware/raspberrypi/repo/init.sls
rename to hardware/raspberrypi/repo.sls
index 2dbc0b0..0db81c1 100644
--- a/hardware/raspberrypi/repo/init.sls
+++ b/hardware/raspberrypi/repo.sls
@@ -10,8 +10,9 @@
 
 repo_raspi:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url }}archive.raspberrypi.org/debian/ {{ grains['oscodename'] }} main
+    - name: deb http://{{ cache_url }}raspbian.raspberrypi.org/raspbian/ {{ grains['oscodename'] }} main contrib firmware rpi
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/raspi.list
     - clean_file: True
 
+