From 9531cf694c7d6aba4c7e73dc55fb6cbbf3e23f70 Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Thu, 22 Oct 2020 19:53:18 +0200
Subject: [PATCH] apt-cacher

---
 base/packages/openhab2.sls             |  3 +--
 base/packages/repo/debian.sls          |  4 +---
 hardware/raspberrypi/init.sls          |  1 +
 hardware/raspberrypi/repo/raspbian.sls | 17 +++++++++++++++++
 4 files changed, 20 insertions(+), 5 deletions(-)
 create mode 100644 hardware/raspberrypi/repo/raspbian.sls

diff --git a/base/packages/openhab2.sls b/base/packages/openhab2.sls
index 6677e7f..a4305c2 100644
--- a/base/packages/openhab2.sls
+++ b/base/packages/openhab2.sls
@@ -27,8 +27,7 @@ openhab2-pkgs:
 
 repo_openhab2:
   pkgrepo.managed:
-    - name: deb https://{{ cache_url }}dl.bintray.com/openhab/apt-repo2 stable main 
-    #- dist: {{ grains['oscodename'] }}
+    - name: deb http://{{ cache_url }}dl.bintray.com/openhab/apt-repo2 stable main 
     - file: /etc/apt/sources.list.d/openhab2.list
     - key_url: 'https://bintray.com/user/downloadSubjectPublicKey?username=openhab'
     - clean_file: True
diff --git a/base/packages/repo/debian.sls b/base/packages/repo/debian.sls
index 629a434..d3b94e9 100644
--- a/base/packages/repo/debian.sls
+++ b/base/packages/repo/debian.sls
@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-# vim: ft=yaml
----
+#!jinja|yaml|gpg
 
 {%-
  set cache_url = salt['pillar.get'](
diff --git a/hardware/raspberrypi/init.sls b/hardware/raspberrypi/init.sls
index 83478de..c036d02 100644
--- a/hardware/raspberrypi/init.sls
+++ b/hardware/raspberrypi/init.sls
@@ -13,6 +13,7 @@ set has_fan = salt['pillar.get'](
 %}
 
 include:
+  - .repo.raspbian
 {%- if 'node_exporter' in has_promexporter %}
   - .prometheus-exporter
 {%- endif %}
diff --git a/hardware/raspberrypi/repo/raspbian.sls b/hardware/raspberrypi/repo/raspbian.sls
new file mode 100644
index 0000000..520215a
--- /dev/null
+++ b/hardware/raspberrypi/repo/raspbian.sls
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+
+{%- set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
+repo_maketank:
+  pkgrepo.managed:
+    - name: deb http://{{ cache_url }}archive.raspberrypi.org/debian/ {{ grains['oscodename'] }} main
+    - dist: {{ grains['oscodename'] }}
+    - file: /etc/apt/sources.list.d/raspi.list
+    - clean_file: True
+