From e04aabd08833aaea20359b8987beb9940fa0849d Mon Sep 17 00:00:00 2001 From: julienmalik Date: Mon, 30 Jan 2017 17:10:36 +0100 Subject: [PATCH 1/4] No need to configure lxc.network.veth.pair It gets a name automatically, and we never use this interface name anywhere --- sub_scripts/lxc_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh index e45b4ce..f623b86 100755 --- a/sub_scripts/lxc_build.sh +++ b/sub_scripts/lxc_build.sh @@ -48,7 +48,7 @@ echo -e "\e[1m> Active le bridge réseau\e[0m" | tee -a "$LOG_BUILD_LXC" sudo ifup lxc-pchecker --interfaces=/etc/network/interfaces.d/lxc-pchecker >> "$LOG_BUILD_LXC" 2>&1 echo -e "\e[1m> Configuration réseau du conteneur\e[0m" | tee -a "$LOG_BUILD_LXC" -sudo sed -i 's/^lxc.network.type = empty$/lxc.network.type = veth\nlxc.network.flags = up\nlxc.network.link = lxc-pchecker\nlxc.network.name = eth0\nlxc.network.veth.pair = $LXC_NAME\nlxc.network.hwaddr = 00:FF:AA:00:00:01/' /var/lib/lxc/$LXC_NAME/config >> "$LOG_BUILD_LXC" 2>&1 +sudo sed -i 's/^lxc.network.type = empty$/lxc.network.type = veth\nlxc.network.flags = up\nlxc.network.link = lxc-pchecker\nlxc.network.name = eth0\nlxc.network.hwaddr = 00:FF:AA:00:00:01/' /var/lib/lxc/$LXC_NAME/config >> "$LOG_BUILD_LXC" 2>&1 echo -e "\e[1m> Configuration réseau de la machine virtualisée\e[0m" | tee -a "$LOG_BUILD_LXC" sudo sed -i "s@iface eth0 inet dhcp@iface eth0 inet static\n\taddress $PLAGE_IP.2/24\n\tgateway $PLAGE_IP.1@" /var/lib/lxc/$LXC_NAME/rootfs/etc/network/interfaces >> "$LOG_BUILD_LXC" 2>&1 From 73029f014aed4b54b704a56b39bf63c70ef66800 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Tue, 31 Jan 2017 01:01:12 +0100 Subject: [PATCH 2/4] ping a besoin de sudo... --- sub_scripts/lxc_launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/lxc_launcher.sh b/sub_scripts/lxc_launcher.sh index f38861d..7b52071 100755 --- a/sub_scripts/lxc_launcher.sh +++ b/sub_scripts/lxc_launcher.sh @@ -44,7 +44,7 @@ LXC_START () { echo "Redémarrage du conteneur..." fi LXC_STOP - elif ssh $ARG_SSH $LXC_NAME "ping -q -c 2 security.debian.org > /dev/null 2>&1; exit \$?"; then # Si le conteneur a démarré, test sa connectivité. + elif ! ssh $ARG_SSH $LXC_NAME "sudo ping -q -c 2 security.debian.org > /dev/null 2>&1; exit \$?"; then # Si le conteneur a démarré, test sa connectivité. ECHO_FORMAT "Le conteneur ne parvient pas à accéder à internet...\n" "lred" "bold" failstart=1 if [ "$i" -ne 3 ]; then From 2430b14feb77ea6a2f137e22249c4e62d43e8ec9 Mon Sep 17 00:00:00 2001 From: julienmalik Date: Tue, 31 Jan 2017 10:34:04 +0100 Subject: [PATCH 3/4] Fix invalid a-Z for sed --- sub_scripts/testing_process.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh index 0b59b13..638b387 100644 --- a/sub_scripts/testing_process.sh +++ b/sub_scripts/testing_process.sh @@ -151,12 +151,12 @@ CHECK_SETUP_SUBDIR () { return fi MANIFEST_ARGS_MOD=$MANIFEST_ARGS # Copie des arguments - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_DOMAIN=[a-Z./-$]*\&/$MANIFEST_DOMAIN=$SOUS_DOMAIN\&/") - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s@$MANIFEST_PATH=[a-Z/$]*\&@$MANIFEST_PATH=$PATH_TEST\&@") - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s@$MANIFEST_USER=[a-Z/-$]*\&@$MANIFEST_USER=$USER_TEST\&@") - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PASSWORD=[a-Z$]*\&/$MANIFEST_PASSWORD=$PASSWORD_TEST\&/") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_DOMAIN=[a-zA-Z./-$]*\&/$MANIFEST_DOMAIN=$SOUS_DOMAIN\&/") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s@$MANIFEST_PATH=[a-zA-Z/$]*\&@$MANIFEST_PATH=$PATH_TEST\&@") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s@$MANIFEST_USER=[a-zA-Z/-$]*\&@$MANIFEST_USER=$USER_TEST\&@") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PASSWORD=[a-zA-Z$]*\&/$MANIFEST_PASSWORD=$PASSWORD_TEST\&/") if [ -n "$MANIFEST_PUBLIC" ] && [ -n "$MANIFEST_PUBLIC_public" ]; then # Si possible, install en public pour le test d'accès url - MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PUBLIC=[a-Z]*\&/$MANIFEST_PUBLIC=$MANIFEST_PUBLIC_public\&/") + MANIFEST_ARGS_MOD=$(echo $MANIFEST_ARGS_MOD | sed "s/$MANIFEST_PUBLIC=[a-zA-Z]*\&/$MANIFEST_PUBLIC=$MANIFEST_PUBLIC_public\&/") fi # Installation de l'app SETUP_APP From 807b2b7090ca5da19fdb2b4b4754aea58b46e48c Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Tue, 31 Jan 2017 11:26:48 +0100 Subject: [PATCH 4/4] Fix a-Z --- package_check.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_check.sh b/package_check.sh index a9cc1d4..ab4f259 100755 --- a/package_check.sh +++ b/package_check.sh @@ -689,8 +689,8 @@ then # Si le fichier check_process est trouvé fi if echo "$LIGNE" | grep -q "(PUBLIC"; then # Accès public/privé dans le manifest MANIFEST_PUBLIC=$(echo "$LIGNE" | cut -d '=' -f1) # Récupère la clé du manifest correspondant à l'accès public ou privé - MANIFEST_PUBLIC_public=$(echo "$LIGNE" | grep -o "|public=[a-Z0-9]*" | cut -d "=" -f2) # Récupère la valeur pour un accès public. - MANIFEST_PUBLIC_private=$(echo "$LIGNE" | grep -o "|private=[a-Z0-9]*" | cut -d "=" -f2) # Récupère la valeur pour un accès privé. + MANIFEST_PUBLIC_public=$(echo "$LIGNE" | grep -o "|public=[[:alnum:]]*" | cut -d "=" -f2) # Récupère la valeur pour un accès public. + MANIFEST_PUBLIC_private=$(echo "$LIGNE" | grep -o "|private=[[:alnum:]]*" | cut -d "=" -f2) # Récupère la valeur pour un accès privé. LIGNE=$(echo "$LIGNE" | cut -d '(' -f1) # Retire l'indicateur de clé de manifest à la fin de la ligne fi if echo "$LIGNE" | grep -q "(PASSWORD)"; then # Password dans le manifest