fixing all repos with apt-cacher.lan

base/packages/common.sls

@@ -58,3 +58,7 @@ common-removed:
       - exim4-base
       - exim4-config
       - exim4-daemon-light
+      - command-not-found
+
+
+

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
+    

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

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
 
+