add crowdsec role, move config logs site -> global, remove caddy_ca_root, modularized Caddy build and config
Some checks failed
Publish collection to Galaxy / publish (push) Failing after 42s
Some checks failed
Publish collection to Galaxy / publish (push) Failing after 42s
This commit is contained in:
@@ -24,19 +24,19 @@
|
||||
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: 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
|
||||
@@ -45,7 +45,7 @@
|
||||
- "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_default_packages:
|
||||
- "net-tools"
|
||||
- "htop"
|
||||
@@ -130,6 +130,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 }}"
|
||||
@@ -142,6 +144,7 @@
|
||||
roles:
|
||||
- "local_ca_certs"
|
||||
- "consul"
|
||||
- "crowdsec"
|
||||
- "caddy"
|
||||
# - "keepalived"
|
||||
- "unbound"
|
||||
|
||||
Reference in New Issue
Block a user