From bdd76db56c470727353af78a2bede6ecbd5539e9 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sat, 1 Jul 2017 22:25:04 +0200 Subject: [PATCH] Apps upgrade --- demo_lxc_build.sh | 5 +++-- demo_upgrade.sh | 8 +++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/demo_lxc_build.sh b/demo_lxc_build.sh index 67b3b1d..9c04da4 100755 --- a/demo_lxc_build.sh +++ b/demo_lxc_build.sh @@ -106,8 +106,6 @@ echo -e "\e[36mInstallation de dokuwiki\e[0m" | tee -a "$LOG_BUILD_LXC" ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install dokuwiki -a \"domain=$DOMAIN&path=/dokuwiki&admin=$USER_DEMO&is_public=Yes\"" | tee -a "$LOG_BUILD_LXC" echo -e "\e[36mInstallation de hextris\e[0m" | tee -a "$LOG_BUILD_LXC" ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install hextris -a \"domain=$DOMAIN&path=/hextris&is_public=Yes\"" | tee -a "$LOG_BUILD_LXC" -echo -e "\e[36mInstallation de jappix\e[0m" | tee -a "$LOG_BUILD_LXC" -ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install jappix -a \"domain=$DOMAIN&path=/jappix&name=YunoJappix&language=en\"" | tee -a "$LOG_BUILD_LXC" echo -e "\e[36mInstallation de jirafeau\e[0m" | tee -a "$LOG_BUILD_LXC" ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install jirafeau -a \"domain=$DOMAIN&path=/jirafeau&admin_user=$USER_DEMO&upload_password=$PASSWORD_DEMO&is_public=Yes\"" | tee -a "$LOG_BUILD_LXC" echo -e "\e[36mInstallation de kanboard\e[0m" | tee -a "$LOG_BUILD_LXC" @@ -118,6 +116,9 @@ echo -e "\e[36mInstallation de owncloud\e[0m" | tee -a "$LOG_BUILD_LXC" ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install owncloud -a \"domain=$DOMAIN&path=/owncloud&admin=$USER_DEMO&user_home=0\"" | tee -a "$LOG_BUILD_LXC" echo -e "\e[36mInstallation de phpmyadmin\e[0m" | tee -a "$LOG_BUILD_LXC" ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install phpmyadmin -a \"domain=$DOMAIN&path=/phpmyadmin&admin=$USER_DEMO\"" | tee -a "$LOG_BUILD_LXC" + +echo -e "\e[36mInstallation de rainloop\e[0m" | tee -a "$LOG_BUILD_LXC" +ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install rainloop -a \"domain=$DOMAIN&path=/rainloop&is_public=No&password=admin&ldap=Yes&lang=English\"" | tee -a "$LOG_BUILD_LXC" echo -e "\e[36mInstallation de roundcube\e[0m" | tee -a "$LOG_BUILD_LXC" ssh $ARG_SSH $LXC_NAME1 "sudo yunohost app install roundcube -a \"domain=$DOMAIN&path=/webmail&with_carddav=0\"" | tee -a "$LOG_BUILD_LXC" echo -e "\e[36mInstallation de searx\e[0m" | tee -a "$LOG_BUILD_LXC" diff --git a/demo_upgrade.sh b/demo_upgrade.sh index 86031f8..b19a988 100755 --- a/demo_upgrade.sh +++ b/demo_upgrade.sh @@ -100,6 +100,12 @@ UPGRADE_DEMO_CONTAINER () { # Démarrage, upgrade et snapshot fi done <<< "$(ls -1 "$script_dir/upgrade.d/Constant_upgrade")" + # Upgrade des apps + sudo lxc-attach -n $MACHINE -- yunohost app fetchlist + sudo lxc-attach -n $MACHINE -- service nginx restart + sudo lxc-attach -n $MACHINE -- yunohost app upgrade + sudo lxc-attach -n $MACHINE -- service nginx restart + # Arrêt de la machine virtualisée sudo lxc-stop -n $MACHINE @@ -118,7 +124,7 @@ UPGRADE_DEMO_CONTAINER () { # Démarrage, upgrade et snapshot then # Après l'upgrade du 2e conteneur, déplace les scripts dans le dossier des anciens scripts si ils ont été exécutés avec succès. ls -1 "$script_dir/upgrade.d" | while read LIGNE do - if [ ! "$LIGNE" == "exemple" ] && [ ! "$LIGNE" == "old_scripts" ] && ! echo "$LIGNE" | grep -q ".fail$" # Le fichier exemple, le dossier old_scripts et les scripts fail sont ignorés + if [ ! "$LIGNE" == "exemple" ] && [ ! "$LIGNE" == "old_scripts" ] && [ ! "$LIGNE" == "Constant_upgrade" ] && ! echo "$LIGNE" | grep -q ".fail$" # Le fichier exemple, le dossier old_scripts et les scripts fail sont ignorés then mv -f "$script_dir/upgrade.d/$LIGNE" "$script_dir/upgrade.d/old_scripts/$LIGNE" fi