From bad74e9c4c113a076f853f0c2792e33cde56009a Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Fri, 3 Apr 2020 23:01:42 -0700 Subject: Make this actually work in salt --- base/base.sls | 15 --------------- base/braswell.sls | 5 ----- base/init.sls | 17 +++++++++++++++++ base/macbook.sls | 5 ----- base/skylake.sls | 5 ----- base/top.sls | 12 ------------ 6 files changed, 17 insertions(+), 42 deletions(-) delete mode 100644 base/base.sls delete mode 100644 base/braswell.sls create mode 100644 base/init.sls delete mode 100644 base/macbook.sls delete mode 100644 base/skylake.sls delete mode 100644 base/top.sls (limited to 'base') diff --git a/base/base.sls b/base/base.sls deleted file mode 100644 index 7e9e837..0000000 --- a/base/base.sls +++ /dev/null @@ -1,15 +0,0 @@ -/etc: - file.recurse: - - source: salt://etc - - include_empty: True - -clean: - file.absent: - - names: - - /etc/portage/package.use/no-gles2 - - /etc/portage/package.use/no-cramfs - - /etc/portage/package.use/no-netifrc - - /etc/portage/package.keywords/jpeg - - /etc/portage/package.keywords/iptables - - /etc/portage/package.keywords/gnome-3.24 - - /etc/portage/package.use/audacious diff --git a/base/braswell.sls b/base/braswell.sls deleted file mode 100644 index a0c8329..0000000 --- a/base/braswell.sls +++ /dev/null @@ -1,5 +0,0 @@ -/etc/portage/savedconfig/sys-kernel: - file.recurse: - - source: salt://etc/portage/savedconfig/sys-kernel - - include_empty: True - - clean: True diff --git a/base/init.sls b/base/init.sls new file mode 100644 index 0000000..3333f12 --- /dev/null +++ b/base/init.sls @@ -0,0 +1,17 @@ +/etc/portage/package.accept_keywords/50-common: + file.recurse: + - source: salt://base/etc/portage/package.accept_keywords/50-common + - include_empty: True + - clean: True + +/etc/portage/package.use/50-common: + file.recurse: + - source: salt://base/etc/portage/package.use/50-common + - include_empty: True + - clean: True + +/etc/portage/package.mask/50-common: + file.recurse: + - source: salt://base/etc/portage/package.mask/50-common + - include_empty: True + - clean: True diff --git a/base/macbook.sls b/base/macbook.sls deleted file mode 100644 index a0c8329..0000000 --- a/base/macbook.sls +++ /dev/null @@ -1,5 +0,0 @@ -/etc/portage/savedconfig/sys-kernel: - file.recurse: - - source: salt://etc/portage/savedconfig/sys-kernel - - include_empty: True - - clean: True diff --git a/base/skylake.sls b/base/skylake.sls deleted file mode 100644 index a0c8329..0000000 --- a/base/skylake.sls +++ /dev/null @@ -1,5 +0,0 @@ -/etc/portage/savedconfig/sys-kernel: - file.recurse: - - source: salt://etc/portage/savedconfig/sys-kernel - - include_empty: True - - clean: True diff --git a/base/top.sls b/base/top.sls deleted file mode 100644 index f83ce05..0000000 --- a/base/top.sls +++ /dev/null @@ -1,12 +0,0 @@ -base: - '*.mattst88.com': - - base -braswell: - 'braswell.mattst88.com': - - braswell -macbook: - 'macbook.mattst88.com': - - macbook -skylake: - 'skl*.mattst88.com': - - skylake -- cgit v1.2.3