]> Frank Brehm's Git Trees - salt/states.git/commitdiff
Adding Debian Repo buster
authorFrank Brehm <frank@brehm-online.com>
Wed, 5 Jul 2017 11:50:05 +0000 (13:50 +0200)
committerFrank Brehm <frank@brehm-online.com>
Wed, 5 Jul 2017 11:50:05 +0000 (13:50 +0200)
debian/apt/files/sources.list
debian/apt/init.sls
debian/apt/map.jinja

index 103d3d923aa1ab318bcbbc03571852ae68315dc9..2126f8187c7e08fe5dc625a2412706448e3e9871 100644 (file)
@@ -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
index 6272a9b9adf1fa5a3bddd32645e5c37b271fec4d..5a4b0362fcfdd6a25dbaccd4adbe6b580164f98c 100644 (file)
     - 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:
index 1a9685812f4420297c9441fa54a609a14ca295c9..cc666c72fac6773c891a763a2904a8dae41f62fd 100644 (file)
@@ -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' %}