Merge "Update gitea containers to use journald logging"

playbooks/roles/gitea/templates/docker-compose.yaml.j2

@@ -17,7 +17,7 @@ services:
       - /var/gitea/db:/var/lib/mysql
       - /var/gitea/conf/99-max_conn_my.cnf:/etc/mysql/conf.d/99-max_conn_my.cnf:ro
     logging:
-      driver: syslog
+      driver: journald
       options:
         tag: "docker-mariadb"
   gitea-web:
@@ -39,7 +39,7 @@ services:
       - /var/gitea/logs:/logs
       - /var/gitea/certs:/certs
     logging:
-      driver: syslog
+      driver: journald
       options:
         tag: "docker-gitea"
   gitea-ssh:
@@ -56,6 +56,6 @@ services:
       - /var/gitea/conf:/custom/conf
       - /var/gitea/logs:/logs
     logging:
-      driver: syslog
+      driver: journald
       options:
         tag: "docker-gitea-ssh"

playbooks/roles/haproxy/templates/docker-compose.yaml.j2

@@ -39,7 +39,7 @@ services:
       - /var/haproxy/etc:/usr/local/etc/haproxy:ro
       - /var/haproxy/run:/var/haproxy/run
     logging:
-      driver: syslog
+      driver: journald
       options:
         tag: "docker-haproxy"
 
@@ -55,7 +55,7 @@ services:
       STATSD_HOST: graphite.opendev.org
       STATSD_PORT: 8125
     logging:
-      driver: syslog
+      driver: journald
       options:
         tag: "docker-haproxy-statsd"
 {% endif %}