il/ilnmors-homelab
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(repo): update dependency and abstract variables

Browse Source
This commit is contained in:
il
2026-06-25 16:56:11 +09:00
parent a2334bb236
commit a49cdcb9d1
10 changed files with 36 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/node/app/nftables.conf.j2
+2 -2
View File
@@ -9,9 +9,9 @@ define HOSTS4_AUTH = {{ hostvars['fw']['network4']['auth']['server'] }}
define HOSTS6_AUTH = {{ hostvars['fw']['network6']['auth']['server'] }}
define PORTS_SSH = 22
define PORTS_HTTP = 80
define PORTS_HTTP_FORWARD = 2080
define PORTS_HTTP_FORWARD = {{ services['caddy']['ports']['http'] }}
define PORTS_HTTPS = 443
define PORTS_HTTPS_FORWARD = 2443
define PORTS_HTTPS_FORWARD = {{ services['caddy']['ports']['https'] }}
table inet nat {
chain prerouting {
config/node/auth/nftables.conf.j2
+2 -2
View File
@@ -7,9 +7,9 @@ define HOSTS4_CONSOLE = { {{ hostvars['fw']['network4']['console'].values() | jo
define HOSTS6_CONSOLE = { {{ hostvars['fw']['network6']['console'].values() | join(', ') }} }
define PORTS_SSH = 22
define PORTS_HTTP = 80
define PORTS_HTTP_FORWARD = 2080
define PORTS_HTTP_FORWARD = {{ services['caddy']['ports']['http'] }}
define PORTS_HTTPS = 443
define PORTS_HTTPS_FORWARD = 2443
define PORTS_HTTPS_FORWARD = {{ services['caddy']['ports']['https'] }}
table inet nat {
chain prerouting {
config/node/common/hosts.j2
+2 -2
View File
@@ -25,12 +25,12 @@
{{ hostvars['fw']['network4']['blocky']['server'] }} blocky.{{ domain['internal'] }}
{{ hostvars['fw']['network4']['bind']['server'] }} bind.{{ domain['internal'] }}
# DB, LDAP, CA, Prometheus, Loki, mail (infra)
{{ hostvars['fw']['network4']['infra']['server'] }} postgresql.{{ domain['internal'] }} ldap.{{ domain['internal'] }} prometheus.{{ domain['internal'] }} loki.{{ domain['internal'] }} mail.{{ domain['internal'] }} ca.{{ domain['internal'] }}
{{ hostvars['fw']['network4']['infra']['server'] }} postgresql.{{ domain['internal'] }} ldap.{{ domain['internal'] }} prometheus.{{ domain['internal'] }} loki.{{ domain['internal'] }} maddy.{{ domain['internal'] }} ca.{{ domain['internal'] }}
# IPv6
# Crowdsec, blocky, bind(fw)
{{ hostvars['fw']['network6']['firewall']['server'] }} ntp.{{ domain['internal'] }} crowdsec.{{ domain['internal'] }}
{{ hostvars['fw']['network6']['blocky']['server'] }} blocky.{{ domain['internal'] }}
{{ hostvars['fw']['network6']['bind']['server'] }} bind.{{ domain['internal'] }}
# DB, LDAP, CA, Prometheus, Loki, mail (infra)
{{ hostvars['fw']['network6']['infra']['server'] }} postgresql.{{ domain['internal'] }} ldap.{{ domain['internal'] }} prometheus.{{ domain['internal'] }} loki.{{ domain['internal'] }} mail.{{ domain['internal'] }} ca.{{ domain['internal'] }}
{{ hostvars['fw']['network6']['infra']['server'] }} postgresql.{{ domain['internal'] }} ldap.{{ domain['internal'] }} prometheus.{{ domain['internal'] }} loki.{{ domain['internal'] }} maddy.{{ domain['internal'] }} ca.{{ domain['internal'] }}
{% endif %}
config/node/fw/nftables.conf.j2
+1 -1
View File
@@ -48,7 +48,7 @@ define PORTS_WEB = { 80, 443 }
define PORTS_DHCP = { 67, 68, 546, 547 }
define PORTS_DNS = 53
define PORTS_NTP = 123
define PORTS_VPN = 11290
define PORTS_VPN = {{ services['wireguard']['ports']['udp'] }}
define PORTS_CROWDSEC = {{ services['crowdsec']['ports']['https'] }}
table inet nat {
config/node/fw/wireguard/30-fw-wg0.netdev
+1 -1
View File
@@ -2,7 +2,7 @@
Name=wg0
Kind=wireguard
[WireGuard]
ListenPort=11290
ListenPort={{ services['wireguard']['ports']['udp'] }}
PrivateKey={{ hostvars['console']['wireguard']['server']['private_key'] }}
[WireGuardPeer]
PublicKey={{ hostvars['console']['wireguard']['console']['public_key'] }}
config/node/infra/nftables.conf.j2
+2 -2
View File
@@ -13,9 +13,9 @@ define PORTS_CA = {{ services['ca']['ports']['https'] }}
define PORTS_LDAPS = 636
define PORTS_LDAPS_FORWARD = {{ services['ldap']['ports']['ldaps'] }}
define PORTS_HTTP = 80
define PORTS_HTTP_FORWARD = 2080
define PORTS_HTTP_FORWARD = {{ services['caddy']['ports']['http'] }}
define PORTS_HTTPS = 443
define PORTS_HTTPS_FORWARD = 2443
define PORTS_HTTPS_FORWARD = {{ services['caddy']['ports']['https'] }}
define PORTS_PROMETHEUS = {{ services['prometheus']['ports']['https'] }}
define PORTS_LOKI = {{ services['loki']['ports']['https'] }}
define PORTS_SMTP = 587
config/services/containers/infra/maddy/maddy.container.j2
+5 -3
View File
@@ -4,8 +4,8 @@ DefaultDependencies=false
[Unit]
Description=Maddy
After=network-online.target
Wants=network-online.target
After=postgresql.service ldap.service
Requires=postgresql.service ldap.service
[Container]
Image=docker.io/foxcpp/maddy:{{ version['containers']['maddy'] }}
@@ -19,15 +19,17 @@ PublishPort={{ services['maddy']['ports']['imaps'] }}:993/tcp
AddHost={{ services['postgresql']['domain']['internal'] }}.{{ domain['internal'] }}:host-gateway
AddHost={{ services['ldap']['domain']['internal'] }}.{{ domain['internal'] }}:host-gateway
Volume=%h/containers/maddy/maddy.conf:/data/maddy.conf:ro
Volume=%h/containers/maddy/ssl:/etc/ssl/maddy:ro
Volume=%h/data/containers/maddy/data:/data:rw
Volume=%h/containers/maddy/maddy.conf:/data/maddy.conf:ro
Environment="TZ={{ timezone }}"
Secret=MADDY_LDAP_BIND_PASSWORD,type=env
Secret=MADDY_POSTGRES_URL,type=env
[Service]
ExecStartPre=/usr/bin/nc -zv {{ services['postgresql']['domain']['internal'] }}.{{ domain['internal'] }} {{ services['postgresql']['ports']['tcp'] }}
ExecStartPre=/usr/bin/nc -zv {{ services['postgresql']['domain']['internal'] }}.{{ domain['internal'] }} 636
Restart=always
RestartSec=10s
TimeoutStopSec=120