summaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2020-04-03 23:01:42 -0700
committerMatt Turner <mattst88@gmail.com>2020-04-04 11:29:04 -0700
commitbad74e9c4c113a076f853f0c2792e33cde56009a (patch)
tree67a21340a4d6a5b036c7ce4407ffd226b6c7a59f /base
parent82709b447e4f464761ae0d83152ac1908b09f173 (diff)
Make this actually work in salt
Diffstat (limited to 'base')
-rw-r--r--base/base.sls15
-rw-r--r--base/braswell.sls5
-rw-r--r--base/init.sls17
-rw-r--r--base/macbook.sls5
-rw-r--r--base/skylake.sls5
-rw-r--r--base/top.sls12
6 files changed, 17 insertions, 42 deletions
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