From 05e27102c05b1e042589c324f2026158950428c7 Mon Sep 17 00:00:00 2001 From: Christoph Date: Mon, 17 May 2021 10:24:50 +0200 Subject: [PATCH] update.. --- group_vars/all/main.yml | 33 ++- group_vars/mail_server.yml | 2 - host_vars/95.217.204.247.yml | 250 ------------------ host_vars/a.mx.oopen.de.yml | 3 +- host_vars/b.mx.oopen.de.yml | 145 ++++++++++ host_vars/gw-ebs.oopen.de.yml | 108 ++++++++ host_vars/o36.oopen.de.yml | 106 +++++++- hosts | 139 +++++----- .../files/b.mx/etc/postfix/postfwd.bl-sender | 5 + .../files/b.mx/etc/postfix/postfwd.bl-user | 6 + .../files/b.mx/etc/postfix/postfwd.wl-user | 7 + .../conf/check_webservice_load.conf | 154 +++++++++++ .../bin/postfix/conf/create_opendkim_key.conf | 176 ++++++++++++ .../bin/postfix/conf/whitelist_mb_sigs.conf | 44 +++ .../files/root/.ssh/b.mx-id_rsa-dehydrated | 51 ++++ .../root/.ssh/b.mx-id_rsa-dehydrated.pub | 1 + .../files/root/.ssh/b.mx-id_rsa-opendkim | 51 ++++ .../files/root/.ssh/b.mx-id_rsa-opendkim.pub | 1 + .../mailsystem/conf/install_amavis.conf.j2 | 6 +- .../conf/install_postfix_advanced.conf.j2 | 8 +- 20 files changed, 950 insertions(+), 346 deletions(-) delete mode 100644 host_vars/95.217.204.247.yml create mode 100644 host_vars/b.mx.oopen.de.yml create mode 100644 host_vars/gw-ebs.oopen.de.yml create mode 100644 roles/common/files/b.mx/etc/postfix/postfwd.bl-sender create mode 100644 roles/common/files/b.mx/etc/postfix/postfwd.bl-user create mode 100644 roles/common/files/b.mx/etc/postfix/postfwd.wl-user create mode 100644 roles/common/files/b.mx/root/bin/monitoring/conf/check_webservice_load.conf create mode 100644 roles/common/files/b.mx/root/bin/postfix/conf/create_opendkim_key.conf create mode 100644 roles/common/files/b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf create mode 100644 roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated create mode 100644 roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated.pub create mode 100644 roles/common/files/root/.ssh/b.mx-id_rsa-opendkim create mode 100644 roles/common/files/root/.ssh/b.mx-id_rsa-opendkim.pub diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index fc59133..118ef91 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -1214,17 +1214,40 @@ ipv6_address: # postfix_db_type # -# possible values are 'PostgreSQL' and 'MySQL' + +is_relay_host: + +# sasl_auth_enable: +# +# possible values are: +# !!str "true" +# !!str "false" +sasl_auth_enable: +sasl_user: +sasl_pass: + +# - +# install_amavis.conf +# - + +# db_in_use: +# +# possible values are: +# !!str "true" +# !!str "false" +db_in_use: +# postfix_db_type +# +# possible values are +# 'PostgreSQL' +# 'MySQL' +# postfix_db_type: postfix_db_name: postfix_db_user: postfix_db_host: postfix_db_pass: -# - -# install_amavis.conf -# - - # mp_receipt_number # # O.OPEN/IL/Warenform: 106015125438 diff --git a/group_vars/mail_server.yml b/group_vars/mail_server.yml index 9603898..5195c41 100644 --- a/group_vars/mail_server.yml +++ b/group_vars/mail_server.yml @@ -26,8 +26,6 @@ apt_install_compiler_pkgs: true -apt_install_postgresql_pkgs: true - # --- # vars used by roles/common/tasks/users.yml diff --git a/host_vars/95.217.204.247.yml b/host_vars/95.217.204.247.yml deleted file mode 100644 index bd4b946..0000000 --- a/host_vars/95.217.204.247.yml +++ /dev/null @@ -1,250 +0,0 @@ ---- - -# --- -# vars used by roles/ansible_dependencies -# --- - - -# --- -# vars used by roles/ansible_user -# --- - - -# --- -# vars used by roles/common/tasks/basic.yml -# --- - - -# --- -# vars used by roles/common/tasks/sshd.yml -# --- - - -# --- -# vars used by roles/common/tasks/apt.yml -# --- - -apt_install_compiler_pkgs: true - -apt_install_postgresql_pkgs: true - - -# --- -# vars used by roles/common/tasks/users.yml -# --- - -insert_root_ssh_keypair: true - -root_ssh_keypair: - - name: id-rsa-dehydrated - priv_key_src: root/.ssh/a.mx-id_rsa-dehydrated - priv_key_dest: /root/.ssh/id_rsa-dehydrated - pub_key_src: root/.ssh/a.mx-id_rsa-dehydrated.pub - pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub - - name: id-rsa-opendkim - priv_key_src: root/.ssh/a.mx-id_rsa-opendkim - priv_key_dest: /root/.ssh/id_rsa-opendkim - pub_key_src: root/.ssh/a.mx-id_rsa-opendkim.pub - pub_key_dest: /root/.ssh/id_rsa-opendkim.pub - - -# --- -# vars used by roles/common/tasks/users-systemfiles.yml -# --- - - -# --- -# vars used by roles/common/tasks/webadmin-user.yml -# --- - - -# --- -# vars used by roles/common/tasks/sudoers.yml -# --- -# -# see: roles/common/tasks/vars - - -# --- -# vars used by roles/common/tasks/caching-nameserver.yml -# --- - - -# --- -# vars used by roles/common/tasks/git.yml -# --- -# -# see: roles/common/tasks/vars - - -# --- -# vars used by roles/common/tasks/copy_files.yml -# --- - -copy_plain_files: - - # /root/bin/monitoring - # - - name: monitoring_check_cert_for_dovecot.conf - src_path: a.mx/root/bin/monitoring/conf/check_cert_for_dovecot.conf - dest_path: /root/bin/monitoring/conf/check_cert_for_dovecot.conf - - - name: monitoring_check_webservice_load.conf - src_path: a.mx/root/bin/monitoring/conf/check_webservice_load.conf - dest_path: /root/bin/monitoring/conf/check_webservice_load.conf - - # /root/bin/postfix - # - - name: postfix_create_opendkim_key.conf - src_path: a.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: a.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: a.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: a.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf - dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf - - # Postfix Firewall postfwd - # - - name: postfwd.bl-sender - src_path: a.mx/etc/postfix/postfwd.bl-sender - dest_path: /etc/postfix/postfwd.bl-sender - - - name: postfwd.bl-sender_domain - src_path: a.mx/etc/postfix/postfwd.bl-sender_domain - dest_path: /etc/postfix/postfwd.bl-sender_domain - - - name: postfwd.bl-user - src_path: a.mx/etc/postfix/postfwd.bl-user - dest_path: /etc/postfix/postfwd.bl-user - - - name: postfwd.wl-user - src_path: a.mx/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 -# --- - -hostname: a.mx.oopen.de -ipv4_address: 95.217.204.247 -ipv6_address: 2a01:4f9:4a:47e5::247 - -admin_email: argus@oopen.de -is_relay_host: false - -# postfix_db_type -# -# possible values are 'PostgreSQL' and 'MySQL' -postfix_db_type: PostgreSQL -postfix_db_name: postfix -postfix_db_user: postfix -postfix_db_host: localhost -postfix_db_pass: FKt4z55FxMZp - -# install_amavis.conf -# -mp_receipt_number: 106015125438 -si_authorisation_signature: b0b7e94d3fcc8f3b1f128edd5830392361868cf0174723a9924ac25bf8b1b588cb974b50234e1bc1d9839dfe0ca6e1627733d90daf1399347b1046d20c2e3a89 - -# install_postfixadmin.conf -# -website_name_postfixadmin: adm.oopen.de - -email_welcome_message: "\n -Hallo,\n - -Ihre/Deine neue E-Mail Adresse ist eingerichtet.\n - -O.OPEN\n - ---\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 -" - -# install_update_dovecot.conf -# -dovecot_from_address: "o.open " -dovecot_reply_to: "oo@oopen.de" -webmailer_address: "https://webmail.oopen.de" -salutation: "O.OPEN\n - ---\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" - -# install_upgrade_roundcube-webmail.conf -# -# Webmailer -webmail_site_name: webmail.oopen.de -autoreply_hostname: autoreply.oopen.de -# possible values: 'pgsql' or 'mysql' -roundcube_db_type: pgsql -roundcube_db_name: roundcubemail -roundcube_db_user: roundcube -roundcube_db_host: localhost -roundcube_db_pass: '3Dsz3j5R' - -roundcube_product_name: O.OPEN - Webmailer -roundcube_support_url: https://www.oopen.de -roundcube_skin_logo: "images/oopen-logo.png" - -# 2 Webmailer -webmaili_2_site_name: webmail2.oopen.de -autoreply_2_hostname: autoreply.oopen.de -# possible values: 'pgsql' or 'mysql' -roundcube_2_db_type: pgsql -roundcube_2_db_name: roundcubemail2 -roundcube_2_db_user: roundcube -roundcube_2_db_host: localhost -roundcube_2_db_pass: '3Dsz3j5R' - -roundcube_2_product_name: O.OPEN - Webmailer -roundcube_2_support_url: https://www.oopen.de -roundcube_2_skin_logo: "images/oopen-logo.png" - - -template_files_mailsystem_script: - - - 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 - - - name: mailsystem_install_postfixadmin.conf - src_path: usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2 - dest_path: /usr/local/src/mailsystem/conf/install_postfix_advanced.conf - - - name: mailsystem_install_postfixadmin.conf - src_path: usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2 - dest_path: /usr/local/src/mailsystem/conf/install_postfixadmin.conf - - - name: mailsystem_install_update_dovecot.conf - src_path: usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2 - dest_path: /usr/local/src/mailsystem/conf/install_update_dovecot.conf - - - name: mailsystem_install_upgrade_roundcube-webmail.conf - src_path: usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2 - dest_path: /usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf - - - name: mailsystem_install_upgrade_roundcube-webmail2.conf - src_path: usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail2.conf.j2 - dest_path: /usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail2.conf diff --git a/host_vars/a.mx.oopen.de.yml b/host_vars/a.mx.oopen.de.yml index bd4b946..8edfd7e 100644 --- a/host_vars/a.mx.oopen.de.yml +++ b/host_vars/a.mx.oopen.de.yml @@ -147,8 +147,9 @@ ipv4_address: 95.217.204.247 ipv6_address: 2a01:4f9:4a:47e5::247 admin_email: argus@oopen.de -is_relay_host: false +is_relay_host: !!str "false" +db_in_use: !!str "true" # postfix_db_type # # possible values are 'PostgreSQL' and 'MySQL' diff --git a/host_vars/b.mx.oopen.de.yml b/host_vars/b.mx.oopen.de.yml new file mode 100644 index 0000000..8368c66 --- /dev/null +++ b/host_vars/b.mx.oopen.de.yml @@ -0,0 +1,145 @@ +--- + +# --- +# vars used by roles/ansible_dependencies +# --- + + +# --- +# vars used by roles/ansible_user +# --- + + +# --- +# vars used by roles/common/tasks/basic.yml +# --- + + +# --- +# vars used by roles/common/tasks/sshd.yml +# --- + + +# --- +# vars used by roles/common/tasks/apt.yml +# --- + +apt_install_compiler_pkgs: true + + +# --- +# vars used by roles/common/tasks/users.yml +# --- + +insert_root_ssh_keypair: true + +root_ssh_keypair: + - name: id-rsa-dehydrated + priv_key_src: root/.ssh/b.mx-id_rsa-dehydrated + priv_key_dest: /root/.ssh/id_rsa-dehydrated + pub_key_src: root/.ssh/b.mx-id_rsa-dehydrated.pub + pub_key_dest: /root/.ssh/id_rsa-dehydrated.pub + - name: id-rsa-opendkim + priv_key_src: root/.ssh/b.mx-id_rsa-opendkim + priv_key_dest: /root/.ssh/id_rsa-opendkim + pub_key_src: root/.ssh/b.mx-id_rsa-opendkim.pub + pub_key_dest: /root/.ssh/id_rsa-opendkim.pub + + +# --- +# vars used by roles/common/tasks/users-systemfiles.yml +# --- + + +# --- +# vars used by roles/common/tasks/webadmin-user.yml +# --- + + +# --- +# vars used by roles/common/tasks/sudoers.yml +# --- +# +# see: roles/common/tasks/vars + + +# --- +# vars used by roles/common/tasks/caching-nameserver.yml +# --- + + +# --- +# vars used by roles/common/tasks/git.yml +# --- +# +# see: roles/common/tasks/vars + + +# --- +# vars used by roles/common/tasks/copy_files.yml +# --- + +copy_plain_files: + + # /root/bin/monitoring + # + + - name: monitoring_check_webservice_load.conf + src_path: b.mx/root/bin/monitoring/conf/check_webservice_load.conf + dest_path: /root/bin/monitoring/conf/check_webservice_load.conf + + # /root/bin/postfix + # + - name: postfix_create_opendkim_key.conf + src_path: b.mx/root/bin/postfix/conf/create_opendkim_key.conf + dest_path: /root/bin/postfix/conf/create_opendkim_key.conf + + - name: postfix_whitelist_mb_sigs.conf + src_path: b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf + dest_path: /root/bin/postfix/conf/whitelist_mb_sigs.conf + + # Postfix Firewall postfwd + # + - name: postfwd.bl-sender + src_path: a.mx/etc/postfix/postfwd.bl-sender + dest_path: /etc/postfix/postfwd.bl-sender + + - name: postfwd.bl-user + src_path: a.mx/etc/postfix/postfwd.bl-user + dest_path: /etc/postfix/postfwd.bl-user + + - name: postfwd.wl-user + src_path: a.mx/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 +# --- + +hostname: b.mx.oopen.de +ipv4_address: 162.55.82.73 +ipv6_address: 2a01:4f8:271:1266::73 + +admin_email: argus@oopen.de +is_relay_host: !!str "true" +sasl_auth_enable: !!str "yes" + + +template_files_mailsystem_script: + + - 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 + + - name: install_postfix_advanced.conf + src_path: usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2 + dest_path: /usr/local/src/mailsystem/conf/install_postfix_advanced.conf diff --git a/host_vars/gw-ebs.oopen.de.yml b/host_vars/gw-ebs.oopen.de.yml new file mode 100644 index 0000000..93286ab --- /dev/null +++ b/host_vars/gw-ebs.oopen.de.yml @@ -0,0 +1,108 @@ +--- + +# --- +# vars used by roles/ansible_dependencies +# --- + + +# --- +# vars used by roles/ansible_user +# --- + + +# --- +# vars used by roles/common/tasks/basic.yml +# --- + + +# --- +# vars used by roles/common/tasks/sshd.yml +# --- + + +# --- +# vars used by roles/common/tasks/apt.yml +# --- + + +# --- +# vars used by roles/common/tasks/users.yml +# --- + +default_user: + + - name: chris + password: $6$KHaRubWiBQk1amaA$.adqxBIlrlulGGcdK1EWR0XoGiMiyRwf5LPub/MxVFbTjBrH.m3edIAV2KmO06gVGiTlHUZH3XsvtUOXIptpT0 + shell: /bin/bash + ssh_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5IhVprsvVOcFPbZzD9xR0nCjZ/9qVG6RhLJ7QBSts81nRvLwnmvcMBHSf5Rfaigey7Ff5dLHfJnxRE0KDATn6n2yd/5mXpn2GAA8hDVfhdsmsb5U7bROjZNr8MmIUrP7c3msUGx1FtvzhwxtyvIWOFQpWx+W5biBa6hFjIxT1pkUJqe6fclp7xbGYKZiqZRBS4qKG5CpKnisuOYDsqYPND+OkU+PShoxGVzp1JywIVze7qeKv6GyYbRA9SP9Np+5Mit6B21Io4zOI81c2Rz6sPX7mwEAQEs7iCm2hzG8qJws45Lb4ERqDkVEVhGNUyHjHgGebS1sZx1mLExdurXlPm1l/EamkncDFDCutHXtLP7lsFFiym7fKUjSEgiiLmyu5Xm+mwZvesKa1FYNaeiFWfYZpCJrNzIk+ffs+mgg3kmL4Sd4Ooy7jXPX+WJe5Xyh1KLU/+Wj2TVrhN+LbmupYAti/Wgd3DA1v601svmG82aLmyJRtKC0rGMePH3kDbtqU72kYpzI8mXERe1TIQ00Z77kQBR/7BF/9y5/0YmYDcXt1wNCoSie+mzz3xYcEdLAc7T+DhYpd4M6VgWnuz/exzRzhQwoSdEKkEED8CpEoBrEWEiMdrlElGmlkVomLU7P9i9j1rshX/pAq0asnqeSoPdC3vNbU3keiJQnhIHECvw== chris@luna' + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCyWbdnjnN/xfy1F6kPbsRXp8zvJEh8uHfTZuZKyaRV/iRuhsvqRiDB+AhUAlIaPwgQ8itaI6t5hijD+sZf+2oXXbNy3hkOHTrCDKCoVAWfMRKPuA1m8RqS4ZXXgayaeCzVnPEq6UrC5z0wO/XBwAktT37RRSQ/Hq2zCHy36NQEQYrhF3+ytX7ayb10pJAMVGRctYmr5YnLEVMSIREbPxZTNc80H1zqNPVJwYZhl8Ox61U4MoNhJmJwbKWPRPZsJpbTh9W2EU37tdwRBVQP6yxhua3TR6C7JnNPVY0IK23BYlNtQEDY4PHcIuewkamEWpP0+jhEjtwy1TqjRPdU/y+2uQjC6FSOVMsSPxgd8mw4cSsfp+Ard7P+YOevUXD81+jFZ3Wz0PRXbWMWAm2OCe7n8jVvkXMz+KxSYtrsvKNw1WugJq1z//bJNMTK6ISWpqaXDevGYQRJJ8dPbMmbey40WpS5CA/l29P7fj/cOl59w3LZGshrMOm7lVz9qysVV0ylfE3OpfKCGitkpY0Asw4lSkuLHoNZnDo6I5/ulRuKi6gsLk27LO5LYS8Zm1VOis/qHk1Gg1+QY47C4RzdTUxlU1CGesPIiQ1uUX2Z4bD7ebTrrOuEFcmNs3Wu5nif21Qq0ELEWhWby6ChFrbFHPn+hWlDwNM0Nr11ftwg0+sqVw== root@luna' + + - name: sysadm + + user_id: 1050 + group_id: 1050 + group: sysadm + password: $6$XI.g9q9bTmzqe35q$tDrpoJFBGsHrmy/mtOAQfrstgIhZEaYGt6hxfTCXI0YvAAUiHT4cJOLR6ivN0CPVNtkv8IFe7dk8NXR/1yScm. + shell: /bin/bash + ssh_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5IhVprsvVOcFPbZzD9xR0nCjZ/9qVG6RhLJ7QBSts81nRvLwnmvcMBHSf5Rfaigey7Ff5dLHfJnxRE0KDATn6n2yd/5mXpn2GAA8hDVfhdsmsb5U7bROjZNr8MmIUrP7c3msUGx1FtvzhwxtyvIWOFQpWx+W5biBa6hFjIxT1pkUJqe6fclp7xbGYKZiqZRBS4qKG5CpKnisuOYDsqYPND+OkU+PShoxGVzp1JywIVze7qeKv6GyYbRA9SP9Np+5Mit6B21Io4zOI81c2Rz6sPX7mwEAQEs7iCm2hzG8qJws45Lb4ERqDkVEVhGNUyHjHgGebS1sZx1mLExdurXlPm1l/EamkncDFDCutHXtLP7lsFFiym7fKUjSEgiiLmyu5Xm+mwZvesKa1FYNaeiFWfYZpCJrNzIk+ffs+mgg3kmL4Sd4Ooy7jXPX+WJe5Xyh1KLU/+Wj2TVrhN+LbmupYAti/Wgd3DA1v601svmG82aLmyJRtKC0rGMePH3kDbtqU72kYpzI8mXERe1TIQ00Z77kQBR/7BF/9y5/0YmYDcXt1wNCoSie+mzz3xYcEdLAc7T+DhYpd4M6VgWnuz/exzRzhQwoSdEKkEED8CpEoBrEWEiMdrlElGmlkVomLU7P9i9j1rshX/pAq0asnqeSoPdC3vNbU3keiJQnhIHECvw== chris@luna' + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCyWbdnjnN/xfy1F6kPbsRXp8zvJEh8uHfTZuZKyaRV/iRuhsvqRiDB+AhUAlIaPwgQ8itaI6t5hijD+sZf+2oXXbNy3hkOHTrCDKCoVAWfMRKPuA1m8RqS4ZXXgayaeCzVnPEq6UrC5z0wO/XBwAktT37RRSQ/Hq2zCHy36NQEQYrhF3+ytX7ayb10pJAMVGRctYmr5YnLEVMSIREbPxZTNc80H1zqNPVJwYZhl8Ox61U4MoNhJmJwbKWPRPZsJpbTh9W2EU37tdwRBVQP6yxhua3TR6C7JnNPVY0IK23BYlNtQEDY4PHcIuewkamEWpP0+jhEjtwy1TqjRPdU/y+2uQjC6FSOVMsSPxgd8mw4cSsfp+Ard7P+YOevUXD81+jFZ3Wz0PRXbWMWAm2OCe7n8jVvkXMz+KxSYtrsvKNw1WugJq1z//bJNMTK6ISWpqaXDevGYQRJJ8dPbMmbey40WpS5CA/l29P7fj/cOl59w3LZGshrMOm7lVz9qysVV0ylfE3OpfKCGitkpY0Asw4lSkuLHoNZnDo6I5/ulRuKi6gsLk27LO5LYS8Zm1VOis/qHk1Gg1+QY47C4RzdTUxlU1CGesPIiQ1uUX2Z4bD7ebTrrOuEFcmNs3Wu5nif21Qq0ELEWhWby6ChFrbFHPn+hWlDwNM0Nr11ftwg0+sqVw== root@luna' + + - name: back + user_id: 1060 + group_id: 1060 + group: back + password: $6$8v0PKesHmS2Z1xIO$n2a19e2GawIvHNi9U.W4nTxjJCTDtO5AlEP082PnCdp.fw5vIMv1AA.i2RMbXH2XuMdphXU6srSV/wFmp0e0q. + shell: /bin/bash + ssh_keys: + - 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC5IhVprsvVOcFPbZzD9xR0nCjZ/9qVG6RhLJ7QBSts81nRvLwnmvcMBHSf5Rfaigey7Ff5dLHfJnxRE0KDATn6n2yd/5mXpn2GAA8hDVfhdsmsb5U7bROjZNr8MmIUrP7c3msUGx1FtvzhwxtyvIWOFQpWx+W5biBa6hFjIxT1pkUJqe6fclp7xbGYKZiqZRBS4qKG5CpKnisuOYDsqYPND+OkU+PShoxGVzp1JywIVze7qeKv6GyYbRA9SP9Np+5Mit6B21Io4zOI81c2Rz6sPX7mwEAQEs7iCm2hzG8qJws45Lb4ERqDkVEVhGNUyHjHgGebS1sZx1mLExdurXlPm1l/EamkncDFDCutHXtLP7lsFFiym7fKUjSEgiiLmyu5Xm+mwZvesKa1FYNaeiFWfYZpCJrNzIk+ffs+mgg3kmL4Sd4Ooy7jXPX+WJe5Xyh1KLU/+Wj2TVrhN+LbmupYAti/Wgd3DA1v601svmG82aLmyJRtKC0rGMePH3kDbtqU72kYpzI8mXERe1TIQ00Z77kQBR/7BF/9y5/0YmYDcXt1wNCoSie+mzz3xYcEdLAc7T+DhYpd4M6VgWnuz/exzRzhQwoSdEKkEED8CpEoBrEWEiMdrlElGmlkVomLU7P9i9j1rshX/pAq0asnqeSoPdC3vNbU3keiJQnhIHECvw== chris@luna' + +sudo_users: + - chris + - sysadm + + +# --- +# vars used by roles/common/tasks/users-systemfiles.yml +# --- + + +# --- +# vars used by roles/common/tasks/webadmin-user.yml +# --- + + +# --- +# vars used by roles/common/tasks/sudoers.yml +# --- +# +# see: roles/common/tasks/vars + + +# --- +# vars used by roles/common/tasks/caching-nameserver.yml +# --- + +apt_install_bind9_packages: true + +# --- +# vars used by roles/common/tasks/git.yml +# --- + +git_firewall_repository: + name: ipt-gateway + repo: https://git.oopen.de/firewall/ipt-gateway + dest: /usr/local/src/ipt-gateway + +# ============================== + + +# --- +# vars used by scripts/reset_root_passwd.yml +# --- + +root_user: + name: root + password: $6$J1ssJfdshf/$mknQEPDcW4HN5.wFfawbamamywI7F7fhdZmaR1abNrc4DA7DNRx766lz3ygf9YV3gcmRq3QhJ3fBVlkwGMCvq. + diff --git a/host_vars/o36.oopen.de.yml b/host_vars/o36.oopen.de.yml index b285945..d233d99 100644 --- a/host_vars/o36.oopen.de.yml +++ b/host_vars/o36.oopen.de.yml @@ -1,5 +1,100 @@ --- +# --- +# vars used by roles/network_interfaces +# --- + + +# If true, all additional files in /etc/network/interfaces/interfaces.d/ are deleted +network_manage_devices: True + +# Should the interfaces be reloaded after config change? +network_interface_reload: False + +network_interface_path: /etc/network/interfaces.d +network_interface_required_packages: + - vlan + - bridge-utils + - ifmetric + - ifupdown2 + + +network_interfaces: + + - device: br0 + # use only once per device (for the first device entry) + headline: br0 - bridge over device enp41s0 + + # auto & allow are only used for the first device entry + allow: [] # array of allow-[stanzas] eg. allow-hotplug + auto: true + + family: inet + mode: static + description: Bridge Interface IPv4 for LXC + address: '162.55.82.89' + netmask: '255.255.255.192' + network: '162.55.82.64' + broadcast: '162.55.82.127' + gateway: '162.55.82.65' + + # optional dns settings nameservers: [] + # nameservers: + # - "194.150.168.168" # dns.as250.net + # - "91.239.100.100" # anycast.censurfridns.dk + + # optional additional subnets/ips subnets: [] + # subnets: + # - '192.168.123.0/24' + # - '192.168.124.11/32' + + # optional bridge parameters bridge: {} + # bridge: + # ports: + # stp: + # fd: + # maxwait: + # waitport: + bridge: + ports: enp41s0 # for mor devices support a blan separated list + stp: !!str off + fd: 5 + hello: 2 + + # optional bonding parameters bond: {} + # bond: + # mode: + # miimon: + # master: + # slaves: + # lacp-rate: + bond: {} + + # optional vlan settings | vlan: {} + # vlan: {} + # raw-device: 'eth0' + vlan: {} + + # inline hook scripts + pre-up: [] # pre-up script lines + up: + - !!str "route add -net 162.55.82.64 netmask 255.255.255.192 gw 162.55.82.65 dev br0" # up script lines + post-up: [] # post-up script lines (alias for up) + pre-down: [] # pre-down script lines (alias for down) + down: [] # down script lines + post-down: [] # post-down script lines + + + + - device: br0 + family: inet6 + mode: static + description: Bridge Interface IPv6 for LXC + address: '2a01:4f8:271:1266::2' + netmask: 64 + gateway: 'fe80::1' + + # --- # vars used by roles/ansible_dependencies # --- @@ -24,8 +119,6 @@ # vars used by roles/common/tasks/apt.yml # --- -#apt_manage_sources_list: false - # --- # vars used by roles/common/tasks/users.yml @@ -107,15 +200,6 @@ git_firewall_repository: repo: https://git.oopen.de/firewall/ipt-server dest: /usr/local/src/ipt-server -git_other_repositories: - - name: jitsi - repo: https://git.oopen.de/install/jitsi - dest: /usr/local/src/jitsi - - - name: etherpad-lite - repo: https://git.oopen.de/install/etherpad-lite - dest: /usr/local/src/etherpad-lite - # ============================== diff --git a/hosts b/hosts index f165e2f..4e06217 100644 --- a/hosts +++ b/hosts @@ -11,6 +11,7 @@ devel-root.wf.netz gw-123.oopen.de gw-ah.kanzlei-kiel.netz +gw-ebs.oopen.de gw-akb.akb.netz gw-ckubu.local.netz gw-b3.oopen.de @@ -71,8 +72,9 @@ mx.warenform.de lists.mx.warenform.de server25.warenform.de -web1.warenform.de web0.warenform.de +web1.warenform.de +web2.warenform.de # Jitsi Meet - Faire Integration server28.warenform.de @@ -88,12 +90,6 @@ o13-web.oopen.de o14.oopen.de a.mx.oopen.de -o15.oopen.de -b.mx.oopen.de -piwik.oopen.de -web-01.oopen.de -web-03.oopen.de - o17.oopen.de test.mx.oopen.de meet2.oopen.de @@ -167,8 +163,12 @@ web-02.oopen.de d.mx.oopen.de 95.217.204.247 -# Jitsi Meet - ReachOut +# O.OPEN - b.mx web-01 ... o36.oopen.de +b.mx.oopen.de +piwik.oopen.de +web-01.oopen.de +web-03.oopen.de # Backup Faire Mobilitaet o37.oopen.de @@ -180,6 +180,7 @@ lxc-host-kb.anw-kb.netz gw-123.oopen.de gw-ah.kanzlei-kiel.netz +gw-ebs.oopen.de gw-akb.akb.netz gw-b3.oopen.de gw-blkr.oopen.de @@ -248,8 +249,9 @@ lists.mx.warenform.de # server25 server25.warenform.de -web1.warenform.de web0.warenform.de +web1.warenform.de +web2.warenform.de # server26 server26.warenform.de @@ -288,13 +290,6 @@ o13-web.oopen.de o14.oopen.de a.mx.oopen.de -# - o15.oopen.de -o15.oopen.de -b.mx.oopen.de -piwik.oopen.de -web-01.oopen.de -web-03.oopen.de - o17.oopen.de test.mx.oopen.de test.mariadb.oopen.de @@ -378,8 +373,12 @@ web-02.oopen.de d.mx.oopen.de 95.217.204.247 -# Jitsi Meet - ReachOut +# O.OPEN - b.mx web-01 ... o36.oopen.de +b.mx.oopen.de +piwik.oopen.de +web-01.oopen.de +web-03.oopen.de # Backup Faire Mobilitaet o37.oopen.de @@ -397,6 +396,9 @@ gw-akb.akb.netz # - Kanzlei Kiel gw-ah.kanzlei-kiel.netz +# - Kanzlei EBS Leipzig +gw-ebs.oopen.de + # - GA - Gemeinschaft Altensclirf ga-st-lxc1.ga.netz ga-st-mail.ga.netz @@ -444,11 +446,6 @@ o13-web.oopen.de # o14.oopen.de a.mx.oopen.de -# o15.oopen.de -web-01.oopen.de -web-03.oopen.de -piwik.oopen.de - # o17.oopen.de test.mariadb.oopen.de test.mx.oopen.de @@ -488,6 +485,12 @@ web-02.oopen.de d.mx.oopen.de 95.217.204.247 +# o36 - b.mx, web-01, web-03,-- +piwik.oopen.de +web-01.oopen.de +web-03.oopen.de +b.mx.oopen.de + # Backup Faire Mobilitaet o37.oopen.de @@ -526,8 +529,9 @@ mx.warenform.de lists.mx.warenform.de # server25 -web1.warenform.de web0.warenform.de +web1.warenform.de +web2.warenform.de # server27 verdi-django.warenform.de @@ -563,8 +567,9 @@ vvn-shop.warenform.de vvn-www.warenform.de # server25 -web1.warenform.de web0.warenform.de +web1.warenform.de +web2.warenform.de # server27 verdi-django.warenform.de @@ -633,9 +638,6 @@ o34.oopen.de # o35.oopen.de cl-02.oopen.de -# Jitsi Meet - ReachOut -o36.oopen.de - [ftp_server] @@ -649,9 +651,6 @@ initiativenserver.oopen.de # o13.oopen.de o13-web.oopen.de -# o15.oopen.de -web-01.oopen.de -web-03.oopen.de # o21.oopen.de web.cadus.org @@ -675,6 +674,10 @@ o32.oopen.de etherpad.oopen.de web-02.oopen.de +# o36 - b.mx, web-01, web-03,-- +web-01.oopen.de +web-03.oopen.de + # --- # Warenform server @@ -700,10 +703,6 @@ o13-schleuder.oopen.de # o14.oopen.de a.mx.oopen.de -# o15.oopen.de -b.mx.oopen.de -web-01.oopen.de - # o17.oopen.de test.mx.oopen.de @@ -718,6 +717,9 @@ e.mx.oopen.de d.mx.oopen.de 95.217.204.247 +# o36 - b.mx, web-01, web-03,-- +web-01.oopen.de +b.mx.oopen.de # --- # O.OPEN office network @@ -754,10 +756,6 @@ o13-mail.oopen.de # o14.oopen.de a.mx.oopen.de -# o15.oopen.de -web-03.oopen.de -web-01.oopen.de - # o25.oopen.de mail.faire-mobilitaet.de @@ -766,6 +764,10 @@ e.mx.oopen.de d.mx.oopen.de 95.217.204.247 +# o36 - b.mx, web-01, web-03,-- +web-01.oopen.de +web-03.oopen.de + # --- # O.OPEN office network # --- @@ -803,11 +805,6 @@ o13-board.oopen.de o13-mail.oopen.de o13-web.oopen.de -# o15.oopen.de -piwik.oopen.de -web-01.oopen.de -web-03.oopen.de - # o17.oopen.de test.mx.oopen.de test.mariadb.oopen.de @@ -851,6 +848,11 @@ etherpad.oopen.de web-02.oopen.de d.mx.oopen.de +# o36 - b.mx, web-01, web-03,-- +piwik.oopen.de +web-01.oopen.de +web-03.oopen.de + # Backup Faire Mobilitaet o37.oopen.de @@ -882,8 +884,9 @@ mx.warenform.de lists.mx.warenform.de # server25.warenform.de -web1.warenform.de web0.warenform.de +web1.warenform.de +web2.warenform.de # --- # - Warenform Office @@ -956,9 +959,6 @@ o13-mail.oopen.de # o14.oopen.de a.mx.oopen.de -# o15.oopen.de -b.mx.oopen.de - # o17.oopen.de test.mx.oopen.de @@ -976,6 +976,9 @@ d.mx.oopen.de e.mx.oopen.de 95.217.204.247 +# o36.oopen.de - b.mx, web-01, web-03 +b.mx.oopen.de + # --- # O.OPEN office network # --- @@ -1051,6 +1054,9 @@ meet.faire-mobilitaet.de # netcup - Jitsi Meet Martin Beck o27.oopen.de +# Jitsi Meet - Faire Integration +server28.warenform.de + # Jitsi Meet - Anwaeltinnenbüro o29.oopen.de @@ -1060,12 +1066,6 @@ meet.akweb.de # Jitsi Meet - AG Beratung o34.oopen.de -# Jitsi Meet - ReachOut -o36.oopen.de - -# Jitsi Meet - Faire Integration -server28.warenform.de - [lxc_host] @@ -1076,7 +1076,6 @@ server28.warenform.de o12.oopen.de o13.oopen.de o14.oopen.de -o15.oopen.de o17.oopen.de o18.oopen.de #o20.oopen.de @@ -1089,6 +1088,7 @@ o28.oopen.de o30.oopen.de o32.oopen.de o35.oopen.de +o36.oopen.de lxc-host-kb.anw-kb.netz @@ -1142,12 +1142,6 @@ o13-web.oopen.de # - o14.oopen.de a.mx.oopen.de -# - o15.oopen.de -b.mx.oopen.de -piwik.oopen.de -web-01.oopen.de -web-03.oopen.de - # - o17.oopen.de test.mx.oopen.de test.mariadb.oopen.de @@ -1222,8 +1216,11 @@ b.ns.oopen.de d.mx.oopen.de 95.217.204.247 -# Jitsi Meet - ReachOut -o36.oopen.de +# o36 - b.mx, web-01, web-03,-- +b.mx.oopen.de +piwik.oopen.de +web-01.oopen.de +web-03.oopen.de # --- # O.OPEN office network @@ -1262,6 +1259,7 @@ lists.mx.warenform.de # - server25 web0.warenform.de web1.warenform.de +web2.warenform.de # - server26 server26.warenform.de @@ -1323,13 +1321,6 @@ o13-web.oopen.de o14.oopen.de a.mx.oopen.de -# - o15.oopen.de -o15.oopen.de -b.mx.oopen.de -piwik.oopen.de -web-01.oopen.de -web-03.oopen.de - # - o17.oopen.de o17.oopen.de test.mx.oopen.de @@ -1416,8 +1407,11 @@ b.ns.oopen.de d.mx.oopen.de 95.217.204.247 -# Jitsi Meet - ReachOut -o36.oopen.de +# o36 - b.mx, web-01, web-03,-- +b.mx.oopen.de +piwik.oopen.de +web-03.oopen.de +web-01.oopen.de # Backup Faire Mobilitaet o37.oopen.de @@ -1442,6 +1436,7 @@ gitea.so36.net # --- gw-ah.oopen.de +gw-ebs.oopen.de gw-ak.oopen.de gw-akb.oopen.de gw-ckubu.local.netz @@ -1487,6 +1482,7 @@ gw-replacement.wf.netz [gateway_server_rw] gw-ah.oopen.de +gw-ebs.oopen.de gw-ak.oopen.de gw-akb.oopen.de gw-ckubu.local.netz @@ -1544,6 +1540,7 @@ lists.mx.warenform.de server25.warenform.de web0.warenform.de web1.warenform.de +web2.warenform.de # - server26 server26.warenform.de diff --git a/roles/common/files/b.mx/etc/postfix/postfwd.bl-sender b/roles/common/files/b.mx/etc/postfix/postfwd.bl-sender new file mode 100644 index 0000000..2782ddc --- /dev/null +++ b/roles/common/files/b.mx/etc/postfix/postfwd.bl-sender @@ -0,0 +1,5 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# --- +# Sender addresses blocked by postfwd +# --- diff --git a/roles/common/files/b.mx/etc/postfix/postfwd.bl-user b/roles/common/files/b.mx/etc/postfix/postfwd.bl-user new file mode 100644 index 0000000..8867e2a --- /dev/null +++ b/roles/common/files/b.mx/etc/postfix/postfwd.bl-user @@ -0,0 +1,6 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# --- +# SASL Users blocked by postfwd +# --- + diff --git a/roles/common/files/b.mx/etc/postfix/postfwd.wl-user b/roles/common/files/b.mx/etc/postfix/postfwd.wl-user new file mode 100644 index 0000000..a736dc3 --- /dev/null +++ b/roles/common/files/b.mx/etc/postfix/postfwd.wl-user @@ -0,0 +1,7 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# --- +# SASL Users whitelisted by postfwd +# --- + +kanzlei-kiel@b.mx.oopen.de diff --git a/roles/common/files/b.mx/root/bin/monitoring/conf/check_webservice_load.conf b/roles/common/files/b.mx/root/bin/monitoring/conf/check_webservice_load.conf new file mode 100644 index 0000000..a40811b --- /dev/null +++ b/roles/common/files/b.mx/root/bin/monitoring/conf/check_webservice_load.conf @@ -0,0 +1,154 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +#--------------------------------------- +#----------------------------- +# Settings +#----------------------------- +#--------------------------------------- + + +# --- +# - LOGGING +# - +# - This Parameter is now obsolete. If script is running in a terminal, then output ist verbose, +# - the output will be verbos. If running as cronjob, output will only be written, if warnings or +# - errors occurs. +# --- + + +# - What to check +# - +check_load=true +check_mysql=false +check_apache=true +check_php_fpm=false +check_website=false + + +# - Additional Settings for check_mysql +# - +# - MySQL / MariaDB credentials +# - +# - Giving password on command line is insecure an sind mysql 5.5 +# - you will get a warning doing so. +# - +# - Reading username/password fro file ist also possible, using MySQL/MariaDB +# - commandline parameter '--defaults-file'. +# - +# - Since Mysql Version 5.6, you can read username/password from +# - encrypted file. +# - +# - Create (encrypted) option file: +# - $ mysql_config_editor set --login-path=local --socket=/tmp/mysql.sock --user=root --password +# - $ Password: +# - +# - Use of option file: +# - $ mysql --login-path=local ... +# - +# - Example +# - mysql_credential_args="--login-path=local" +# - mysql_credential_args="--defaults-file=/etc/mysql/debian.cnf" (Debian default) +# - mysql_credential_args="--defaults-file=/usr/local/mysql/sys-maint.cnf" +# - +mysql_credential_args="" + + +# - Additional Settings for check_php_fpm +# - +# - On Linux Vserver System set +# - curl_check_host=localhost +# - +# - On LX-Container set +# - curl_check_host=127.0.0.1 +# - +curl_check_host=127.0.0.1 + +# - Which PHP versions should be supported by this script. If more than one, +# - give a blank separated list +# - +# - Example: +# - php_versions="5.4 5.6 7.0 7.1" +# - +php_versions="" + +# - If PHP-FPM's ping.path setting does not match ping-$php_major_version, +# - set the value given in your ping.path setting here. Give ping_path also +# - the concerning php_version in form +# - : +# - +# - Multiple settings are possible, give a blank separated list. +# - +# - Example: +# - +# - ping_path="5.4:ping-site36_net 5.6:ping-oopen_de" +# - +ping_path="" + + +# - Additional Settings for check_website - checking (expected) website response +# - +# - example: +# - is_working_url="https://www.outoflineshop.de/" +# - check_string='ool-account-links' +# - include_cleanup_function=true +# - extra_alert_address="ilker@so36.net" +# - cleanup_function=' +# - rm -rf /var/www/www.outoflineshop.de/htdocs/var/cache/* +# - rm -rf /var/www/www.outoflineshop.de/htdocs/var/session/* +# - /usr/local/bin/redis-cli flushall > /dev/null 2>&1 +# - if [[ "$?" = "0" ]]; then +# - ok "I have cleaned up directory \"/var/www/www.outoflineshop.de/htdocs/var/cache/\"" +# - else +# - error "Cleaning up directory \"/var/www/www.outoflineshop.de/htdocs/var/cache/\" failed!" +# - fi +# - /etc/init.d/redis_6379 restart +# - if [[ "$?" = "0" ]]; then +# - ok "I restarted the redis service" +# - echo -e "\t[ Ok ]: I restarted the redis service" >> $LOCK_DIR/extra_msg.txt +# - else +# - error "Restarting the redis server failed!" +# - echo -e "\t[ Error ]: Restarting the redis server failed!" >> $LOCK_DIR/extra_msg.txt +# - fi +# - ' +# - +is_working_url='' + +check_string='' + +include_cleanup_function=true + +# - An extra e-mail address, which will be informed, if the given check URL +# - does not response as expected (check_string) AFTER script checking, restarting +# - servervices (webserver, php-fpm) and cleaning up (cleanup_function) was done. +# - +extra_alert_address='' + +# - php_version_of_working_url +# - +# - If given website (is_working_url) does not response as expected, this PHP FPM +# - engines will be restarted. +# - +# - Type "None" if site does not support php +# - +# - If php_version_of_working_url is not set, PHP FPM processes of ALL versions (php_versions) +# - will be restarted +# - +php_version_of_working_url='' + +# - Notice: +# - If single qoutes "'" not needed inside cleanup function, then use single quotes +# - to enclose variable "cleanup_function". Then you don't have do masquerade any +# - sign inside. +# - +# - Otherwise use double quotes and masq any sign to prevent bash from interpreting. +# - +cleanup_function=' +' + + +# - E-Mail settings for sending script messages +# - +from_address="root@`hostname -f`" +content_type='Content-Type: text/plain;\n charset="utf-8"' +to_addresses="root" + diff --git a/roles/common/files/b.mx/root/bin/postfix/conf/create_opendkim_key.conf b/roles/common/files/b.mx/root/bin/postfix/conf/create_opendkim_key.conf new file mode 100644 index 0000000..3a2d6be --- /dev/null +++ b/roles/common/files/b.mx/root/bin/postfix/conf/create_opendkim_key.conf @@ -0,0 +1,176 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# --------------------------------------------------------- +# - Parameter Settings for script 'create_opendkim_key.sh'. +# --------------------------------------------------------- + + +# ---------- +# DNS Server +# ---------- + +# - dns_dkim_zone_master_server +# - +# - The DNS Server who is serving the update zone and is used +# - for the dynamic updates (nsupdate) +# - +#dns_dkim_zone_master_server="" +dns_dkim_zone_master_server="b.ns.oopen.de" + +# - update_dns +# - +# - Possible Values are 'true' or 'false' +# - +#update_dns=true + +# - update_zone +# - +# - Zone containing the DKIM TXT record. +# - +# - Defaults to '_domainkey.' +# - +# - Note: +# - do NOT change/set this option unless you know what you do. +# - +#update_zone="" + +# - TTL +# - +# - TTL for the DKIM TXT Record. +# - +# - Defaults to "" if update_dns=false +# - Defaults to "43200" if update_dns=true +# - +#TTL= + + +# ---------- +# TSIG Key +# ---------- + +# - key_secret +# - +# - Sectret Key used by 'nsupdate' to create/update the +# - DKIM TXT record. +# - +# - Example: +# - key_secret="EtvvMdW0PXD4GMHP+onuHZ0dT/Z8OSJGlce/xH10OwI=" +# - +#key_secret="" +key_secret="4woPu0jqf9Jp1IX+gduJ3BVW/1ZMeyCPTQMqEsMXLFw=" + +# - key_algo +# - +# - The key algorithm used for key creation. Available choices are: hmac-md5, +# - hmac-sha1, hmac-sha224, hmac-sha256, hmac-sha384 and hmac-sha512. The +# - default is hmac-sha256. Options are case-insensitive. +# - +# - Example: +# - key_algo="hmac-md5" +# - +# - Defaults to 'hmac-sha256' +# - +#key_algo="hmac-sha256" +key_algo="hmac-sha256" + +# - key_name +# - +# - Name of the Key +# - +# - Defaults to "$update_zone" +# - +#key_name="" +key_name="update-dkim" + + +# ---------- +# Access Credentials DNS Server +# ---------- + +# - dns_ssh_user +# - +# - Defaults to 'manage-bind' +# - +#dns_ssh_user="manage-bind" + +# - dns_ssh_port +# - +# - Defaults to '22' +# - +#dns_ssh_port=22 + +# - dns_ssh_key +# - +# - Defaults to '/root/.ssh/id_rsa-opendkim' +# - +#dns_ssh_key="/root/.ssh/id_rsa-opendkim" + + +# ---------- +# Scripts envoked at DNS Server +# ---------- + +# - set_new_serial_script +# - +# - Script increases the serial for a given domain or a given +# - hostname's concerning domain. +# - +# - Defaults to /root/bin/bind/bind_set_new_serial.sh +# - +#set_new_serial_script="/root/bin/bind/bind_set_new_serial.sh" + +# - create_dkim_delegation_script +# - +# - Script adds DKIM subdomain delegation for a given domain +# - +# - Defaults to '/root/bin/bind/bind_create_dkim_delegation.sh' +# - +#create_dkim_delegation_script="/root/bin/bind/bind_create_dkim_delegation.sh" + +# - add_dkim_zone_master_script +# - +# - Script adds zone _domainkey. as master zone +# - +# - Defaults to '/root/bin/bind/bind_add_dkim_zone_master.sh' +# - +#add_dkim_zone_master_script="/root/bin/bind/bind_add_dkim_zone_master.sh" + +# - add_dkim_zone_slave_script +# - +# - Script adds zone _domainkey. as slave zone +# - +# - Defaults to '/root/bin/bind/bind_add_dkim_zone_slave.sh' +# - +#add_dkim_zone_slave_script="/root/bin/bind/bind_add_dkim_zone_slave.sh" + + + +# ---------- +# OpenDKIM Installation +# ---------- + +# - opendkim_dir +# - +# - OpenDKIM's etc-directory +# - +# - Defaults to opendkim_dir="/etc/opendkim" +# - +#opendkim_dir="/etc/opendkim" + +# - key_base_dir +# - +# - Defaults to "${opendkim_dir}/keys" +# - +#key_base_dir=${opendkim_dir}/keys + +# - signing_table_file +# - +# - Defaults to "${opendkim_dir}/signing.table" +# - +#signing_table_file="${opendkim_dir}/signing.table" + +# - key_table_file +# - +# - Defaults to "${opendkim_dir}/key.table" +# - +#key_table_file="${opendkim_dir}/key.table" diff --git a/roles/common/files/b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf b/roles/common/files/b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf new file mode 100644 index 0000000..11c60fa --- /dev/null +++ b/roles/common/files/b.mx/root/bin/postfix/conf/whitelist_mb_sigs.conf @@ -0,0 +1,44 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# ====================================================== +# --- +# Parameter Settings for Script 'whitelist_mb_sigs.conf' +# --- +# ====================================================== + +# QUARANTINE_BASE_DIR +# +# Base directory where amavis stores quarantined e-mails, mostly in +# +# virus e-mails: $QUARANTINE_BASE_DIR/virus +# spam emails: $QUARANTINE_BASE_DIR/spam +# .. +# +# Defaults to: +# QUARANTINE_BASE_DIR="/var/QUARANTINE" +# +#QUARANTINE_BASE_DIR="/var/QUARANTINE" + + +# CLAMAV_VIRUS_WHITE_LIST +# +# Full path to clamav's (personal) white list file +# +# Defaults to: +# CLAMAV_VIRUS_WHITE_LIST="/var/lib/clamav/my_whitelist.ign2" +# +#CLAMAV_VIRUS_WHITE_LIST="/var/lib/clamav/my_whitelist.ign2" + + +# WHITE_LIST_STRINGS +# +# A blank separated list of strings to whitelist. +# +# Example: +# WHITE_LIST_STRINGS="google.com tinyurl.com" +# +# Defaults to: +# WHITE_LIST_STRINGS="google.com" +# +#WHITE_LIST_STRINGS="google.com" +WHITE_LIST_STRINGS="google.com tinyurl.com" diff --git a/roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated b/roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated new file mode 100644 index 0000000..7d0c4c5 --- /dev/null +++ b/roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated.pub b/roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated.pub new file mode 100644 index 0000000..e2b40f9 --- /dev/null +++ b/roles/common/files/root/.ssh/b.mx-id_rsa-dehydrated.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQMbIuKCFXgya1DQle0rsUYoX3Vqi6Dpn/Q8tnJ++pXVd9CuzSz/ykcykaY8ia3XVSCLDqxn0PuANs1q7Y0gMiFDiS/j31fPIdf5SdQSqDSXIqQBRD1diudZAAJr8IzSu4os0QjdWDy60EcuKeDluyKwUfNUXhBgZljFf6RDJ4rv5nWgNYXptV+qSWiJ/EbXLsMOPvVd8FNNi0H0bPWZTuWX/w0ZZJsJGnkzwoJEaq0X2qHo1NpyVt/l/Giwtmhho/gzpPGBAUFt9hDraUKLXggcXJEfIHZDHqgSSA2n8LMITSPg0vb1lgDFbh1lmDmaKoiBoMWBFzOdT817LIcEZ4ilHM25sTawf+0UX5xmXec3AvJn6DzXo4EjC1GGxzAtZ6yax75QR+q14yQOqhK01fxvdl05w6WuFJVtvNsnbitO5Ye6xG7lbnMnewq/TK+0JyToutnbsYat2rYG4tHZ3BNBYQEsFFbOW0OBChsPOYPSGyT7pF9BOUWRQHv4uok1tPpEnLvQAWltW/zySFAhZ4FRwlggwgTYEyo/gsaqGogJn5CmJ2bOMW7mm+CfCj5Hlq9UK4PfOStRlMTElV1TEYQOUUZRjQBUUHr858e3AqnOtbg5m8l0a/NiJl8gA1yoc33m2o/q61FZWzb7DPsBAyRu50gULMbovtBM29FDVEnLUQ== root@b.mx.oopen.de diff --git a/roles/common/files/root/.ssh/b.mx-id_rsa-opendkim b/roles/common/files/root/.ssh/b.mx-id_rsa-opendkim new file mode 100644 index 0000000..cac5660 --- /dev/null +++ b/roles/common/files/root/.ssh/b.mx-id_rsa-opendkim @@ -0,0 +1,51 @@ +-----BEGIN RSA PRIVATE KEY----- +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 +-----END RSA PRIVATE KEY----- diff --git a/roles/common/files/root/.ssh/b.mx-id_rsa-opendkim.pub b/roles/common/files/root/.ssh/b.mx-id_rsa-opendkim.pub new file mode 100644 index 0000000..e7f7f48 --- /dev/null +++ b/roles/common/files/root/.ssh/b.mx-id_rsa-opendkim.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC/1+rof+U/BaxO+Cx6IGrde0IJEoxgWEBJvfl8X3V7S9nRkW759N/WA/7umHQs1f3XGpYPKI9BOyEV9tRLtzSZx3rtwyXUg4UVM/PQZIDzCBz8/JsCiMhBOWYpxDKPvIySDPj1siRd879dsCUlVaX216871k+WSZfmcm5ivDUjqOTPCALtxRtV7kIxUpE0WA6Z55ofcaREWrS8H4WTKIEW5MI2wXwhhE4Y96x2qAt/Cc/sVHq4HEzBwyoT1oAuj9TIRmOAEDtyKjqEIcpy01eD+DRpy6GCkKfEf9C8cim6VpKhj2yZsUbfTOIK7ElGuZ9huYrZiZdDZNNTsCeDKUHjs330LW91gJ7E+bsKTYtkILjMHzSBey4bh7iCpgUQyPX0HK+JuWdaxkscj90miMmJMhSq+tJiDe1kchRqF3DqcPcaOC+UpqlQRFdTD84wFBXYD5/cjHQ6OwkQICxy22lJeAp5icSZq82B5Dmycg1+OPFyMyTTAyiDUXwyPz796LyKJ/sMGnIBx4jDhZBmJB9qr47Qg7wh2+L76a82dRncrAyVoc+/B3iTdqX0IO9+d7Wtelmo64p2hBNq4dtq6c0gRkwFvHamYkHMzf6pGW8G2LmcNkN08JPX3BtA0u6OXGt0jApwlLNnVEHOIVqbca6HV3uBCXGmD4GkRBhpNoJeuQ== root@b.mx diff --git a/roles/common/templates/usr/local/src/mailsystem/conf/install_amavis.conf.j2 b/roles/common/templates/usr/local/src/mailsystem/conf/install_amavis.conf.j2 index 505421e..acd5d5e 100644 --- a/roles/common/templates/usr/local/src/mailsystem/conf/install_amavis.conf.j2 +++ b/roles/common/templates/usr/local/src/mailsystem/conf/install_amavis.conf.j2 @@ -12,11 +12,13 @@ _IPV6='{{ ipv6_address | default(omit) }}' _QUARANTINE_DIR=/var/QUARANTINE _QUARANTINE_ADMIN=postmaster\@$mydomain -_DB_IN_USE=true +_DB_IN_USE="{{ db_in_use | default('false') }}" {% if "PostgreSQL" == postfix_db_type %} _DB_TYPE=PostgreSQL -{% else %} +{% elif 'MySQL' == postfix_db_type %} _DB_TYPE=MySQL +{% else %} +_DB_TYPE=None {% endif %} _DB_HOST={{ postfix_db_host | default(omit) }} _DB_NAME={{ postfix_db_name | default(omit) }} diff --git a/roles/common/templates/usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2 b/roles/common/templates/usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2 index 1891adb..4de79b6 100644 --- a/roles/common/templates/usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2 +++ b/roles/common/templates/usr/local/src/mailsystem/conf/install_postfix_advanced.conf.j2 @@ -13,8 +13,8 @@ _HOSTNAME={{ hostname }} _IPV4='{{ ipv4_address | default(omit) }}' _IPV6='{{ ipv6_address | default(omit) }}' _ADMIN_EMAIL=argus@oopen.de -_SASL_AUTH=false -_SASL_USER= -_SASL_PASS= -_RELAY_HOST=false +_SASL_AUTH_ENABLED="{{ sasl_auth_enable | default('no') }}" +_SASL_USER='{{ sasl_user | default(omit) }}' +_SASL_PASS='{{ sasl_pass | default(omit) }}' +_RELAY_HOST="{{ is_relay_host | default('false') }}"