Merge pull request #1 from salt-formulas/master

Upstream merge

.travis.yml

@@ -26,18 +26,20 @@ install:
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
-  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=system
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=network
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=system
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=network
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=system
   - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=duo
+  - PLATFORM=netmanagers/salt-2019.2-py3:ubuntu-18.04 SUITE=network
+  # - PLATFORM=netmanagers/salt-2019.2-py3:ubuntu-18.04 SUITE=system
+  # - PLATFORM=netmanagers/salt-2019.2-py3:ubuntu-18.04 SUITE=duo 
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=network
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=system
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=network
   # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=system
-
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=system
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=network
 before_script:
   - set -o pipefail
   - make test | tail

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/auth/duo.sls

@@ -3,6 +3,8 @@
 package_duo:
   pkg.installed:
     - name: duo-unix
+    - skip_verify: True
+
 
 login_duo:
   file.managed:

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_journal_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|tojson }}
+    - 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 %}

linux/system/systemd.sls

@@ -1,5 +1,9 @@
 {%- from "linux/map.jinja" import system with context %}
 {%- if system.enabled and grains.get('init', None) == 'systemd' %}
+{%- if system.systemd.journal is defined %}
+include: 
+  - linux.system.journal
+{%- endif %}
 
 {%- if system.systemd.system is defined %}
 linux_systemd_system_config:

tests/pillar/system.sls

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