ansible/oopen-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(mail-common.yml): update SSH keypair paths and format email messages for clarity

Browse Source
This commit is contained in:
Christoph
2026-07-28 21:28:43 +02:00
parent 4d92340f9b
commit b3babf6831
1 changed files with 20 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
host_vars/mail.cadus.org/mail-common.yml
+20 -85
View File
@@ -107,14 +107,14 @@ insert_root_ssh_keypair: true
root_ssh_keypair: root_ssh_keypair:
- name: id-rsa-dehydrated - name: id-rsa-dehydrated
priv_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-dehydrated priv_key_src: mail.cadus.org/root/.ssh/mail.cadus-id_rsa-dehydrated
priv_key_dest: /root/.ssh/id_rsa-dehydrated priv_key_dest: /root/.ssh/id_rsa-dehydrated
pub_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-dehydrated.pub pub_key_src: mail.cadus.org/root/.ssh/mail.cadus-id_rsa-dehydrated.pub
pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub
- name: id-rsa-opendkim - name: id-rsa-opendkim
priv_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-opendkim priv_key_src: mail.cadus.org/root/.ssh/mail.cadus-id_rsa-opendkim
priv_key_dest: /root/.ssh/id_rsa-opendkim priv_key_dest: /root/.ssh/id_rsa-opendkim
pub_key_src: mail.cadus/root/.ssh/mail.cadus-id_rsa-opendkim.pub pub_key_src: mail.cadus.org/root/.ssh/mail.cadus-id_rsa-opendkim.pub
pub_key_dest: /root/.ssh/id_rsa-opendkim.pub pub_key_dest: /root/.ssh/id_rsa-opendkim.pub
@@ -151,57 +151,6 @@ root_ssh_keypair:
# vars used by roles/common/tasks/copy_files.yml # vars used by roles/common/tasks/copy_files.yml
# --- # ---
copy_plain_files:
# /root/bin/monitoring
#
- name: monitoring_check_cert_for_dovecot.conf
src_path: mail.cadus/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: mail.cadus/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: mail.cadus/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: mail.cadus/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: mail.cadus/root/bin/postfix/conf/whitelist_mb_sigs.conf
dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf
copy_plain_files_postfwd_host_specific:
- name: postfwd.high-rate-number-messages
src_path: mail.cadus/etc/postfix/postfwd.high-rate-number-messages
dest_path: /etc/postfix/postfwd.high-rate-number-messages
- name: postfwd.wl-nets
src_path: mail.cadus/etc/postfix/postfwd.wl-nets
dest_path: /etc/postfix/postfwd.wl-nets
- name: postfwd.wl-sender
src_path: mail.cadus/etc/postfix/postfwd.wl-sender
dest_path: /etc/postfix/postfwd.wl-sender
- name: postfwd.wl-user
src_path: mail.cadus/etc/postfix/postfwd.wl-user
dest_path: /etc/postfix/postfwd.wl-user
# Postfix Firewall postfwd
#
# - name: postfwd.wl-user
# src_path: mail.cadus/etc/postfix/postfwd.wl-user
# dest_path: /etc/postfix/postfwd.wl-user
# copy_template_files: [] # copy_template_files: []
# #
@@ -240,47 +189,33 @@ si_authorisation_signature: abb4ec6b194639f3d123154f1b971843a3b8751d8c1bcdc7d07e
# #
website_name_postfixadmin: adm.cadus.org website_name_postfixadmin: adm.cadus.org
email_welcome_message: "\n email_welcome_message: |
Hello, Hello,
Your email address has been set up. Your email address has been set up.
Cadus e.V. - Redefine Global Solidarity\n Cadus e.V. - Redefine Global Solidarity
--\n --
Cadus e.V.\n Cadus e.V.
Holzmarktstr. 25\n Holzmarktstr. 25
D-10243 Berlin\n D-10243 Berlin
admin@cadus.org\n admin@cadus.org
"
# email_welcome_message: "\n
# Hallo,\n
#
# Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n
#
# Cadus e.V. - Redefine Global Solidarity\n
#
# --\n
# Cadus e.V.\n
# Am Sudhaus 2\n
# D-12053 Berlin\n
# admin@cadus.org\n
# "
# install_update_dovecot.conf # install_update_dovecot.conf
dovecot_msg_language: en dovecot_msg_language: en
dovecot_from_address: "Administrator E-Mail <admin@cadus.org>" dovecot_from_address: "Administrator E-Mail <admin@cadus.org>"
dovecot_reply_to: "admin@cadus.org" dovecot_reply_to: "admin@cadus.org"
webmailer_address: "https://webmail.cadus.org" webmailer_address: "https://webmail.cadus.org"
salutation: "Cadus e.V. - Redefine Global Solidarity\n salutation: |
Cadus e.V. - Redefine Global Solidarity
--\n --
Cadus e.V.\n Cadus e.V.
Holzmarktstr. 25\n Holzmarktstr. 25
D-10243 Berlin\n D-10243 Berlin
admin@cadus.org\n admin@cadus.org
"
# install_upgrade_roundcube-webmail.conf # install_upgrade_roundcube-webmail.conf
# #