chore(ansible): clean up host_vars YAML and normalize mail text blocks
This commit is contained in:
@@ -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:
|
||||
- 194.150.168.168
|
||||
- 194.150.168.168
|
||||
|
||||
|
||||
# ---
|
||||
@@ -105,16 +105,16 @@ resolved_fallback_nameserver:
|
||||
|
||||
insert_root_ssh_keypair: true
|
||||
|
||||
#root_ssh_keypair:
|
||||
# root_ssh_keypair:
|
||||
# - name: id-rsa-dehydrated
|
||||
# priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated
|
||||
# priv_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-dehydrated
|
||||
# priv_key_dest: /root/.ssh/id_rsa-dehydrated
|
||||
# pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-dehydrated.pub
|
||||
# pub_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-dehydrated.pub
|
||||
# pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
|
||||
# - name: id-rsa-opendkim
|
||||
# priv_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim
|
||||
# priv_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-opendkim
|
||||
# priv_key_dest: /root/.ssh/id_rsa-opendkim
|
||||
# pub_key_src: e.mx/root/.ssh/e.mx-id_rsa-opendkim.pub
|
||||
# pub_key_src: e.mx.oopen.de/root/.ssh/e.mx-id_rsa-opendkim.pub
|
||||
# pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
|
||||
|
||||
|
||||
@@ -151,36 +151,6 @@ insert_root_ssh_keypair: true
|
||||
# vars used by roles/common/tasks/copy_files.yml
|
||||
# ---
|
||||
|
||||
#copy_plain_files:
|
||||
#
|
||||
# - name: monitoring_check_cert_for_dovecot.conf
|
||||
# src_path: e.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf
|
||||
# dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf
|
||||
#
|
||||
# - name: postfix_create_opendkim_key.conf
|
||||
# src_path: e.mx/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: e.mx/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: e.mx/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: e.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf
|
||||
# dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
|
||||
#
|
||||
#
|
||||
#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,33 +178,34 @@ mp_receipt_number: 106015125438
|
||||
si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07ed6db26621b11bca0e23d2a42b60aef3f7b7803a1466a964d90c7b1e82d67c7680c8f46b59a4e
|
||||
|
||||
# install_postfixadmin.conf
|
||||
#
|
||||
#
|
||||
website_name_postfixadmin: adm-e.oopen.de
|
||||
|
||||
email_welcome_message: "\n
|
||||
Hallo,\n
|
||||
email_welcome_message: |
|
||||
|
||||
Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n
|
||||
Hallo,
|
||||
|
||||
O.OPEN\n
|
||||
Ihre/Deine neue E-Mail Adresse ist eingerichtet.
|
||||
|
||||
--\n
|
||||
O.OPEN | Phone: +49 30 / 290 484 91\n
|
||||
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n
|
||||
D-10999 Berlin | E-MAIL: oo@oopen.de\n
|
||||
"
|
||||
O.OPEN
|
||||
|
||||
--
|
||||
O.OPEN | Phone: +49 30 / 290 484 91
|
||||
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99
|
||||
D-10999 Berlin | E-MAIL: oo@oopen.de
|
||||
|
||||
# install_update_dovecot.conf
|
||||
#
|
||||
dovecot_from_address: "o.open <oo@oopen.de>"
|
||||
dovecot_reply_to: "oo@oopen.de"
|
||||
webmailer_address: "https://webmail-e.oopen.de"
|
||||
salutation: "O.OPEN\n
|
||||
salutation: |
|
||||
O.OPEN
|
||||
|
||||
--\n
|
||||
O.OPEN | Phone: +49 30 / 290 484 91\n
|
||||
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99\n
|
||||
D-10999 Berlin | http://oopen.de"
|
||||
--
|
||||
O.OPEN | Phone: +49 30 / 290 484 91
|
||||
Erkelenzdamm 21 | Fax: +49 30 / 290 484 99
|
||||
D-10999 Berlin | http://oopen.de
|
||||
|
||||
# install_upgrade_roundcube-webmail.conf
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user