From 89d3bb331d45c8aa3c700e6ef42b39fcd8dc3ae9 Mon Sep 17 00:00:00 2001
From: do <do@maketank.net>
Date: Thu, 2 Apr 2020 18:13:03 +0200
Subject: [PATCH] maketank repo with osdcodename

---
 base/init.sls                   |  5 +++--
 base/packages/init.sls          |  7 +++++++
 base/packages/repo/maketank.sls | 18 ++++++++++++++++++
 top.sls                         | 10 ++--------
 4 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 base/packages/init.sls
 create mode 100644 base/packages/repo/maketank.sls

diff --git a/base/init.sls b/base/init.sls
index ddc5ba4..e2bd97f 100644
--- a/base/init.sls
+++ b/base/init.sls
@@ -2,6 +2,7 @@
 # vim: ft=yaml
 ---
 
-import:
+include:
   - sysctl
-  - packages.common
+  - .packages
+  - .pki
diff --git a/base/packages/init.sls b/base/packages/init.sls
new file mode 100644
index 0000000..7be2210
--- /dev/null
+++ b/base/packages/init.sls
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+
+include:
+  - .common
+  - .repo.maketank
diff --git a/base/packages/repo/maketank.sls b/base/packages/repo/maketank.sls
new file mode 100644
index 0000000..38db240
--- /dev/null
+++ b/base/packages/repo/maketank.sls
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# vim: ft=yaml
+---
+
+repo_maketank:
+  pkgrepo.managed:
+    - name: deb http://apt.maketank.net/debian {{ grains['oscodename'] }} main
+    - dist: {{ grains['oscodename'] }}
+    - file: /etc/apt/sources.list.d/maketank.list
+    - key_url: http://apt.maketank.net/debian/debian.gpg
+    - clean_file: True
+
+
+apt-update:
+  cmd.run:
+    - name: apt update -y
+    - listen:
+      - pkgrepo: repo_maketank
diff --git a/top.sls b/top.sls
index 0cf7ce5..a4730c8 100644
--- a/top.sls
+++ b/top.sls
@@ -4,14 +4,8 @@
 
 base:
   '*':
-    #- base
-    - sysctl
-    - base.packages.common
-    - base.pki
-  'cpuarch:aarch64':
-    - match: grain
-    - base.packages.arch.arm
-  'cpuarch:armv7l':
+    - base 
+  'cpuarch:aarch64 or cpuarch:armv6l or cpuarch:armv6l':
     - match: grain
     - base.packages.arch.arm
   'riot01*':