Compare commits

...
5 Commits
6 changed files with 23 additions and 16 deletions

No files matched your search

+10 -8
View File
@@ -6,7 +6,7 @@
roles: roles:
- role: githubixx.ansible_role_wireguard - role: githubixx.ansible_role_wireguard
when: applications.wireguard.enabled | bool when: applications.wireguard.enabled | default(false) | bool
tags: wireguard, apps tags: wireguard, apps
- name: Application Deployment - name: Application Deployment
@@ -16,30 +16,32 @@
serial: 1 serial: 1
roles: roles:
- role: robertdebock.dnsmasq
when: applications.dnsmasq.enabled | default(false) | bool
tags: dnsmasq, apps
- role: borgbase.ansible_role_borgbackup - role: borgbase.ansible_role_borgbackup
when: applications.borgbackup.enabled | bool when: applications.borgbackup.enabled | default(false) | bool
tags: borgbackup, apps tags: borgbackup, apps
- role: artis3n.tailscale.machine - role: artis3n.tailscale.machine
when: >- when: applications.tailscale.enabled | default(false) | bool
(applications.tailscale.enabled or
applications.tailscale.state | default('latest') == 'absent') | bool
vars: vars:
state: "{{ applications.tailscale.state | default('latest') }}" state: "{{ applications.tailscale.state | default('latest') }}"
tags: tailscale, apps tags: tailscale, apps
- role: salt - role: salt
when: applications.salt.enabled | bool when: applications.salt.enabled | default(false) | bool
tags: salt, apps tags: salt, apps
- role: dokploy - role: dokploy
when: (applications.dokploy.enabled and containers.docker.enabled) | bool when: (applications.dokploy.enabled | default(false) and containers.docker.enabled | default(false)) | bool
vars: vars:
dokploy_state: "{{ applications.dokploy.state | default('present') }}" dokploy_state: "{{ applications.dokploy.state | default('present') }}"
tags: dokploy, apps tags: dokploy, apps
- role: coolify - role: coolify
when: (applications.coolify.enabled and containers.docker.enabled) | bool when: (applications.coolify.enabled | default(false) and containers.docker.enabled | default(false)) | bool
vars: vars:
coolify_state: "{{ applications.coolify.state | default('present') }}" coolify_state: "{{ applications.coolify.state | default('present') }}"
tags: coolify, apps tags: coolify, apps
+2
View File
@@ -43,6 +43,8 @@ applications:
enabled: false enabled: false
wireguard: wireguard:
enabled: false enabled: false
dnsmasq:
enabled: false
salt: salt:
enabled: false enabled: false
coolify: coolify:
+2 -3
View File
@@ -24,6 +24,7 @@ _docker_daemon_options_base:
ipv6: true ipv6: true
ip-forward: true ip-forward: true
firewall-backend: nftables
iptables: true iptables: true
ip6tables: true ip6tables: true
ip-masq: false ip-masq: false
@@ -35,11 +36,9 @@ _docker_daemon_options_base:
default-network-opts: {} default-network-opts: {}
dns: dns:
- "100.100.100.100"
- "1.1.1.1" - "1.1.1.1"
- "8.8.8.8" - "8.8.8.8"
dns-search: dns-search: []
- "headnet.itqdev.xyz"
dns-opts: [] dns-opts: []
storage-driver: "overlay2" storage-driver: "overlay2"
+1
View File
@@ -45,6 +45,7 @@ system_packages:
- python3-docker - python3-docker
- acpi - acpi
- attr - attr
- pahole
monitoring: monitoring:
- htop - htop
- atop - atop
+2
View File
@@ -26,3 +26,5 @@ roles:
- src: https://github.com/githubixx/ansible-role-wireguard.git - src: https://github.com/githubixx/ansible-role-wireguard.git
name: githubixx.ansible_role_wireguard name: githubixx.ansible_role_wireguard
version: 19.0.0 version: 19.0.0
- src: robertdebock.dnsmasq
version: 2.2.0
+6 -5
View File
@@ -24,6 +24,7 @@
{% set blocked_ips = security_nftables_blocked_ips | default([]) %} {% set blocked_ips = security_nftables_blocked_ips | default([]) %}
{% set trusted_ips = security_nftables_trusted_ips | default([]) %} {% set trusted_ips = security_nftables_trusted_ips | default([]) %}
{% set allowed_port_ranges = security_nftables_allowed_port_ranges | default([]) %} {% set allowed_port_ranges = security_nftables_allowed_port_ranges | default([]) %}
{% set chain_priorities = security_nftables_chain_priorities | default({}) %}
{% set blocked_v4 = blocked_ips | select('match', '.*\\..*') | list %} {% set blocked_v4 = blocked_ips | select('match', '.*\\..*') | list %}
{% set blocked_v6 = blocked_ips | reject('match', '.*\\..*') | list %} {% set blocked_v6 = blocked_ips | reject('match', '.*\\..*') | list %}
@@ -91,7 +92,7 @@ table inet ansible_filter {
{% endif %} {% endif %}
chain input { chain input {
type filter hook input priority filter; policy {{ default_policy }}; type filter hook input priority {{ chain_priorities.input | default('filter') }}; policy {{ default_policy }};
# Conntrack: allow established, drop invalid # Conntrack: allow established, drop invalid
ct state established,related accept ct state established,related accept
@@ -182,7 +183,7 @@ table inet ansible_filter {
} }
chain forward { chain forward {
type filter hook forward priority filter; policy {{ forward_policy }}; type filter hook forward priority {{ chain_priorities.forward | default('filter') }}; policy {{ forward_policy }};
# Conntrack # Conntrack
ct state established,related accept ct state established,related accept
@@ -218,7 +219,7 @@ table inet ansible_filter {
} }
chain output { chain output {
type filter hook output priority filter; policy {{ output_policy }}; type filter hook output priority {{ chain_priorities.output | default('filter') }}; policy {{ output_policy }};
ct state established,related accept ct state established,related accept
@@ -236,7 +237,7 @@ table ip ansible_nat {
{% if dnat_rules | length > 0 %} {% if dnat_rules | length > 0 %}
chain prerouting { chain prerouting {
type nat hook prerouting priority dstnat; policy accept; type nat hook prerouting priority {{ chain_priorities.prerouting | default('dstnat') }}; policy accept;
{% for rule in dnat_rules %} {% for rule in dnat_rules %}
{% set proto = rule.proto | default('tcp') %} {% set proto = rule.proto | default('tcp') %}
@@ -263,7 +264,7 @@ table ip ansible_nat {
{% endif %} {% endif %}
{% if snat_rules | length > 0 or masquerade_interfaces | length > 0 %} {% if snat_rules | length > 0 or masquerade_interfaces | length > 0 %}
chain postrouting { chain postrouting {
type nat hook postrouting priority srcnat; policy accept; type nat hook postrouting priority {{ chain_priorities.postrouting | default('srcnat') }}; policy accept;
{% for rule in snat_rules %} {% for rule in snat_rules %}
{% set comment = ' comment "' + rule.comment + '"' if rule.comment is defined else '' %} {% set comment = ' comment "' + rule.comment + '"' if rule.comment is defined else '' %}