From df3db74c6b129b3ec68561ae6ff6299adfee12c4 Mon Sep 17 00:00:00 2001 From: Christoph Date: Fri, 2 Aug 2024 17:25:47 +0200 Subject: [PATCH] update.. --- group_vars/all/main.yml | 4 + host_vars/a.mx.oopen.de.yml | 4 + host_vars/mail.cadus.org.yml | 4 +- install_amavis.conf.j2 | 64 +++++++++++ .../postfwd.bl-recipient-exeeds-msg-size-20mb | 34 ++++++ .../postfwd.bl-recipient-exeeds-msg-size-20mb | 32 ++++++ .../files/mailserver/etc/postfix/postfwd.cf | 13 +++ roles/common/tasks/main.yml | 4 +- .../mailsystem/conf/install_amavis.conf.j2 | 42 ++++++-- .../conf/install_postfix_advanced.conf.j2 | 16 ++- .../conf/install_postfixadmin.conf.j2 | 30 +++++- .../conf/install_update_dovecot.conf.j2 | 66 ++++++++++-- .../install_upgrade_roundcube-webmail.conf.j2 | 74 ++++++++++--- ...install_upgrade_roundcube-webmail2.conf.j2 | 100 +++++++++++++++--- 14 files changed, 429 insertions(+), 58 deletions(-) create mode 100644 install_amavis.conf.j2 create mode 100644 roles/common/files/a.mx/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb create mode 100644 roles/common/files/mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb diff --git a/group_vars/all/main.yml b/group_vars/all/main.yml index 9c87031..aef67f7 100644 --- a/group_vars/all/main.yml +++ b/group_vars/all/main.yml @@ -2675,6 +2675,10 @@ copy_plain_files_postfwd: src_path: mailserver/etc/postfix/postfwd.bl-user dest_path: /etc/postfix/postfwd.bl-user + - name: postfwd.bl-recipient-exeeds-msg-size-20mb + src_path: mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb + dest_path: /etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb + - name: postfwd.wl-hosts src_path: mailserver/etc/postfix/postfwd.wl-hosts dest_path: /etc/postfix/postfwd.wl-hosts diff --git a/host_vars/a.mx.oopen.de.yml b/host_vars/a.mx.oopen.de.yml index e0381fa..652d1e2 100644 --- a/host_vars/a.mx.oopen.de.yml +++ b/host_vars/a.mx.oopen.de.yml @@ -190,6 +190,10 @@ copy_plain_files_postfwd_host_specific: src_path: a.mx/etc/postfix/postfwd.wl-user dest_path: /etc/postfix/postfwd.wl-user + - name: postfwd.bl-recipient-exeeds-msg-size-20mb + src_path: a.mx/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb + dest_path: /etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb + #copy_template_files: [] # diff --git a/host_vars/mail.cadus.org.yml b/host_vars/mail.cadus.org.yml index f9666f1..a36cd59 100644 --- a/host_vars/mail.cadus.org.yml +++ b/host_vars/mail.cadus.org.yml @@ -233,7 +233,7 @@ db_in_use: !!str "true" postfix_db_type: MySQL postfix_db_name: postfix postfix_db_user: postfix -#postfix_db_host: +postfix_db_host: postfix_db_pass: T3CJnFMJNX9wmhNs # install_amavis.conf @@ -298,7 +298,7 @@ template_files_mailsystem_script: 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 + - name: mailsystem_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/install_amavis.conf.j2 b/install_amavis.conf.j2 new file mode 100644 index 0000000..3be894d --- /dev/null +++ b/install_amavis.conf.j2 @@ -0,0 +1,64 @@ +# {{ ansible_managed }} + +# --- +# - Parametersettins postfix bases system +# --- + + +_HOSTNAME={{ hostname }} +{% if ipv4_address is defined and ipv4_address|length %} +_IPV4='{{ ipv4_address }}' +{% else %} +_IPV4= +{% endif %} +{% if ipv6_address is defined and ipv6_address %} +_IPV6="{{ ipv6_address }}" +{% else %} +_IPV6=disabled +{% endif %} + +_QUARANTINE_DIR=/var/QUARANTINE +_QUARANTINE_ADMIN=postmaster\@$mydomain + +_DB_IN_USE="{{ db_in_use | default('false') }}" +{% if "PostgreSQL" == postfix_db_type %} +_DB_TYPE=PostgreSQL +{% elif 'MySQL' == postfix_db_type %} +_DB_TYPE=MySQL +{% else %} +_DB_TYPE=None +{% endif %} +{% if postfix_db_host is defined and postfix_db_host|length %} +_DB_HOST={{ postfix_db_host }} +{% else %} +_DB_HOST= +{% endif %} +{% if postfix_db_name is defined and postfix_db_name|length %} +_DB_NAME={{ postfix_db_name }} +{% else %} +_DB_NAME= +{% endif %} +{% if postfix_db_user is defined and postfix_db_user|length %} +_DB_USER={{ postfix_db_user }} +{% else %} +_DB_USER= +{% endif %} +{% if postfix_db_pass is defined and postfix_db_pass|length %} +_DB_PASS='{{ postfix_db_pass }}' +{% else %} +_DB_PASS= +{% endif %} +_INSTALL_CLAMAV_UNOFFICIAL_SIGS=true +_MALWARE_PATROL_IN_USE=true +_MALWERE_PATROL_FREE=false +{% if mp_receipt_number is defined and mp_receipt_number|length %} +_MP_RECEIPT_NUMBER={{ mp_receipt_number }} +{% else %} +_MP_RECEIPT_NUMBER= +{% endif %} +_SECURITE_INFO_IN_USE=true +{% if si_authorisation_signature is defined and si_authorisation_signature|length %} +_SI_AUTHORISATION_SIGNATURE={{ si_authorisation_signature }} +{% else %} +_SI_AUTHORISATION_SIGNATURE= +{% endif %} diff --git a/roles/common/files/a.mx/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb b/roles/common/files/a.mx/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb new file mode 100644 index 0000000..507514c --- /dev/null +++ b/roles/common/files/a.mx/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb @@ -0,0 +1,34 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# --- +# Block messages exeeds 20 MB for listed recipients +# +# This file is called with '=~'. This means perl regexp is possible +# +# +# To increase performance use ^ and/or $ in regular expressions +# +# @acieu\.co\.uk$ +# ^error@mailfrom\.com$ +# +# instedt of +# +# @acieu.co.uk +# error@mailfrom.com +# +# +# Example: +# +# # # annoying spammer domains +# # block all senders of maildomaindomain 'oopen.de' +# @acieu\.co\.uk$ +# +# # annoying spammer addresses +# # block sender address +# error@mailfrom.com +# sqek@eike\.se$ +# +# --- + +# MBR / VDK +info@mbr-berlin.de diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb b/roles/common/files/mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb new file mode 100644 index 0000000..3dec979 --- /dev/null +++ b/roles/common/files/mailserver/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb @@ -0,0 +1,32 @@ +# *** [ Ansible managed: DO NOT EDIT DIRECTLY ] *** + +# --- +# Block messages exeeds 20 MB for listed recipients +# +# This file is called with '=~'. This means perl regexp is possible +# +# +# To increase performance use ^ and/or $ in regular expressions +# +# @acieu\.co\.uk$ +# ^error@mailfrom\.com$ +# +# instedt of +# +# @acieu.co.uk +# error@mailfrom.com +# +# +# Example: +# +# # # annoying spammer domains +# # block all senders of maildomaindomain 'oopen.de' +# @acieu\.co\.uk$ +# +# # annoying spammer addresses +# # block sender address +# error@mailfrom.com +# sqek@eike\.se$ +# +# --- + diff --git a/roles/common/files/mailserver/etc/postfix/postfwd.cf b/roles/common/files/mailserver/etc/postfix/postfwd.cf index 9b8b549..7cb6ea7 100644 --- a/roles/common/files/mailserver/etc/postfix/postfwd.cf +++ b/roles/common/files/mailserver/etc/postfix/postfwd.cf @@ -50,6 +50,13 @@ sender=~file:/etc/postfix/postfwd.bl-sender } +# Block messages exceedds size of 20MB +&&BLOCK_CLIENT_NAME_MSG_SIZE_20MB { + protocol_state==END-OF-MESSAGE + recipient=~file:/etc/postfix/postfwd.bl-recipient-exeeds-msg-size-20mb + size=20971520 +} + # Inbound emails only &&INCOMING { client_address!=127.0.0.1 @@ -139,6 +146,12 @@ id=BL_SENDER action=REJECT Sender address is blocked by Mailserver admins. Error: BL_SENDER +# Block messages for given recipients exceeds size of 20 MB +id=BLOCK_MSG_SIZE_20MB + &&BLOCK_CLIENT_NAME_MSG_SIZE_20MB + action=REJECT message exceeds the size of 20 MB ($$size). Error: BLOCK_MSG_SIZE_20MB + + # Rate Limits # Throttle unknown clients to 5 recipients per 5 minutes: diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 40f5d32..d6a4878 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -208,8 +208,8 @@ # tags supported inside config_files_mailsystem_scripts.yml: # -#- import_tasks: config_files_mailsystem_scripts.yml -# tags: +- import_tasks: config_files_mailsystem_scripts.yml + tags: - config-files-mailsystem # tags supported inside samba-user.yml: 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 9a12c49..dcfba88 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 @@ -6,7 +6,11 @@ _HOSTNAME={{ hostname }} -_IPV4='{{ ipv4_address | default(omit) }}' +{% if ipv4_address is defined and ipv4_address %} +_IPV4='{{ ipv4_address }}' +{% else %} +_IPV4= +{% endif %} {% if ipv6_address is defined and ipv6_address %} _IPV6="{{ ipv6_address }}" {% else %} @@ -24,13 +28,37 @@ _DB_TYPE=MySQL {% else %} _DB_TYPE=None {% endif %} -_DB_HOST={{ postfix_db_host | default(omit) }} -_DB_NAME={{ postfix_db_name | default(omit) }} -_DB_USER={{ postfix_db_user | default(omit) }} -_DB_PASS='{{ postfix_db_pass | default(omit) }}' +{% if postfix_db_host is defined and postfix_db_host %} +_DB_HOST={{ postfix_db_host }} +{% else %} +_DB_HOST= +{% endif %} +{% if postfix_db_name is defined and postfix_db_name %} +_DB_NAME={{ postfix_db_name }} +{% else %} +_DB_NAME= +{% endif %} +{% if postfix_db_user is defined and postfix_db_user %} +_DB_USER={{ postfix_db_user }} +{% else %} +_DB_USER= +{% endif %} +{% if postfix_db_pass is defined and postfix_db_pass %} +_DB_PASS='{{ postfix_db_pass }}' +{% else %} +_DB_PASS= +{% endif %} _INSTALL_CLAMAV_UNOFFICIAL_SIGS=true _MALWARE_PATROL_IN_USE=true _MALWERE_PATROL_FREE=false -_MP_RECEIPT_NUMBER={{ mp_receipt_number | default(omit) }} +{% if mp_receipt_number is defined and mp_receipt_number %} +_MP_RECEIPT_NUMBER={{ mp_receipt_number }} +{% else %} +_MP_RECEIPT_NUMBER= +{% endif %} _SECURITE_INFO_IN_USE=true -_SI_AUTHORISATION_SIGNATURE={{ si_authorisation_signature | default(omit) }} +{% if si_authorisation_signature is defined and si_authorisation_signature %} +_SI_AUTHORISATION_SIGNATURE={{ si_authorisation_signature }} +{% else %} +_SI_AUTHORISATION_SIGNATURE= +{% endif %} 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 fbc1a22..e9e6977 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 @@ -10,7 +10,11 @@ # ---------------------------------------------------- _HOSTNAME={{ hostname }} +{% if ipv4_address is defined and ipv4_address %} _IPV4='{{ ipv4_address | default(omit) }}' +{% else %} +_IPV4= +{% endif %} {% if ipv6_address is defined and ipv6_address %} _IPV6="{{ ipv6_address }}" {% else %} @@ -18,8 +22,16 @@ _IPV6=disabled {% endif %} _ADMIN_EMAIL="{{ admin_email }}" _SASL_AUTH_ENABLED="{{ sasl_auth_enable | default('no') }}" -_SASL_USER='{{ sasl_user | default(omit) }}' -_SASL_PASS='{{ sasl_pass | default(omit) }}' +{% if sasl_user is defined and sasl_user %} +_SASL_USER='{{ sasl_user }}' +{% else %} +_SASL_USER= +{% endif %} +{% if sasl_pass is defined and sasl_pass %} +_SASL_PASS='{{ sasl_pass }}' +{% else %} +_SASL_PASS= +{% endif %} {% if is_sympa_list_server is defined and is_sympa_list_server is sameas true %} _RELAY_HOST=true _SYMPA_LIST_SERVER=true diff --git a/roles/common/templates/usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2 b/roles/common/templates/usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2 index 67d06e9..cae9819 100644 --- a/roles/common/templates/usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2 +++ b/roles/common/templates/usr/local/src/mailsystem/conf/install_postfixadmin.conf.j2 @@ -6,15 +6,27 @@ # - Name of the website - usualy 'webmail..' # - -WEBSITE_NAME="{{ website_name_postfixadmin | default(omit) }}" +{% if website_name_postfixadmin is defined and website_name_postfixadmin|length %} +WEBSITE_NAME="{{ website_name_postfixadmin }}" +{% else %} +#WEBSITE_NAME="" +{% endif %} # - IPv4 Address # - -IPV4='{{ ipv4_address | default(omit) }}' +{% if ipv4_address is defined and ipv4_address|length %} +IPV4='{{ ipv4_address }}' +{% else %} +#IPV4="" +{% endif %} # - IPv6 Address # - -IPV6='{{ ipv6_address | default(omit) }}' +{% if ipv6_address is defined and ipv6_address|length %} +IPV6='{{ ipv6_address }}' +{% else %} +#IPV6='' +{% endif %} # - Is apache installed from debian package system ? # - @@ -147,7 +159,11 @@ APACHE_SERVER_KEY="privkey.pem" # - '/etc/mysql/debian.cnf' if MySQL is installed from debian package system # - '/usr/local/mysql/sys-maint.cnf' otherwise # - -MYSQL_CREDENTIALS='{{ mysql_credentials | default(omit) }}' +{% if mysql_credentials is defined and mysql_credentials %} +MYSQL_CREDENTIALS='{{ mysql_credentials }}' +{% else %} +#MYSQL_CREDENTIALS='' +{% endif %} # - The wa passwords will be encrypted. @@ -264,7 +280,11 @@ POSTFIX_DB_HOST_PGSQL="{{ postfix_db_host }}" # - Password of Postfix Database # - -POSTFIX_DB_PASS='{{ postfix_db_pass | default(omit) }}' +{% if mysql_credentials is defined and mysql_credentials|length %} +POSTFIX_DB_PASS='{{ postfix_db_pass }}' +{% else %} +#POSTFIX_DB_PASS='' +{% endif %} # ========== diff --git a/roles/common/templates/usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2 b/roles/common/templates/usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2 index 47ec534..ff65a07 100644 --- a/roles/common/templates/usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2 +++ b/roles/common/templates/usr/local/src/mailsystem/conf/install_update_dovecot.conf.j2 @@ -43,13 +43,25 @@ postmaster_address="{{ admin_email | split('@') | first }}\@{{ admin_email | spl # - # - This parameter must be set here! There is no default value. # - -hostname="{{ hostname | default(omit) }}" +{% if hostname is defined and hostname %} +hostname="{{ hostname }}" +{% else %} +hostname= +{% endif %} # - IPv4 / IPv6 Addressen # - -ipv4="{{ ipv4_address | default(omit) }}" -ipv6="{{ ipv6_address | default(omit) }}" +{% if ipv4_address is defined and ipv4_address %} +ipv4="{{ ipv4_address }}" +{% else %} +ipv4= +{% endif %} +{% if ipv6_address is defined and ipv6_address %} +ipv6="{{ ipv6_address }}" +{% else %} +ipv6= +{% endif %} # - Webserver User @@ -100,19 +112,31 @@ database="mysql" # - dbname # - # - Defaults to 'postfix' -dbname={{ postfix_db_name | default(omit) }} +{% if postfix_db_name is defined and postfix_db_name %} +dbname={{ postfix_db_name }} +{% else %} +dbname= +{% endif %} # - dbuser # - # - Defaults to 'postfix' # - -dbuser={{ postfix_db_user | default(omit) }} +{% if postfix_db_user is defined and postfix_db_user %} +dbuser={{ postfix_db_user }} +{% else %} +dbuser= +{% endif %} # - dbpassword # - # - This parameter must be set here! # - -dbpassword="{{ postfix_db_pass | default(omit) }}" +{% if postfix_db_pass is defined and postfix_db_pass %} +dbpassword="{{ postfix_db_pass }}" +{% else %} +dbpassword= +{% endif %} # - dbhost # - @@ -120,10 +144,14 @@ dbpassword="{{ postfix_db_pass | default(omit) }}" # - '/var/run/postgresql' if database is set to 'postgres' # - '127.0.0.1' if database is set to 'mysql' # - +{% if postfix_db_host is defined and postfix_db_host %} {% if postfix_db_type == 'PostgeSQL' %} dbhost=/var/run/postgresql {% else %} -dbhost={{ postfix_db_host | default(omit) }} +dbhost={{ postfix_db_host }} +{% endif %} +{% else %} +dbhost= {% endif %} # - default_pass_scheme @@ -166,10 +194,26 @@ auth_mechanisms="plain login" # - Settings for quota warning sript # - -from_address="{{ dovecot_from_address | default(omit) }}" -reply_to="{{ dovecot_reply_to | default(omit) }}" -webmailer="{{ webmailer_address | default(omit) }}" -salutation="{{ salutation | default(omit) }}" +{% if dovecot_from_address is defined and dovecot_from_address %} +from_address="{{ dovecot_from_address }}" +{% else %} +from_address= +{% endif %} +{% if dovecot_reply_to is defined and dovecot_reply_to %} +reply_to="{{ dovecot_reply_to }}" +{% else %} +reply_to= +{% endif %} +{% if webmailer_address is defined and webmailer_address %} +webmailer="{{ webmailer_address }}" +{% else %} +webmailer= +{% endif %} +{% if salutation is defined and salutation %} +salutation="{{ salutation }}" +{% else %} +salutation= +{% endif %} # --- # --- End server-specific Settings diff --git a/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2 b/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2 index e9e412a..d546ade 100644 --- a/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2 +++ b/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail.conf.j2 @@ -6,15 +6,27 @@ # - Name of the website - usualy 'webmail..' # - -WEBSITE_NAME="{{ webmail_site_name | default(omit) }}" +{% if webmail_site_name is defined and webmail_site_name %} +WEBSITE_NAME="{{ webmail_site_name }}" +{% else %} +#WEBSITE_NAME= +{% endif %} # - IPv4 Address # - -IPV4="{{ ipv4_address | default(omit) }}" +{% if ipv4_address is defined and ipv4_address %} +IPV4="{{ ipv4_address }}" +{% else %} +#IPV4="" +{% endif %} # - IPv6 Address # - -IPV6="{{ ipv6_address | default(omit) }}" +{% if ipv6_address is defined and ipv6_address %} +IPV6="{{ ipv6_address }}" +{% else %} +#IPV6="" +{% endif %} # - Is apache installed from debian package system ? # - @@ -43,7 +55,7 @@ IPV6="{{ ipv6_address | default(omit) }}" # - Defaults to 'admin@.' # - {% if (admin_email is defined) and admin_email %} -POSTFIX_DB_HOST_PGSQL="{{ postfix_db_host }}" +WEBMASTER_EMAIL="{{ admin_email }}" {% else %} #WEBMASTER_EMAIL="" {% endif %} @@ -135,13 +147,21 @@ PHP_DEBIAN_INSTALLATION="false" # - # - Defaults to 'autoreply.. # - -AUTOREPLY_HOSTNAME="{{ autoreply_hostname | default(omit) }}" +{% if autoreply_hostname is defined and autoreply_hostname %} +AUTOREPLY_HOSTNAME="{{ autoreply_hostname }}" +{% else %} +#AUTOREPLY_HOSTNAME="" +{% endif %} # - Database type for Roundcube # - # - Possible values are 'pgsql' (PostgeSQL) or 'mysql' (MySQL) # - -DB_TYPE="{{ roundcube_db_type | default(omit) }}" +{% if roundcube_db_type is defined and roundcube_db_type %} +DB_TYPE="{{ roundcube_db_type }}" +{% else %} +#DB_TYPE="" +{% endif %} # - Host of Roundcube Database # - @@ -157,17 +177,29 @@ DB_HOST="{{ roundcube_db_host }}" # - # - Defaults to 'roundcubemail' # - -DB_NAME="{{ roundcube_db_name | default(omit) }}" +{% if roundcube_db_name is defined and roundcube_db_name %} +DB_NAME="{{ roundcube_db_name }}" +{% else %} +#DB_NAME="" +{% endif %} # - User of Roundcube Database # - # - Defaults to 'roundcube' # - -DB_USER="{{ roundcube_db_user | default(omit) }}" +{% if roundcube_db_user is defined and roundcube_db_user %} +DB_USER="{{ roundcube_db_user }}" +{% else %} +#DB_USER="" +{% endif %} # - Password of Roundcube Database # - -DB_PASS='{{ roundcube_db_pass | default(omit) }}' +{% if roundcube_db_pass is defined and roundcube_db_pass %} +DB_PASS='{{ roundcube_db_pass }}' +{% else %} +#DB_PASS='' +{% endif %} # - Is MySQL installed from debian package system? @@ -201,13 +233,21 @@ DB_PASS='{{ roundcube_db_pass | default(omit) }}' # - # - Defaults to 'Roundcube Webmail' # - -PRODUCT_NAME="{{ roundcube_product_name | default(omit) }}" +{% if roundcube_product_name is defined and roundcube_product_name %} +PRODUCT_NAME="{{ roundcube_product_name }}" +{% else %} +#PRODUCT_NAME="" +{% endif %} # - URL for users, to get in contact if something goes wrong # - # - Defaults to 'www..' # - -SUPPORT_URL="{{ roundcube_support_url | default(omit) }}" +{% if roundcube_support_url is defined and roundcube_support_url %} +SUPPORT_URL="{{ roundcube_support_url }}" +{% else %} +#SUPPORT_URL="" +{% endif %} # - Provide your own logo under this URI # - @@ -216,7 +256,11 @@ SUPPORT_URL="{{ roundcube_support_url | default(omit) }}" # - # - Default is empty # - -SKIN_LOGO="{{ roundcube_skin_logo | default(omit) }}" +{% if roundcube_skin_logo is defined and roundcube_skin_logo %} +SKIN_LOGO="{{ roundcube_skin_logo }}" +{% else %} +#SKIN_LOGO="" +{% endif %} @@ -281,7 +325,11 @@ POSTFIX_DB_USER="{{ postfix_db_user }}" # - # - used for setting $config['password_db_dsn'] # - -POSTFIX_DB_PASSWD='{{ postfix_db_pass | default(omit) }}' +{% if (postfix_db_pass is defined) and postfix_db_pass %} +POSTFIX_DB_PASSWD='{{ postfix_db_pass }}' +{% else %} +#POSTFIX_DB_PASSWD='' +{% endif %} # === diff --git a/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail2.conf.j2 b/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail2.conf.j2 index b72b4ed..b324ffc 100644 --- a/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail2.conf.j2 +++ b/roles/common/templates/usr/local/src/mailsystem/conf/install_upgrade_roundcube-webmail2.conf.j2 @@ -6,15 +6,27 @@ # - Name of the website - usualy 'webmail..' # - -WEBSITE_NAME="{{ webmaili_2_site_name | default(omit) }}" +{% if (webmaili_2_site_name is defined) and webmaili_2_site_name %} +WEBSITE_NAME="{{ webmaili_2_site_name }}" +{% else %} +#WEBSITE_NAME= +{% endif %} # - IPv4 Address # - -IPV4="{{ ipv4_address | default(omit) }}" +{% if ipv4_address is defined and ipv4_address %} +IPV4="{{ ipv4_address }}" +{% else %} +#IPV4="" +{% endif %} # - IPv6 Address # - -IPV6="{{ ipv6_address | default(omit) }}" +{% if ipv6_address is defined and ipv6_address %} +IPV6="{{ ipv6_address }}" +{% else %} +#IPV6="" +{% endif %} # - Is apache installed from debian package system ? # - @@ -42,7 +54,11 @@ IPV6="{{ ipv6_address | default(omit) }}" # - # - Defaults to 'admin@.' # - +{% if (admin_email is defined) and admin_email %} +WEBMASTER_EMAIL="{{ admin_email }}" +{% else %} #WEBMASTER_EMAIL="" +{% endif %} # - Base Directory of Roundcube Website # - @@ -122,35 +138,59 @@ APACHE_SERVER_KEY="privkey.pem" # - # - Defaults to 'autoreply.. # - -AUTOREPLY_HOSTNAME="{{ autoreply_2_hostname | default(omit) }}" +{% if autoreply_2_hostname is defined and autoreply_2_hostname %} +AUTOREPLY_HOSTNAME="{{ autoreply_2_hostname }}" +{% else %} +#AUTOREPLY_HOSTNAME="" +{% endif %} # - Database type for Roundcube # - # - Possible values are 'pgsql' (PostgeSQL) or 'mysql' (MySQL) # - -DB_TYPE="{{ roundcube_2_db_type | default(omit) }}" +{% if roundcube_2_db_type is defined and roundcube_2_db_type %} +DB_TYPE="{{ roundcube_2_db_type }}" +{% else %} +#DB_TYPE="" +{% endif %} # - Host of Roundcube Database # - # - Defaults to 'localhost' # - -DB_HOST="{{ roundcube_2_db_host | default(omit) }}" +{% if (roundcube_2_db_host is defined) and roundcube_2_db_host %} +DB_HOST="{{ roundcube_2_db_host }}" +{% else %} +#DB_HOST="" +{% endif %} # - Name of Roundcube Database # - # - Defaults to 'roundcubemail' # - -DB_NAME="{{ roundcube_2_db_name | default(omit) }}" +{% if roundcube_2_db_name is defined and roundcube_2_db_name %} +DB_NAME="{{ roundcube_2_db_name }}" +{% else %} +#DB_NAME="" +{% endif %} # - User of Roundcube Database # - # - Defaults to 'roundcube' # - -DB_USER="{{ roundcube_2_db_user | default(omit) }}" +{% if roundcube_2_db_user is defined and roundcube_2_db_user %} +DB_USER="{{ roundcube_2_db_user }}" +{% else %} +#DB_USER="" +{% endif %} # - Password of Roundcube Database # - -DB_PASS="3Dsz3j5R" +{% if roundcube_2_db_pass is defined and roundcube_2_db_pass %} +DB_PASS='{{ roundcube_2_db_pass }}' +{% else %} +#DB_PASS='' +{% endif %} # - Is MySQL installed from debian package system? @@ -184,13 +224,21 @@ DB_PASS="3Dsz3j5R" # - # - Defaults to 'Roundcube Webmail' # - -PRODUCT_NAME="{{ roundcube_2_product_name | default(omit) }}" +{% if roundcube_2_product_name is defined and roundcube_2_product_name %} +PRODUCT_NAME="{{ roundcube_2_product_name }}" +{% else %} +#PRODUCT_NAME="" +{% endif %} # - URL for users, to get in contact if something goes wrong # - # - Defaults to 'www..' # - -SUPPORT_URL="{{ roundcube_2_support_url | default(omit) }}" +{% if roundcube_2_support_url is defined and roundcube_2_support_url %} +SUPPORT_URL="{{ roundcube_2_support_url }}" +{% else %} +#SUPPORT_URL="" +{% endif %} # - Provide your own logo under this URI # - @@ -199,7 +247,11 @@ SUPPORT_URL="{{ roundcube_2_support_url | default(omit) }}" # - # - Default is empty # - -SKIN_LOGO="{{ roundcube_2_skin_logo | default(omit) }}" +{% if roundcube_2_skin_logo is defined and roundcube_2_skin_logo %} +SKIN_LOGO="{{ roundcube_2_skin_logo }}" +{% else %} +#SKIN_LOGO="" +{% endif %} @@ -230,7 +282,11 @@ POSTFIX_DB_TYPE="mysql" # - # - Defaults to 'localhost' # - -POSTFIX_DB_HOST="{{ postfix_db_host | default(omit) }}" +{% if (postfix_db_host is defined) and postfix_db_host %} +POSTFIX_DB_HOST_PGSQL="{{ postfix_db_host }}" +{% else %} +#POSTFIX_DB_HOST_PGSQL="" +{% endif %} # - Name of Postfix Database # - @@ -238,7 +294,11 @@ POSTFIX_DB_HOST="{{ postfix_db_host | default(omit) }}" # - # - Defaults to 'postfix' # - -POSTFIX_DB_NAME="{{ postfix_db_name | default(omit) }}" +{% if (postfix_db_name is defined) and postfix_db_name %} +POSTFIX_DB_NAME="{{ postfix_db_name }}" +{% else %} +#POSTFIX_DB_NAME="" +{% endif %} # - User of Postfix Database # - @@ -246,13 +306,21 @@ POSTFIX_DB_NAME="{{ postfix_db_name | default(omit) }}" # - # - Defaults to 'postfix' # - -POSTFIX_DB_USER="{{ postfix_db_user | default(omit) }}" +{% if (postfix_db_name is defined) and postfix_db_name %} +POSTFIX_DB_USER="{{ postfix_db_user }}" +{% else %} +#POSTFIX_DB_USER="" +{% endif %} # - Password of Postfix Database # - # - used for setting $config['password_db_dsn'] # - -POSTFIX_DB_PASSWD='{{ postfix_db_pass | default(omit) }}' +{% if (postfix_db_pass is defined) and postfix_db_pass %} +POSTFIX_DB_PASSWD='{{ postfix_db_pass }}' +{% else %} +#POSTFIX_DB_PASSWD='' +{% endif %} # ===