Merge branch 'master' of git.friedersdorff.com:max/saltfiles into master

diff --git a/states/conky/arch.sls b/states/conky/arch.sls
index d5da829227f03a8d23904af1b8a6632ddac3f81b..7c2f408b9016d078e72b5845b76ebf6cd08dc49f 100644 (file)
--- a/states/conky/arch.sls
+++ b/states/conky/arch.sls
@@ -1,3 +1,3 @@
 install conky:
   pkg.installed:
-    - name: conky-git
+    - name: conky

diff --git a/states/setup.sls b/states/setup.sls
index 137cda94a18a02f0eeebbf60940049490deeb379..364d569bbb50cf62ae7d173276af553f95f783d8 100644 (file)
--- a/states/setup.sls
+++ b/states/setup.sls
@@ -3,5 +3,4 @@ include:
   - ntp
   - pass
   - firefox
-  - glocker
   - utils