--- configure-instance.sh.orig 2020-04-12 13:04:08.592703446 +0200 +++ configure-instance.sh 2020-04-12 13:04:52.428706530 +0200 @@ -46,12 +46,12 @@ # copy the smtp CA path if specified ca_path=$($POSTCONF -hx smtp_tls_CApath) - case "$sca_path" in - '') :;; # no sca_path + case "$ca_path" in + '') :;; # no ca_path $queue_dir/*) :;; # skip stuff already in chroot *) - if test -d "$sca_path"; then - dest_dir="$queue_dir/${sca_path#/}" + if test -d "$ca_path"; then + dest_dir="$queue_dir/${ca_path#/}" # strip any/all trailing / while [ "${dest_dir%/}" != "${dest_dir}" ]; do dest_dir="${dest_dir%/}" @@ -64,7 +64,7 @@ fi mkdir --parent ${dest_dir} # handle files in subdirectories - (cd "$sca_path" && find . -name '*.pem' -not -xtype l -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || + (cd "$ca_path" && find . -name '*.pem' -not -xtype l -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || (echo failure copying certificates; exit 1) c_rehash "$dest_dir" >/dev/null 2>&1 if [ "$new" = 1 ]; then @@ -78,12 +78,12 @@ # copy the smtpd CA path if specified ca_path=$($POSTCONF -hx smtpd_tls_CApath) - case "$dca_path" in - '') :;; # no dca_path + case "$ca_path" in + '') :;; # no ca_path $queue_dir/*) :;; # skip stuff already in chroot *) - if test -d "$dca_path"; then - dest_dir="$queue_dir/${dca_path#/}" + if test -d "$ca_path"; then + dest_dir="$queue_dir/${ca_path#/}" # strip any/all trailing / while [ "${dest_dir%/}" != "${dest_dir}" ]; do dest_dir="${dest_dir%/}" @@ -96,7 +96,7 @@ fi mkdir --parent ${dest_dir} # handle files in subdirectories - (cd "$dca_path" && find . -name '*.pem' -not -xtype l -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || + (cd "$ca_path" && find . -name '*.pem' -not -xtype l -print0 | cpio -0pdL --quiet "$dest_dir") 2>/dev/null || (echo failure copying certificates; exit 1) c_rehash "$dest_dir" >/dev/null 2>&1 if [ "$new" = 1 ]; then