CHANGED: Mitigate Fedora issue by replacing file.managed source: in common.xterm

diff --git a/user_salt/common/xterm/files/Xresources b/user_salt/common/xterm/files/Xresources
deleted file mode 100644 (file)
index 6bf22c8..0000000
--- a/user_salt/common/xterm/files/Xresources
+++ /dev/null
@@ -1,7 +0,0 @@
-xterm*scrollBar: false
-xterm*background: black
-xterm*foreground: white
-xterm*selectToClipboard: true
-
-! if you do a double click on a ling, xterm now automatically selects the whole link
-xterm*charClass: 33:48,35-39:48,42-47:48,58-59:48,61:48,63:48,64:48,91-93:48,95:48,126:48

diff --git a/user_salt/common/xterm/init.sls b/user_salt/common/xterm/init.sls
index 270c2f1987e6919476802ff61dc900d8de5af9ee..7165afe40fe3110d832d58b96180911268c5b639 100644 (file)
--- a/user_salt/common/xterm/init.sls
+++ b/user_salt/common/xterm/init.sls
@@ -1,10 +1,18 @@
-/home/user/.Xresources:
+xterm--configure-xresources:
   file.managed:
-    - source: salt://common/xterm/files/Xresources
-    - mode: 0644
+    - name: /home/user/.Xresources
+    - contents: |
+        xterm*scrollBar: false
+        xterm*background: black
+        xterm*foreground: white
+        xterm*selectToClipboard: true
+        ! if you do a double click on a ling, xterm now automatically selects the whole link
+        xterm*charClass: 33:48,35-39:48,42-47:48,58-59:48,61:48,63:48,64:48,91-93:48,95:48,126:48
     - user: user
     - group: user
+    - mode: 644
 
-"xrdb -merge /home/user/.Xresources":
+xterm--configure-xresources-merge:
   cmd.run:
-    - user: user
+    - name: xrdb -merge /home/user/.Xresources
+    - runas: user

diff --git a/user_salt/common/xterm/xterm--configure.sls b/user_salt/common/xterm/xterm--configure.sls
deleted file mode 100644 (file)
index f15d94f..0000000
--- a/user_salt/common/xterm/xterm--configure.sls
+++ /dev/null
@@ -1,18 +0,0 @@
-xterm--configure-xresources:
-  file.managed:
-    - name: /home/user/.Xresources
-    - source: salt://xterm/files/Xresources
-    - user: user
-    - group: user
-    - mode: 644
-
-{% set users = salt['cmd.run']('getent passwd | grep /home | cut -d: -f1').splitlines() %}
-
-{% for user in users %}
-
-xterm--confgiure-xresources-merge:
-  cmd.run:
-    - name: xrdb -merge /home/{{ user }}/.Xresources
-    - user: {{ user }}
-
-{% endfor %}