Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • infrastruktur/ansible-warpzone
  • specki/ansible-warpzone
2 results
Show changes
Commits on Source (6)
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
"max-file": "5" "max-file": "5"
}, },
"metrics-addr": "{{int_ip4}}:9323", "metrics-addr": "{{int_ip4}}:9323",
"experimental": true "experimental": true,
"ip6tables": true
} }
...@@ -37,11 +37,19 @@ ...@@ -37,11 +37,19 @@
dest: "{{ basedir }}/{{ item }}" dest: "{{ basedir }}/{{ item }}"
with_items: with_items:
- docker-compose.yml - docker-compose.yml
- traefik.yml - traefik.yml
- dynamic/redirect-default.yml
- dynamic/tls.yml - dynamic/tls.yml
register: config register: config
- name: redirect-default ersstellen, wenn domain_default definiert ist
template:
src: "{{ item }}"
dest: "{{ basedir }}/{{ item }}"
with_items:
- dynamic/redirect-default.yml
when: domain_default is defined
register: config
- name: "stop {{ servicename}} docker" - name: "stop {{ servicename}} docker"
docker_compose: docker_compose:
project_src: "{{ basedir }}" project_src: "{{ basedir }}"
......
...@@ -3,7 +3,7 @@ version: '2.4' ...@@ -3,7 +3,7 @@ version: '2.4'
services: services:
app: app:
image: traefik:v2.9.8 image: traefik:v3.0
restart: always restart: always
ports: ports:
- "80:80" - "80:80"
......
...@@ -14,7 +14,6 @@ tls: ...@@ -14,7 +14,6 @@ tls:
options: options:
default: default:
sniStrict: true sniStrict: true
preferServerCipherSuites: true
minVersion: "VersionTLS12" minVersion: "VersionTLS12"
curvePreferences: curvePreferences:
- "secp521r1" - "secp521r1"
......
...@@ -35,37 +35,37 @@ mail_domains: ...@@ -35,37 +35,37 @@ mail_domains:
maildomain: warpzone.ms maildomain: warpzone.ms
mxserver: mailserver.warpzone.ms mxserver: mailserver.warpzone.ms
mxhostname: webserver mxhostname: webserver
spf: "v=spf1 mx a:mailserver.warpzone.ms ~all" spf: "v=spf1 mx a:{{ mail_domains.warpzonems.mxserver }} ip4:{{ hostvars['webserver'].ext_ip4 }} ip6:{{ hostvars['webserver'].ext_ip6 }} -all"
dmarc: v=DMARC1; p=none; dmarc: "v=DMARC1; p=none;"
dkim: dkim:
- { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNnNZElbWq9EonFULbr8vWWykKmZEylRwjo4lYx/lXsGDFWBuNh2s6gFF10OuHWtavokjvh/7sFidNaRYQkn3uwHmylBWFn7Jr2lPWY8PBEoIeAZZx5qHaDWxJVgzE7maFyXAswDGXcR/DRTn2xR6osNXOovjGeYXq/atR/45iwfgkhqAaXaV1uP/K9y\" \"y2sZ2dRtGEwCKsWbP26cOZ6MUcADszgUTEp59iKey79m0uwi0IpA8WjEKVwbMcf/6fBw1ejIEjVUX+bami2fQ6RPl4uEyloco4paV3w/vww2hh4VchCFLYAEKMkZOZs/eTDGsjaMguwHbPeVJjkpX2T6WQIDAQAB" } - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxNnNZElbWq9EonFULbr8vWWykKmZEylRwjo4lYx/lXsGDFWBuNh2s6gFF10OuHWtavokjvh/7sFidNaRYQkn3uwHmylBWFn7Jr2lPWY8PBEoIeAZZx5qHaDWxJVgzE7maFyXAswDGXcR/DRTn2xR6osNXOovjGeYXq/atR/45iwfgkhqAaXaV1uP/K9y\" \"y2sZ2dRtGEwCKsWbP26cOZ6MUcADszgUTEp59iKey79m0uwi0IpA8WjEKVwbMcf/6fBw1ejIEjVUX+bami2fQ6RPl4uEyloco4paV3w/vww2hh4VchCFLYAEKMkZOZs/eTDGsjaMguwHbPeVJjkpX2T6WQIDAQAB" }
member_warpzonems: member_warpzonems:
maildomain: member.warpzone.ms maildomain: "member.{{ mail_domains.warpzonems.maildomain }}"
mxserver: mailserver.warpzone.ms mxserver: "{{ mail_domains.warpzonems.mxserver }}"
mxhostname: webserver mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
spf: "v=spf1 mx a:mailserver.warpzone.ms ~all" spf: "{{ mail_domains.warpzonems.spf }}"
dkim: dkim:
- { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu334a+uJ5b7D8UTz3Up6A8EjZhEnXaIpiIcKAGPXXD2ZBGmkWfUNcwDcfMoDErH6ntXzf0uH2VMvaajB/wdKLyly1irDKoyjLA3hJb5wnF9Gh0anL1qxY6UA189vWsw+2JlZJWyQ3IcaQ720SM3OrrK4AL3gRItieSEQ+23m5aW0P6sgUuMXTmmKLbd4\" \"DzZ14Emw293TD2p4gJtgxW/6EfIfcUU+/jP1NNm9gksyzynH1pJXPwVruo9u4QujEQiPqtVsVtrtUm1kbnW+pexj3eKOLLEHGZ+p5AZ/jtALk9pJfNumm/XHFK5PTZDBIipXOYvuG8RdwsaCQRezGKy04QIDAQAB" } - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu334a+uJ5b7D8UTz3Up6A8EjZhEnXaIpiIcKAGPXXD2ZBGmkWfUNcwDcfMoDErH6ntXzf0uH2VMvaajB/wdKLyly1irDKoyjLA3hJb5wnF9Gh0anL1qxY6UA189vWsw+2JlZJWyQ3IcaQ720SM3OrrK4AL3gRItieSEQ+23m5aW0P6sgUuMXTmmKLbd4\" \"DzZ14Emw293TD2p4gJtgxW/6EfIfcUU+/jP1NNm9gksyzynH1pJXPwVruo9u4QujEQiPqtVsVtrtUm1kbnW+pexj3eKOLLEHGZ+p5AZ/jtALk9pJfNumm/XHFK5PTZDBIipXOYvuG8RdwsaCQRezGKy04QIDAQAB" }
lists_warpzonems: lists_warpzonems:
maildomain: lists.warpzone.ms maildomain: "lists.{{ mail_domains.warpzonems.maildomain }}"
mxserver: mailserver.warpzone.ms mxserver: "{{ mail_domains.warpzonems.mxserver }}"
mxhostname: webserver mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
spf: "v=spf1 mx a:mailserver.warpzone.ms ~all" spf: "{{ mail_domains.warpzonems.spf }}"
dkim: dkim:
- { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoO7SXkUkM17Y1Vi/cvO48IJmlReGWSaYHY+wEldLHt80TiXP0AGZ8nG+DshXi1J2D5xjn8cJu4VqgDrLFnsRJyGYKmi7yVukANVg6gjYlET4y5+UU7Vk2W3xhN2U/8F0rcyynALzQa8i4Y/wEI0qkgHyE6+lITmglJvlj6tgp4YYK2TBH3Zo//PukOmU\" \"6gG/qu0+6p+CepvqzfGT2l1duov5a2+DJJzlJTULJ5D5Blsmg/0GeC81gZ4QDC3S8aaM5Pw3I3lQCSJT4Q4Ge6Ues4ccagNrdnZhtHNaVFGdL1mR1k+G784gpMZphPj5MylNEpA3V4bD7/Ygf4GuAvHdMwIDAQAB" } - { selector: "dkim", value: "v=DKIM1; k=rsa; p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoO7SXkUkM17Y1Vi/cvO48IJmlReGWSaYHY+wEldLHt80TiXP0AGZ8nG+DshXi1J2D5xjn8cJu4VqgDrLFnsRJyGYKmi7yVukANVg6gjYlET4y5+UU7Vk2W3xhN2U/8F0rcyynALzQa8i4Y/wEI0qkgHyE6+lITmglJvlj6tgp4YYK2TBH3Zo//PukOmU\" \"6gG/qu0+6p+CepvqzfGT2l1duov5a2+DJJzlJTULJ5D5Blsmg/0GeC81gZ4QDC3S8aaM5Pw3I3lQCSJT4Q4Ge6Ues4ccagNrdnZhtHNaVFGdL1mR1k+G784gpMZphPj5MylNEpA3V4bD7/Ygf4GuAvHdMwIDAQAB" }
# chaostreffmuensterde: # chaostreffmuensterde:
# maildomain: chaostreff-muenster.de # maildomain: chaostreff-muenster.de
# mxserver: mailserver.warpzone.ms # mxserver: "{{ mail_domains.warpzonems.mxserver }}"
# mxhostname: webserver # mxhostname: "{{ mail_domains.warpzonems.mxhostname }}"
# spf: v=spf1 mx ~all # spf: "{{ mail_domains.warpzonems.spf }}"
# dmarc: v=DMARC1; p=none; # dmarc: v=DMARC1; p=none;
# dkim: # dkim:
# - { selector: "dkim", value: "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/OBnxYygjhKeZVyvhDAO1/O1XwyYEhQx3bW/rO/Wmp8ZzP/eQh3dljDEibj1KsfdUhfgTIU8CnTKLayb8B07MMzhBklpg8WUV2LrDmpndfhixizjaxzwBj/dhtiZE7e4BwhOPOmdBQ0cCIvNhMcQcCa1RgCpX/g5Ii0AtQ2zCPMTSOW5YWn+VY" } # - { selector: "dkim", value: "v=DKIM1;k=rsa;t=s;s=email;p=MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz/OBnxYygjhKeZVyvhDAO1/O1XwyYEhQx3bW/rO/Wmp8ZzP/eQh3dljDEibj1KsfdUhfgTIU8CnTKLayb8B07MMzhBklpg8WUV2LrDmpndfhixizjaxzwBj/dhtiZE7e4BwhOPOmdBQ0cCIvNhMcQcCa1RgCpX/g5Ii0AtQ2zCPMTSOW5YWn+VY" }
# lists_chaostreffmuensterde: # lists_chaostreffmuensterde:
# maildomain: lists.chaostreff-muenster.de # maildomain: "lists.{{ mail_domains.chaostreffmuensterde.maildomain }}"
# mxserver: mailserver.warpzone.ms # mxserver: "{{ mail_domains.chaostreffmuensterde.mxserver }}"
# mxhostname: webserver # mxhostname: "{{ mail_domains.chaostreffmuensterde.mxhostname }}"
# spf: v=spf1 mx ~all # spf: "{{ mail_domains.chaostreffmuensterde.spf }}"
# dmarc: v=DMARC1; p=none; # dmarc: v=DMARC1; p=none;
......
...@@ -35,8 +35,8 @@ administratorenteam: ...@@ -35,8 +35,8 @@ administratorenteam:
# Monitoring aktivieren # Monitoring aktivieren
alert: alert:
load: load:
warn: 5 warn: 10
crit: 10 crit: 20
disks: disks:
- { mountpoint: "/", warn: "5 GB", crit: "1 GB" } - { mountpoint: "/", warn: "5 GB", crit: "1 GB" }
...@@ -49,8 +49,8 @@ docker: ...@@ -49,8 +49,8 @@ docker:
# Monitoring aktivieren # Monitoring aktivieren
alert: alert:
load: load:
warn: 5 warn: 10
crit: 10 crit: 20
containers: containers:
- { name: "dockerstats_app_1" } - { name: "dockerstats_app_1" }
- { name: "esphome_app_1" } - { name: "esphome_app_1" }
......
...@@ -32,8 +32,8 @@ administratorenteam: ...@@ -32,8 +32,8 @@ administratorenteam:
# Monitoring aktivieren # Monitoring aktivieren
alert: alert:
load: load:
warn: 10 warn: 15
crit: 20 crit: 30
disks: disks:
- { mountpoint: "/", warn: "10 GB", crit: "3 GB" } - { mountpoint: "/", warn: "10 GB", crit: "3 GB" }
# btrfs currently no data from node exporter # btrfs currently no data from node exporter
......
...@@ -276,7 +276,6 @@ ...@@ -276,7 +276,6 @@
servicename: traefik, servicename: traefik,
basedir: /srv/traefik, basedir: /srv/traefik,
domain: "warpzone.ms", domain: "warpzone.ms",
domain_default: "www.warpzone.ms"
} }
- { - {
role: verwaltung/docker_gitea, tags: gitea, role: verwaltung/docker_gitea, tags: gitea,
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
# Set Version # Set Version
MAILU_VERSION=2.0.4 MAILU_VERSION=2.0.4
# enable IPv6
SUBNET6=fd00:dead:beef:25::/64
# Autocreate Admin User # Autocreate Admin User
INITIAL_ADMIN_ACCOUNT=mailadmin INITIAL_ADMIN_ACCOUNT=mailadmin
INITIAL_ADMIN_DOMAIN={{ domain }} INITIAL_ADMIN_DOMAIN={{ domain }}
......