Skip to content

Commit 3ed981c

Browse files
authored
Merge pull request #3375 from SUSE/create-pull-request/update-versions-and-files
🤖: Update package versions and files
2 parents 66f26b9 + de4a017 commit 3ed981c

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

src/bci_build/package/package_versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
},
5353
"kubevirt": {
5454
"16.0": "1.5.2",
55-
"Tumbleweed": "1.6.3"
55+
"Tumbleweed": "1.7.0"
5656
},
5757
"mariadb": {
5858
"16.0": "11.8",

src/bci_build/package/postfix/entrypoint/entrypoint.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ setup_submission() {
192192
SMTPD_TLS_CRT=${SMTPD_TLS_CRT:-"/etc/postfix/ssl/certs/tls.crt"}
193193
SMTPD_TLS_KEY=${SMTPD_TLS_KEY:-"/etc/postfix/ssl/certs/tls.key"}
194194

195-
# smtpd_use_tls is deprecated and only for compatibility
196-
set_config_value "smtpd_use_tls" "yes"
197195
set_config_value "smtpd_tls_security_level" "may"
198196
set_config_value "smtpd_tls_CApath" "/etc/ssl/certs"
199197
set_config_value "smtpd_tls_cert_file" "${SMTPD_TLS_CRT}"
@@ -346,6 +344,7 @@ configure_postfix() {
346344

347345
# Add maps to config and create database
348346
for i in canonical relocated sender_canonical transport virtual; do
347+
test -f "/etc/postfix/${i}" || continue
349348
set_config_value "${i}_maps" "lmdb:/etc/postfix/${i}"
350349
update_db "${i}"
351350
done

src/bci_build/package/postfix/entrypoint/entrypoint.sles.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ setup_submission() {
192192
SMTPD_TLS_CRT=${SMTPD_TLS_CRT:-"/etc/postfix/ssl/certs/tls.crt"}
193193
SMTPD_TLS_KEY=${SMTPD_TLS_KEY:-"/etc/postfix/ssl/certs/tls.key"}
194194

195-
# smtpd_use_tls is deprecated and only for compatibility
196-
set_config_value "smtpd_use_tls" "yes"
197195
set_config_value "smtpd_tls_security_level" "may"
198196
set_config_value "smtpd_tls_CApath" "/etc/ssl/certs"
199197
set_config_value "smtpd_tls_cert_file" "${SMTPD_TLS_CRT}"
@@ -346,6 +344,7 @@ configure_postfix() {
346344

347345
# Add maps to config and create database
348346
for i in canonical relocated sender_canonical transport virtual; do
347+
test -f "/etc/postfix/${i}" || continue
349348
set_config_value "${i}_maps" "lmdb:/etc/postfix/${i}"
350349
update_db "${i}"
351350
done

0 commit comments

Comments
 (0)