opendev/system-config
Code Issues Proposed changes

Merge "Update gitea containers to use journald logging"

Browse Source
This commit is contained in:
Zuul 2024-12-16 20:38:50 +00:00 committed by Gerrit Code Review
commit a580810ee5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
playbooks/roles/gitea/templates/docker-compose.yaml.j2
View File

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

4
playbooks/roles/haproxy/templates/docker-compose.yaml.j2
View File

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