x270 fake_additional

sympa/doc/migration.md

@@ -57,7 +57,7 @@ To:         debian13, sympa 6.2.76
 
 ## miaou-install-from-import-sympa
 
-* CONTAINER=sympa3
+* CONTAINER=sympa1
 * LAST_ARCHIVE=$(find ~/Downloads -type f -name "listes.artcode.re*" | sort -rn | head -1)
 * miaou-create $CONTAINER
 * miaou/miaou-install-from-import-sympa $CONTAINER $LAST_ARCHIVE

sympa/miaou/miaou-install-from-import-sympa

@@ -35,7 +35,7 @@ function parse_options {
 }
 
 function assert_fake_sympa {
-	[[ $(fqdn) == 'topcode' ]] && [[ -d /opt/miaou-incus ]]
+	[[ $(fqdn) =~ topcode|x270 ]] && [[ -d /opt/miaou-incus ]]
 }
 
 function install_fake_additional {
@@ -45,13 +45,11 @@ function install_fake_additional {
 	miaou-push $CONTAINER $HOME/.ssh/id_ed25519 /root/.ssh/
 	miaou-push $CONTAINER $HOME/.ssh/id_ed25519.pub /root/.ssh/
 	miaou-recipe "$CONTAINER" "$BASEDIR"/../recipe/sympa_ldap_auth_remote.recipe
-	echo 'install fake additional...OK'
 }
 
 function fix_dmarc_off {
 	echo 'fix dmarc off...'
 	miaou-recipe "$CONTAINER" "$BASEDIR"/../recipe/sympa_fix_dmarc_off.recipe
-	echo 'fix dmarc off...OK'
 }
 
 # MAIN