wip rsyslogd

stack/erp5/buildout.cfg

@@ -210,6 +210,7 @@ context =
     key template_balancer template-balancer:target
     key template_erp5 template-erp5:target
     key template_haproxy_cfg template-haproxy-cfg:target
+    key template_rsyslog_cfg template-rsyslogd-cfg:target
     key template_jupyter_cfg instance-jupyter-notebook:rendered
     key template_kumofs template-kumofs:target
     key template_mariadb template-mariadb:target
@@ -275,6 +276,9 @@ fontconfig-includes =
 [template-haproxy-cfg]
 <= download-base
 
+[template-rsyslogd-cfg]
+<= download-base
+
 [erp5-bin]
 <= erp5
 repository = https://lab.nexedi.com/nexedi/erp5-bin.git

stack/erp5/buildout.hash.cfg

@@ -90,8 +90,12 @@ md5sum = 2f3ddd328ac1c375e483ecb2ef5ffb57
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 2220ec6fadae05530b8322a19e82e7f1
+md5sum = 167130243df84ba3472679d09fd35ecb
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in
-md5sum = fec6a312e4ef84b02837742992aaf495
+md5sum = c48a0218fe213048f5f5001191c64b4b
+
+[template-rsyslogd-cfg]
+filename = rsyslogd.cfg.in
+md5sum = b31121d0b62978c5e109c358cf2c689b

stack/erp5/instance-balancer.cfg.in

@@ -207,28 +207,37 @@ wrapper-path = ${directory:services}/haproxy
 command-line = "{{ parameter_dict['haproxy'] }}/sbin/haproxy" -f "${haproxy-cfg:rendered}"
 hash-files = ${haproxy-cfg:rendered}
 
-
-[rsyslogd-config]
+[rsyslogd-cfg-parameter-dict]
 log-socket = ${directory:run}/log.sck
+; TODO: apache ?
 log-file = ${directory:log}/backend-haproxy.log
 pid-file = ${directory:run}/rsyslogd.pid
 spool-directory = ${directory:rsyslogd-spool}
 graceful-command = kill -HUP $(cat ${:pid-file})
-;caddy-log-directory = ${caddy-directory:slave-log}
 
-[rsyslogd-config-file]
+[rsyslogd-cfg]
 <= jinja2-template-base
-template = inline: $ TODO {software-release-path:template-backend-haproxy-rsyslogd-conf}
 rendered = ${directory:etc}/rsyslogd.conf
-extra-context =
-  section configuration rsyslogd-config
+context =
+  section parameter_dict rsyslogd-cfg-parameter-dict
+template = inline:
+  module(load="imuxsock" SysSock.Name="{{ parameter_dict['log-socket'] }}")
+  template(name="rawoutput" type="string" string="%msg:2:8192%\n")
+  $ActionFileDefaultTemplate rawoutput
+  $FileCreateMode 0600
+  $DirCreateMode 0700
+  $Umask 0022
+  $WorkDirectory {{ parameter_dict['spool-directory'] }}
+  *.* {{ parameter_dict['log-file'] }}
 
 [{{ section ('rsyslogd') }}]
 recipe = slapos.cookbook:wrapper
-command-line = {{ parameter_dict['rsyslogd'] }}/bin/rsyslogd -i ${rsyslogd-config:pid-file} -n -f ${rsyslogd-config-file:rendered}
+command-line = {{ parameter_dict['rsyslogd'] }}/sbin/rsyslogd -i ${rsyslogd-cfg-parameter-dict:pid-file} -n -f ${rsyslogd-cfg:rendered}
 wrapper-path = ${directory:services-on-watch}/rsyslogd
 ;hash-existing-files = ${buildout:directory}/software_release/buildout.cfg
-; TODO
+; TODO hash
+; TODO promise
+
 
 [apache-conf-ssl]
 cert = ${directory:apache-conf}/apache.crt

stack/erp5/rsyslogd.cfg.in

+module(
+  load="imuxsock"
+    SysSock.Name="{{ parameter_dict['log-socket'] }}")
+
+# Just simply output the raw line without any additional information, as
+# haproxy emits enough information by itself
+# Also cut out first empty space in msg, which is related to rsyslogd
+# internal and end up cutting on 8k, as it's default of $MaxMessageSize
+template(name="rawoutput" type="string" string="%msg:2:8192%\n")
+$ActionFileDefaultTemplate rawoutput
+
+$FileCreateMode 0600
+$DirCreateMode 0700
+$Umask 0022
+
+$WorkDirectory {{ parameter_dict['spool-directory'] }}
+
+*.* {{ parameter_dict['log-file'] }}