update..

2024-08-02 17:25:47 +02:00
parent 1b16027bd6
commit df3db74c6b
14 changed files with 429 additions and 58 deletions
--- 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 %}
--- 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
--- 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.<domain>.<tld>'
 # -
-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 %}


 # ==========
--- 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
--- 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.<domain>.<tld>'
 # -
-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@<domain>.<tld>'
 # -
 {% 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.<domain>.<tld>
 # -
-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.<domain>.<tld>'
 # -
-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 %}


 # ===
--- 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.<domain>.<tld>'
 # -
-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@<domain>.<tld>'
 # -
+{% 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.<domain>.<tld>
 # -
-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.<domain>.<tld>'
 # -
-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 %}


 # ===