heavy repo refactoring

base/packages/repo/debian-bullseye.sls

@@ -5,6 +5,7 @@
       )
 %}
 
+{% if salt['pillar.get']('os:release', default = 'buster') != 'bullseye' %}
 
 repo_debian-bullseye:
   pkgrepo.managed:
@@ -12,3 +13,10 @@ repo_debian-bullseye:
     - file: /etc/apt/sources.list.d/debian-bullseye.list
     - clean_file: True
 
+{% else %}
+
+repo_debian-bullseye-absent:
+  file.absent:
+    - name: /etc/apt/sources.list.d/debian-bullseye.list
+
+{% endif %}

base/packages/repo/debian.sls

@@ -7,6 +7,18 @@
       )
 %}
 
+{%- 
+ set os_rel = salt['pillar.get'](
+     'os:release', 
+     default=False
+     )
+%}
+
+{%- if not os_rel %}
+  set os_rel = grains['oscodename']
+{%- endif %}
+
+
 repo_default:
   file.managed:
     - name: /etc/apt/sources.list
@@ -19,25 +31,32 @@ repo_default:
 
 repo_debian:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ grains['oscodename'] }} main contrib non-free'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }} main contrib non-free'
     - 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'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }}-updates main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-updates.list
     - clean_file: True
 
+#deb http://deb.debian.org/debian-security/ bullseye-security main contrib non-free
+{% if os_rel == 'buster' %}
+{% set repo_path = "/updates" %}
+{% else %}
+{% set repo_path = "-security" %}
+{% endif %}
+
 repo_debian-security:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url}}deb.debian.org/debian-security {{ grains['oscodename'] }}/updates main contrib non-free'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian-security {{ os_rel }}{{ repo_path }} 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'
+    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }}-backports main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
 {% endif %}    

base/release.sls

@@ -1,5 +1,5 @@
 {% set def_rel = 'bullseye' %}
-{% if grains['oscodename'] != 'bullseye' %} 
+{% if grains['oscodename'] != 'bullseye' and salt['pillar.get']('os:release', default = False) != 'bullseye' %} 
 {%    set def_rel = 'buster' %}
 {% endif %}
 

hardware/espressobin/init.sls

@@ -2,5 +2,4 @@
 
 
 include:
-  - .repo
   - .pkgs

hardware/espressobin/repo.sls

@@ -1,15 +0,0 @@
-#!jinja|yaml|gpg
-
-{%-
- set cache_url = salt['pillar.get'](
-      'services:apt-cache',
-      default=''
-      )
-%}
-
-repo_armbian:
-  pkgrepo.managed:
-    - 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/init.sls

@@ -4,9 +4,9 @@ include:
   - .raspberrypi
 {% endif %}
 
-{% if grains['hardware'] == 'Pine64' %}
-  - .pine64
-{% endif %}
+#{% if grains['hardware'] == 'Pine64' %}
+#  - .pine64
+#{% endif %}
 
 {% if grains['hardware'] == 'Espressobin' %}
   - .espressobin

hardware/pine64/init.sls

@@ -1,3 +0,0 @@
-
-include:
-  - .repo

hardware/pine64/repo.sls

@@ -1,15 +0,0 @@
-#!jinja|yaml|gpg
-
-{%-
- set cache_url = salt['pillar.get'](
-      'services:apt-cache',
-      default=''
-      )
-%}
-
-repo_armbian:
-  pkgrepo.managed:
-    - 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

k8s/cri-tools.sls

@@ -1,5 +1,5 @@
 include:
-  - kubernetes.package.repo
+  - .repo.kubernetes
 
 cri-tools_pkgs:
   pkg.installed:

k8s/podman.sls

@@ -3,7 +3,7 @@
 ---
 {% if grains['oscodename'] != 'bullseye' %}
 include:
-  - .repo.debian-bullseye
+  - base.packages.repo.debian-bullseye
 {% endif %}
 
 podman_pkgs:

os/armbian/init.sls

@@ -1,4 +1,5 @@
 include:
+  - .repo
   - .packages
   - .cron
 

os/armbian/repo.sls

@@ -0,0 +1,39 @@
+#!jinja|yaml|gpg
+
+{% set base_url = 'mirrors.dotsrc.org' %}
+
+
+{%-
+ set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
+{%- 
+ set os_rel = salt['pillar.get'](
+     'os:release', 
+     default=False
+     )
+%}
+
+{% if not os_rel %}
+{%   set os_rel = grains['oscodename'] %}
+{% endif %}
+
+
+repo_armbian:
+  pkgrepo.managed:
+    - name: 'deb http://{{ cache_url }}{{ base_url }}/armbian-apt {{ os_rel }} main {{ os_rel }}-utils #{{ os_rel }}-desktop'
+    - dist: {{ os_rel }}
+    - file: /etc/apt/sources.list.d/armbian.list
+    - clean_file: True
+
+pin_repo_armbian:
+  file.managed:
+    - name: /etc/apt/apt.conf.d/999_pin_repo_armbian
+    - contents: |
+        #SALT Managed
+        Package: *  
+        Pin: origin {{ cache_url }}{{ base_url }}  
+        Pin-Priority: 1001