From df8f40ae3f37fb536f2600469c6ef097281a589b Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Wed, 19 Dec 2018 11:57:26 +0100
Subject: [PATCH] No more freebsd repos for salt
---
hshbase/apt/files/saltstack.conf | 7 -------
hshbase/apt/proxy.sls | 10 ----------
2 files changed, 17 deletions(-)
delete mode 100644 hshbase/apt/files/saltstack.conf
diff --git a/hshbase/apt/files/saltstack.conf b/hshbase/apt/files/saltstack.conf
deleted file mode 100644
index 691f5a3..0000000
--- a/hshbase/apt/files/saltstack.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-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 fae989d..dd55eb6 100644
--- a/hshbase/apt/proxy.sls
+++ b/hshbase/apt/proxy.sls
@@ -21,16 +21,6 @@ hsh_freebsd_apt_proxy:
- 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:
file.managed:
--
GitLab