diff --git a/seb4itik/byow/README.md b/seb4itik/byow/README.md index ed1b38b..d409080 100644 --- a/seb4itik/byow/README.md +++ b/seb4itik/byow/README.md @@ -112,7 +112,6 @@ Urgemment: - Connexion à consul, ACL consul - Active backend checks -- Correction de la collecte des logs via OVH LDP - Faire fonctionner le filtre dict2str via la collection Ansible Fonctionnalités à ajouter: diff --git a/seb4itik/byow/roles/caddy/templates/Caddyfile b/seb4itik/byow/roles/caddy/templates/Caddyfile index fb38895..7a144fd 100644 --- a/seb4itik/byow/roles/caddy/templates/Caddyfile +++ b/seb4itik/byow/roles/caddy/templates/Caddyfile @@ -40,9 +40,13 @@ {% endif %} log waf { - format json + format {{ site.log_format | default(caddy_sites_defaults.log_format) }} include "http.handlers.waf" +{% if site.log_to_file | default(caddy_sites_defaults.log_to_file) %} output file {{ caddy_log_dir }}/waf.log +{% else %} + output stdout +{% endif %} } } @@ -258,8 +262,13 @@ } log { - format json + format {{ site.log_format | default(caddy_sites_defaults.log_format) }} + level INFO +{% if site.log_to_file | default(caddy_sites_defaults.log_to_file) %} output file {{ caddy_log_dir }}/site_{{ site.id }}.log +{% else %} + output stdout +{% endif %} } } diff --git a/seb4itik/byow/roles/caddy/templates/caddy.service b/seb4itik/byow/roles/caddy/templates/caddy.service index 0f90130..5d8fb56 100644 --- a/seb4itik/byow/roles/caddy/templates/caddy.service +++ b/seb4itik/byow/roles/caddy/templates/caddy.service @@ -14,6 +14,9 @@ LimitNOFILE=1048576 PrivateTmp=true ProtectSystem=full AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE +StandardOutput=journal +StandardError=journal +SyslogIdentifier={{ caddy_my_name }} [Install] WantedBy=multi-user.target diff --git a/seb4itik/byow/roles/caddy/vars/main.yml b/seb4itik/byow/roles/caddy/vars/main.yml index d6031d7..cbb2c12 100644 --- a/seb4itik/byow/roles/caddy/vars/main.yml +++ b/seb4itik/byow/roles/caddy/vars/main.yml @@ -6,6 +6,11 @@ caddy_global_sites_defaults: site_redirect_from_aliases: true + # Log settings + log_to_file: false + log_format: "json" + + # Proxy settings proxy_lb_policy: "ip_hash" # random # random_choose