From bfade616aa45b37d12bb3ad29dc26dcc18b7beb2 Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Thu, 22 Oct 2020 20:57:17 +0200
Subject: [PATCH] repos galore!

---
 base/packages/openhab2.sls                        |  8 +-------
 base/packages/repo/debian.sls                     | 12 +++---------
 hardware/espressobin/init.sls                     |  3 +++
 hardware/espressobin/repo.sls                     | 15 +++++++++++++++
 hardware/init.sls                                 |  8 ++++++++
 hardware/pine64/init.sls                          |  3 +++
 hardware/pine64/repo.sls                          | 15 +++++++++++++++
 hardware/raspberrypi/init.sls                     |  2 +-
 .../raspberrypi/repo/{raspbian.sls => init.sls}   |  2 +-
 9 files changed, 50 insertions(+), 18 deletions(-)
 create mode 100644 hardware/espressobin/init.sls
 create mode 100644 hardware/espressobin/repo.sls
 create mode 100644 hardware/pine64/init.sls
 create mode 100644 hardware/pine64/repo.sls
 rename hardware/raspberrypi/repo/{raspbian.sls => init.sls} (96%)

diff --git a/base/packages/openhab2.sls b/base/packages/openhab2.sls
index a4305c2..afceebc 100644
--- a/base/packages/openhab2.sls
+++ b/base/packages/openhab2.sls
@@ -1,12 +1,6 @@
 # -*- coding: utf-8 -*-
 # vim: ft=yaml
 ---
-{%-
- set cache_url = salt['pillar.get'](
-      'services:apt-cache',
-      default=''
-      )
-%}
 
 include:
   - haproxy
@@ -27,7 +21,7 @@ openhab2-pkgs:
 
 repo_openhab2:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url }}dl.bintray.com/openhab/apt-repo2 stable main 
+    - name: deb https://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 d3b94e9..cc24278 100644
--- a/base/packages/repo/debian.sls
+++ b/base/packages/repo/debian.sls
@@ -9,29 +9,23 @@
 
 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 {{ grains['oscodename'] }} main contrib non-free'
     - dist: {{ grains['oscodename'] }}
     - file: /etc/apt/sources.list.d/debian.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
-    - dist: {{ grains['oscodename'] }}
+    - name: 'deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}-backports main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-backports.list
     - clean_file: True
 
 repo_debian-security:
   pkgrepo.managed:
-    - name: deb http://{{ cache_url}}deb.debian.org/debian {{ grains['oscodename'] }}/updates main contrib non-free
-    - dist: {{ grains['oscodename'] }}
+    - name: 'deb http://{{ cache_url}}security.debian.org/debian-security {{ grains['oscodename'] }}/updates main contrib non-free'
     - file: /etc/apt/sources.list.d/debian-security.list
     - clean_file: True
 
-
-
-
-
 #apt-update:
 #  cmd.run:
 #    - name: apt update -y
diff --git a/hardware/espressobin/init.sls b/hardware/espressobin/init.sls
new file mode 100644
index 0000000..32e0205
--- /dev/null
+++ b/hardware/espressobin/init.sls
@@ -0,0 +1,3 @@
+
+include:
+  - .repo
\ No newline at end of file
diff --git a/hardware/espressobin/repo.sls b/hardware/espressobin/repo.sls
new file mode 100644
index 0000000..c8f3352
--- /dev/null
+++ b/hardware/espressobin/repo.sls
@@ -0,0 +1,15 @@
+#!jinja|yaml|gpg
+
+{%-
+ set cache_url = salt['pillar.get'](
+      'services:apt-cache',
+      default=''
+      )
+%}
+
+repo_armbian:
+  pkgrepo.managed:
+    - name: 'deb http://{{ cache_url }}apt.armbian.com {{ grains['oscodename'] }} main {{ grains['oscodename'] }}-utils {{ grains['oscodename'] }}-desktop'
+    - dist: {{ grains['oscodename'] }}
+    - file: /etc/apt/sources.list.d/armbian.list
+    - clean_file: True
\ No newline at end of file
diff --git a/hardware/init.sls b/hardware/init.sls
index 97b51bc..80b9349 100644
--- a/hardware/init.sls
+++ b/hardware/init.sls
@@ -3,3 +3,11 @@ include:
 {% if grains['hardware'] == 'RaspberryPi' %}
   - .raspberrypi
 {% endif %}
+
+{% if grains['hardware'] == 'Pine64' %}
+  - .pine64
+{% endif %}
+
+{% if grains['hardware'] == 'Espressobin' %}
+  - .espressobin
+{% endif %}
\ No newline at end of file
diff --git a/hardware/pine64/init.sls b/hardware/pine64/init.sls
new file mode 100644
index 0000000..32e0205
--- /dev/null
+++ b/hardware/pine64/init.sls
@@ -0,0 +1,3 @@
+
+include:
+  - .repo
\ No newline at end of file
diff --git a/hardware/pine64/repo.sls b/hardware/pine64/repo.sls
new file mode 100644
index 0000000..148bdb0
--- /dev/null
+++ b/hardware/pine64/repo.sls
@@ -0,0 +1,15 @@
+#!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
\ No newline at end of file
diff --git a/hardware/raspberrypi/init.sls b/hardware/raspberrypi/init.sls
index c036d02..0bb387a 100644
--- a/hardware/raspberrypi/init.sls
+++ b/hardware/raspberrypi/init.sls
@@ -13,7 +13,7 @@ set has_fan = salt['pillar.get'](
 %}
 
 include:
-  - .repo.raspbian
+  - .repo
 {%- if 'node_exporter' in has_promexporter %}
   - .prometheus-exporter
 {%- endif %}
diff --git a/hardware/raspberrypi/repo/raspbian.sls b/hardware/raspberrypi/repo/init.sls
similarity index 96%
rename from hardware/raspberrypi/repo/raspbian.sls
rename to hardware/raspberrypi/repo/init.sls
index 520215a..2dbc0b0 100644
--- a/hardware/raspberrypi/repo/raspbian.sls
+++ b/hardware/raspberrypi/repo/init.sls
@@ -8,7 +8,7 @@
       )
 %}
 
-repo_maketank:
+repo_raspi:
   pkgrepo.managed:
     - name: deb http://{{ cache_url }}archive.raspberrypi.org/debian/ {{ grains['oscodename'] }} main
     - dist: {{ grains['oscodename'] }}