Merge pull request 'dev' (#16) from dev into main

Reviewed-on: #16
2026-02-12 16:24:52 +01:00
parent 4aee70b07a 7fe5e3f1e5
commit 1d22405d3b
37 changed files with 10221 additions and 371 deletions
--- a/example/ansible/inventory/groups.yml
+++ b/example/ansible/inventory/groups.yml
@@ -2,30 +2,6 @@ linux:
  vars:
    ansible_user: "root"

-debian13:
-  vars:
-    ansible_python_interpreter: "/usr/bin/python3.13"
-
-ubuntu24:
+ubuntu2404lts:
  vars:
    ansible_python_interpreter: "/usr/bin/python3.12"
-
-waf:
-  hosts:
-    waf1:
-    waf2:
-    waf3:
-
-mysql:
-  hosts:
-    sql1:
-
-nfs:
-  hosts:
-    nfs1:
-
-www:
-  hosts:
-    www1:
-    www2:
-    www3:
--- a/example/ansible/inventory/multipass.py
+++ b/example/ansible/inventory/multipass.py
@@ -0,0 +1,36 @@
+#!/usr/bin/env python3
+
+import sys
+import subprocess
+import json
+import re
+
+out = subprocess.run(["multipass", "list", "--format=json"], capture_output=True)
+if out.returncode != 0:
+    print(f"ERR executing multipass list: {out.returncode}")
+    sys.exit(out.returncode)
+
+instances = json.loads(out.stdout)
+ret = {
+    "_meta": {"hostvars": {}},
+    "linux": {"hosts": []}
+}
+
+for instance in instances['list']:
+    if instance['state'] != "Running":
+        continue
+
+    release = instance['release'].replace(' ', '').replace('.', '').lower()
+    if release not in ret:
+        ret[release] = {"hosts": []}
+
+    group = re.search('^[a-z]+', instance['name']).group()
+    if group not in ret:
+        ret[group] = {"hosts": []}
+
+    ret['_meta']['hostvars'][instance['name']] = {"ansible_host": instance['ipv4'][0] }
+    ret['linux']['hosts'].append(instance['name'])
+    ret[release]['hosts'].append(instance['name'])
+    ret[group]['hosts'].append(instance['name'])
+
+print(json.dumps(ret))
--- a/example/ansible/inventory/multipass.sh
+++ b/example/ansible/inventory/multipass.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-multipass list --format=json |jq '{
-  _meta: {hostvars: [.list[] | {(.name): {ansible_host: .ipv4[0]}}] | add},
-  linux: {hosts: [.list[].name]},
-  ubuntu24: {hosts: [.list[].name]},
-}'
--- a/example/ansible/play-config.yml
+++ b/example/ansible/play-config.yml
@@ -17,6 +17,11 @@
          - "DNS:{{ ansible_hostname }}"
          - "IP:{{ ansible_default_ipv4.address }}"
    caddy_config_only: true
+    caddy_consul: true
+    caddy_consul: true
+    caddy_consul_delegate_to: "waf1"
+    caddy_consul_admin_token: "{{ secrets.consul.bootstrap_secret }}"
+    caddy_consul_aes_key: "{{ secrets.caddy.storage_consul_aes_key }}"
    caddy_sites: "{{ common.sites }}"
  roles:
    - "local_ca_certs"
--- a/example/ansible/play-debug.yml
+++ b/example/ansible/play-debug.yml
@@ -6,6 +6,10 @@
  vars:
    caddy_debug: true
    caddy_config_only: true
+    caddy_consul: true
+    caddy_consul_delegate_to: "waf1"
+    caddy_consul_admin_token: "{{ secrets.consul.bootstrap_secret }}"
+    caddy_consul_aes_key: "{{ secrets.caddy.storage_consul_aes_key }}"
    caddy_sites: "{{ common.sites }}"
  roles:
    - "caddy"
--- a/example/ansible/play-main.yml
+++ b/example/ansible/play-main.yml
@@ -24,6 +24,20 @@
  tags:
    - "local_ca"

+- name: Proxy server
+  hosts: proxy
+  gather_facts: false
+  vars_files:
+    - "vars/common.yml"
+    - "vars/secrets.yml"
+  vars:
+    squid_authorized_networks:
+      - "{{ ansible_default_ipv4.network }}/24"
+  roles:
+    - "squid"
+  tags:
+    - "proxy"
+
 - name: Common
  hosts: all
  gather_facts: false
@@ -31,6 +45,7 @@
    - "vars/common.yml"
    - "vars/secrets.yml"
  vars:
+    common_proxy_server: "{{ hostvars['proxy1'].ansible_default_ipv4.address }}:3128"
    common_default_packages:
      - "net-tools"
      - "htop"
@@ -59,6 +74,8 @@
      - cn: "server.{{ common.consul.datacenter }}.{{ common.consul.domain }}"
        domains:
          - "DNS:server.{{ common.consul.datacenter }}.{{ common.consul.domain }}"
+          - "DNS:{{ ansible_fqdn }}"
+          - "DNS:{{ ansible_hostname }}"
      # Sites
      - cn: "test.lab"
        domains:
@@ -66,13 +83,16 @@
          - "DNS:{{ ansible_fqdn }}"
          - "DNS:{{ ansible_hostname }}"
          - "IP:{{ ansible_default_ipv4.address }}"
+    consul_server: true
    consul_domain: "{{ common.consul.domain }}"
    consul_datacenter: "{{ common.consul.datacenter }}"
+    consul_bootstrap_secret: "{{ secrets.consul.bootstrap_secret }}"
    consul_secret_key: "{{ secrets.consul.secret_key }}"
    consul_servers: ["waf1", "waf2", "waf3"]
-    consul_server: true
+    consul_ui_secret_id: "{{ secrets.consul.ui_secret }}"
    consul_services:
      - name: "www"
+        address: "{{ ansible_default_ipv4.address }}"
        port: 443
        check_http: "http://{{ ansible_default_ipv4.address }}:80/"
 #   keepalived_script_user: "byow"
@@ -98,21 +118,27 @@
    unbound_stub_zones:
      - name: "{{ common.consul.datacenter }}.{{ common.consul.domain }}"
        stub_to: "127.0.0.1@8600"
+    caddy_consul: true
+    caddy_consul_delegate_to: "waf1"
+    caddy_consul_admin_token: "{{ secrets.consul.bootstrap_secret }}"
+    caddy_consul_aes_key: "{{ secrets.caddy.storage_consul_aes_key }}"
+    caddy_consul_client_cert: "/etc/ssl/certs/server.lab.itik.fr.crt"
+    caddy_consul_client_key: "/etc/ssl/private/server.lab.itik.fr.key"
    caddy_sites: "{{ common.sites }}"
-    ovh_ldp_cluster: "gra2.logs.ovh.com"
-    ovh_ldp_token: "{{ secrets.ovh_ldp.token }}"
+#   ovh_ldp_cluster: "gra2.logs.ovh.com"
+#   ovh_ldp_token: "{{ secrets.ovh_ldp.token }}"
  roles:
    - "local_ca_certs"
    - "consul"
    - "caddy"
 #   - "keepalived"
    - "unbound"
-    - "ovh_ldp"
+#   - "ovh_ldp"
  tags:
    - "waf"

 - name: MySQL servers
-  hosts: mysql
+  hosts: bdd
  gather_facts: false
  vars_files:
    - "vars/common.yml"
@@ -136,22 +162,11 @@
        password: "{{ secrets.wordpress.mysql_password }}"
        priv: "wordpress.*:ALL"
        host: "{{ ansible_default_ipv4.network }}/255.255.255.0"
-    consul_domain: "{{ common.consul.domain }}"
-    consul_datacenter: "{{ common.consul.datacenter }}"
-    consul_secret_key: "{{ secrets.consul.secret_key }}"
-    consul_key_file: "/etc/ssl/private/{{ ansible_fqdn }}.key"
-    consul_cert_file: "/etc/ssl/certs/{{ ansible_fqdn }}.crt"
-    consul_servers: ["waf1", "waf2", "waf3"]
-    consul_services:
-      - name: "test-lab-mysql"
-        port: 3306
-        check_tcp: "{{ ansible_default_ipv4.address }}:3306"
  roles:
    - "local_ca_certs"
    - "mysql"
-    - "consul"
  tags:
-    - "mysql"
+    - "bdd"

 - name: NFS servers
  hosts: nfs
@@ -208,22 +223,11 @@
    wordpress_admin_email: "seb@itik.fr"
    wordpress_themes: ["twentytwentyfive"]
    wordpress_active_theme: "twentytwentyfive"
-    wordpress_db_host: "sql1"
+    wordpress_db_host: "bdd1"
    wordpress_db_pass: "{{ secrets.wordpress.mysql_password }}"
-    consul_domain: "{{ common.consul.domain }}"
-    consul_datacenter: "{{ common.consul.datacenter }}"
-    consul_secret_key: "{{ secrets.consul.secret_key }}"
-    consul_key_file: "/etc/ssl/private/{{ ansible_fqdn }}.key"
-    consul_cert_file: "/etc/ssl/certs/{{ ansible_fqdn }}.crt"
-    consul_servers: ["waf1", "waf2", "waf3"]
-    consul_services:
-      - name: "test-lab-www"
-        port: 80
-        check_http: "http://localhost:80/"
  roles:
    - "local_ca_certs"
    - "nfs_client"
    - "wordpress"
-    - "consul"
  tags:
    - "www"
--- a/example/ansible/vars/common.yml
+++ b/example/ansible/vars/common.yml
@@ -18,22 +18,28 @@ common:
            - "http://www1"
            - "http://www2"
            - "http://www3"
+      proxy_lb_policy: "random"
+      proxy_active_checks: true
+      proxy_active_checks_status: "301"
+      proxy_passive_checks: false
      custom_cert: true
      custom_cert_file: "/etc/ssl/certs/test.lab.crt"
      custom_cert_key_file: "/etc/ssl/private/test.lab.key"
-      filter_whitelist: ["10.60.117.1"]
+      rate_limit_events: 10
+      rate_limit_window: "1m"
+#     filter_whitelist: ["10.60.117.1"]
      crs_plugins:
        - "wordpress-rule-exclusions"
-      crs_exceptions:
+#     crs_exceptions:
      # Cf. https://github.com/owasp-modsecurity/ModSecurity/wiki/Reference-Manual-(v3.x)
 #       before_request:
 #         - 'SecRule REQUEST_FILENAME "@endsWith /wp-admin/admin-ajax.php" "id:1,nolog,ctl:ruleRemoveById=932260"'
-        after_response:
-          - 'SecRuleUpdateTargetById 932260 "!ARGS:tag-name"'
+#       after_response:
+#         - 'SecRuleUpdateTargetById 932260 "!ARGS:tag-name"'
      header_cross_origin_embedder_policy: "unsafe-none"
      header_content_security_policy:
        worker-src: "'self' blob:"
-        img-src: "'self' data: https://secure.gravatar.com/avatar/"
+        img-src: "'self' data: https://secure.gravatar.com/avatar/ https://s.w.org/images/"
        font-src: "'self' data:"
        script-src: "'self' 'unsafe-eval'"
        script-src-elem: "'self' 'unsafe-inline'"
--- a/example/tofu/cloud-init.yml
+++ b/example/tofu/cloud-init.yml
@@ -2,3 +2,5 @@ users:
  - name: "root"
    ssh_authorized_keys:
      - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOHAAcWecBuLe9gt/NLC5b3DCl68knbwCFcHrH9wPPTk seb@itik.fr"
+package_update: false
+package_upgrade: false
--- a/example/tofu/infra.auto.tfvars
+++ b/example/tofu/infra.auto.tfvars
@@ -1,8 +1,17 @@
 vms = {
-  waf1 = {},
-  waf2 = {},
-  waf3 = {},
-  sql1 = {},
+  proxy1 = {
+    disk = "20g"
+  },
+  waf1 = {
+    cpus = 4
+  },
+  waf2 = {
+    cpus = 4
+  },
+  waf3 = {
+    cpus = 4
+  },
+  bdd1 = {},
  nfs1 = {},
  www1 = {},
  www2 = {},
--- a/seb4itik/byow/README.md
+++ b/seb4itik/byow/README.md
@@ -72,8 +72,8 @@ Fonctionnalités déjà implémentées:
 - Déploiement et configuration avec une collection Ansible
 - Serveurs transient
 - VIP (avec Keepalived)
- DNS dynamique (via Nomad)
- Cluster via Nomad
+- DNS dynamique (via Consul)
+- Cluster via Consul
 - OWASP CRS
 - Multisite (avec configuration complète des CRS par site)
 - Alias avec redirection optionnelle vers nom canonique
@@ -105,19 +105,15 @@ Fonctionnalités déjà implémentées:
 - Collecte des logs via OVH LDP
 - Whitelist
 - Static files et FastCGI pour PHP (NON, par design !)
- Rate limit (non distribué)
+- Authorizations (NON, par design !)
 - CORS
-
-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
+- Rate limiting distribué

 Fonctionnalités à ajouter:

- Rate limiting distribué
+- version de crs-setup.conf en fonction de la version des OWASP CRS
+- option "api: true" for activating API default settings
+- Antivirus
 - Antibot par:
  - Cookie
  - Captcha
@@ -134,17 +130,24 @@ Fonctionnalités à ajouter:
  - (ip:danmeuk-tor-exit, ua:mitchellkrogza-bad-user-agents)
 - Client cache
 - Proxy cache
+- Random WAF signatures
 - Compression Brotli
 - Reverse scan
 - Robots.txt (DarkVisitors API/Community Lists/Custom URLs/Manual Rules)
 - Gestion des sessions
 - Bad behavior (via Caddy events ?)
 - Authentification
+  - cf. https://cheatsheetseries.owasp.org/cheatsheets/Authentication_Cheat_Sheet.html
+  - avec vérification force du mot de passe (cf. CdC Essor)
+  - avec test mot de passe moins un caractère
+  - avec test mot de passe comprommis
 - Anti DDoS
 - Greylist
+- HTML Sanitization
 - HTML injection
 - Metrics (Elasticsearch + Metabase)
 - Crowdsec
+- Stream support
 - Caddy as internal CA
 - https://raw.githubusercontent.com/mitchellkrogza/nginx-ultimate-bad-bot-blocker/master/_generator_lists/bad-user-agents.list 

@@ -157,6 +160,18 @@ Fonctionnalités à ajouter:
 - [Documentation AWOSP CRS](https://coreruleset.org/docs/)
 - https://github.com/owasp-modsecurity/ModSecurity/wiki/Reference-Manual-(v3.x)

+- (1) https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Headers_Cheat_Sheet.html
+- (2) https://cheatsheetseries.owasp.org/cheatsheets/HTTP_Strict_Transport_Security_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Clickjacking_Defense_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Content_Security_Policy_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Cookie_Theft_Mitigation_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Credential_Stuffing_Prevention_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Cross-Site_Request_Forgery_Prevention_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Cross_Site_Scripting_Prevention_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Denial_of_Service_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Injection_Prevention_Cheat_Sheet.html
+- https://cheatsheetseries.owasp.org/cheatsheets/Injection_Prevention_Cheat_Sheet.html
+

 ### Installation d'Ansible avec pipx

--- a/seb4itik/byow/plugins/filter/listadddel.py
+++ b/seb4itik/byow/plugins/filter/listadddel.py
@@ -0,0 +1,52 @@
+#!/usr/bin/python
+
+
+DOCUMENTATION = r"""
+  name: listadddel
+  short_description: This filter add and remove items to/from a list.
+  version_added: "0.2.2"
+  author: Sébastien Namèche (@seb4itik)
+  description:
+    - If my_list is ["un", "deux", "trois"], then:
+    - {{ my_list | listadddel(["quatre", "cinq"], ["un"]) }}
+    - will produce:
+    - ["deux", "trois", "quatre", "cinq"]
+  options:
+    _input:
+      description: A list of strings.
+      type: list
+      elements: str
+      required: true
+    add:
+      description: A list of string to add to _input.
+      type: list
+      elements: str
+      default: []
+    delete:
+      description: A list of string to remove from _input.
+      type: list
+      elements: str
+      default: []
+  notes:
+    - delete is tronger than add. If the string is present in both delete and
+      add, it will not be in returned list.
+"""
+
+
+RETURN = r"""
+  _value:
+    type: list
+      elements: str
+    description:
+      - List of strings with new and removed elements.
+"""
+
+
+class FilterModule(object):
+    def filters(self):
+        return {
+            'listadddel': self.listadddel
+        }
+    
+    def listadddel(self, l, add=[], delete=[]):
+        return [e for e in l+add if e not in delete]
--- a/seb4itik/byow/roles/caddy/defaults/main.yml
+++ b/seb4itik/byow/roles/caddy/defaults/main.yml
@@ -1,36 +1,59 @@
-# Defaults
-caddy_config_only: false
-caddy_debug: false
+# Several instances of the WAF can be deployed onto the same host if their
+# names are different and they bind to different ports/interfaces. These
+# instances may use different versions of Go, xcaddy, Caddy, and Coraza.
+caddy_my_name: "mywaf"
 caddy_http_port: 80
 caddy_https_port: 443
-caddy_default_bind: ""
+caddy_default_bind: null

-caddy_version: "2.10.2"
-caddy_go_version: "1.25.6"
-caddy_xcaddy_version: "0.4.5"
-caddy_coraza_caddy_version: "2.1.0"  # Coraza v3.3.3
-caddy_owasp_crs_versions: ["4.22.0"]
+# If true, will not install software, just deploy Caddy and OWASP CRS
+# configuration files.
+caddy_config_only: false

-caddy_my_name: "mywaf"
-caddy_system_user: "{{ caddy_my_name }}"
-caddy_system_group: "{{ caddy_my_name }}"
-caddy_home_dir: "/opt/{{ caddy_my_name }}"
-caddy_config_dir: "/etc/{{ caddy_my_name }}"
-caddy_log_dir: "/var/log/{{ caddy_my_name }}"
+# Debug will go to /var/log/<caddy_my_name>/debug.log.
+caddy_debug: false

-# Required for Let's Encrypt auto certificates
+# Required for Let's Encrypt auto certificates.
 caddy_email: null

-# If a custom CA root have to be used
+# If a custom CA root have to be used.
 caddy_ca_root: null

+# For using a Consul cluster.
+caddy_consul: false
+caddy_consul_server: "{{ ansible_fqdn }}:8501"
+caddy_consul_delegate_to: null         # Required, Consul host for running Consul commands
+caddy_consul_admin_token: null         # Required
+caddy_consul_aes_key: null             # Required, 32 characters
+caddy_consul_client_cert: null         # Required
+caddy_consul_client_key: null          # Required
+
+# Accound id and license key are required if a site use Geoip filtering.
 # See: https://dev.maxmind.com/geoip/updating-databases/
-caddy_geoip_account_id: null
+caddy_geoip_account_id: null    
 caddy_geoip_license_key: null
 caddy_geoip_edition_ids: "GeoLite2-ASN,GeoLite2-Country,GeoLite2-City"
 caddy_geoip_update_frequency: 86400   # In seconds

+# Sotware versions
+caddy_version: "2.10.2"
+caddy_go_version: "1.25.6"
+caddy_xcaddy_version: "0.4.5"
+caddy_coraza_caddy_version: "v2@v2.1.0"  # Coraza v3.3.3
+# Different sites can use different versions of OWASP CRS
+caddy_owasp_crs_versions: ["4.23.0"]

+# Paths
+caddy_binary: "/usr/local/bin/{{ caddy_my_name }}"
+caddy_system_user: "{{ caddy_my_name }}"
+caddy_system_group: "{{ caddy_my_name }}"
+caddy_home_dir: "/opt/{{ caddy_my_name }}"
+caddy_config_dir: "/etc/{{ caddy_my_name }}"
+caddy_crs_plugins_dir: "{{ caddy_config_dir }}/crs-plugins"
+caddy_sites_dir: "{{ caddy_config_dir }}/sites"
+caddy_log_dir: "/var/log/{{ caddy_my_name }}"
+
+# OWASP CRS plugins that will can be actived per site.
 # Cf.: https://github.com/coreruleset/plugin-registry
 caddy_crs_plugins:
  - name: "drupal-rule-exclusions"
@@ -52,15 +75,16 @@ caddy_crs_plugins:
    provider: "EsadCetiner"


-# For each site, mandatories parameters
+# Sites
 caddy_sites: []
-# - id: ""
-#   name: ""
-#   paths:
-#     - path: ""  (default "*")
-#       addrs:    (minimum 1 required)
-#         - ""
+# - id: ""            # Mandatory: short id for the site (for site specific directories and files)
+#   name: ""          # Mandatory: canonical domain name
+#   paths:            # Mandatory: targets for the reverse proxy
+#     - path: ""      # Optionnal: path of the request, default "*"
+#       addrs:        # Mandatory: upstreams
+#         - ""        # Mandatory: URL of the upstream, minimum 1 required


-# Will be merged with caddy_global_sites_defaults
+# For overriding default global parameters. Will be merged with
+# caddy_global_sites_defaults (in vars/main.yml).
 caddy_my_sites_defaults: {}
--- a/seb4itik/byow/roles/caddy/handlers/main.yml
+++ b/seb4itik/byow/roles/caddy/handlers/main.yml
@@ -1,8 +1,8 @@
+- name: Reload systemd
+  ansible.builtin.service:
+    daemon_reload: true
+
 - name: Restart Caddy
  ansible.builtin.service:
    name: "{{ caddy_my_name }}"
    state: "restarted"
-
-# - name: Update GeoIP databases
-#   ansible.builtin.command:
-#     cmd: "/usr/bin/geoipupdate"
--- a/seb4itik/byow/roles/caddy/tasks/caddy_config.yml
+++ b/seb4itik/byow/roles/caddy/tasks/caddy_config.yml
@@ -5,7 +5,7 @@
 - name: Create sites config directories
  loop: "{{ caddy_sites }}"
  ansible.builtin.file:
-    path: "{{ caddy_config_dir }}/sites/{{ item.id }}"
+    path: "{{ caddy_sites_dir }}/{{ item.id }}"
    state: "directory"
    group: "{{ caddy_system_group }}"
    mode: "0750"
@@ -16,7 +16,7 @@
    loop_var: "site"
  ansible.builtin.template:
    src: "templates/coraza.conf"
-    dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/coraza.conf"
+    dest: "{{ caddy_sites_dir }}/{{ site.id }}/coraza.conf"
    group: "{{ caddy_system_group }}"
    mode: "0640"
  notify:
@@ -28,7 +28,7 @@
    loop_var: "site"
  ansible.builtin.template:
    src: "templates/crs-setup.conf"
-    dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/crs-setup.conf"
+    dest: "{{ caddy_sites_dir }}/{{ site.id }}/crs-setup.conf"
    group: "{{ caddy_system_group }}"
    mode: "0640"
  notify:
@@ -40,7 +40,7 @@
    loop_var: "site"
  ansible.builtin.template:
    src: "templates/exclusions-request-before.conf"
-    dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/exclusions-request-before.conf"
+    dest: "{{ caddy_sites_dir }}/{{ site.id }}/exclusions-request-before.conf"
    group: "{{ caddy_system_group }}"
    mode: "0640"
  notify:
@@ -52,16 +52,7 @@
    loop_var: "site"
  ansible.builtin.template:
    src: "templates/exclusions-response-after.conf"
-    dest: "{{ caddy_config_dir }}/sites/{{ site.id }}/exclusions-response-after.conf"
-    group: "{{ caddy_system_group }}"
-    mode: "0640"
-  notify:
-    - "Restart Caddy"
-
- name: Generate Caddyfile
-  ansible.builtin.template:
-    src: "templates/Caddyfile"
-    dest: "{{ caddy_config_dir }}/Caddyfile"
+    dest: "{{ caddy_sites_dir }}/{{ site.id }}/exclusions-response-after.conf"
    group: "{{ caddy_system_group }}"
    mode: "0640"
  notify:
@@ -76,18 +67,17 @@
  notify:
    - "Restart Caddy"

-# - name: Generate GeoIP config file
-#   when: "caddy_geoip_account_id != None and caddy_geoip_license_key != None"
-#   ansible.builtin.template:
-#     src: "templates/GeoIP.conf"
-#     dest: "/etc/GeoIP.conf"
-#     mode: "0640"
-#   notify:
-#     - "Update GeoIP databases"
+- name: Generate Caddyfile
+  ansible.builtin.template:
+    src: "templates/Caddyfile"
+    dest: "{{ caddy_config_dir }}/Caddyfile"
+    group: "{{ caddy_system_group }}"
+    mode: "0640"
+  notify:
+    - "Restart Caddy"

 - name: Enable and start Caddy
  ansible.builtin.service:
    name: "{{ caddy_my_name }}"
    state: "started"
    enabled: true
-    daemon_reload: true
--- a/seb4itik/byow/roles/caddy/tasks/caddy_consul.yml
+++ b/seb4itik/byow/roles/caddy/tasks/caddy_consul.yml
@@ -0,0 +1,47 @@
+- name: Create consul policy for Caddy TLS and rate limit
+  delegate_to: "{{ caddy_consul_delegate_to }}"
+  run_once: true
+  community.general.consul_policy:
+    token: "{{ caddy_consul_admin_token }}"
+    name: "caddy"
+    rules: |
+      key_prefix "caddy-{{ caddy_my_name }}-tls" {
+        policy = "write"
+      }
+      key_prefix "caddy-{{ caddy_my_name }}-rl" {
+        policy = "write"
+      }
+      session_prefix "" {
+        policy = "write"
+      }
+      node_prefix "" {
+        policy = "read"
+      }
+      agent_prefix "" {
+        policy = "read"
+      }
+
+- name: Create/retrieve Consul Caddy accessor_id
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      if test -f /root/.consul_caddy_accessor_id; then
+        echo OK
+      else
+        uuidgen > /root/.consul_caddy_accessor_id
+        echo CHANGED
+      fi
+      cat /root/.consul_caddy_accessor_id
+  register: "consul_out_caddy_accessor_id"
+  changed_when: "consul_out_caddy_accessor_id.stdout_lines[0] == 'CHANGED'"
+
+- name: Create/retrieve consul token
+  delegate_to: "{{ caddy_consul_delegate_to }}"
+  community.general.consul_token:
+    token: "{{ caddy_consul_admin_token }}"
+    accessor_id: "{{ consul_out_caddy_accessor_id.stdout_lines[1] }}"
+    description: "Caddy {{ caddy_my_name }} {{ ansible_fqdn }}"
+    policies:
+      - name: "caddy"
+  register: "caddy_out_consul_token"
--- a/seb4itik/byow/roles/caddy/tasks/caddy_install.yml
+++ b/seb4itik/byow/roles/caddy/tasks/caddy_install.yml
@@ -4,7 +4,6 @@
      - "git"
      - "libnss3-tools"
      - "ssl-cert"
-#     - "geoipupdate"

 - name: Create Go directory
  ansible.builtin.file:
@@ -16,6 +15,9 @@
  ansible.builtin.unarchive:
    src: "https://go.dev/dl/go{{ caddy_go_version }}.linux-amd64.tar.gz"
    dest: "/usr/local/go-{{ caddy_go_version }}"
+    creates: "/usr/local/go-{{ caddy_go_version }}/bin/go"
+    extra_opts:
+      - "--strip-components=1"
    remote_src: true

 - name: Create xcaddy directory
@@ -28,6 +30,7 @@
  ansible.builtin.unarchive:
    src: "https://github.com/caddyserver/xcaddy/releases/download/v{{ caddy_xcaddy_version }}/xcaddy_{{ caddy_xcaddy_version }}_linux_amd64.tar.gz"
    dest: "/usr/local/xcaddy-{{ caddy_xcaddy_version }}"
+    creates: "/usr/local/xcaddy-{{ caddy_xcaddy_version }}/xcaddy"
    remote_src: true

 - name: Create Caddy build command
@@ -35,18 +38,18 @@
    caddy_build_command: >
      /usr/local/xcaddy-{{ caddy_xcaddy_version }}/xcaddy build v{{ caddy_version }}
      --with github.com/pteich/caddy-tlsconsul
-      --with github.com/corazawaf/coraza-caddy/v2@v{{ caddy_coraza_caddy_version }}
+      --with github.com/corazawaf/coraza-caddy/{{ caddy_coraza_caddy_version }}
      --with github.com/mholt/caddy-ratelimit
      --with github.com/steffenbusch/caddy-bot-barrier
      --with github.com/zhangjiayin/caddy-geoip2
-      --output /usr/local/bin/{{ caddy_my_name }}
+      --output {{ caddy_binary }}

 - name: Remember and test Caddy version
  ansible.builtin.copy:
-    dest: "/usr/local/bin/.caddy.build"
+    dest: "/usr/local/bin/.caddy.{{ caddy_my_name }}.build"
    content: >
-      XCADDY_WHICH_GO=/usr/local/go-{{ caddy_go_version }}/go/bin/go
-      {{ caddy_build_command }}"
+      XCADDY_WHICH_GO=/usr/local/go-{{ caddy_go_version }}/bin/go
+      {{ caddy_build_command }}
    mode: "0644"
  register: caddy_test_caddy_version

@@ -54,10 +57,10 @@
  # noqa: no-handler
  when: "caddy_test_caddy_version.changed"
  environment:
-    XCADDY_WHICH_GO: "/usr/local/go-{{ caddy_go_version }}/go/bin/go"
+    XCADDY_WHICH_GO: "/usr/local/go-{{ caddy_go_version }}/bin/go"
  ansible.builtin.command:
    cmd: "{{ caddy_build_command }}"
-    creates: "/usr/local/bin/{{ caddy_my_name }}"
+    creates: "{{ caddy_binary }}"
  notify:
    - "Restart Caddy"

@@ -73,39 +76,57 @@
    groups: ["ssl-cert"]
    password: "!"
    system: true
+    shell: "/usr/sbin/nologin"
    home: "{{ caddy_home_dir }}"

- name: Create Caddy config directories
+- name: Create Caddy directories
  ansible.builtin.file:
-    path: "{{ item }}"
+    path: "{{ item.path }}"
    state: "directory"
+    owner: "{{ item.owner | default('root') }}"
    group: "{{ caddy_system_group }}"
-    mode: "0750"
+    mode: "{{ item.mode | default('0750') }}"
  loop:
-    - "{{ caddy_config_dir }}"
-    - "{{ caddy_config_dir }}/crs-plugins"
-    - "{{ caddy_config_dir }}/sites"
-
- name: Create Caddy log dir
-  ansible.builtin.file:
-    path: "{{ caddy_log_dir }}"
-    state: "directory"
-    group: "{{ caddy_system_group }}"
-    mode: "0770"
+    - path: "{{ caddy_config_dir }}"
+    - path: "{{ caddy_crs_plugins_dir }}"
+    - path: "{{ caddy_sites_dir }}"
+    - path: "{{ caddy_log_dir }}"
+      mode: "0770"
+    - path: "{{ caddy_home_dir }}/geoip2"
+      owner: "{{ caddy_system_user }}"

 - name: Install OWASP CRS
  loop: "{{ caddy_owasp_crs_versions }}"
  ansible.builtin.unarchive:
    src: "https://github.com/coreruleset/coreruleset/archive/refs/tags/v{{ item }}.tar.gz"
    dest: "{{ caddy_config_dir }}"
+    creates: "{{ caddy_config_dir }}/coreruleset-{{ item }}/rules/"
    group: "{{ caddy_system_group }}"
    remote_src: true

 - name: Install plugins
  loop: "{{ caddy_crs_plugins }}"
-  loop_control:
-    loop_var: "plugin"
-  ansible.builtin.include_tasks: "plugin_install.yml"
+  ansible.builtin.unarchive:
+    src: "https://github.com/{{ item.provider | default('coreruleset') }}/{{ item.name }}-plugin/archive/refs/tags/v{{ item.version }}.tar.gz"
+    dest: "{{ caddy_crs_plugins_dir }}"
+    creates: "{{ caddy_crs_plugins_dir }}/{{ item.name }}-config.conf"
+    include:
+      - "*.conf"
+    extra_opts:
+      - "--strip-components=2"
+      - "--wildcards"
+    mode: "0644"
+    group: "{{ caddy_system_group }}"
+    remote_src: true
+
+- name: Create plugins after config
+  loop: "{{ caddy_crs_plugins }}"
+  when: "not(item.has_after_config | default(false))"
+  ansible.builtin.copy:
+    content: ""
+    dest: "{{ caddy_crs_plugins_dir }}/{{ item.name }}-after.conf"
+    mode: "0644"
+    group: "{{ caddy_system_group }}"

 - name: Deploy caddy service file
  ansible.builtin.template:
@@ -113,4 +134,5 @@
    dest: "/etc/systemd/system/{{ caddy_my_name }}.service"
    mode: "0644"
  notify:
+    - "Reload systemd"
    - "Restart Caddy"
--- a/seb4itik/byow/roles/caddy/tasks/main.yml
+++ b/seb4itik/byow/roles/caddy/tasks/main.yml
@@ -2,5 +2,9 @@
  when: "not(caddy_config_only)"
  ansible.builtin.include_tasks: "caddy_install.yml"

+- name: Configure Consul for Caddy
+  when: "caddy_consul"
+  ansible.builtin.include_tasks: "caddy_consul.yml"
+
 - name: Configure Caddy
  ansible.builtin.include_tasks: "caddy_config.yml"
--- a/seb4itik/byow/roles/caddy/tasks/plugin_install.yml
+++ b/seb4itik/byow/roles/caddy/tasks/plugin_install.yml
@@ -1,55 +0,0 @@
- name: Download plugin {{ plugin.name }}
-  ansible.builtin.get_url:
-    url: "https://github.com/{{ plugin.provider | default('coreruleset') }}/{{ plugin.name }}-plugin/archive/refs/tags/v{{ plugin.version }}.tar.gz"
-    dest: "/usr/local/src/"
-    mode: "0644"
-  register: "caddy_plugin_downloaded"
-
- name: Deploy plugin {{ plugin.name }}
-  # noqa: no-handler
-  when: "caddy_plugin_downloaded.changed"
-  block:
-
-    - name: Get temp dir {{ plugin.name }}
-      ansible.builtin.tempfile:
-        state: "directory"
-      register: "caddy_temp_plugin_dir"
-
-    - name: Unarchive plugin {{ plugin.name }}
-      ansible.builtin.unarchive:
-        src: "/usr/local/src/{{ plugin.name }}-plugin-{{ plugin.version }}.tar.gz"
-        dest: "{{ caddy_temp_plugin_dir.path }}"
-        remote_src: true
-
-    - name: Copy plugin files {{ plugin.name }}
-      ansible.builtin.copy:
-        src: "{{ caddy_temp_plugin_dir.path }}/{{ plugin.name }}-plugin-{{ plugin.version }}/plugins/"
-        dest: "{{ caddy_config_dir }}/crs-plugins/"
-        mode: "0644"
-#       directory_mode: "0750"
-        group: "{{ caddy_system_group }}"
-        remote_src: true
-      notify:
-        - "Restart Caddy"
-
-    - name: Create after config {{ plugin.name }}
-      when: "not(plugin.has_after_config | default(false))"
-      ansible.builtin.copy:
-        content: ""
-        dest: "{{ caddy_config_dir }}/crs-plugins/{{ plugin.name }}-after.conf"
-        mode: "0644"
-        group: "{{ caddy_system_group }}"
-
-    # FIXME: bad hack, why is it required?
-    - name: Adjust plugins diretory permissions
-      ansible.builtin.file:
-        path: "{{ caddy_config_dir }}/crs-plugins"
-        state: "directory"
-        group: "{{ caddy_system_group }}"
-        mode: "0750"
-
-    - name: Delete temp dir {{ plugin.name }}
-      when: "caddy_temp_plugin_dir.path is defined"
-      ansible.builtin.file:
-        path: "{{ caddy_temp_plugin_dir.path }}"
-        state: "absent"
--- a/seb4itik/byow/roles/caddy/templates/Caddyfile
+++ b/seb4itik/byow/roles/caddy/templates/Caddyfile
@@ -1,7 +1,7 @@
 {
  http_port {{ caddy_http_port }}
  https_port {{ caddy_https_port }}
-{% if caddy_default_bind != "" %}
+{% if caddy_default_bind != None %}
  default_bind {{ caddy_default_bind }}
 {% endif %}
  order geoip2_vars first
@@ -9,12 +9,25 @@
  admin off
  persist_config off

+{% if caddy_consul %}
+  storage consul {
+    address      "{{ caddy_consul_server }}"
+    token        "{{ caddy_out_consul_token.token.SecretID }}"
+    timeout      10
+    prefix       "caddy-{{ caddy_my_name }}-tls"
+    value_prefix "{{ caddy_my_name }}"
+    aes_key      "{{ caddy_consul_aes_key }}"
+    tls_enabled  "true"
+    tls_insecure "false"
+  }
+{% endif %}
+
 {% if caddy_geoip_account_id != None and caddy_geoip_license_key != None %}
  geoip2 {
    accountId         "{{ caddy_geoip_account_id }}"
    licenseKey        "{{ caddy_geoip_license_key }}"
-    databaseDirectory "{{ caddy_home_dir }}"
-    lockFile          "{{ caddy_home_dir }}/.geoip2.lock"
+    databaseDirectory "{{ caddy_home_dir }}/geoip2"
+    lockFile          "{{ caddy_home_dir }}/geoip2/.geoip2.lock"
    editionID         "{{ caddy_geoip_edition_ids }}"
    updateUrl         "https://updates.maxmind.com"
    updateFrequency   {{ caddy_geoip_update_frequency }}
@@ -40,39 +53,46 @@
 {% endif %}

  log waf {
-    format json
+    format {{ caddy_sites_defaults.log_format }}
    include "http.handlers.waf"
+    format append {
+      waf_id {{ caddy_my_name }}
+    }
+{% if caddy_sites_defaults.log_to_file %}
    output file {{ caddy_log_dir }}/waf.log
+{% else %}
+    output stdout
+{% endif %}
  }
 }

 # 0=origin, 1=methods, 2=headers, 3=allow credentials, 4=max age, 5=vary, 6=expose headers
 (cors) {
-  @match-cors-preflight-{args.0} {
-    header Origin {args.0}
+  @match-cors-preflight-{args[0]} {
+    header Origin {args[0]}
    method OPTIONS
  }
-  header @match-cors-preflight-{args.0} {
-    Access-Control-Allow-Origin "{args.0}"
-    Access-Control-Allow-Methods "{args.1}"
-    Access-Control-Allow-Headers "{args.2}"
-    Access-Control-Allow-Credentials "{args.3}"
-    Access-Control-Max-Age "{args.4}"
-    Vary "{args.5}"
+  header @match-cors-preflight-{args[0]} {
+    Access-Control-Allow-Origin "{args[0]}"
+    Access-Control-Allow-Methods "{args[1]}"
+    Access-Control-Allow-Headers "{args[2]}"
+    Access-Control-Allow-Credentials "{args[3]}"
+    Access-Control-Max-Age "{args[4]}"
+    Vary "{args[5]}"
  }
-  handle @match-cors-preflight-{args.0} {
+  handle @match-cors-preflight-{args[0]} {
    respond "" 204
  }

-  @match-cors-request-{args.0} {
-    header Origin {args.0}
+  @match-cors-request-{args[0]} {
+    header Origin {args[0]}
    not method OPTIONS
  }
-  header @match-cors-request-{args.0} {
-    >Access-Control-Allow-Origin "{args.0}"
-    >Access-Control-Allow-Credentials "{args.3}"
-    >Vary "{args.5}"
-    >Access-Control-Expose-Headers "{args.6}"
+  header @match-cors-request-{args[0]} {
+    >Access-Control-Allow-Origin "{args[0]}"
+    >Access-Control-Allow-Credentials "{args[3]}"
+    >Vary "{args[5]}"
+    >Access-Control-Expose-Headers "{args[6]}"
  }
 }

@@ -86,13 +106,10 @@
 {% for site in caddy_sites %}

 {% if (site.site_redirect_from_aliases | default(caddy_sites_defaults.site_redirect_from_aliases)) and (site.site_aliases | default([]) | length) > 0 %}
-
 {{ site.site_aliases | join(', ') }} {
  redir https://{{ site.name }}{uri}
 }
-
 {% else %}
-
 {% for alias in site.site_aliases | default(caddy_sites_defaults.site_aliases) %}
 {{ alias }},
 {% endfor %}
@@ -106,19 +123,27 @@
      to {{ path.addrs | join(' ') }}
      header_up X-Real-IP {remote}
      lb_policy {{ site.proxy_lb_policy | default(caddy_sites_defaults.proxy_lb_policy) }}
-      # Active checks
-#     health_uri /
-#     health_interval 10s
-#     health_timeout 5s
-#     health_status 200
-      # Passive checks
-      fail_duration 30s
-      max_fails 3
-      unhealthy_latency 2000ms
-      transport http {
-#       tls_server_name {host}
-#       tls_insecure_skip_verify
-      }
+
+{% if site.proxy_active_checks | default(caddy_sites_defaults.proxy_active_checks) %}
+      health_uri {{ site.proxy_active_checks_uri | default(caddy_sites_defaults.proxy_active_checks_uri) }}
+      health_port {{ site.proxy_active_checks_port | default(caddy_sites_defaults.proxy_active_checks_port) }}
+      health_interval {{ site.proxy_active_checks_interval | default(caddy_sites_defaults.proxy_active_checks_interval) }}
+      health_timeout {{ site.proxy_active_checks_timeout | default(caddy_sites_defaults.proxy_active_checks_timeout) }}
+      health_method {{ site.proxy_active_checks_method | default(caddy_sites_defaults.proxy_active_checks_method) }}
+      health_status {{ site.proxy_active_checks_status | default(caddy_sites_defaults.proxy_active_checks_status) }}
+{% if site.proxy_active_checks_body | default(caddy_sites_defaults.proxy_active_checks_body) != None %}
+      health_body {{ site.proxy_active_checks_body | default(caddy_sites_defaults.proxy_active_checks_body) }}
+{% endif %}
+{% endif %}
+{% if site.proxy_passive_checks | default(caddy_sites_defaults.proxy_passive_checks) %}
+      fail_duration {{ site.proxy_passive_checks_fail_duration | default(caddy_sites_defaults.proxy_passive_checks_fail_duration) }}
+      max_fails {{ site.proxy_passive_checks_max_fails | default(caddy_sites_defaults.proxy_passive_checks_max_fails) }}
+      unhealthy_status {{ site.proxy_passive_checks_unhealthy_status | default(caddy_sites_defaults.proxy_passive_checks_unhealthy_status) }}
+      unhealthy_latency {{ site.proxy_passive_checks_unhealthy_latency | default(caddy_sites_defaults.proxy_passive_checks_unhealthy_latency) }}
+{% if site.proxy_passive_checks_unhealthy_request_count | default(caddy_sites_defaults.proxy_passive_checks_unhealthy_request_count) != None %}
+      unhealthy_request_count {{ site.proxy_passive_checks_unhealthy_request_count | default(caddy_sites_defaults.proxy_passive_checks_unhealthy_request_count) }}
+{% endif %}
+{% endif %}
    }
  }
 {% endfor %}
@@ -180,7 +205,20 @@

 {% if site.rate_limit | default(caddy_sites_defaults.rate_limit) %}
  rate_limit @not_whitelisted {
-#   distributed
+{% if caddy_consul %}
+    distributed
+    storage consul {
+      address      "{{ caddy_consul_server }}"
+      token        "{{ caddy_out_consul_token.token.SecretID }}"
+      timeout      10
+      prefix       "caddy-{{ caddy_my_name }}-rl"
+      value_prefix "{{ caddy_my_name }}"
+      aes_key      "{{ caddy_consul_aes_key }}"
+      tls_enabled  "true"
+      tls_insecure "false"
+  }
+{%  endif %}
+    log_key
    zone remote_ip {
      key {remote.ip}
      events {{ site.rate_limit_events | default(caddy_sites_defaults.rate_limit_events) }}
@@ -193,17 +231,17 @@
  coraza_waf @not_whitelisted {
    load_owasp_crs
    directives `
-      Include "{{ caddy_config_dir }}/sites/{{ site.id }}/coraza.conf"
-      Include "{{ caddy_config_dir }}/sites/{{ site.id }}/crs-setup.conf"
+      Include "{{ caddy_sites_dir }}/{{ site.id }}/coraza.conf"
+      Include "{{ caddy_sites_dir }}/{{ site.id }}/crs-setup.conf"
 {% for plugin in site.crs_plugins | default(caddy_sites_defaults.crs_plugins) %}
-      Include "{{ caddy_config_dir }}/crs-plugins/{{ plugin }}-config.conf"
-      Include "{{ caddy_config_dir }}/crs-plugins/{{ plugin }}-before.conf"
+      Include "{{ caddy_crs_plugins_dir }}/{{ plugin }}-config.conf"
+      Include "{{ caddy_crs_plugins_dir }}/{{ plugin }}-before.conf"
 {% endfor %}
-      Include "{{ caddy_config_dir }}/sites/{{ site.id }}/exclusions-request-before.conf"
+      Include "{{ caddy_sites_dir }}/{{ site.id }}/exclusions-request-before.conf"
      Include "{{ caddy_config_dir }}/coreruleset-{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}/rules/*.conf"
-      Include "{{ caddy_config_dir }}/sites/{{ site.id }}/exclusions-response-after.conf"
+      Include "{{ caddy_sites_dir }}/{{ site.id }}/exclusions-response-after.conf"
 {% for plugin in site.crs_plugins | default(caddy_sites_defaults.crs_plugins) %}
-      Include "{{ caddy_config_dir }}/crs-plugins/{{ plugin }}-after.conf"
+      Include "{{ caddy_crs_plugins_dir }}/{{ plugin }}-after.conf"
 {% endfor %}
      SecRuleEngine On
    `
@@ -211,8 +249,14 @@
 {% endif %}

 {% if site.cors | default(caddy_sites_defaults.cors) %}
-{% for origin in site.cors_allow_origins | mandatory %}
-  import cors {{ origin }} "{{ site.cors_allow_methods | default(caddy_sites_defaults.cors_allow_methods) | join(', ') }}" "{{ site.cors_allow_headers | default(caddy_sites_defaults.cors_allow_headers) | join(', ') }}" "{{ site.cors_allow_credentials | default(caddy_sites_defaults.cors_allow_credentials) | ternary('true', 'false') }}" "{{ site.cors_max_age | default(caddy_sites_defaults.cors_max_age) }}" "{{ site.cors_vary | default(caddy_sites_defaults.cors_vary) | join(', ') }}" "{{ site.cors_expose_headers | default(caddy_sites_defaults.cors_expose_headers) | join(', ') }}"
+{% for origin in site.cors_allowed_origins | mandatory %}
+  import cors https://{{ origin }} "{{
+    site.cors_allowed_methods | default(caddy_sites_defaults.cors_allowed_methods) | listadddel(site.cors_allowed_methods_add | default([]), site.cors_allowed_methods_del | default([])) | join(', ') }}" "{{
+    site.cors_allowed_headers | default(caddy_sites_defaults.cors_allowed_headers) | listadddel(site.cors_allowed_headers_add | default([]), site.cors_allowed_headers_del | default([])) | join(', ') }}" "{{
+    site.cors_allowed_credentials | default(caddy_sites_defaults.cors_allowed_credentials) | ternary('true', 'false') }}" "{{
+    site.cors_max_age | default(caddy_sites_defaults.cors_max_age) }}" "{{
+    site.cors_vary | default(caddy_sites_defaults.cors_vary) | listadddel(site.cors_vary_add | default([]), site.cors_vary_del | default([]))  | join(', ') }}" "{{
+    site.cors_exposed_headers | default(caddy_sites_defaults.cors_exposed_headers) | listadddel(site.cors_exposed_headers_add | default([]), site.cors_exposed_headers_del | default([]))  | join(', ') }}"
 {% endfor %}
  import cors-deny
 {% endif %}
@@ -231,10 +275,9 @@

  header {
    Content-Security-Policy      "{{ caddy_sites_defaults.header_content_security_policy | combine(site.header_content_security_policy | default({})) | dict2str(sep1=' ', sep2='; ', sep3=';') }}"
-# FIXME
-#   Cross-Origin-Embedder-Policy "{{ site.header_cross_origin_embedder_policy | default(caddy_sites_defaults.header_cross_origin_embedder_policy) }}"
-#   Cross-Origin-Opener-Policy   "{{ site.header_cross_origin_opener_policy | default(caddy_sites_defaults.header_cross_origin_opener_policy) }}"
-#   Cross-Origin-Resource-Policy "{{ site.header_cross_origin_resource_policy | default(caddy_sites_defaults.header_cross_origin_resource_policy) }}"
+    Cross-Origin-Embedder-Policy "{{ site.header_cross_origin_embedder_policy | default(caddy_sites_defaults.header_cross_origin_embedder_policy) }}"
+    Cross-Origin-Opener-Policy   "{{ site.header_cross_origin_opener_policy | default(caddy_sites_defaults.header_cross_origin_opener_policy) }}"
+    Cross-Origin-Resource-Policy "{{ site.header_cross_origin_resource_policy | default(caddy_sites_defaults.header_cross_origin_resource_policy) }}"
    Feature-Policy               "{{ caddy_sites_defaults.header_feature_policy | combine(site.header_feature_policy | default({})) | dict2str(sep1=' ', sep2='; ', sep3=';') }}"
    Permissions-Policy           "{{ caddy_sites_defaults.header_permissions_policy | combine(site.header_permissions_policy | default({})) | dict2str(sep2=', ') }}"
    Referrer-Policy              "{{ site.header_referrer_policy | default(caddy_sites_defaults.header_referrer_policy) }}"
@@ -258,8 +301,16 @@
  }

  log {
-    format json
+    format {{ site.log_format | default(caddy_sites_defaults.log_format) }}
+    level INFO
+    format append {
+      waf_id {{ caddy_my_name }}
+    }
+{% 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 %}
  }
 }

--- a/seb4itik/byow/roles/caddy/templates/GeoIP.conf
+++ b/seb4itik/byow/roles/caddy/templates/GeoIP.conf
@@ -1,3 +0,0 @@
-AccountID {{ caddy_geoip_account_id }}
-LicenseKey {{ caddy_geoip_license_key }}
-EditionIDs {{ caddy_geoip_edition_ids }}
--- a/seb4itik/byow/roles/caddy/templates/caddy.service
+++ b/seb4itik/byow/roles/caddy/templates/caddy.service
@@ -1,19 +1,25 @@
 [Unit]
-Description=WAF {{ caddy_my_name }} (built with BYOW: Build Your Own WAF)
+Description=WAF ({{ caddy_my_name }}) (built with BYOW: Build Your Own WAF)
 After=network.target network-online.target
-Requires=network-online.target
+Requires=network-online.target{% if caddy_consul %} consul.service{% endif %}

 [Service]
 Type=notify
 User={{ caddy_system_user }}
 Group={{ caddy_system_group }}
-ExecStart=/usr/local/bin/{{ caddy_my_name }} run --environ --config {{ caddy_config_dir }}/Caddyfile
-ExecReload=/usr/local/bin/{{ caddy_my_name }} reload --config {{ caddy_config_dir }}/Caddyfile --force
+ExecStart={{ caddy_binary }} run --environ --config {{ caddy_config_dir }}/Caddyfile
+ExecReload={{ caddy_binary }} reload --config {{ caddy_config_dir }}/Caddyfile --force
 TimeoutStopSec=15s
 LimitNOFILE=1048576
 PrivateTmp=true
 ProtectSystem=full
 AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE
+StandardOutput=journal
+StandardError=journal
+SyslogIdentifier={{ caddy_my_name }}
+{% if caddy_consul %}
+Environment="CONSUL_CLIENT_CERT={{ caddy_consul_client_cert }}" "CONSUL_CLIENT_KEY={{ caddy_consul_client_key }}"
+{% endif %}

 [Install]
 WantedBy=multi-user.target
--- a/seb4itik/byow/roles/caddy/templates/coraza.conf
+++ b/seb4itik/byow/roles/caddy/templates/coraza.conf
@@ -1,4 +1,5 @@
 # -- Rule engine initialization ----------------------------------------------
+# See: https://coraza.io/docs/seclang/directives/

 # Enable Coraza, attaching it to every transaction. Use detection
 # only to start with, because that minimises the chances of post-installation
--- a/seb4itik/byow/roles/caddy/templates/crs-setup.conf
+++ b/seb4itik/byow/roles/caddy/templates/crs-setup.conf
@@ -112,7 +112,7 @@ SecAction \
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
    setvar:tx.enable_default_collections=1"

-## HTTP Policy Settings
+## Allowed HTTP methods
 SecAction \
    "id:900200,\
    phase:1,\
@@ -121,7 +121,17 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.allowed_methods={{ site.crs_allowed_methods | default(caddy_sites_defaults.crs_allowed_methods) | join(" ") }}'"
+    setvar:'tx.allowed_methods={{ site.crs_allowed_methods | default(caddy_sites_defaults.crs_allowed_methods) | listadddel(site.crs_allowed_methods_add | default([]), site.crs_allowed_methods_del | default([])) | join(" ") }}'"
+
+## HTTP Method Override Parameter
+SecAction \
+    "id:900210,\
+    phase:1,\
+    pass,\
+    nolog,\
+    tag:'OWASP_CRS',\
+    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
+    setvar:'tx.allow_method_override_parameter={{ site.crs_allow_method_override_parameter | default(caddy_sites_defaults.crs_allow_method_override_parameter) }}'"

 ## Content-Types that a client is allowed to send in a request
 SecAction \
@@ -132,7 +142,7 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.allowed_request_content_type={{ site.crs_allowed_request_content_type | default(caddy_sites_defaults.crs_allowed_request_content_type) | join(" ") }}'"
+    setvar:'tx.allowed_request_content_type={{ site.crs_allowed_request_content_type | default(caddy_sites_defaults.crs_allowed_request_content_type) | listadddel(site.crs_allowed_request_content_type_add | default([]), site.crs_allowed_request_content_type_del | default([])) | join(" ") }}'"

 ## Allowed HTTP versions
 SecAction \
@@ -143,7 +153,7 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.allowed_http_versions={{ site.crs_allowed_http_versions | default(caddy_sites_defaults.crs_allowed_http_versions) | join(" ") }}'"
+    setvar:'tx.allowed_http_versions={{ site.crs_allowed_http_versions | default(caddy_sites_defaults.crs_allowed_http_versions) | listadddel(site.crs_allowed_http_versions_add | default([]), site.crs_allowed_http_versions_del | default([])) | join(" ") }}'"

 ## Forbidden file extensions
 SecAction \
@@ -154,7 +164,7 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.restricted_extensions={{ site.crs_restricted_extensions | default(caddy_sites_defaults.crs_restricted_extensions) | join(" ") }}'"
+    setvar:'tx.restricted_extensions={{ site.crs_restricted_extensions | default(caddy_sites_defaults.crs_restricted_extensions) | listadddel(site.crs_restricted_extensions_add | default([]), site.crs_restricted_extensions_del | default([])) | join(" ") }}'"

 ## Restricted request headers
 SecAction \
@@ -165,7 +175,7 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.restricted_headers_basic={{ site.crs_restricted_headers_basic | default(caddy_sites_defaults.crs_restricted_headers_basic) | join(" ") }}'"
+    setvar:'tx.restricted_headers_basic={{ site.crs_restricted_headers_basic | default(caddy_sites_defaults.crs_restricted_headers_basic) | listadddel(site.restricted_headers_basic_add | default([]), site.restricted_headers_basic_del | default([])) | join(" ") }}'"

 ## Extended restricted request headers (forbidden at a higher paranoia level)
 SecAction \
@@ -176,7 +186,7 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.restricted_headers_extended={{ site.crs_restricted_headers_extended | default(caddy_sites_defaults.crs_restricted_headers_extended) | join(" ") }}'"
+    setvar:'tx.restricted_headers_extended={{ site.crs_restricted_headers_extended | default(caddy_sites_defaults.crs_restricted_headers_extended) | listadddel(site.restricted_headers_extended_add | default([]), site.restricted_headers_extended_del | default([])) | join(" ") }}'"

 ## Content-Types charsets that a client is allowed to send in a request
 SecAction \
@@ -187,7 +197,7 @@ SecAction \
    nolog,\
    tag:'OWASP_CRS',\
    ver:'OWASP_CRS/{{ site.crs_version | default(caddy_sites_defaults.crs_version) }}',\
-    setvar:'tx.allowed_request_content_type_charset={{ caddy_sites_defaults.crs_allowed_request_content_type_charset | default(caddy_sites_defaults.crs_allowed_request_content_type_charset) | join(" ") }}'"
+    setvar:'tx.allowed_request_content_type_charset={{ caddy_sites_defaults.crs_allowed_request_content_type_charset | default(caddy_sites_defaults.crs_allowed_request_content_type_charset) | listadddel(site.allowed_request_content_type_charset_add | default([]), site.allowed_request_content_type_charset_del | default([])) | join(" ") }}'"

 ## Block request if number of arguments is too high
 SecAction \
--- a/seb4itik/byow/roles/caddy/vars/main.yml
+++ b/seb4itik/byow/roles/caddy/vars/main.yml
@@ -5,8 +5,15 @@ caddy_global_sites_defaults:
  site_aliases: []
  site_redirect_from_aliases: true

+  # Log settings
+  # If log_to_file is true, logs will go:
+  # - for each site, in: /var/log/<caddy_my_name>/site_<site id>.log
+  # - for WAF logs (Coraza), in /var/log/<caddy_my_name>/waf.log
+  log_to_file: false
+  log_format: "json"

  # Proxy settings
+  # See: https://caddyserver.com/docs/caddyfile/directives/reverse_proxy#lb_policy
  proxy_lb_policy: "ip_hash"  # random
                              # random_choose <n>
                              # first
@@ -19,38 +26,67 @@ caddy_global_sites_defaults:
                              # query [key]
                              # header [field]
                              # cookie [<name> [<secret>]]
-  
+
+  # Upstreams active checks
+  # See: https://caddyserver.com/docs/caddyfile/directives/reverse_proxy#active-health-checks
+  proxy_active_checks: false
+  proxy_active_checks_uri: "/"
+  proxy_active_checks_port: 80
+  proxy_active_checks_interval: "30s"
+  proxy_active_checks_timeout: "5s"
+  proxy_active_checks_method: "GET"
+  proxy_active_checks_status: "2xx"
+  proxy_active_checks_body: null
+
+  # Upstreams passive checks
+  # See: https://caddyserver.com/docs/caddyfile/directives/reverse_proxy#passive-health-checks
+  proxy_passive_checks: false
+  proxy_passive_checks_fail_duration: "30s"
+  proxy_passive_checks_max_fails: 1
+  proxy_passive_checks_unhealthy_status: "5xx"
+  proxy_passive_checks_unhealthy_latency: "2000ms"
+  proxy_passive_checks_unhealthy_request_count: null

  # Filters
-  filter_blacklist: []   # Superseeds filter_whitelist
+  filter_blacklist: []        # Superseeds filter_whitelist
  filter_whitelist: ["127.0.0.1"]

-
  # Custom TLS certificate
  custom_cert: false
-  custom_cert_file: ""
-  custom_cert_key_file: ""
-
+  custom_cert_file: null      # Mandatory if custum_cert is true
+  custom_cert_key_file: null  # Mandatory if custum_cert is true

  # CORS - Cross Origin Resource Sharing
  cors: false
-  cors_allow_origins: null        # Mandatory
-  cors_allow_methods:
+  cors_allowed_origins: []    # Minimum 1 required
+  cors_allowed_methods:
+  # These variables can be used for adding and removing methods from the list:
+  # cors_allowed_methods_add: ["XXX"]
+  # cors_allowed_methods_del: ["YYY"]
    - "GET"
    - "HEAD"
    - "POST"
    - "OPTIONS"
-  cors_allow_headers:
+  cors_allowed_headers:
+  # These variables can be used for adding and removing headers from the list:
+  # cors_allowed_headers_add: ["Xxx"]
+  # cors_allowed_headers_del: ["Yyy"]
    - "Cache-Control"
    - "Content-Type"
    - "If-Modified-Since"
    - "Range"
    - "User-Agent"
  cors_max_age: 3600
-  cors_allow_credentials: false
+  cors_allowed_credentials: false
  cors_vary:
+  # These variables can be used for adding and removing headers from the list:
+  # cors_vary_add: ["Xxx"]
+  # cors_vary_del: ["Yyy"]
    - "Origin"
-  cors_expose_headers:
+  cors_exposed_headers:
+  # These variables can be used for adding and removing headers from the list:
+  # cors_exposed_headers_add: ["Xxx"]
+  # cors_exposed_headers_del: ["Yyy"]
    - "Content-Length"
    - "Content-Range"

@@ -235,20 +271,17 @@ caddy_global_sites_defaults:
    - name: "X-BYOW"
      value: "🍷"

-
  # caddy-ratelimit
  rate_limit: true
  rate_limit_events: 1000
  rate_limit_window: "1m"

-
  # steffenbusch/caddy-bot-barrier
  bot_barrier: false
-  bot_barrier_secret: null     # Required
+  bot_barrier_secret: null    # Required
  bot_barrier_complexity: 18
  bot_barrier_valid_for: "60m"

-
  # corazawaf/coraza-caddy
  crs: true
  crs_version: "4.22.0"
@@ -257,7 +290,7 @@ caddy_global_sites_defaults:
  crs_exceptions:
    before_request: []
    after_response: []
-  crs_paranoia_level: 1
+  crs_paranoia_level: 4
  crs_detection_paranoia_level: null
  crs_enforce_bodyproc_urlencoded: 1
  crs_critical_anomaly_score: 5
@@ -274,21 +307,29 @@ caddy_global_sites_defaults:
  crs_max_file_size: 10485760        # 10 Mo
  crs_combined_file_sizes: 20970520  # 20 Mo
  crs_sampling_percentage: 100
+  crs_allow_method_override_parameter: 0
  crs_allowed_methods:
+  # These variables can be used for adding and removing methods from the list:
+  # crs_allowed_methods_add: ["XXX"]
+  # crs_allowed_methods_del: ["YYY"]
    - "GET"
    - "HEAD"
    - "POST"
    - "OPTIONS"
  crs_allowed_request_content_type:
-    - "|application/csp-report|"
+  # These variables can be used for adding and removing content types from the list:
+  # crs_allowed_request_content_type_add: ["|xxx/yyy|"]
+  # crs_allowed_request_content_type_del: ["|zzz/aaa|"]
    - "|application/json|"
-    - "|application/reports+json|"
    - "|application/soap+xml|"
    - "|application/x-www-form-urlencoded|"
    - "|application/xml|"
    - "|multipart/form-data|"
    - "|text/xml|"
  crs_restricted_extensions:
+  # These variables can be used for adding and removing extensions from the list:
+  # crs_restricted_extensions_add: [".xxx/"]
+  # crs_restricted_extensions_del: [".yyy/"]
    - ".ani/"
    - ".asa/"
    - ".asax/"
@@ -332,6 +373,7 @@ caddy_global_sites_defaults:
    - ".inc/"
    - ".inf/"
    - ".ini/"
+    - ".jks/"
    - ".jse/"
    - ".key/"
    - ".licx/"
@@ -364,9 +406,12 @@ caddy_global_sites_defaults:
    - ".sql/"
    - ".sqlite/"
    - ".sqlite3/"
+    - ".swap/"
+    - ".swo/"
    - ".swp/"
    - ".sys/"
    - ".temp/"
+    - ".tfstate/"
    - ".tlb/"
    - ".tmp/"
    - ".vb/"
@@ -383,6 +428,9 @@ caddy_global_sites_defaults:
    - ".xsd/"
    - ".xsx/"
  crs_restricted_headers_basic:
+  # These variables can be used for adding and removing headers from the list:
+  # crs_restricted_headers_basic_add: ["/xxx/"]
+  # crs_restricted_headers_basic_del: ["/yyy/"]
    - "/content-encoding/"
    - "/content-range/"
    - "/expect/"
@@ -394,8 +442,14 @@ caddy_global_sites_defaults:
    - "/x-method-override/"
    - "/x-middleware-subrequest/"
  crs_restricted_headers_extended:
+  # These variables can be used for adding and removing headers from the list:
+  # crs_restricted_headers_extended_add: ["/xxx/"]
+  # crs_restricted_headers_extended_del: ["/yyy/"]
    - "/accept-charset/"
  crs_allowed_http_versions:
+  # These variables can be used for adding and removing protocols from the list:
+  # crs_allowed_http_versions_add: ["HTTP/x.x"]
+  # crs_allowed_http_versions_del: ["HTTP/y.y"]
    - "HTTP/1.0"
    - "HTTP/1.1"
    - "HTTP/2"
@@ -403,12 +457,14 @@ caddy_global_sites_defaults:
    - "HTTP/3"
    - "HTTP/3.0"
  crs_allowed_request_content_type_charset:
+  # These variables can be used for adding and removing charsets from the list:
+  # crs_allowed_request_content_type_charset_add: ["|xxx|"]
+  # crs_allowed_request_content_type_charset_del: ["|yyy|"]
    - "|utf-8|"
    - "|iso-8859-1|"
    - "|iso-8859-15|"
    - "|windows-1252|"

-
  # github.com/zhangjiayin/caddy-geoip2
  geoip: false
  geoip_debug: false
--- a/seb4itik/byow/roles/consul/defaults/main.yml
+++ b/seb4itik/byow/roles/consul/defaults/main.yml
@@ -1,22 +1,34 @@
-# Required
-consul_datacenter: null
-consul_domain: null
-consul_secret_key: null
+# Required.
 consul_server: false
+consul_datacenter: null
+consul_secret_key: null           # Generate with "consul keygen"
 consul_servers: []

-# Required for registering services
-consul_services: []
+# Required if consul_server.
+consul_bootstrap_secret: null     # Generate with "uuidgen"

-# Defaults
-consul_version: "1.22.2"
-consul_key_file: "/etc/ssl/private/server.{{ consul_datacenter }}.{{ consul_domain }}.key"
-consul_cert_file: "/etc/ssl/certs/server.{{ consul_datacenter }}.{{ consul_domain }}.crt"
-consul_ca_file: "/etc/ssl/certs/local-ca.crt"
-consul_client_addr: "0.0.0.0"
+# Required for activating UI.
+consul_ui_secret_id: null         # Generate with "uuidgen"
+
+# Defaults.
+consul_domain: "consul"
+consul_version: "1.22.3"
+consul_client_addr: "127.0.0.1"
 consul_bind_addr: "{{ ansible_default_ipv4.address }}"
-consul_advertise_addr: "{{ ansible_default_ipv4.address }}"
 consul_default_check_interval: "15s"
 consul_default_check_timeout: "2s"

-consul_acl_bootstraped: false
+# Attributes for certificate must be:
+# cn: server.<consul_datacenter>.<consul_domain>
+# SANs: DNS:server.<consul_datacenter>.<consul_domain>
+consul_key_file: "/etc/ssl/private/server.{{ consul_datacenter }}.{{ consul_domain }}.key"
+consul_cert_file: "/etc/ssl/certs/server.{{ consul_datacenter }}.{{ consul_domain }}.crt"
+consul_ca_file: "/etc/ssl/certs/local-ca.crt"
+
+# Required for registering services.
+consul_services: []
+# - name: "www"
+#   port: 443
+#   check_tcp: ""
+#   check_http: "http://{{ ansible_default_ipv4.address }}:80/"
+#   scheme: "" (default "http")
--- a/seb4itik/byow/roles/consul/handlers/main.yml
+++ b/seb4itik/byow/roles/consul/handlers/main.yml
@@ -1,5 +1,11 @@
- name: Restart Consul
+- name: Restart Consul - Restart service
+  listen: "Restart Consul"
  ansible.builtin.service:
    name: "consul"
    state: "restarted"
    daemon_reload: true
+
+- name: Restart Consul - Wait a little
+  listen: "Restart Consul"
+  ansible.builtin.wait_for:
+    timeout: 5
--- a/seb4itik/byow/roles/consul/tasks/main.yml
+++ b/seb4itik/byow/roles/consul/tasks/main.yml
@@ -3,13 +3,6 @@
    name:
      - "unzip"

- # Not required for Ubuntu 24, was a test for Debian 13
- name: Disable IPv6 on all interfaces
-  ansible.posix.sysctl:
-    name: "net.ipv6.conf.all.disable_ipv6"
-    value: "1"
-    sysctl_set: true
-
 - name: Create Consul directory
  ansible.builtin.file:
    path: "/usr/local/consul-{{ consul_version }}"
@@ -20,40 +13,34 @@
  ansible.builtin.unarchive:
    src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip"
    dest: "/usr/local/consul-{{ consul_version }}"
+    creates: "/usr/local/consul-{{ consul_version }}/consul"
    remote_src: true
  notify:
    - "Restart Consul"

- name: Link Consul
-  ansible.builtin.file:
-    src: "/usr/local/consul-{{ consul_version }}/consul"
-    dest: "/usr/local/bin/consul"
-    state: "link"
-  notify:
-    - "Restart Consul"
-
- name: Create consul system group
+- name: Create Consul system group
  ansible.builtin.group:
    name: "consul"
    system: true

- name: Create consul system user
+- name: Create Consul system user
  ansible.builtin.user:
    name: "consul"
    group: "consul"
    groups: ["ssl-cert"]
    password: "!"
    system: true
+    shell: "/usr/sbin/nologin"
    home: "/opt/consul"

- name: Create consul config directory
+- name: Create Consul config directory
  ansible.builtin.file:
    path: "/etc/consul"
    state: "directory"
    group: "consul"
    mode: "0750"

- name: Create consul log dir
+- name: Create Consul log dir
  ansible.builtin.file:
    path: "/var/log/consul"
    state: "directory"
@@ -84,35 +71,162 @@
    enabled: true
    daemon_reload: true

-# consul acl bootstrap -format=json
-# {
-#     "CreateIndex": 1042,
-#     "ModifyIndex": 1042,
-#     "AccessorID": "50f8bfb6-b259-4c08-f9aa-2dc0eeb08e99",
-#     "SecretID": "b7f16a8a-0b4f-4661-fea2-f79d95dd011b",
-#     "Description": "Bootstrap Token (Global Management)",
-#     "Policies": [
-#         {
-#             "ID": "00000000-0000-0000-0000-000000000001",
-#             "Name": "global-management"
-#         }
-#     ],
-#     "Local": false,
-#     "CreateTime": "2026-01-19T18:41:13.294800712+03:00",
-#     "Hash": "X2AgaFhnQGRhSSF/h0m6qpX1wj/HJWbyXcxkEM/5GrY="
-# }
+- name: Generate Consul ACL config
+  when: "consul_server"
+  ansible.builtin.template:
+    src: "templates/acl.json"
+    dest: "/etc/consul/acl.json"
+    group: "consul"
+    mode: "0640"
+  notify:
+    - "Restart Consul"
+
+- name: Running handlers for restarting Consul if required
+  ansible.builtin.meta: "flush_handlers"
+
+- name: Bootstrap Consul ACL system
+  when: "consul_server"
+  run_once: true
+  community.general.consul_acl_bootstrap:
+    bootstrap_secret: "{{ consul_bootstrap_secret }}"
+
+- name: Create/retrieve Consul node agent accessor_id
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      if test -f /root/.consul_agent_accessor_id; then
+        echo OK
+      else
+        uuidgen > /root/.consul_agent_accessor_id
+        echo CHANGED
+      fi
+      cat /root/.consul_agent_accessor_id
+  register: "consul_out_agent_accessor_id"
+  changed_when: "consul_out_agent_accessor_id.stdout_lines[0] == 'CHANGED'"
+
+- name: Create/retrieve Consul node agent token
+  community.general.consul_token:
+    token: "{{ consul_bootstrap_secret }}"
+    accessor_id: "{{ consul_out_agent_accessor_id.stdout_lines[1] }}"
+    description: "Node {{ ansible_fqdn }}"
+    node_identities:
+      - datacenter: "{{ consul_datacenter }}"
+        node_name: "{{ ansible_hostname }}"
+  register: "consul_out_agent_token"
+
+- name: Create Consul policy for DNS agent
+  when: "consul_server"
+  run_once: true
+  community.general.consul_policy:
+    token: "{{ consul_bootstrap_secret }}"
+    name: "dns-access"
+    rules: |
+      node_prefix "" {
+        policy = "read"
+      }
+      {% for service in consul_services %}
+      service "{{ service.name }}" {
+        policy = "read"
+      }
+      {% endfor %}
+
+- name: Create/retrieve Consul DNS agent accessor_id
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      if test -f /root/.consul_dns_accessor_id; then
+        echo OK
+      else
+        uuidgen > /root/.consul_dns_accessor_id
+        echo CHANGED
+      fi
+      cat /root/.consul_dns_accessor_id
+  register: "consul_out_dns_accessor_id"
+  changed_when: "consul_out_dns_accessor_id.stdout_lines[0] == 'CHANGED'"
+
+- name: Create/retrieve Consul DNS agent token
+  when: "consul_server"
+  community.general.consul_token:
+    token: "{{ consul_bootstrap_secret }}"
+    accessor_id: "{{ consul_out_dns_accessor_id.stdout_lines[1] }}"
+    description: "DNS {{ ansible_fqdn }}"
+    policies:
+      - name: "dns-access"
+  register: "consul_out_dns_token"
+
+- name: Generate Consul agent tokens config
+  ansible.builtin.template:
+    src: "templates/tokens.json"
+    dest: "/etc/consul/tokens.json"
+    group: "consul"
+    mode: "0640"
+  notify:
+    - "Restart Consul"
+
+- name: Running handlers for restarting Consul if required
+  ansible.builtin.meta: "flush_handlers"
+
+- name: Create Consul policy for UI
+  when: "consul_server and consul_ui_secret_id != None"
+  run_once: true
+  community.general.consul_policy:
+    token: "{{ consul_bootstrap_secret }}"
+    name: "ui-access"
+    rules: |
+      key_prefix "" {
+        policy = "write"
+      }
+      node_prefix "" {
+        policy = "read"
+      }
+      service_prefix "" {
+        policy = "read"
+      }
+
+- name: Create/retrieve Consul UI accessor_id
+  when: "consul_server and consul_ui_secret_id != None and consul_servers[0] == ansible_hostname"
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      if test -f /root/.consul_ui_accessor_id; then
+        echo OK
+      else
+        uuidgen > /root/.consul_ui_accessor_id
+        echo CHANGED
+      fi
+      cat /root/.consul_ui_accessor_id
+  register: "consul_out_ui_accessor_id"
+  changed_when: "consul_out_ui_accessor_id.stdout_lines[0] == 'CHANGED'"
+
+- name: Create/retrieve Consul UI token
+  when: "consul_server and consul_ui_secret_id != None and consul_servers[0] == ansible_hostname"
+  community.general.consul_token:
+    token: "{{ consul_bootstrap_secret }}"
+    accessor_id: "{{ consul_out_ui_accessor_id.stdout_lines[1] }}"
+    secret_id: "{{ consul_ui_secret_id }}"
+    description: "UI"
+    policies:
+      - name: "ui-access"

 - name: Register services to consul
  loop: "{{ consul_services }}"
  community.general.consul_agent_service:
+    token: "{{ consul_bootstrap_secret }}"
    name: "{{ item.name }}"
+    address: "{{ item.address | default(ansible_default_ipv4.address) }}"
    service_port: "{{ item.port }}"
    tags: "{{ item.tags | default([]) }}"
+  # Because community.general.consul_agent_check is not idempotent:
+  register: "consul_out_register_services"

 - name: Register HTTP checks to consul
  loop: "{{ consul_services }}"
-  when: "item.check_http | default(None) != None"
+  when: "consul_out_register_services.changed and (item.check_http | default(None) != None)"
  community.general.consul_agent_check:
+    token: "{{ consul_bootstrap_secret }}"
    name: "{{ item.name }}_check"
    service_id: "{{ item.name }}"
    interval: "{{ item.check_interval | default(consul_default_check_interval) }}"
@@ -122,8 +236,9 @@

 - name: Register TCP checks to consul
  loop: "{{ consul_services }}"
-  when: "item.check_tcp | default(None) != None"
+  when: "consul_out_register_services and (item.check_tcp | default(None) != None)"
  community.general.consul_agent_check:
+    token: "{{ consul_bootstrap_secret }}"
    name: "{{ item.name }}_check"
    service_id: "{{ item.name }}"
    interval: "{{ item.check_interval | default(consul_default_check_interval) }}"
--- a/seb4itik/byow/roles/consul/templates/acl.json
+++ b/seb4itik/byow/roles/consul/templates/acl.json
@@ -0,0 +1,9 @@
+{
+  "acl" : {
+    "enabled" : true,
+{% if consul_server %}
+    "default_policy" : "deny",
+{% endif %}
+    "down_policy" : "extend-cache"
+  }
+}
--- a/seb4itik/byow/roles/consul/templates/config.json
+++ b/seb4itik/byow/roles/consul/templates/config.json
@@ -1,28 +1,45 @@
 {
  "log_level": "INFO",
+  "enable_syslog": true,
+  "node_name": "{{ ansible_hostname }}",
  "domain": "{{ consul_domain }}",
  "datacenter": "{{ consul_datacenter | mandatory }}",
-  "key_file": "{{ consul_key_file }}",
-  "cert_file": "{{ consul_cert_file }}",
-  "ca_file": "{{ consul_ca_file }}",
-  "verify_incoming": true,
-  "verify_outgoing": true,
-  "verify_server_hostname": true,
  "encrypt": "{{ consul_secret_key }}",
  "data_dir": "/opt/consul",
+  "retry_join": ["{{ consul_servers | join('", "') }}"],
+  "disable_coordinates": true,
+  "disable_remote_exec": true,
+  "disable_update_check": true,
+  "tls": {
+    "defaults": {
+      "ca_file": "{{ consul_ca_file }}",
+      "cert_file": "{{ consul_cert_file }}",
+      "key_file": "{{ consul_key_file }}",
+      "verify_incoming": true,
+      "verify_outgoing": true
+    },
+    "internal_rpc": {
+      "verify_server_hostname": true
+    }
+  },
+  "addresses": {
+    "http": "127.0.0.1",
+    "https": "0.0.0.0"
+  },
+  "ports": {
+    "https": 8501
+  },
 {% if consul_server %}
-  "node_name": "{{ ansible_hostname }}",
  "server": true,
-  "ui": true,
  "leave_on_terminate": true,
-  "client_addr": "{{ consul_client_addr }}",
  "bind_addr": "{{ consul_bind_addr }}",
-  "advertise_addr": "{{ consul_advertise_addr }}",
-  "bootstrap_expect": {{ (consul_servers | length) - 1 }},
-  "enable_syslog": true,
+  "bootstrap_expect": {{ consul_servers | length }},
+  "ui_config": {
+    "enabled": {{ (consul_ui_secret_id != None) | ternary('true', 'false') }}
+  },
  "performance": {
    "raft_multiplier": 1
-  },
+  }
+{% else %}
 {% endif %}
-  "retry_join": ["{{ consul_servers | join('", "') }}"]
 }
--- a/seb4itik/byow/roles/consul/templates/consul.service
+++ b/seb4itik/byow/roles/consul/templates/consul.service
@@ -9,10 +9,10 @@ ConditionFileNotEmpty=/etc/consul/config.json
 Type=notify
 User=consul
 Group=consul
-ExecStart=/usr/local/bin/consul agent -config-file=/etc/consul/config.json
+ExecStart=/usr/local/consul-{{ consul_version }}/consul agent -config-file=/etc/consul/
 KillMode=process
 Restart=on-failure
 LimitNOFILE=65536

 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target
--- a/seb4itik/byow/roles/consul/templates/tokens.json
+++ b/seb4itik/byow/roles/consul/templates/tokens.json
@@ -0,0 +1,10 @@
+{
+  "acl" : {
+    "tokens": {
+{% if consul_server %}
+      "dns": "{{ consul_out_dns_token.token.SecretID }}",
+{% endif %}
+      "default": "{{ consul_out_agent_token.token.SecretID }}"
+    }
+  }
+}
--- a/seb4itik/byow/roles/ovh_ldp/defaults/main.yml
+++ b/seb4itik/byow/roles/ovh_ldp/defaults/main.yml
@@ -1,5 +1,5 @@
 # Required
-ovh_ldp_token: null
+ovh_ldp_token: null      # Jeton d'écriture
 ovh_ldp_cluster: null

 # Defaults
--- a/seb4itik/byow/roles/squid/defaults/main.yml
+++ b/seb4itik/byow/roles/squid/defaults/main.yml
@@ -0,0 +1,2 @@
+squid_authorized_networks: ["127.0.0.1"]
+squid_cache_size: 10240
--- a/seb4itik/byow/roles/squid/handlers/main.yml
+++ b/seb4itik/byow/roles/squid/handlers/main.yml
@@ -0,0 +1,4 @@
+- name: Restart squid
+  ansible.builtin.systemd:
+    name: "squid"
+    state: "restarted"
--- a/seb4itik/byow/roles/squid/tasks/main.yml
+++ b/seb4itik/byow/roles/squid/tasks/main.yml
@@ -0,0 +1,23 @@
+- name: Install squid package
+  ansible.builtin.apt:
+    name: "squid"
+  notify:
+    - "Restart squid"
+
+- name: Deploy squid configuration file
+  ansible.builtin.template:
+    src: "templates/squid.conf"
+    dest: "/etc/squid/squid.conf"
+    owner: "root"
+    group: "root"
+    mode: "0644"
+  notify:
+    - "Restart squid"
+
+- name: Enable squid
+  ansible.builtin.systemd:
+    name: "squid"
+    enabled: true
+    daemon_reload: true
+  notify:
+    - "Restart squid"
--- a/seb4itik/byow/roles/squid/templates/squid.conf
+++ b/seb4itik/byow/roles/squid/templates/squid.conf
--- a/seb4itik/byow/roles/unbound/templates/unbound.conf
+++ b/seb4itik/byow/roles/unbound/templates/unbound.conf
@@ -1,4 +1,12 @@
 server:
+  do-ip4: yes
+  do-ip6: no
+  do-udp: yes
+  do-tcp: yes
+  hide-identity: yes
+  hide-version: yes
+  harden-glue: yes
+  use-caps-for-id: yes
  do-not-query-localhost: no
 {% for interface in unbound_listen_interfaces %}
  interface: {{ interface }}
@@ -6,15 +14,18 @@ server:
 {% for access in unbound_access_control %}
  access-control: {{ access }}
 {% endfor %}
-{% for zone in unbound_stub_zones %}

+  # Consul ne supporte pas DNSSEC
+  # FIXME: domain-insecure: "consul"
+
+{% for zone in unbound_stub_zones %}
 stub-zone:
  name: "{{ zone.name }}"
  stub-addr: {{ zone.stub_to }}
  stub-no-cache: {{ zone.no_cache | default('yes') }}
 {% endfor %}
-{% for zone in unbound_forward_zones %}

+{% for zone in unbound_forward_zones %}
 forward-zone:
  name: "{{ zone.name }}"
  forward-addr: {{ zone.forward_to }}