From c4d013260f469adf8df5a80334ebcc73c98f08d3 Mon Sep 17 00:00:00 2001 From: sticky-note Date: Thu, 12 Sep 2019 16:16:30 +1100 Subject: [PATCH] fix(symlinks): replace symlinks with real files --- salt/pkgrepo/arch | 1 - salt/pkgrepo/arch/clean.sls | 7 +++++++ salt/pkgrepo/arch/init.sls | 5 +++++ salt/pkgrepo/arch/install.sls | 7 +++++++ salt/pkgrepo/debian/absent.sls | 14 +++++++++++++- salt/pkgrepo/freebsd | 1 - salt/pkgrepo/freebsd/clean.sls | 7 +++++++ salt/pkgrepo/freebsd/init.sls | 5 +++++ salt/pkgrepo/freebsd/install.sls | 7 +++++++ salt/pkgrepo/macos | 1 - salt/pkgrepo/macos/clean.sls | 7 +++++++ salt/pkgrepo/macos/init.sls | 5 +++++ salt/pkgrepo/macos/install.sls | 7 +++++++ salt/pkgrepo/redhat/absent.sls | 7 ++++++- salt/pkgrepo/suse/absent.sls | 7 ++++++- 15 files changed, 82 insertions(+), 6 deletions(-) delete mode 120000 salt/pkgrepo/arch create mode 100644 salt/pkgrepo/arch/clean.sls create mode 100644 salt/pkgrepo/arch/init.sls create mode 100644 salt/pkgrepo/arch/install.sls mode change 120000 => 100644 salt/pkgrepo/debian/absent.sls delete mode 120000 salt/pkgrepo/freebsd create mode 100644 salt/pkgrepo/freebsd/clean.sls create mode 100644 salt/pkgrepo/freebsd/init.sls create mode 100644 salt/pkgrepo/freebsd/install.sls delete mode 120000 salt/pkgrepo/macos create mode 100644 salt/pkgrepo/macos/clean.sls create mode 100644 salt/pkgrepo/macos/init.sls create mode 100644 salt/pkgrepo/macos/install.sls mode change 120000 => 100644 salt/pkgrepo/redhat/absent.sls mode change 120000 => 100644 salt/pkgrepo/suse/absent.sls diff --git a/salt/pkgrepo/arch b/salt/pkgrepo/arch deleted file mode 120000 index 0595218..0000000 --- a/salt/pkgrepo/arch +++ /dev/null @@ -1 +0,0 @@ -nop/ \ No newline at end of file diff --git a/salt/pkgrepo/arch/clean.sls b/salt/pkgrepo/arch/clean.sls new file mode 100644 index 0000000..f535f7f --- /dev/null +++ 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'] }} diff --git a/salt/pkgrepo/arch/init.sls b/salt/pkgrepo/arch/init.sls new file mode 100644 index 0000000..d3e5518 --- /dev/null +++ b/salt/pkgrepo/arch/init.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .install diff --git a/salt/pkgrepo/arch/install.sls b/salt/pkgrepo/arch/install.sls new file mode 100644 index 0000000..55e3907 --- /dev/null +++ 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'] }} diff --git a/salt/pkgrepo/debian/absent.sls b/salt/pkgrepo/debian/absent.sls deleted file mode 120000 index 46623a6..0000000 --- a/salt/pkgrepo/debian/absent.sls +++ /dev/null @@ -1 +0,0 @@ -clean.sls \ No newline at end of file diff --git a/salt/pkgrepo/debian/absent.sls b/salt/pkgrepo/debian/absent.sls new file mode 100644 index 0000000..5cd26cc --- /dev/null +++ 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 diff --git a/salt/pkgrepo/freebsd b/salt/pkgrepo/freebsd deleted file mode 120000 index 0595218..0000000 --- a/salt/pkgrepo/freebsd +++ /dev/null @@ -1 +0,0 @@ -nop/ \ No newline at end of file diff --git a/salt/pkgrepo/freebsd/clean.sls b/salt/pkgrepo/freebsd/clean.sls new file mode 100644 index 0000000..f535f7f --- /dev/null +++ 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'] }} diff --git a/salt/pkgrepo/freebsd/init.sls b/salt/pkgrepo/freebsd/init.sls new file mode 100644 index 0000000..d3e5518 --- /dev/null +++ b/salt/pkgrepo/freebsd/init.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .install diff --git a/salt/pkgrepo/freebsd/install.sls b/salt/pkgrepo/freebsd/install.sls new file mode 100644 index 0000000..55e3907 --- /dev/null +++ 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'] }} diff --git a/salt/pkgrepo/macos b/salt/pkgrepo/macos deleted file mode 120000 index 0595218..0000000 --- a/salt/pkgrepo/macos +++ /dev/null @@ -1 +0,0 @@ -nop/ \ No newline at end of file diff --git a/salt/pkgrepo/macos/clean.sls b/salt/pkgrepo/macos/clean.sls new file mode 100644 index 0000000..f535f7f --- /dev/null +++ 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'] }} diff --git a/salt/pkgrepo/macos/init.sls b/salt/pkgrepo/macos/init.sls new file mode 100644 index 0000000..d3e5518 --- /dev/null +++ b/salt/pkgrepo/macos/init.sls @@ -0,0 +1,5 @@ +# -*- coding: utf-8 -*- +# vim: ft=sls + +include: + - .install diff --git a/salt/pkgrepo/macos/install.sls b/salt/pkgrepo/macos/install.sls new file mode 100644 index 0000000..55e3907 --- /dev/null +++ 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'] }} diff --git a/salt/pkgrepo/redhat/absent.sls b/salt/pkgrepo/redhat/absent.sls deleted file mode 120000 index 46623a6..0000000 --- a/salt/pkgrepo/redhat/absent.sls +++ /dev/null @@ -1 +0,0 @@ -clean.sls \ No newline at end of file diff --git a/salt/pkgrepo/redhat/absent.sls b/salt/pkgrepo/redhat/absent.sls new file mode 100644 index 0000000..1310b01 --- /dev/null +++ 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 diff --git a/salt/pkgrepo/suse/absent.sls b/salt/pkgrepo/suse/absent.sls deleted file mode 120000 index 46623a6..0000000 --- a/salt/pkgrepo/suse/absent.sls +++ /dev/null @@ -1 +0,0 @@ -clean.sls \ No newline at end of file diff --git a/salt/pkgrepo/suse/absent.sls b/salt/pkgrepo/suse/absent.sls new file mode 100644 index 0000000..09bc765 --- /dev/null +++ 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