From: Frank Brehm <frank@brehm-online.com>
Date: Wed, 5 Jul 2017 11:50:05 +0000 (+0200)
Subject: Adding Debian Repo buster
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=6bcff96f0054c7ce8d12dd7ed72d759fc097d1ef;p=salt%2Fstates.git

Adding Debian Repo buster
---

diff --git a/debian/apt/files/sources.list b/debian/apt/files/sources.list
index 103d3d9..2126f81 100644
--- a/debian/apt/files/sources.list
+++ b/debian/apt/files/sources.list
@@ -6,6 +6,11 @@ deb	http://mirror.hetzner.de/debian/security	{{ debian_release }}/updates	main c
 
 # deb cdrom:[Debian GNU/Linux stretch-DI-alpha7 _Stretch_ - Official Snapshot amd64 NETINST Binary-1 20160630-14:29]/ stretch main
 
+{% elif debian_release == 'buster' -%}
+#
+
+# deb cdrom:[Debian GNU/Linux testing _Buster_ - Official Snapshot amd64 NETINST 20170703-03:41]/ buster main
+
 {% endif -%}
 
 # deb	http://{{ debian_mirror }}/debian	{{ debian_release }}		main
diff --git a/debian/apt/init.sls b/debian/apt/init.sls
index 6272a9b..5a4b036 100644
--- a/debian/apt/init.sls
+++ b/debian/apt/init.sls
@@ -13,12 +13,12 @@
     - source: salt://debian/apt/files/SALTSTACK-GPG-KEY.pub
     - backup: minion
 
-/etc/apt/repo.uhu-banane.de.gpg-key.pub:
+/etc/apt/repo.uhu-banane.de.gpg-key2.pub:
   file.managed:
     - user: root
     - group: root
     - mode: 644
-    - source: salt://debian/apt/files/repo.uhu-banane.de.gpg-key.pub
+    - source: salt://debian/apt/files/repo.uhu-banane.de.gpg-key2.pub
     - backup: minion
 
 /etc/apt/apt.conf.d:
diff --git a/debian/apt/map.jinja b/debian/apt/map.jinja
index 1a96858..cc666c7 100644
--- a/debian/apt/map.jinja
+++ b/debian/apt/map.jinja
@@ -8,7 +8,9 @@
 {% if loc_country == 'us' %}
   {% set debian_mirror = 'ftp.us.debian.org' %}
 {% else %}
-  {% if loc_provider == 'gridscale' %}
+  {% if loc_provider == 'home' %}
+    {% set debian_mirror = 'debian.charite.de' %}
+  {% elif loc_provider == 'gridscale' %}
     {% set debian_mirror = 'ftp.plusline.de' %}
   {% else %}
     {% set debian_mirror = 'ftp-stud.hs-esslingen.de' %}