From 683830ce529c9193f34693b2103a8b485210e297 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 17 Aug 2019 22:50:45 +0200 Subject: [PATCH] Make the legacy app even legacier lolz --- legacy_app_ynh/scripts/install | 13 ++++++++----- legacy_app_ynh/scripts/restore | 19 ++++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/legacy_app_ynh/scripts/install b/legacy_app_ynh/scripts/install index 616fec6..a62e20d 100644 --- a/legacy_app_ynh/scripts/install +++ b/legacy_app_ynh/scripts/install @@ -6,9 +6,6 @@ number=$YNH_APP_INSTANCE_NUMBER domain=$YNH_APP_ARG_DOMAIN path=$YNH_APP_ARG_PATH -# Source app helpers -source /usr/share/yunohost/helpers - # Check domain/path availability sudo yunohost app checkurl $domain/$path -a $app @@ -21,11 +18,17 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/$app.conf sudo mkdir -p /var/www/$app sudo cp ../conf/index.html /var/www/$app +sudo yunohost app checkport 12345 +if [[ ! $? -eq 0 ]]; then + echo "Ogod noez the port 12345 aint available!!" + exit 1 +fi + # Create a dummy mysql db db_user=$app db_pwd="yoloswag42" -ynh_mysql_create_db "$db_user" "$db_user" $db_pwd -ynh_app_setting_set $app mysqlpwd $db_pwd +sudo yunohost app initdb "$db_user" -p $db_pwd +sudo yunohost app setting $app mysqlpwd -v $db_pwd # Other custom stuff sudo cp ../sources/importantfile /etc/ diff --git a/legacy_app_ynh/scripts/restore b/legacy_app_ynh/scripts/restore index d35873c..6fa75e5 100644 --- a/legacy_app_ynh/scripts/restore +++ b/legacy_app_ynh/scripts/restore @@ -1,17 +1,12 @@ -#!/bin/bash - # No set -eu for this particular app restore script (see comment near the end) #set -eu -# Source app helpers -source /usr/share/yunohost/helpers - restore_dir=$1 app=$2 # Get old parameter of the app -domain=$(ynh_app_setting_get $app domain) -path=$(ynh_app_setting_get $app path) +domain=$(sudo yunohost app setting $app domain) +path=$(sudo yunohost app setting $app path) # Restore www directory sudo cp -a "${restore_dir}/var/www/$app" /var/www/$app @@ -23,10 +18,16 @@ sudo cp -a "${restore_dir}/conf/nginx.conf" $nginx_conf # Restore custom file sudo cp -a "${restore_dir}/importantfile" /etc/importantfile +sudo yunohost app checkport 12345 +if [[ ! $? -eq 0 ]]; then + echo "Ogod noez the port 12345 aint available!!" + exit 1 +fi + # Restore the database db_user=$app -db_pwd=$(ynh_app_setting_get $app mysqlpwd) -ynh_mysql_create_db $db_user $db_user $db_pwd +db_pwd=$(sudo yunohost app setting $app mysqlpwd) +sudo yunohost app initdb $db_user -p $db_pwd sudo su -c "mysql -u $db_user -p$db_pwd $app < ${restore_dir}/db.sql" # Some scripts wanted to delete the db.sql... This won't make the script crash # even if restore_dir is in read-only as long as there's no set -eu activated...