Merge pull request #437 from sticky-note/fix/symlinks

fix(symlinks): replace symlinks with real files
2019-09-21 00:22:40 +02:00 · 2019-09-21 00:22:40 +02:00 · 356035d8f8
commit 356035d8f8
parent e88fce1ffb c4d013260f
15 changed files with 82 additions and 6 deletions
--- a/salt/pkgrepo/arch
+++ b/salt/pkgrepo/arch
@ -1 +0,0 @@
-nop/
--- a/salt/pkgrepo/arch/clean.sls
+++ b/salt/pkgrepo/arch/clean.sls
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-clean-saltstack-norepo-{{ grains['os_family']|lower }}:
+  test.show_notification:
+    - text: |
+        No official repository for {{ grains['os_family'] }}
--- a/salt/pkgrepo/arch/init.sls
+++ b/salt/pkgrepo/arch/init.sls
@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install
--- a/salt/pkgrepo/arch/install.sls
+++ b/salt/pkgrepo/arch/install.sls
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-install-saltstack-norepo-{{ grains['os_family']|lower }}:
+  test.show_notification:
+    - text: |
+        No official repository for {{ grains['os_family'] }}
--- a/salt/pkgrepo/debian/absent.sls
+++ b/salt/pkgrepo/debian/absent.sls
@ -1 +0,0 @@
-clean.sls
--- a/salt/pkgrepo/debian/absent.sls
+++ b/salt/pkgrepo/debian/absent.sls
@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+{% from "salt/map.jinja" import salt_settings with context %}
+
+salt-pkgrepo-clean-saltstack-debian:
+  pkgrepo.absent:
+    - name: {{ salt_settings.pkgrepo }}
+  file.absent:
+    - name: /etc/apt/sources.list.d/saltstack.list
+
+salt-pkgrepo-clean-saltstack-debian-apt-key:
+  file.absent:
+    - name: /etc/apt/trusted.gpg.d/saltstack.gpg
--- a/salt/pkgrepo/freebsd
+++ b/salt/pkgrepo/freebsd
@ -1 +0,0 @@
-nop/
--- a/salt/pkgrepo/freebsd/clean.sls
+++ b/salt/pkgrepo/freebsd/clean.sls
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-clean-saltstack-norepo-{{ grains['os_family']|lower }}:
+  test.show_notification:
+    - text: |
+        No official repository for {{ grains['os_family'] }}
--- a/salt/pkgrepo/freebsd/init.sls
+++ b/salt/pkgrepo/freebsd/init.sls
@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install
--- a/salt/pkgrepo/freebsd/install.sls
+++ b/salt/pkgrepo/freebsd/install.sls
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-install-saltstack-norepo-{{ grains['os_family']|lower }}:
+  test.show_notification:
+    - text: |
+        No official repository for {{ grains['os_family'] }}
--- a/salt/pkgrepo/macos
+++ b/salt/pkgrepo/macos
@ -1 +0,0 @@
-nop/
--- a/salt/pkgrepo/macos/clean.sls
+++ b/salt/pkgrepo/macos/clean.sls
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-clean-saltstack-norepo-{{ grains['os_family']|lower }}:
+  test.show_notification:
+    - text: |
+        No official repository for {{ grains['os_family'] }}
--- a/salt/pkgrepo/macos/init.sls
+++ b/salt/pkgrepo/macos/init.sls
@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+include:
+  - .install
--- a/salt/pkgrepo/macos/install.sls
+++ b/salt/pkgrepo/macos/install.sls
@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-install-saltstack-norepo-{{ grains['os_family']|lower }}:
+  test.show_notification:
+    - text: |
+        No official repository for {{ grains['os_family'] }}
--- a/salt/pkgrepo/redhat/absent.sls
+++ b/salt/pkgrepo/redhat/absent.sls
@ -1 +0,0 @@
-clean.sls
--- a/salt/pkgrepo/redhat/absent.sls
+++ b/salt/pkgrepo/redhat/absent.sls
@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-clean-saltstack-redhat:
+  pkgrepo.absent:
+    - name: saltstack
--- a/salt/pkgrepo/suse/absent.sls
+++ b/salt/pkgrepo/suse/absent.sls
@ -1 +0,0 @@
-clean.sls
--- a/salt/pkgrepo/suse/absent.sls
+++ b/salt/pkgrepo/suse/absent.sls
@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# vim: ft=sls
+
+salt-pkgrepo-clean-saltstack-suse:
+  pkgrepo.absent:
+    - name: systemsmanagement_saltstack_products