Update to 2021-02-19 20:00

4 years ago · 67c5fbca24
parent f1444d088c
commit 67c5fbca24
4 changed files with 4 additions and 3 deletions
--- a/roles/crowdsec/tasks/conf.yml
+++ b/roles/crowdsec/tasks/conf.yml
@ -35,6 +35,7 @@
  tags: crowdsec

 - when:
+    - crowdsec_lapi_enabled
    - crowdsec_capi_enabled
    - crowdsec_capi_user is not defined or crowdsec_capi_pass is not defined
  block:
--- a/roles/crowdsec/tasks/install.yml
+++ b/roles/crowdsec/tasks/install.yml
@ -38,7 +38,7 @@
      RestartSec=30
    dest: /etc/systemd/system/crowdsec.service.d/restart.conf
  register: crodwsec_unit
-  notify: restart crodwsec
+  notify: restart crowdsec
  tags: crowdsec

 - name: Reload systemd
--- a/roles/crowdsec/templates/local_api_credentials.yaml.j2
+++ b/roles/crowdsec/templates/local_api_credentials.yaml.j2
@ -1,3 +1,3 @@
-url: {{ crowdsec_lapi_enabled | ternary('http://127.0.0.1:' ~ crowdsec_lapi_port,crowdsec_lapi_url) }}
+url: {{ crowdsec_lapi_enabled | ternary('http://127.0.0.1:' ~ crowdsec_lapi_port,(crowdsec_lapi_url is search('/$')) | ternary(crowdsec_lapi_url, crowdsec_lapi_url ~ '/')) }}
 login: {{ crowdsec_lapi_user }}
 password: {{ crowdsec_lapi_pass }}
--- a/roles/crowdsec_bouncer_firewall/templates/cs-firewall-bouncer.yaml.j2
+++ b/roles/crowdsec_bouncer_firewall/templates/cs-firewall-bouncer.yaml.j2
@ -6,7 +6,7 @@ update_frequency: 10s
 daemonize: true
 log_mode: stdout
 log_level: info
-api_url: {{ crowdsec_fw_lapi_url }}
+api_url: {{ (crowdsec_fw_lapi_url is search('/$')) | ternary(crowdsec_fw_lapi_url,crowdsec_fw_lapi_url ~ '/') }}
 api_key: {{ crowdsec_fw_lapi_key }}
 disable_ipv6: false