bullseye stuff

base/packages/repo/debian.sls

@@ -31,13 +31,13 @@ repo_default:
 
 repo_debian:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url }}deb.debian.org/debian {{ os_rel }} 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 {{ os_rel }}-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
 
@@ -50,13 +50,13 @@ repo_debian-updates:
 
 repo_debian-security:
   pkgrepo.managed:
-    - name: 'deb http://{{ cache_url }}deb.debian.org/debian-security {{ os_rel }}{{ repo_path }} 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 {{ os_rel }}-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/packages/repo/maketank.sls

@@ -1,24 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
-
-{%- set cache_url = salt['pillar.get'](
-      'services:apt-cache',
-      default=''
-      )
-%}
-
-repo_maketank:
-  pkgrepo.absent:
-    - name: deb http://{{ cache_url }}apt.maketank.net/debian buster main
-    - dist: buster
-    - file: /etc/apt/sources.list.d/maketank.list
-    - key_url: http://apt.maketank.net/debian/debian.gpg
-    - clean_file: True
-
-
-#apt-update:
-#  cmd.run:
-#    - name: apt update -y
-#    - listen:
-#      - pkgrepo: repo_maketank