Added journal settings

README.rst

@@ -430,6 +430,18 @@ Systemd settings:
               DefaultLimitCPU: 2
               DefaultLimitNPROC: 4
 
+Systemd journal settings:
+
+.. code-block:: yaml
+
+    linux:
+      system:
+        ...
+        systemd:
+          journal:
+            SystemMaxUse: "50M"
+            RuntimeMaxFiles: "100"
+            
 Ensure presence of directory:
 
 .. code-block:: yaml

linux/files/journal.conf

@@ -0,0 +1,6 @@
+{%- from "linux/map.jinja" import system with context -%}
+#This file is managed by salt
+[Journal]
+{%- for option, value in settings.items() %}
+{{ option }}={{ value }}
+{%- endfor -%}

linux/system/journal.sls

@@ -0,0 +1,25 @@
+{%- from "linux/map.jinja" import system with context %}
+{%- if system.enabled and grains.get('init', None) == 'systemd' %}
+
+{%- if system.systemd.journal is defined %}
+
+linux_systemd_system_config:
+  file.managed:
+    - name: /etc/systemd/journald.conf.d/90-salt.conf
+    - source: salt://linux/files/journal.conf
+    - template: jinja
+    - makedirs: True
+    - defaults:
+        settings: {{ system.systemd.journal }}
+    - watch_in:
+      - module: linux_journal_systemd_reload
+
+linux_journal_systemd_reload:
+  module.wait:
+    - name: service.restart
+    - m_name: systemd-journald
+    - require:
+      - module: service.systemctl_reload
+
+{%- endif %}
+{%- endif %}

tests/pillar/system.sls

@@ -458,7 +458,6 @@ linux:
         - host1
         - host2
         - .local
-
     # pillars for netconsole setup
     netconsole:
       enabled: true