repos galore!

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

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

hardware/espressobin/init.sls

@@ -0,0 +1,3 @@
+
+include:
+  - .repo

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

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 %}

hardware/pine64/init.sls

@@ -0,0 +1,3 @@
+
+include:
+  - .repo

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

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 %}

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'] }}