diff --git a/sympa/miaou/miaou-migrate-sympa-from-container b/sympa/miaou/miaou-migrate-sympa-from-container index c5923e2..06fd065 100755 --- a/sympa/miaou/miaou-migrate-sympa-from-container +++ b/sympa/miaou/miaou-migrate-sympa-from-container @@ -61,28 +61,23 @@ EOF } function get_container_net0 { - local vmid=$(pct-lookup $CONTAINER) - local vm_conf_file="/etc/pve/nodes/$(hostname)/lxc/$vmid.conf" - SYMPA_NET0=$(grep ^net0 $vm_conf_file) + OLD_VMID=$(pct-lookup $CONTAINER) + SYMPA_NET0=$(pct config $OLD_VMID | grep ^net0 | cut -d ' ' -f2) echo $SYMPA_NET0 } -function stop_old_container { - pct-stop $CONTAINER +function rename_old_container { + pct set $OLD_VMID --delete net0 pct-rename $CONTAINER $CONTAINER.9 - sleep 10 # wait until rename action takes place } function create_new_container { miaou-create $CONTAINER local vmid=$(pct-lookup $CONTAINER) - local vm_conf_file="/etc/pve/nodes/$(hostname)/lxc/$vmid.conf" - local net1="net1: $(grep ^net0 $vm_conf_file | cut -d' ' -f2 | sed 's/name=eth0/name=eth1/')" - - pct stop $vmid - /opt/miaou-bash/tools/append_or_replace "^net0.*$" "$SYMPA_NET0\n$net1" $vm_conf_file - pct start $vmid + local net1="net1: $(pct config $vmid | grep ^net0 | cut -d ' ' -f2 | sed 's/name=eth0/name=eth1/')" + pct set $vmid --net0 $SYMPA_NET0 + pct set $vmid --net1 $net1 } function import_from_archive { @@ -97,17 +92,10 @@ assert_proxmox assert_container_sympa_debian9 export_sympa get_container_net0 -stop_old_container +rename_old_container create_new_container import_from_archive -# 5. install sympa -# 6. import old data -# 7. fix_dmarc_off + fix_dkim_global_on # 8. fix external origin # allowed_external_origin * # (https://gitlab.cemea.org/cemeaweb/khazad-dum/-/issues/110) - -# "$BASEDIR"/miaou-install-sympa "$CONTAINER" -# echo "launch the import process" -# miaou-exec $CONTAINER -- /opt/miaou-sympa/tools/sympa_import.bash "/root/$import_base" diff --git a/sympa/resources/tools/sympa_import.bash b/sympa/resources/tools/sympa_import.bash index 0b24af2..5f4c2cc 100755 --- a/sympa/resources/tools/sympa_import.bash +++ b/sympa/resources/tools/sympa_import.bash @@ -238,6 +238,16 @@ function configure_postfix { /opt/miaou-bash/tools/append_or_replace "^myhostname =.*$" "myhostname = $SYMPA_DOMAIN" /etc/postfix/main.cf /opt/miaou-bash/tools/append_or_replace "^alias_maps =.*$" "alias_maps = hash:/etc/aliases, hash:/etc/mail/sympa/aliases" /etc/postfix/main.cf /opt/miaou-bash/tools/append_or_replace "^alias_database =.*$" "alias_database = hash:/etc/aliases, hash:/etc/mail/sympa/aliases" /etc/postfix/main.cf + + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_cert_file =.*$" "smtpd_tls_cert_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/fullchain.pem" + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_key_file =.*$" "smtpd_tls_key_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/privkey.pem" + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_security_level =.*$" "smtpd_tls_security_level = may" + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_received_header =.*$" "smtpd_tls_received_header = yes" + /opt/miaou-bash/tools/append_or_replace "^smtpd_tls_loglevel =.*$" "smtpd_tls_loglevel = 1" + + /opt/miaou-bash/tools/append_or_replace "^smtp_tls_cert_file =.*$" "smtp_tls_cert_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/fullchain.pem" + /opt/miaou-bash/tools/append_or_replace "^smtp_tls_key_file =.*$" "smtp_tls_key_file = /etc/letsencrypt/live/$SYMPA_DOMAIN/privkey.pem" + /opt/miaou-bash/tools/append_or_replace "^smtp_tls_security_level =.*$" "smtp_tls_security_level = may" } function import {