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

diff --git a/user_salt/common/journald/files/journald.conf b/user_salt/common/journald/files/journald.conf
deleted file mode 100644 (file)
index 22da64f..0000000
--- a/user_salt/common/journald/files/journald.conf
+++ /dev/null
@@ -1,47 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU Lesser General Public License as published by the Free
-#  Software Foundation; either version 2.1 of the License, or (at your option)
-#  any later version.
-#
-# Entries in this file show the compile time defaults. Local configuration
-# should be created by either modifying this file, or by creating "drop-ins" in
-# the journald.conf.d/ subdirectory. The latter is generally recommended.
-# Defaults can be restored by simply deleting this file and all drop-ins.
-#
-# Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
-#
-# See journald.conf(5) for details.
-
-[Journal]
-Storage=none
-#Compress=yes
-#Seal=yes
-#SplitMode=uid
-#SyncIntervalSec=5m
-#RateLimitIntervalSec=30s
-#RateLimitBurst=10000
-#SystemMaxUse=
-#SystemKeepFree=
-#SystemMaxFileSize=
-#SystemMaxFiles=100
-#RuntimeMaxUse=
-#RuntimeKeepFree=
-#RuntimeMaxFileSize=
-#RuntimeMaxFiles=100
-#MaxRetentionSec=
-#MaxFileSec=1month
-#ForwardToSyslog=yes
-#ForwardToKMsg=no
-#ForwardToConsole=no
-#ForwardToWall=yes
-#TTYPath=/dev/console
-#MaxLevelStore=debug
-#MaxLevelSyslog=debug
-#MaxLevelKMsg=notice
-#MaxLevelConsole=info
-#MaxLevelWall=emerg
-#LineMax=48K
-#ReadKMsg=yes
-#Audit=no

diff --git a/user_salt/common/journald/journald--configure.sls b/user_salt/common/journald/journald--configure.sls
index 0e5a7c82994aec5ac1a4333b4f1dc48924f61bb3..23296fd6b5187b64569adac1d6accf2ee8ac411e 100644 (file)
--- a/user_salt/common/journald/journald--configure.sls
+++ b/user_salt/common/journald/journald--configure.sls
@@ -1,4 +1,51 @@
 journald--configure:
   file.managed:
     - name: /etc/systemd/journald.conf
-    - source: salt://common/journald/files/journald.conf
+    - contents: |
+        #  This file is part of systemd.
+        #
+        #  systemd is free software; you can redistribute it and/or modify it under the
+        #  terms of the GNU Lesser General Public License as published by the Free
+        #  Software Foundation; either version 2.1 of the License, or (at your option)
+        #  any later version.
+        #
+        # Entries in this file show the compile time defaults. Local configuration
+        # should be created by either modifying this file, or by creating "drop-ins" in
+        # the journald.conf.d/ subdirectory. The latter is generally recommended.
+        # Defaults can be restored by simply deleting this file and all drop-ins.
+        #
+        # Use 'systemd-analyze cat-config systemd/journald.conf' to display the full config.
+        #
+        # See journald.conf(5) for details.
+        
+        [Journal]
+        Storage=none
+        #Compress=yes
+        #Seal=yes
+        #SplitMode=uid
+        #SyncIntervalSec=5m
+        #RateLimitIntervalSec=30s
+        #RateLimitBurst=10000
+        #SystemMaxUse=
+        #SystemKeepFree=
+        #SystemMaxFileSize=
+        #SystemMaxFiles=100
+        #RuntimeMaxUse=
+        #RuntimeKeepFree=
+        #RuntimeMaxFileSize=
+        #RuntimeMaxFiles=100
+        #MaxRetentionSec=
+        #MaxFileSec=1month
+        #ForwardToSyslog=yes
+        #ForwardToKMsg=no
+        #ForwardToConsole=no
+        #ForwardToWall=yes
+        #TTYPath=/dev/console
+        #MaxLevelStore=debug
+        #MaxLevelSyslog=debug
+        #MaxLevelKMsg=notice
+        #MaxLevelConsole=info
+        #MaxLevelWall=emerg
+        #LineMax=48K
+        #ReadKMsg=yes
+        #Audit=no