From 1f6112695803daa2d80278910372c7bdec3c2797 Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Wed, 19 Jul 2017 13:46:19 +0200
Subject: [PATCH] Fix saltstack.conf repo for FreeBSD
---
hshbase/apt/files/saltstack.conf | 7 +++++++
hshbase/apt/proxy.sls | 12 ++++++++++++
2 files changed, 19 insertions(+)
create mode 100644 hshbase/apt/files/saltstack.conf
diff --git a/hshbase/apt/files/saltstack.conf b/hshbase/apt/files/saltstack.conf
new file mode 100644
index 0000000..691f5a3
--- /dev/null
+++ b/hshbase/apt/files/saltstack.conf
@@ -0,0 +1,7 @@
+SaltStack:{
+ url: "http://apt-proxy.it.hs-hannover.de:8080/repo.saltstack.com/freebsd/${ABI}/",
+ mirror_type: "http",
+ enabled: true
+ priority: 10
+}
+
diff --git a/hshbase/apt/proxy.sls b/hshbase/apt/proxy.sls
index 694ff5d..fae989d 100644
--- a/hshbase/apt/proxy.sls
+++ b/hshbase/apt/proxy.sls
@@ -18,6 +18,18 @@ hsh_freebsd_apt_proxy:
- mode: 644
- user: root
- group: wheel
+ - require:
+ - file: /usr/local/etc/pkg/repos
+
+hsh_freebsd_salt_apt_proxy:
+ file.managed:
+ - name: /usr/local/etc/pkg/repos/saltstack.conf
+ - source: salt://hshbase/apt/files/saltstack.conf
+ - mode: 644
+ - user: root
+ - group: wheel
+ - require:
+ - file: /usr/local/etc/pkg/repos
{% elif grains['os'] == 'Debian' or grains['os'] == 'Ubuntu' %}
hsh_debian_apt_proxy:
--
GitLab