Allow configuring systemd-journald disk usage

basic-system/handlers/main.yml

@@ -4,6 +4,9 @@
 - name: restart rsyslogd
   service: name=rsyslog state=restarted
 
+- name: restart systemd-journald
+  systemd: name=systemd-journald.service state=restarted
+
 - name: configure journal directory
   command: systemd-tmpfiles --create --prefix /var/log/journal
 

basic-system/tasks/logging.yml

@@ -23,7 +23,7 @@
     - syslog
     - journal
 
-- name: ensure systemd journal is presistent
+- name: ensure systemd journal is persistent
   file:
     path: /var/log/journal
     state: directory
@@ -48,6 +48,26 @@
   tags:
     - syslog
 
+- name: create systemd-journald config directory
+  file:
+    path: /etc/systemd/journald.conf.d
+    state: directory
+    mode: '0755'
+  tags:
+    - config
+    - syslog
+
+- name: configure journal size limits
+  template:
+    src: size.conf.j2
+    dest: /etc/systemd/journald.conf.d/size.conf
+    mode: '0644'
+  notify: restart systemd-journald
+  tags:
+    - config
+    - syslog
+    - service
+
 - name: ensure rsyslog is running and enabled
   service:
     name: rsyslog

basic-system/templates/size.conf.j2

+[Journal]
+{% if systemd_journald is defined %}
+{% if systemd_journald.system_max_use is defined %}
+SystemMaxUse={{ systemd_journald.system_max_use }}
+{% endif %}
+{% if systemd_journald.system_keep_free is defined %}
+SystemKeepFree={{ systemd_journald.system_keep_free }}
+{% endif %}
+{% if systemd_journald.system_max_file_size is defined %}
+SystemMaxFileSize={{ systemd_journald.system_max_file_size }}
+{% endif %}
+{% if systemd_journald.system_max_files is defined %}
+SystemMaxFiles={{ systemd_journald.system_max_files }}
+{% endif %}
+{% endif %}