caddy: improve readability

Reviewed-on: #16

.gitignore

@@ -1,5 +1,7 @@
-/notes/
+notes/
 .ansible/
 __pycache__/
 infra-*/
 .DS_Store
+/seb4itik/byow/roles/elastic/
+/seb4itik/byow/roles/metabase/

example/ansible/.gitignore

@@ -1,4 +1,3 @@
 /ca/
 /.vault_pass
 /ansible_local.env
-/known_hosts

example/ansible/ansible.cfg

@@ -5,4 +5,4 @@ vault_password_file = ./.vault_pass
 
 [ssh_connection]
 pipelining = True
-ssh_args = -o ControlMaster=auto -o ControlPersist=300s -o StrictHostKeyChecking=no -o UserKnownHostsFile=./known_hosts
+ssh_args = -o ControlMaster=auto -o ControlPersist=300s -o StrictHostKeyChecking=no

example/ansible/inventory/groups.yml

@@ -2,6 +2,39 @@ linux:
   vars:
     ansible_user: "root"
 
+debian13:
+  hosts:
+    bdd1:
+    nfs1:
+    waf1:
+#   waf2:
+#   waf3:
+    www1:
+    www2:
+    www3:
+#   www4:
+#   www5:
+  vars:
+    ansible_python_interpreter: "/usr/bin/python3.13"
+
+ubuntu2204lts:
+  vars:
+    ansible_python_interpreter: "/usr/bin/python3.10"
+
 ubuntu2404lts:
   vars:
     ansible_python_interpreter: "/usr/bin/python3.12"
+
+test1:
+  hosts:
+    www1:
+    www2:
+    www3:
+
+test2:
+  hosts:
+    www4:
+
+test3:
+  hosts:
+    www5:

example/ansible/play-config.yml

@@ -18,7 +18,6 @@
           - "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 }}"

example/ansible/play-debug.yml

@@ -4,8 +4,10 @@
     - "vars/common.yml"
     - "vars/secrets.yml"
   vars:
-    caddy_debug: true
     caddy_config_only: true
+    caddy_log_debug: true
+    caddy_crowdsec: true
+    caddy_crowdsec_api_key: "{{ secrets.crowdsec.lapi_key }}"
     caddy_consul: true
     caddy_consul_delegate_to: "waf1"
     caddy_consul_admin_token: "{{ secrets.consul.bootstrap_secret }}"

example/ansible/play-main.yml

@@ -45,7 +45,9 @@
     - "vars/common.yml"
     - "vars/secrets.yml"
   vars:
-    common_proxy_server: "{{ hostvars['proxy1'].ansible_default_ipv4.address }}:3128"
+#   common_proxy_server: "{{ hostvars['proxy1'].ansible_default_ipv4.address }}:3128"
+    common_search_domains:
+      - "multipass"
     common_default_packages:
       - "net-tools"
       - "htop"
@@ -77,9 +79,21 @@
           - "DNS:{{ ansible_fqdn }}"
           - "DNS:{{ ansible_hostname }}"
       # Sites
-      - cn: "test.lab"
+      - cn: "test1.lab"
         domains:
-          - "DNS:test.lab"
+          - "DNS:test1.lab"
+          - "DNS:{{ ansible_fqdn }}"
+          - "DNS:{{ ansible_hostname }}"
+          - "IP:{{ ansible_default_ipv4.address }}"
+      - cn: "test2.lab"
+        domains:
+          - "DNS:test2.lab"
+          - "DNS:{{ ansible_fqdn }}"
+          - "DNS:{{ ansible_hostname }}"
+          - "IP:{{ ansible_default_ipv4.address }}"
+      - cn: "test3.lab"
+        domains:
+          - "DNS:test3.lab"
           - "DNS:{{ ansible_fqdn }}"
           - "DNS:{{ ansible_hostname }}"
           - "IP:{{ ansible_default_ipv4.address }}"
@@ -118,6 +132,8 @@
     unbound_stub_zones:
       - name: "{{ common.consul.datacenter }}.{{ common.consul.domain }}"
         stub_to: "127.0.0.1@8600"
+    caddy_crowdsec: true
+    caddy_crowdsec_api_key: "{{ secrets.crowdsec.lapi_key }}"
     caddy_consul: true
     caddy_consul_delegate_to: "waf1"
     caddy_consul_admin_token: "{{ secrets.consul.bootstrap_secret }}"
@@ -130,6 +146,7 @@
   roles:
     - "local_ca_certs"
     - "consul"
+    - "crowdsec"
     - "caddy"
 #   - "keepalived"
     - "unbound"
@@ -144,17 +161,6 @@
     - "vars/common.yml"
     - "vars/secrets.yml"
   vars:
-    local_ca_certs_ca_passphrase: "{{ secrets.ca.passphrase }}"
-    local_ca_certs_default_country_name: "{{ common.certificates.country_name }}"
-    local_ca_certs_default_locality_name: "{{ common.certificates.locality_name }}"
-    local_ca_certs_default_organization_name: "{{ common.certificates.organization_name }}"
-    local_ca_certs_default_email_address: "{{ common.certificates.email_address }}"
-    local_ca_certs_list:
-      - cn: "{{ ansible_fqdn }}"
-        domains:
-          - "DNS:{{ ansible_fqdn }}"
-          - "DNS:{{ ansible_hostname }}"
-          - "IP:{{ ansible_default_ipv4.address }}"
     mysql_databases:
       - "wordpress"
     mysql_users:
@@ -163,7 +169,6 @@
         priv: "wordpress.*:ALL"
         host: "{{ ansible_default_ipv4.network }}/255.255.255.0"
   roles:
-    - "local_ca_certs"
     - "mysql"
   tags:
     - "bdd"
@@ -180,54 +185,98 @@
         owner: 1001
         group: 33
         clients:
-          - address: "www1"
+          - address: "www1.multipass"
             options: "rw,no_root_squash"
-          - address: "www2"
+          - address: "www2.multipass"
             options: "rw,no_root_squash"
-          - address: "www3"
+          - address: "www3.multipass"
             options: "rw,no_root_squash"
   roles:
     - "nfs_server"
   tags:
     - "nfs"
 
-- name: HTTP Servers
-  hosts: www
+- name: HTTP Servers (test1.lab)
+  hosts: test1
   gather_facts: false
   vars_files:
     - "vars/common.yml"
     - "vars/secrets.yml"
   vars:
-    local_ca_certs_ca_passphrase: "{{ secrets.ca.passphrase }}"
-    local_ca_certs_default_country_name: "{{ common.certificates.country_name }}"
-    local_ca_certs_default_locality_name: "{{ common.certificates.locality_name }}"
-    local_ca_certs_default_organization_name: "{{ common.certificates.organization_name }}"
-    local_ca_certs_default_email_address: "{{ common.certificates.email_address }}"
-    local_ca_certs_list:
-      - cn: "{{ ansible_fqdn }}"
-        domains:
-          - "DNS:{{ ansible_fqdn }}"
-          - "DNS:{{ ansible_hostname }}"
-          - "IP:{{ ansible_default_ipv4.address }}"
     nfs_client_mounts:
       - mount_point: "/var/www/wordpress"
-        server: "nfs1:/srv/wordpress"
+        server: "nfs1.multipass:/srv/wordpress"
         owner: 1001
         group: 33
     wordpress_create_master: "www1"
-    wordpress_site: "test.lab"
-    wordpress_url: "test.lab"
-    wordpress_site_title: "Lab Test"
-    wordpress_admin_user: "spock"
+    wordpress_site: "test1.lab"
+    wordpress_url: "test1.lab"
+    wordpress_site_title: "Lab Test I"
+    wordpress_admin_user: "spock1"
     wordpress_admin_password: "{{ secrets.wordpress.admin_password }}"
     wordpress_admin_email: "seb@itik.fr"
     wordpress_themes: ["twentytwentyfive"]
     wordpress_active_theme: "twentytwentyfive"
-    wordpress_db_host: "bdd1"
+    wordpress_db_host: "bdd1.multipass"
     wordpress_db_pass: "{{ secrets.wordpress.mysql_password }}"
   roles:
-    - "local_ca_certs"
     - "nfs_client"
     - "wordpress"
   tags:
-    - "www"
+    - "test1"
+
+- name: HTTP Server (test2.lab)
+  hosts: test2
+  gather_facts: false
+  vars_files:
+    - "vars/common.yml"
+    - "vars/secrets.yml"
+  vars:
+    mysql_databases:
+      - "wordpress"
+    mysql_users:
+      - name: "wordpress"
+        password: "{{ secrets.wordpress.mysql_password }}"
+        priv: "wordpress.*:ALL"
+    wordpress_site: "test2.lab"
+    wordpress_url: "test2.lab"
+    wordpress_site_title: "Lab Test II"
+    wordpress_admin_user: "spock2"
+    wordpress_admin_password: "{{ secrets.wordpress.admin_password }}"
+    wordpress_admin_email: "seb@itik.fr"
+    wordpress_themes: ["twentytwentyfive"]
+    wordpress_active_theme: "twentytwentyfive"
+    wordpress_db_pass: "{{ secrets.wordpress.mysql_password }}"
+  roles:
+    - "mysql"
+    - "wordpress"
+  tags:
+    - "test2"
+
+- name: HTTP Server (test3.lab)
+  hosts: test3
+  gather_facts: false
+  vars_files:
+    - "vars/common.yml"
+    - "vars/secrets.yml"
+  vars:
+    mysql_databases:
+      - "wordpress"
+    mysql_users:
+      - name: "wordpress"
+        password: "{{ secrets.wordpress.mysql_password }}"
+        priv: "wordpress.*:ALL"
+    wordpress_site: "test3.lab"
+    wordpress_url: "test3.lab"
+    wordpress_site_title: "Lab Test III"
+    wordpress_admin_user: "spock3"
+    wordpress_admin_password: "{{ secrets.wordpress.admin_password }}"
+    wordpress_admin_email: "seb@itik.fr"
+    wordpress_themes: ["twentytwentyfive"]
+    wordpress_active_theme: "twentytwentyfive"
+    wordpress_db_pass: "{{ secrets.wordpress.mysql_password }}"
+  roles:
+    - "mysql"
+    - "wordpress"
+  tags:
+    - "test3"

example/ansible/vars/common.yml

@@ -11,8 +11,9 @@ common:
     datacenter: "lab"
 
   sites:
-    - id: "test"
-      name: "test.lab"
+
+    - id: "test1"
+      name: "test1.lab"
       paths:
         - addrs:
             - "http://www1"
@@ -23,8 +24,8 @@ common:
       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"
+      custom_cert_file: "/etc/ssl/certs/test1.lab.crt"
+      custom_cert_key_file: "/etc/ssl/private/test1.lab.key"
       rate_limit_events: 10
       rate_limit_window: "1m"
 #     filter_whitelist: ["10.60.117.1"]
@@ -46,3 +47,45 @@ common:
         style-src-attr: "'self' 'unsafe-inline'"
         style-src-elem: "'self' 'unsafe-inline'"
         frame-src: "'self' blob:"
+
+    - id: "test2"
+      name: "test2.lab"
+      paths:
+        - addrs:
+            - "http://www4"
+      custom_cert: true
+      custom_cert_file: "/etc/ssl/certs/test2.lab.crt"
+      custom_cert_key_file: "/etc/ssl/private/test2.lab.key"
+      crs_plugins:
+        - "wordpress-rule-exclusions"
+      header_cross_origin_embedder_policy: "unsafe-none"
+      header_content_security_policy:
+        worker-src: "'self' blob:"
+        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'"
+        style-src-attr: "'self' 'unsafe-inline'"
+        style-src-elem: "'self' 'unsafe-inline'"
+        frame-src: "'self' blob:"
+
+    - id: "test3"
+      name: "test3.lab"
+      paths:
+        - addrs:
+            - "http://www4"
+      custom_cert: true
+      custom_cert_file: "/etc/ssl/certs/test3.lab.crt"
+      custom_cert_key_file: "/etc/ssl/private/test3.lab.key"
+      crs_plugins:
+        - "wordpress-rule-exclusions"
+      header_cross_origin_embedder_policy: "unsafe-none"
+      header_content_security_policy:
+        worker-src: "'self' blob:"
+        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'"
+        style-src-attr: "'self' 'unsafe-inline'"
+        style-src-elem: "'self' 'unsafe-inline'"
+        frame-src: "'self' blob:"

example/ansible/vars/secrets.yml

@@ -1,24 +1,33 @@
 $ANSIBLE_VAULT;1.1;AES256
-30356233646632316565363533613033376333306433626366623230633838356230363461383135
-3834363137353762316262363134643763353632306362640a613538306235633565356563613532
-64643862613431313666363130376338356538323035346532636331316637646235346236333331
-6336313466313434640a316437343866343061383838383362633638363633363535363330333463
-64616330333361643166663061306338616265316262646339663438306465623231336139653764
-63353862303538636636306430333464383339316233326133623564613337306266353730616564
-63366562626135626136663665353663323265346438346131363838383263663665653937393066
-32353061396661346138386561633734353634363164663438656331383663323035613264653265
-38646164633465363238623232393731633761393466326466653430316532633139636533613033
-39303764363861353666356239306366633662643865663033383235336663623632373566383330
-32363334653936393962633266666439623130616161373231313037343735616361303131383230
-62333863313432353536363962623161383434363136316264663061343038633065316232313334
-38653233356135623431343166356464666663636330373663303663326561363333633837303337
-66616464393661653835636665353439353539393530623730656331316235643032336337616436
-64373163373932653038613765633061306331363962333932383564333735353534646637303237
-62376561303364386662343331373631343166326261636362623432323437643735663437333564
-39323961626131616334323131393963323231626638393231326631306337306230666138323830
-63373331636234646431666332633633353637313338353536663539303531663938336132356134
-30323631646666396239323261366435656434623537343935393531633966643135633561633636
-31626266366432613936643937646537636164646334316562396639363132313862616433653535
-34666537653433663466323730373363363064393334386133366365383435616436623963626634
-31376162306565623262663732356463616464376231356432316137373138356466393663653035
-613336396164633836626637393036303336
+66313136343333353333666339316366663134303039333133376461333765383138663238376162
+3739613236313832623963346565393630636562356239640a613634643365653264373338393737
+64626435636131666132646566393735653364353764366139616533393135366662353564636666
+3139636566613065340a383931353561376339373730376633656537663435653764663139316665
+30666261313338656230323861633033323733346463326166323262613866323264663736633235
+66313334343963316261613137363439633938383134656164323963636665376534653963346534
+36383435323239666366653362373635306465316338303332656438333332623030333433643165
+39333432616666353539653766656363373365373335643238373336653433646536313666393163
+61653664626131343131376363316337373666396564646465333764353465393666636136646162
+34336364303139343864303766393963313135343531366131633731633234623133353631636234
+32626230393539343561393135386163363536376637376533356536356266613266613434396338
+34343364356364356262346161653962313336656433346132623437626332366336643034326532
+38346339333332303265353334386661353935623837633865373361313830613138613138323835
+34656535383664373039333734396564623662363330643332646535386533376265343863626632
+36636537393162373064323361376361306664363065633961363033313031313763613134353436
+63366434363137346263653966323239613164363634613235656364663037386537386335666431
+65363162623031633166613735393735333133626466313061396333306236393039383062326264
+38343464636330326162653036326663383631613836656461303462333035636335326135303766
+37323463666338323766393063633662343835393330326332616331373633663366393563303438
+37666162633461313333623934633138663930623135663638386634626430346264633735333532
+64623461613538343436306436626133383733393737393463306539383763663866346164306339
+64303335303539306632306164613761343035306632303063393233633262333264333431333363
+30373861636565363438346338376531346162303564653435373237636237366632323564646539
+37383361356362653132653961376134663930363763326437306338623064623862336435373664
+63393262323039616539626137396432613932633730316235396435396531366466616264393161
+62323339393039323235383663663265643065626137636562656335343233313734366166336264
+35633765316262633636323866633266653037326165646230326564323033613963316331346331
+32346265386164376361303532343730343139393837343162666238633366643361353332376137
+33633764323133316334323234353932363165636438656563353630373238376465643463656535
+30383337303861326433303137383539313536333465663063306137646264316438636665323263
+34383933666565333962363863313536653232363930306665336432373738353238666362353639
+37316136373639373233

example/tofu/infra.auto.tfvars

@@ -1,19 +1,27 @@
 vms = {
-  proxy1 = {
-    disk = "20g"
-  },
+# proxy1 = {
+#   disk = "20g"
+# },
   waf1 = {
     cpus = 4
   },
   waf2 = {
     cpus = 4
+    image = "22.04"
   },
   waf3 = {
     cpus  = 4
+    image = "24.04"
   },
   bdd1 = {},
   nfs1 = {},
   www1 = {},
   www2 = {},
   www3 = {},
+  www4 = {
+    image = "22.04"
+  },
+  www5 = {
+    image = "24.04"
+  },
 }

example/tofu/variables.tf

@@ -4,6 +4,6 @@ variable "vms" {
     cpus   = optional(number, 2),
     memory = optional(string, "3g"),
     disk   = optional(string, "12g"),
-    image  = optional(string, "24.04"),
+    image  = optional(string, "https://cloud.debian.org/images/cloud/trixie/latest/debian-13-generic-amd64.qcow2"),
   }))
 }

seb4itik/byow/galaxy.yml

@@ -1,6 +1,6 @@
 namespace: "seb4itik"
 name: "byow"
-version: "0.2.1"
+version: "0.3.1"
 readme: "README.md"
 authors:
 - "S. Namèche <sebastien@itik.fr>"

seb4itik/byow/roles/caddy/defaults/main.yml

@@ -6,45 +6,26 @@ caddy_http_port: 80
 caddy_https_port: 443
 caddy_default_bind: null
 
-# If true, will not install software, just deploy Caddy and OWASP CRS
+# Sotware versions
+caddy_go_version: "1.26.1"
+caddy_xcaddy_version: "0.4.5"
+caddy_version: "2.11.2"
+
+# If true, will not install software, just deploy Caddyfile and OWASP CRS
 # configuration files.
 caddy_config_only: false
 
-# Debug will go to /var/log/<caddy_my_name>/debug.log.
-caddy_debug: false
-
-# Required for Let's Encrypt auto certificates.
-caddy_email: null
-
-# 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_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"]
+# Log settings
+# If log_to_file is false, will log to journald.
+# If log_to_file is true, logs will go:
+# - for each site, in: /var/log/<caddy_my_name>/site_<sit.id>.log
+# - for WAF logs (Coraza), in /var/log/<caddy_my_name>/waf.log
+caddy_log_to_file: true
+caddy_log_format: "console"                # "console" or "json"
+caddy_log_debug: false                         # Debug will go to /var/log/<caddy_my_name>/debug.log
 
 # Paths
-caddy_binary: "/usr/local/bin/{{ caddy_my_name }}"
+caddy_binary: "/usr/local/sbin/caddy_{{ caddy_my_name }}"  # Should begin by "caddy" for CrowdSec
 caddy_system_user: "{{ caddy_my_name }}"
 caddy_system_group: "{{ caddy_my_name }}"
 caddy_home_dir: "/opt/{{ caddy_my_name }}"
@@ -53,9 +34,52 @@ 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.
+# Required for Let's Encrypt auto certificates.
+caddy_email: 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, CN must be "server.<consul datacenter>.<consul domain>"
+                                       # At least, SANs must include:
+                                       #   - "DNS:server.<consul datacenter>.<consul domain>"
+                                       #   - "DNS:<host FQDN>" 
+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: false    
+caddy_geoip_account_id: null           # Required
+caddy_geoip_license_key: null          # Required
+caddy_geoip_edition_ids: "GeoLite2-ASN,GeoLite2-Country,GeoLite2-City"
+caddy_geoip_update_frequency: 86400    # In seconds
+
+# CrowdSec
+caddy_crowdsec: false
+caddy_crowdsec_api_key: null           # Required
+caddy_crowdsec_api_url: "http://127.0.0.1:8080"
+caddy_crowdsec_ticker_interval: 15     # In seconds
+caddy_crowdsec_appsec_url: null        # "http://localhost:7422"
+caddy_crowdsec_streaming: true
+caddy_crowdsec_hard_fails: true
+
+# Rate Limit
+caddy_ratelimit: true
+
+# Bot barrier
+caddy_bot_barrier: false
+
+# Coraza
+caddy_coraza: true
+caddy_coraza_caddy_version: "v2@v2.2.0"  # Coraza v3.3.3
+# Different sites can use different versions of OWASP CRS
+caddy_coraza_crs_versions: ["4.24.1"]
+# OWASP CRS plugins that can be actived per site.
 # Cf.: https://github.com/coreruleset/plugin-registry
-caddy_crs_plugins:
+caddy_coraza_crs_plugins:
   - name: "drupal-rule-exclusions"
     version: "1.0.0"
   - name: "wordpress-rule-exclusions"
@@ -80,9 +104,11 @@ caddy_sites: []
 # - 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 "*"
+#     - path: "*"            # Optionnal: path of the request, default "*"
+#       strip_prefix: false  # Optionnal: default "false"
 #       addrs:               # Mandatory: upstreams
 #         - ""               # Mandatory: URL of the upstream, minimum 1 required
+#   ...                      # Site configuration directives (see caddy_global_sites_defaults in vars/main.yml)
 
 
 # For overriding default global parameters. Will be merged with

seb4itik/byow/roles/caddy/handlers/main.yml

@@ -6,3 +6,8 @@
   ansible.builtin.service:
     name: "{{ caddy_my_name }}"
     state: "restarted"
+
+- name: Restart Crowdsec Securiy Engine
+  ansible.builtin.systemd_service:
+    name: "crowdsec"
+    state: "restarted"

seb4itik/byow/roles/caddy/tasks/caddy_config.yml

@@ -2,7 +2,11 @@
   ansible.builtin.set_fact:
     caddy_sites_defaults: "{{ caddy_global_sites_defaults | combine(caddy_my_sites_defaults) }}"
 
-- name: Create sites config directories
+- name: Configure Caddy Coraza CRS
+  when: "caddy_coraza"
+  block:
+
+    - name: Create sites config directories
       loop: "{{ caddy_sites }}"
       ansible.builtin.file:
         path: "{{ caddy_sites_dir }}/{{ item.id }}"
@@ -10,7 +14,7 @@
         group: "{{ caddy_system_group }}"
         mode: "0750"
 
-- name: Generate sites coraza.conf config file
+    - name: Generate sites coraza.conf config file
       loop: "{{ caddy_sites }}"
       loop_control:
         loop_var: "site"
@@ -22,7 +26,7 @@
       notify:
         - "Restart Caddy"
 
-- name: Generate sites crs-setup config file
+    - name: Generate sites crs-setup config file
       loop: "{{ caddy_sites }}"
       loop_control:
         loop_var: "site"
@@ -34,7 +38,7 @@
       notify:
         - "Restart Caddy"
 
-- name: Generate sites exclusions before request file
+    - name: Generate sites exclusions before request file
       loop: "{{ caddy_sites }}"
       loop_control:
         loop_var: "site"
@@ -46,7 +50,7 @@
       notify:
         - "Restart Caddy"
 
-- name: Generate sites exclusions after response file
+    - name: Generate sites exclusions after response file
       loop: "{{ caddy_sites }}"
       loop_control:
         loop_var: "site"
@@ -58,7 +62,9 @@
       notify:
         - "Restart Caddy"
 
+# FIXME: Should per site
 - name: Copy bot barrier template
+  when: "caddy_bot_barrier"
   ansible.builtin.copy:
     src: "files/bot_barrier_template.html"
     dest: "{{ caddy_config_dir }}/bot_barrier_template.html"

seb4itik/byow/roles/caddy/tasks/caddy_crowdsec.yml

@@ -0,0 +1,19 @@
+- name: Get collections list
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      cscli collection list --output=json |jq -r '.collections[] |.name'
+  register: "crowdsec_out_list_collections"
+  changed_when: false
+
+- name: Install collections
+  loop:
+    - "crowdsecurity/caddy"
+    - "barnoux/caddy-coraza"
+  when: "item not in crowdsec_out_list_collections.stdout_lines"
+  ansible.builtin.command:
+    cmd: "cscli collections install {{ item }}"
+  changed_when: true
+  notify:
+    - "Restart Crowdsec Securiy Engine"

seb4itik/byow/roles/caddy/tasks/caddy_install.yml

@@ -4,6 +4,7 @@
       - "git"
       - "libnss3-tools"
       - "ssl-cert"
+      - "jq"
 
 - name: Create Go directory
   ansible.builtin.file:
@@ -37,16 +38,31 @@
   ansible.builtin.set_fact:
     caddy_build_command: >
       /usr/local/xcaddy-{{ caddy_xcaddy_version }}/xcaddy build v{{ caddy_version }}
-      --with github.com/pteich/caddy-tlsconsul
+      {% if caddy_coraza %}
       --with github.com/corazawaf/coraza-caddy/{{ caddy_coraza_caddy_version }}
+      {% endif %}
+      {% if caddy_ratelimit %}
       --with github.com/mholt/caddy-ratelimit
+      {% endif %}
+      {% if caddy_consul %}
+      --with github.com/pteich/caddy-tlsconsul
+      {% endif %}
+      {% if caddy_bot_barrier %}
       --with github.com/steffenbusch/caddy-bot-barrier
+      {% endif %}
+      {% if caddy_geoip %}
       --with github.com/zhangjiayin/caddy-geoip2
+      {% endif %}
+      {% if caddy_crowdsec %}
+      --with github.com/hslatman/caddy-crowdsec-bouncer/http
+      --with github.com/hslatman/caddy-crowdsec-bouncer/layer4
+      --with github.com/hslatman/caddy-crowdsec-bouncer/appsec
+      {% endif %}
       --output {{ caddy_binary }}
 
 - name: Remember and test Caddy version
   ansible.builtin.copy:
-    dest: "/usr/local/bin/.caddy.{{ caddy_my_name }}.build"
+    dest: "{{ caddy_binary }}.build"
     content: >
       XCADDY_WHICH_GO=/usr/local/go-{{ caddy_go_version }}/bin/go
       {{ caddy_build_command }}
@@ -60,7 +76,6 @@
     XCADDY_WHICH_GO: "/usr/local/go-{{ caddy_go_version }}/bin/go"
   ansible.builtin.command:
     cmd: "{{ caddy_build_command }}"
-    creates: "{{ caddy_binary }}"
   notify:
     - "Restart Caddy"
 
@@ -96,7 +111,8 @@
       owner: "{{ caddy_system_user }}"
 
 - name: Install OWASP CRS
-  loop: "{{ caddy_owasp_crs_versions }}"
+  when: "caddy_coraza"
+  loop: "{{ caddy_coraza_crs_versions }}"
   ansible.builtin.unarchive:
     src: "https://github.com/coreruleset/coreruleset/archive/refs/tags/v{{ item }}.tar.gz"
     dest: "{{ caddy_config_dir }}"
@@ -104,8 +120,9 @@
     group: "{{ caddy_system_group }}"
     remote_src: true
 
-- name: Install plugins
-  loop: "{{ caddy_crs_plugins }}"
+- name: Install CRS plugins
+  when: "caddy_coraza"
+  loop: "{{ caddy_coraza_crs_plugins }}"
   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 }}"
@@ -119,9 +136,9 @@
     group: "{{ caddy_system_group }}"
     remote_src: true
 
-- name: Create plugins after config
-  loop: "{{ caddy_crs_plugins }}"
-  when: "not(item.has_after_config | default(false))"
+- name: Create CRS plugins after config
+  loop: "{{ caddy_coraza_crs_plugins }}"
+  when: "caddy_coraza and not(item.has_after_config | default(false))"
   ansible.builtin.copy:
     content: ""
     dest: "{{ caddy_crs_plugins_dir }}/{{ item.name }}-after.conf"

seb4itik/byow/roles/caddy/tasks/main.yml

@@ -6,5 +6,9 @@
   when: "caddy_consul"
   ansible.builtin.include_tasks: "caddy_consul.yml"
 
+- name: Configure CrowdSec for Caddy
+  when: "caddy_crowdsec"
+  ansible.builtin.include_tasks: "caddy_crowdsec.yml"
+
 - name: Configure Caddy
   ansible.builtin.include_tasks: "caddy_config.yml"

seb4itik/byow/roles/caddy/templates/Caddyfile

@@ -1,31 +1,40 @@
 {
   http_port {{ caddy_http_port }}
   https_port {{ caddy_https_port }}
+  admin off
+  persist_config off
 {% if caddy_default_bind != None %}
   default_bind {{ caddy_default_bind }}
 {% endif %}
+{% if caddy_crowdsec %}
+  order crowdsec first
+{% endif %}
+{% if caddy_geoip %}
   order geoip2_vars first
+{% endif %}
+{% if caddy_coraza %}
   order coraza_waf first
-  admin off
-  persist_config off
+{% endif %}
 
 {% if caddy_consul %}
+  # See: https://github.com/pteich/caddy-tlsconsul
   storage consul {
     address      "{{ caddy_consul_server }}"
-    token        "{{ caddy_out_consul_token.token.SecretID }}"
+    token        "{{ caddy_out_consul_token.token.SecretID | mandatory }}"
     timeout      10
     prefix       "caddy-{{ caddy_my_name }}-tls"
     value_prefix "{{ caddy_my_name }}"
-    aes_key      "{{ caddy_consul_aes_key }}"
+    aes_key      "{{ caddy_consul_aes_key | mandatory }}"
     tls_enabled  "true"
     tls_insecure "false"
   }
 {% endif %}
 
-{% if caddy_geoip_account_id != None and caddy_geoip_license_key != None %}
+{% if caddy_geoip %}
+  # See: https://github.com/zhangjiayin/caddy-geoip2
   geoip2 {
-    accountId         "{{ caddy_geoip_account_id }}"
-    licenseKey        "{{ caddy_geoip_license_key }}"
+    accountId         "{{ caddy_geoip_account_id | mandatory }}"
+    licenseKey        "{{ caddy_geoip_license_key | mandatory }}"
     databaseDirectory "{{ caddy_home_dir }}/geoip2"
     lockFile          "{{ caddy_home_dir }}/geoip2/.geoip2.lock"
     editionID         "{{ caddy_geoip_edition_ids }}"
@@ -38,32 +47,49 @@
   email "{{ caddy_email }}"
 {% endif %}
 
-{% if caddy_ca_root | default(None) != None %}
-  tls {
-    ca_root "{{ caddy_ca_root }}"
-  }
-{% endif %}
-
-{% if caddy_debug %}
-  log {
-    format json
-    level DEBUG
-    output file {{ caddy_log_dir }}/debug.log
+{% if caddy_crowdsec %}
+  # See: https://github.com/hslatman/caddy-crowdsec-bouncer
+  crowdsec {
+    api_key {{ caddy_crowdsec_api_key | mandatory }}
+    api_url {{ caddy_crowdsec_api_url }}
+    ticker_interval {{ caddy_crowdsec_ticker_interval }}s
+{% if caddy_crowdsec_appsec_url != None %}
+    appsec_url {{ caddy_crowdsec_appsec_url }}
+{% endif %}
+{% if not caddy_crowdsec_streaming %}
+    disable_streaming
+{% endif %}
+{% if caddy_crowdsec_hard_fails %}
+    enable_hard_fails
+{% endif %}
   }
 {% endif %}
 
+{% if caddy_coraza %}
   log waf {
-    format {{ caddy_sites_defaults.log_format }}
     include "http.handlers.waf"
+    format {{ caddy_log_format }}
     format append {
       waf_id {{ caddy_my_name }}
     }
-{% if caddy_sites_defaults.log_to_file %}
+{% if caddy_log_to_file %}
     output file {{ caddy_log_dir }}/waf.log
 {% else %}
     output stdout
 {% endif %}
   }
+{% endif %}
+
+{% if caddy_log_debug %}
+  log {
+    level DEBUG
+    format {{ caddy_log_format }}
+    format append {
+      waf_id {{ caddy_my_name }}
+    }
+    output file {{ caddy_log_dir }}/debug.log
+  }
+{% endif %}
 }
 
 # 0=origin, 1=methods, 2=headers, 3=allow credentials, 4=max age, 5=vary, 6=expose headers
@@ -105,7 +131,7 @@
 
 {% 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 %}
+{% if (site.site_aliases_redirect | default(caddy_sites_defaults.site_aliases_redirect)) and (site.site_aliases | default([]) | length) > 0 %}
 {{ site.site_aliases | join(', ') }} {
   redir https://{{ site.name }}{uri}
 }
@@ -117,8 +143,12 @@
 {{ site.name }} {
   encode gzip zstd
 
+{% if caddy_crowdsec and site.crowdsec | default(caddy_sites_defaults.crowdsec) %}
+  crowdsec
+{% endif %}
+
 {% for path in site.paths %}
-  handle {{ path.path | default('*') }} {
+  handle{% if path.strip_prefix | default(false) %}_path{% endif %} {{ path.path | default('*') }} {
     reverse_proxy {
       to {{ path.addrs | join(' ') }}
       header_up X-Real-IP {remote}
@@ -161,7 +191,7 @@
   respond @blocked "Access Denied" 403
 {% endif %}
 
-{% if site.geoip | default(caddy_sites_defaults.geoip) %}
+{% if caddy_geoip and site.geoip | default(caddy_sites_defaults.geoip) %}
   geoip2_vars strict
   @geofilter expression {{ site.geoip_filter_expression | default(caddy_sites_defaults.geoip_filter_expression) }}
   respond @geofilter "Access Denied" 403
@@ -203,7 +233,8 @@
 {% endfor %}
   }
 
-{% if site.rate_limit | default(caddy_sites_defaults.rate_limit) %}
+{% if caddy_ratelimit and site.rate_limit | default(caddy_sites_defaults.rate_limit) %}
+  # See: https://github.com/mholt/caddy-ratelimit
   rate_limit @not_whitelisted {
 {% if caddy_consul %}
     distributed
@@ -227,7 +258,7 @@
   }
 {% endif %}
 
-{% if site.crs | default(caddy_sites_defaults.crs) %}
+{% if caddy_coraza and site.crs | default(caddy_sites_defaults.crs) %}
   coraza_waf @not_whitelisted {
     load_owasp_crs
     directives `
@@ -261,7 +292,8 @@
   import cors-deny
 {% endif %}
 
-{% if site.bot_barrier | default(caddy_sites_defaults.bot_barrier) %}
+{% if caddy_bot_barrier and site.bot_barrier | default(caddy_sites_defaults.bot_barrier) %}
+  # See: https://github.com/steffenbusch/caddy-bot-barrier
   bot_barrier @not_whitelisted {
      secret {{ site.bot_barrier_secret | default(caddy_sites_defaults.bot_barrier_secret) | mandatory }}
      complexity {{ site.bot_barrier_complexity | default(caddy_sites_defaults.bot_barrier_complexity) }}
@@ -273,6 +305,7 @@
   }
 {% endif %}
 
+{% if site.header | default(caddy_sites_defaults.header) %}
   header {
     Content-Security-Policy      "{{ caddy_sites_defaults.header_content_security_policy | combine(site.header_content_security_policy | default({})) | dict2str(sep1=' ', sep2='; ', sep3=';') }}"
     Cross-Origin-Embedder-Policy "{{ site.header_cross_origin_embedder_policy | default(caddy_sites_defaults.header_cross_origin_embedder_policy) }}"
@@ -294,6 +327,7 @@
     {{ header.name }}            "{{ header.value }}"
 {% endfor %}
   }
+{% endif %}
 
   handle_errors 403 {
     header X-Blocked "true"
@@ -301,12 +335,12 @@
   }
 
   log {
-    format {{ site.log_format | default(caddy_sites_defaults.log_format) }}
     level INFO
+    format {{ caddy_log_format }}
     format append {
       waf_id {{ caddy_my_name }}
     }
-{% if site.log_to_file | default(caddy_sites_defaults.log_to_file) %}
+{% if caddy_log_to_file %}
     output file {{ caddy_log_dir }}/site_{{ site.id }}.log
 {% else %}
     output stdout

seb4itik/byow/roles/caddy/vars/main.yml

@@ -1,16 +1,9 @@
 # Sites default parameter values
 caddy_global_sites_defaults:
 
-  # Site settings
+  # Site aliases
+  site_aliases_redirect: true
   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
@@ -90,6 +83,9 @@ caddy_global_sites_defaults:
     - "Content-Length"
     - "Content-Range"
 
+  # Security headers
+  header: true
+
   # Security headers
   header_content_security_policy:
 
@@ -272,19 +268,19 @@ caddy_global_sites_defaults:
       value: "🍷"
 
   # caddy-ratelimit
-  rate_limit: true
+  rate_limit: "{{ caddy_ratelimit }}"
   rate_limit_events: 1000
   rate_limit_window: "1m"
 
   # steffenbusch/caddy-bot-barrier
-  bot_barrier: false
+  bot_barrier: "{{ caddy_bot_barrier }}"
   bot_barrier_secret: null    # Required
   bot_barrier_complexity: 18
   bot_barrier_valid_for: "60m"
 
   # corazawaf/coraza-caddy
   crs: true
-  crs_version: "4.22.0"
+  crs_version: "4.24.1"
   crs_log_only: false
   crs_plugins: []
   crs_exceptions:
@@ -469,3 +465,5 @@ caddy_global_sites_defaults:
   geoip: false
   geoip_debug: false
   geoip_filter_expression: '{geoip2.country_code} == "UNK"'
+
+  crowdsec: "{{ caddy_crowdsec }}"

seb4itik/byow/roles/common/defaults/main.yml

@@ -1,2 +1,3 @@
+common_search_strings: []
 common_default_packages: []
 common_proxy_server: null

seb4itik/byow/roles/common/handlers/main.yml

@@ -0,0 +1,4 @@
+- name: Restart systemd-resolved
+  ansible.builtin.service:
+    name: "systemd-resolved"
+    state: "restarted"

seb4itik/byow/roles/common/tasks/main.yml

@@ -1,7 +1,11 @@
+- name: Setup hosts file
+  ansible.builtin.include_tasks: "setup_hosts.yml"
+
+- name: Setup resolved
+  ansible.builtin.include_tasks: "setup_resolved.yml"
+
 - name: Setup proxy client
-  when: "common_proxy_server != None"
   ansible.builtin.include_tasks: "setup_proxy_client.yml"
 
 - name: Setup packages
-  when: "common_default_packages | length > 0"
   ansible.builtin.include_tasks: "setup_packages.yml"

seb4itik/byow/roles/common/tasks/setup_hosts.yml

@@ -0,0 +1,25 @@
+- name: Check if /etc/cloud/cloud.cfg exists
+  ansible.builtin.stat:
+    path: "/etc/cloud/cloud.cfg"
+  register: common_out_cloud_cfg
+
+- name: Disable /etc/hosts management by cloud-init
+  when: "common_out_cloud_cfg.stat.exists"
+  block:
+    - name: Disable /etc/hosts management by cloud-init (manage_etc_hosts)
+      ansible.builtin.lineinfile:
+        path: "/etc/cloud/cloud.cfg"
+        search_string: 'manage_etc_hosts:'
+        line: "manage_etc_hosts: false"
+        insertafter: "preserve_hostname:"
+    - name: Disable /etc/hosts management by cloud-init (update_etc_hosts)
+      ansible.builtin.replace:
+        path: "/etc/cloud/cloud.cfg"
+        regexp: '^([^#]*update_etc_hosts.*)$'
+        replace: '# \\1'
+
+- name: Configure /etc/hosts file
+  ansible.builtin.template:
+    src: "templates/hosts"
+    dest: "/etc/hosts"
+    mode: "0644"

seb4itik/byow/roles/common/tasks/setup_packages.yml

@@ -4,6 +4,7 @@
     upgrade: "safe"
 
 - name: Install default packages
+  when: "common_default_packages | length > 0"
   ansible.builtin.apt:
     name: "{{ common_default_packages }}"
     autoclean: true

seb4itik/byow/roles/common/tasks/setup_proxy_client.yml

@@ -1,4 +1,5 @@
 - name: Create 00proxy.conf file
+  when: "common_proxy_server != None"
   ansible.builtin.template:
     src: "templates/apt_proxy.conf"
     dest: "/etc/apt/apt.conf.d/00proxy.conf"
@@ -7,6 +8,7 @@
     group: "root"
 
 - name: Add http_proxy and https_proxy variable to file /etc/environment
+  when: "common_proxy_server != None"
   ansible.builtin.lineinfile:
     path: "/etc/environment"
     regexp: '^{{ item.key }}='

seb4itik/byow/roles/common/tasks/setup_resolved.yml

@@ -0,0 +1,8 @@
+- name: Add multipass in search domains
+  when: "common_search_domains | length > 0"
+  ansible.builtin.lineinfile:
+    path: "/etc/systemd/resolved.conf"
+    search_string: 'Domains='
+    line: "Domains={{ common_search_domains | join(' ') }}"
+  notify:
+    - "Restart systemd-resolved"

seb4itik/byow/roles/common/templates/hosts

@@ -0,0 +1,9 @@
+127.0.0.1 localhost
+{{ ansible_default_ipv4.address }} {{ ansible_fqdn }} {{ ansible_hostname }}
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters

seb4itik/byow/roles/consul/tasks/main.yml

@@ -18,6 +18,12 @@
   notify:
     - "Restart Consul"
 
+- name: Link consul
+  ansible.builtin.file:
+    src: "/usr/local/consul-{{ consul_version }}/consul"
+    dest: "/usr/local/sbin/consul"
+    state: "link"
+
 - name: Create Consul system group
   ansible.builtin.group:
     name: "consul"

seb4itik/byow/roles/crowdsec/README.md

@@ -0,0 +1,5 @@
+# BYOW - Build Your Own WAF
+
+A WAF _à la carte_.
+
+## CrowdSec

seb4itik/byow/roles/crowdsec/defaults/main.yml

@@ -0,0 +1,4 @@
+crowdsec_collections: []
+crowdsec_bouncers: []
+# - name: <name>
+#   key: <LAPI key>

seb4itik/byow/roles/crowdsec/handlers/main.yml

@@ -0,0 +1,4 @@
+- name: Restart Crowdsec Securiy Engine
+  ansible.builtin.systemd_service:
+    name: "crowdsec"
+    state: "restarted"

seb4itik/byow/roles/crowdsec/tasks/main.yml

@@ -0,0 +1,71 @@
+# FIXME: cluster
+# FIXME: BdD PostgreSQL
+# FIXME: sudo cscli console enroll cmmszy92r000402l1kugvmw76
+# FIXME: AppSec
+
+- name: Add Crowdsec repository
+  ansible.builtin.deb822_repository:
+    name: "crowdsec"
+    uris: "https://packagecloud.io/crowdsec/crowdsec/any/"
+    suites: "any"
+    components: "main"
+    signed_by: "https://packagecloud.io/crowdsec/crowdsec/gpgkey"
+
+- name: Install Crowdsec Security Engine
+  ansible.builtin.apt:
+    name:
+      - "crowdsec"
+      - "jq"
+    update_cache: true
+  notify:
+    - "Restart Crowdsec Securiy Engine"
+
+- name: Configure Crowdsec
+  ansible.builtin.template:
+    src: "templates/config.yaml"
+    dest: "/etc/crowdsec/config.yaml"
+    mode: "0600"
+  notify:
+    - "Restart Crowdsec Securiy Engine"
+
+- name: Enable and start Crowdsec Securiy Engine
+  ansible.builtin.systemd_service:
+    name: "crowdsec"
+    state: "started"
+    enabled: true
+
+- name: Get collections list
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      cscli collection list --output=json |jq -r '.collections[] |.name'
+  register: "crowdsec_out_list_collections"
+  changed_when: false
+
+- name: Install collections
+  loop: "{{ crowdsec_collections }}"
+  when: "item not in crowdsec_out_list_collections.stdout_lines"
+  ansible.builtin.command:
+    cmd: "cscli collections install {{ item }}"
+  changed_when: true
+  notify:
+    - "Restart Crowdsec Securiy Engine"
+
+- name: Get bouncers list
+  ansible.builtin.shell:
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      cscli bouncers list --output=json |jq -r '.[] |.name'
+  register: "crowdsec_out_list_bouncers"
+  changed_when: false
+
+- name: Create bouncers API keys
+  loop: "{{ crowdsec_bouncers }}"
+  when: "item.name not in crowdsec_out_list_bouncers.stdout_lines"
+  ansible.builtin.command:
+    cmd: "cscli bouncers add {{ item.name }} --key '{{ item.key }}'"
+  changed_when: true
+  notify:
+    - "Restart Crowdsec Securiy Engine"

seb4itik/byow/roles/crowdsec/templates/config.yaml

@@ -0,0 +1,66 @@
+common:
+  daemonize: true
+  log_media: "file"
+  log_level: "info"
+  log_dir: "/var/log/"
+  log_max_size: 20
+  compress_logs: true
+  log_max_files: 10
+
+config_paths:
+  config_dir: "/etc/crowdsec/"
+  data_dir: "/var/lib/crowdsec/data/"
+  simulation_path: "/etc/crowdsec/simulation.yaml"
+  hub_dir: "/etc/crowdsec/hub/"
+  index_path: "/etc/crowdsec/hub/.index.json"
+  notification_dir: "/etc/crowdsec/notifications/"
+  plugin_dir: "/usr/lib/crowdsec/plugins/"
+
+crowdsec_service:
+  #console_context_path: "/etc/crowdsec/console/context.yaml"
+  #acquisition_path: "/etc/crowdsec/acquis.yaml"
+  acquisition_dir: "/etc/crowdsec/acquis.d"
+  parser_routines: 1
+
+cscli:
+  output: "human"
+  color: "auto"
+
+db_config:
+  log_level: "info"
+  type: "sqlite"
+  db_path: "/var/lib/crowdsec/data/crowdsec.db"
+  #max_open_conns: 100
+  #user: 
+  #password:
+  #db_name:
+  #host:
+  #port:
+  flush:
+    max_items: 5000
+    max_age: "7d"
+
+plugin_config:
+  user: "nobody"
+  group: "nogroup"
+
+api:
+  client:
+    insecure_skip_verify: false
+    credentials_path: "/etc/crowdsec/local_api_credentials.yaml"
+  server:
+    log_level: "info"
+    listen_uri: "127.0.0.1:8080"
+    profiles_path: "/etc/crowdsec/profiles.yaml"
+    console_path: "/etc/crowdsec/console.yaml"
+    online_client: # Central API credentials (to push signals and receive bad IPs)
+      credentials_path: "/etc/crowdsec/online_api_credentials.yaml"
+    trusted_ips: # IP ranges, or IPs which can have admin API access
+      - "127.0.0.1"
+      - "::1"
+#    tls:
+#      cert_file: "/etc/crowdsec/ssl/cert.pem"
+#      key_file: "/etc/crowdsec/ssl/key.pem"
+
+prometheus:
+  enabled: false

seb4itik/byow/roles/local_ca_certs/defaults/main.yml

@@ -8,7 +8,7 @@ local_ca_certs_default_not_before: "-1d"   # valid since yesterday
 
 # Required
 local_ca_certs_ca_passphrase: null
-local_ca_certs_list: {}
+local_ca_certs_list: []
 # - cn: <string>
 #   domains: <array of strings>
 #   country_name: <string>

seb4itik/byow/roles/mysql/defaults/main.yml

@@ -4,3 +4,4 @@ mysql_users: []
 # - name: <string
 #   password: <string>
 #   priv: <string>
+#   host: <string>  (default "127.0.0.1")

seb4itik/byow/roles/mysql/tasks/main.yml

@@ -1,14 +1,14 @@
 - name: Installation de MySQL
   ansible.builtin.apt:
     name:
-      - "mysql-server"
+      - "{{ mysql_distros[ansible_distribution].mysql_package }}"
       - "python3-pymysql"
   notify:
     - "Restart MySQL"
 
 - name: Set MySQL bind_address parameter
   ansible.builtin.lineinfile:
-    path: "/etc/mysql/mysql.conf.d/mysqld.cnf"
+    path: "{{ mysql_distros[ansible_distribution].mysql_config_file }}"
     regexp: "^bind-address\\s+="
     line: "bind-address = *"
   notify:
@@ -28,4 +28,4 @@
     name: "{{ item.name }}"
     password: "{{ item.password }}"
     priv: "{{ item.priv }}"
-    host: "{{ item.host }}"
+    host: "{{ item.host | default('127.0.0.1') }}"

seb4itik/byow/roles/mysql/vars/main.yml

@@ -0,0 +1,7 @@
+mysql_distros:
+  Debian:
+    mysql_package: "default-mysql-server"
+    mysql_config_file: "/etc/mysql/mariadb.conf.d/50-server.cnf"
+  Ubuntu:
+    mysql_package: "mysql-server"
+    mysql_config_file: "/etc/mysql/mysql.conf.d/mysqld.cnf"

seb4itik/byow/roles/squid/README.md

@@ -0,0 +1,5 @@
+# BYOW - Build Your Own WAF
+
+A WAF _à la carte_.
+
+## Squid

seb4itik/byow/roles/wordpress/defaults/main.yml

@@ -13,7 +13,7 @@ wordpress_active_theme: null
 wordpress_user: "wordpress"
 wordpress_plugins: []
 wordpress_locale: "fr_FR"
-wordpress_db_host: "localhost"
+wordpress_db_host: "127.0.0.1"
 wordpress_db_name: "{{ wordpress_user }}"
 wordpress_db_user: "{{ wordpress_user }}"
 wordpress_db_prefix: "wp_"

seb4itik/byow/roles/wordpress/tasks/install_wordpress.yml

@@ -0,0 +1,135 @@
+# FIXME: Wait for DB to be ready
+
+- name: Téléchargement de Wordpress
+  become: true
+  become_user: "{{ wordpress_user }}"
+  ansible.builtin.command:
+    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
+    cmd: "wp core download --locale='{{ wordpress_locale }}' --skip-content"
+    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-config-sample.php"
+
+# TODO: https://make.wordpress.org/cli/handbook/references/config/#config-files
+- name: Configuration de Wordpress
+  become: true
+  become_user: "{{ wordpress_user }}"
+  ansible.builtin.shell:
+    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      wp config create \
+        --dbhost='{{ wordpress_db_host }}' \
+        --dbname='{{ wordpress_db_name }}' \
+        --dbuser='{{ wordpress_db_user }}' \
+        --dbpass='{{ wordpress_db_pass }}' \
+        --dbprefix='{{ wordpress_db_prefix }}' \
+        --dbcharset='{{ wordpress_db_charset }}' \
+        --extra-php <<PHP
+      define('FS_METHOD', 'direct');
+      define('FORCE_SSL_ADMIN', false);
+      define('WP_HOME', 'https://{{ wordpress_site }}');
+      define('WP_SITEURL', 'https://{{ wordpress_site }}');
+
+      error_reporting(0);
+      @ini_set('display_errors', 0);
+      define('DISALLOW_FILE_EDIT', true);
+
+      if (isset(\$_SERVER['HTTP_X_FORWARDED_PROTO']) && \$_SERVER['HTTP_X_FORWARDED_PROTO']=='https')
+          \$_SERVER['HTTPS'] = 'on';
+      PHP
+    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-config.php"
+  notify:
+    - "Flush Wordpress"
+
+- name: Create Wordpress database tables
+  become: true
+  become_user: "{{ wordpress_user }}"
+  ansible.builtin.command:
+    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
+    cmd: >
+      wp core install
+      --url='{{ wordpress_url }}'
+      --title='{{ wordpress_site_title }}'
+      --admin_user='{{ wordpress_admin_user }}'
+      --admin_password='{{ wordpress_admin_password }}'
+      --admin_email='{{ wordpress_admin_email }}'
+      --locale='{{ wordpress_locale }}'
+      --skip-email
+    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/uploads/ }}"
+  register: "wordpress_out_core_install"
+  changed_when: "'Success: WordPress installed successfully.' in wordpress_out_core_install.stdout"
+  notify:
+    - "Flush Wordpress"
+
+- name: Installation des thèmes Wordpress
+  become: true
+  become_user: "{{ wordpress_user }}"
+  loop: "{{ wordpress_themes }}"
+  ansible.builtin.command:
+    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
+    cmd: "wp theme install '{{ item }}'"
+    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/themes/{{ item | basename | splitext | first }}"
+  register: "wordpress_out_theme_install"
+  changed_when: "'Success: Installed 1 of 1 themes' in wordpress_out_theme_install.stdout"
+  notify:
+    - "Flush Wordpress"
+
+- name: Activation du thème Wordpress
+  become: true
+  become_user: "{{ wordpress_user }}"
+  ansible.builtin.command:
+    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
+    cmd: "wp theme activate '{{ wordpress_active_theme }}'"
+  register: "wordpress_out_theme_activate"
+  changed_when: "'Success: Switched to ' in wordpress_out_theme_activate.stdout"
+  notify:
+    - "Flush Wordpress"
+
+- name: Installation des plugins wordpress-importer et one-click-demo-import
+  vars:
+    wordpress_plugins_to_install:
+      - "wordpress-importer"
+      - "one-click-demo-import"
+  ansible.builtin.include_tasks: "install_plugins.yml"
+
+- name: Importation des plugins OCDI
+  become: true
+  become_user: "{{ wordpress_user }}"
+  loop: "{{ wordpress_import_ocdi_indexes }}"
+  ansible.builtin.shell:
+    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
+    executable: "/usr/bin/bash"
+    cmd: |
+      set -o pipefail
+      wp ocdi import --predefined='{{ item }}' \
+      && touch /var/www/{{ wordpress_user }}/{{ wordpress_site }}/.ocdi_index{{ item }}_imported
+    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/.ocdi_index{{ item }}_imported"
+  register: "wordpress_out_ocdi_import"
+  changed_when: "'Success: Content import finished!' in wordpress_out_ocdi_import.stdout"
+  notify:
+    - "Flush Wordpress"
+
+- name: Installation des plugins Wordpress
+  vars:
+    wordpress_plugins_to_install: "{{ wordpress_plugins }}"
+  ansible.builtin.include_tasks: "install_plugins.yml"
+
+- name: Création du répertoire cache de Wordpress
+  ansible.builtin.file:
+    path: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/cache"
+    state: "directory"
+    owner: "{{ wordpress_user }}"
+    group: "www-data"
+    mode: "0775"
+
+- name: Apply permissions
+  loop:
+    - "cache"
+    - "upgrade"
+    - "uploads"
+  ansible.builtin.file:
+    path: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/{{ item }}/"
+    owner: "{{ wordpress_user }}"
+    group: "www-data"
+    mode: "u=rwX,g=rwX,o=rX"
+    recurse: true

seb4itik/byow/roles/wordpress/tasks/main.yml

@@ -16,7 +16,6 @@
       - "zip"
 
 - name: Installation de wp-cli
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
   ansible.builtin.get_url:
     url: "https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar"
     dest: "/usr/local/bin/wp"
@@ -42,148 +41,8 @@
     mode: "0750"
 
 - name: Installation de Wordpress
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  become: true
-  become_user: "{{ wordpress_user }}"
-  ansible.builtin.command:
-    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
-    cmd: "wp core download --locale='{{ wordpress_locale }}' --skip-content"
-    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-config-sample.php"
-
-# TODO: https://make.wordpress.org/cli/handbook/references/config/#config-files
-- name: Configuration de Wordpress
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  become: true
-  become_user: "{{ wordpress_user }}"
-  ansible.builtin.shell:
-    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
-    executable: "/usr/bin/bash"
-    cmd: |
-      set -o pipefail
-      wp config create \
-        --dbhost='{{ wordpress_db_host }}' \
-        --dbname='{{ wordpress_db_name }}' \
-        --dbuser='{{ wordpress_db_user }}' \
-        --dbpass='{{ wordpress_db_pass }}' \
-        --dbprefix='{{ wordpress_db_prefix }}' \
-        --dbcharset='{{ wordpress_db_charset }}' \
-        --extra-php <<PHP
-      define('FS_METHOD', 'direct');
-      define('FORCE_SSL_ADMIN', false);
-      define('WP_HOME', 'https://{{ wordpress_site }}');
-      define('WP_SITEURL', 'https://{{ wordpress_site }}');
-
-      error_reporting(0);
-      @ini_set('display_errors', 0);
-      define('DISALLOW_FILE_EDIT', true);
-
-      if (isset(\$_SERVER['HTTP_X_FORWARDED_PROTO']) && \$_SERVER['HTTP_X_FORWARDED_PROTO']=='https')
-          \$_SERVER['HTTPS'] = 'on';
-      PHP
-    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-config.php"
-  notify:
-    - "Flush Wordpress"
-
-- name: Create Wordpress database tables
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  become: true
-  become_user: "{{ wordpress_user }}"
-  ansible.builtin.command:
-    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
-    cmd: >
-      wp core install
-      --url='{{ wordpress_url }}'
-      --title='{{ wordpress_site_title }}'
-      --admin_user='{{ wordpress_admin_user }}'
-      --admin_password='{{ wordpress_admin_password }}'
-      --admin_email='{{ wordpress_admin_email }}'
-      --locale='{{ wordpress_locale }}'
-      --skip-email
-    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/uploads/ }}"
-  register: "wordpress_out_core_install"
-  changed_when: "'Success: WordPress installed successfully.' in wordpress_out_core_install.stdout"
-  notify:
-    - "Flush Wordpress"
-
-- name: Installation des thèmes Wordpress
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  become: true
-  become_user: "{{ wordpress_user }}"
-  loop: "{{ wordpress_themes }}"
-  ansible.builtin.command:
-    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
-    cmd: "wp theme install '{{ item }}'"
-    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/themes/{{ item | basename | splitext | first }}"
-  register: "wordpress_out_theme_install"
-  changed_when: "'Success: Installed 1 of 1 themes' in wordpress_out_theme_install.stdout"
-  notify:
-    - "Flush Wordpress"
-
-- name: Activation du thème Wordpress
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  become: true
-  become_user: "{{ wordpress_user }}"
-  ansible.builtin.command:
-    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
-    cmd: "wp theme activate '{{ wordpress_active_theme }}'"
-  register: "wordpress_out_theme_activate"
-  changed_when: "'Success: Switched to ' in wordpress_out_theme_activate.stdout"
-  notify:
-    - "Flush Wordpress"
-
-- name: Installation des plugins wordpress-importer et one-click-demo-import
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  vars:
-    wordpress_plugins_to_install:
-      - "wordpress-importer"
-      - "one-click-demo-import"
-  ansible.builtin.include_tasks: "install_plugins.yml"
-
-- name: Importation des plugins OCDI
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  become: true
-  become_user: "{{ wordpress_user }}"
-  loop: "{{ wordpress_import_ocdi_indexes }}"
-  ansible.builtin.shell:
-    chdir: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}"
-    executable: "/usr/bin/bash"
-    cmd: |
-      set -o pipefail
-      wp ocdi import --predefined='{{ item }}' \
-      && touch /var/www/{{ wordpress_user }}/{{ wordpress_site }}/.ocdi_index{{ item }}_imported
-    creates: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/.ocdi_index{{ item }}_imported"
-  register: "wordpress_out_ocdi_import"
-  changed_when: "'Success: Content import finished!' in wordpress_out_ocdi_import.stdout"
-  notify:
-    - "Flush Wordpress"
-
-- name: Installation des plugins Wordpress
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  vars:
-    wordpress_plugins_to_install: "{{ wordpress_plugins }}"
-  ansible.builtin.include_tasks: "install_plugins.yml"
-
-- name: Création du répertoire cache de Wordpress
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  ansible.builtin.file:
-    path: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/cache"
-    state: "directory"
-    owner: "{{ wordpress_user }}"
-    group: "www-data"
-    mode: "0750"
-
-- name: Apply permissions
-  when: "wordpress_create_master != None and wordpress_create_master == ansible_hostname"
-  loop:
-    - "cache"
-    - "upgrade"
-    - "uploads"
-  ansible.builtin.file:
-    path: "/var/www/{{ wordpress_user }}/{{ wordpress_site }}/wp-content/{{ item }}/"
-    owner: "{{ wordpress_user }}"
-    group: "www-data"
-    mode: "u=rwX,g=rwX,o=rX"
-    recurse: true
+  when: "wordpress_create_master == None or wordpress_create_master == ansible_hostname"
+  ansible.builtin.include_tasks: "install_wordpress.yml"
 
 - name: Configuration de Nginx
   ansible.builtin.template: