chore(ansible): clean up host_vars YAML and normalize mail text blocks

This commit is contained in:
2026-07-28 21:24:03 +02:00
parent ae60fa01a5
commit 4d92340f9b
306 changed files with 2049 additions and 2484 deletions
+30 -72
View File
@@ -45,8 +45,8 @@ systemd_resolved: true
# IPv6: 2606:4700:4700::1111
# sekundäre DNS-Adresse
# IPv4: 1.0.0.1
# IPv6: 2606:4700:4700::1001
#
# IPv6: 2606:4700:4700::1001
#
# Google (USA) Public DNS - Großartige Kombination aus Geschwindigkeit und Sicherheit
# primäre DNS-Adresse
# IPv4: 8.8.8.8
@@ -57,20 +57,20 @@ systemd_resolved: true
#
# Quad9 (CH) - Blockiert mühelos schädliche Seiten und verhindert Phishing-Betrug
# primäre DNS-Adresse
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# IPv4: 9.9.9.9
# IPv6: 2620:fe::fe
# sekundäre DNS-Adresse
# IPv4: 149.112.112.112
# IPv6: 2620:fe::9
#
# OpenNIC - https://www.opennic.org/
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 195.10.195.195 - ns31.de
# IPv4: 94.16.114.254 - ns28.de
# IPv4: 51.254.162.59 - ns9.de
# IPv4: 194.36.144.87 - ns29.de
# IPv6: 2a00:f826:8:2::195 - ns31.de
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
#
# Freifunk München (normales DNS, DNS-over-TLS und DNS-over-HTTPS)
# IPv4: 5.1.66.255
# IPv6: 2001:678:e68:f000::
# Servername für DNS-over-TLS: dot.ffmuc.net
@@ -83,10 +83,10 @@ resolved_nameserver:
# search domains
#
# If there are more than one search domains, then specify them here in the order in which
# If there are more than one search domains, then specify them here in the order in which
# the resolver should also search them
#
#resolved_domains: []
# resolved_domains: []
resolved_domains:
- ~.
- oopen.de
@@ -96,7 +96,7 @@ resolved_dnssec: false
# dns.as250.net: 194.150.168.168
#
resolved_fallback_nameserver:
- 83.223.66.51
- 83.223.66.51
# ---
@@ -146,49 +146,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml
# ---
copy_plain_files:
# /root/bin/monitoring
#
- name: monitoring_check_cert_for_dovecot.conf
src_path: mx.warenform.de/root/bin/monitoring/conf/check_cert_for_dovecot.conf
dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
# /root/bin/postfix
#
- name: postfix_create_opendkim_key.conf
src_path: mx.warenform.de/root/bin/postfix/conf/create_opendkim_key.conf
dest_path: /root/bin/postfix/conf/create_opendkim_key.conf
- name: postfix_postfix_add_mailboxes.conf
src_path: mx.warenform.de/root/bin/postfix/conf/postfix_add_mailboxes.conf
dest_path: /root/bin/postfix/conf/postfix_add_mailboxes.conf
- name: postfix_sent_userinfo_postfix.conf
src_path: mx.warenform.de/root/bin/postfix/conf/sent_userinfo_postfix.conf
dest_path: /root/bin/postfix/conf/sent_userinfo_postfix.conf
- name: postfix_whitelist_mb_sigs.conf
src_path: mx.warenform.de/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfwd_host_specific: []
# Postfix Firewall postfwd
#
#- name: postfwd.wl-user
# src_path: mx.warenform/etc/postfix/postfwd.wl-user
# dest_path: /etc/postfix/postfwd.wl-user
#copy_template_files: []
#
# - name: mailsystem_install_amavis.conf
# src_path: usr/local/src/mailsystem/conf/install_amavis.conf.j2
# dest_path: /usr/local/src/mailsystem/conf/install_amavis.conf
# ---
# vars used by roles/common/tasks/config_files_mailsystem_scripts.yml
@@ -208,7 +165,7 @@ db_in_use: !!str "true"
postfix_db_type: PostgreSQL
postfix_db_name: postfix
postfix_db_user: postfix
#postfix_db_host: /run/postgresql
# postfix_db_host: /run/postgresql
postfix_db_pass: CbX8vg347Vvm
# install_amavis.conf
@@ -217,21 +174,21 @@ mp_receipt_number: 106015125438
si_authorisation_signature: 76ed7ca6670dbee497e1a0397a7e178c4caa25888bc26d7327d1eab0195342a4cfa522dcf10382623d57dbc2a79bd37627b9a52def4d4bfe617d26e35405ce3b
# install_postfixadmin.conf
#
#
website_name_postfixadmin: adm.warenform.de
email_welcome_message: "\n
Hallo,\n
email_welcome_message: |
Ihre neue E-Mail Adresse ist eingerichtet.\n
Hallo,
Das WARENFORM-Team\n
Ihre neue E-Mail Adresse ist eingerichtet.
--\n
WARENFORM | Phone: +49 30 / 61 65 17 52 -0\n
Schierker Str. 24 | Fax: +49 30 / 61 65 17 52 -66\n
D-10999 Berlin | http://www.warenform.net\n
"
Das WARENFORM-Team
--
WARENFORM | Phone: +49 30 / 61 65 17 52 -0
Schierker Str. 24 | Fax: +49 30 / 61 65 17 52 -66
D-10999 Berlin | http://www.warenform.net
# install_update_dovecot.conf
@@ -239,12 +196,13 @@ D-10999 Berlin | http://www.warenform.net\n
dovecot_from_address: "warenform gbr <hilfe@kunden.warenform.net>"
dovecot_reply_to: "hilfe@kunden.warenform.net"
webmailer_address: "https://webmail.warenform.de"
salutation: "Das WARENFORM-Team\n
salutation: |
Das WARENFORM-Team
WARENFORM | Phone: +49 30 / 61 65 17 52 -0\n
Schierker Str. 24 | Fax: +49 30 / 61 65 17 52 -66\n
D-10999 Berlin | http://www.warenform.net\n"
WARENFORM | Phone: +49 30 / 61 65 17 52 -0
Schierker Str. 24 | Fax: +49 30 / 61 65 17 52 -66
D-10999 Berlin | http://www.warenform.net
# install_upgrade_roundcube-webmail.conf
@@ -256,10 +214,10 @@ autoreply_hostname: autoreply.warenform.de
roundcube_db_type: pgsql
roundcube_db_name: roundcubemail
roundcube_db_user: roundcube
#roundcube_db_host: localhost
# roundcube_db_host: localhost
roundcube_db_pass: 'Hoo5heis'
#roundcube_acl_plugin: false
# roundcube_acl_plugin: false
roundcube_product_name: O.OPEN - Webmailer
roundcube_support_url: https://www.warenform.net