diff --git a/check_process b/check_process index f953b58..b971b5b 100644 --- a/check_process +++ b/check_process @@ -24,7 +24,4 @@ Notification=none ;;; Upgrade options ; commit=CommitHash name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& - - - \ No newline at end of file + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&is_public=1&password=pass&port=666& diff --git a/scripts/_common.sh b/scripts/_common.sh index d7982dd..7912aa4 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -17,16 +17,3 @@ nodejs_version=14 #================================================= # FUTURE OFFICIAL HELPERS #================================================= - -# Execute a command as another user -# usage: ynh_exec_as USER COMMAND [ARG ...] -ynh_exec_as() { - local USER=$1 - shift 1 - - if [[ $USER = $(whoami) ]]; then - eval "$@" - else - sudo -u "$USER" "$@" - fi -} diff --git a/scripts/install b/scripts/install index ad8972f..47f1711 100755 --- a/scripts/install +++ b/scripts/install @@ -138,7 +138,7 @@ yunohost service add $app --description="A non-linear personal web notebook" --l #================================================= ynh_script_progression --message="Starting a systemd service..." --weight=2 -ynh_systemd_action --service_name=$app --action=start --log_path=systemd #--line_match="Serving on" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving on" #================================================= # SETUP SSOWAT diff --git a/scripts/restore b/scripts/restore index a96c28d..91f2fc0 100755 --- a/scripts/restore +++ b/scripts/restore @@ -101,7 +101,7 @@ yunohost service add $app --description="A non-linear personal web notebook" --l #================================================= ynh_print_info --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Started TiddlyWiki: interactive wiki." +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving on" #================================================= # GENERIC FINALIZATION diff --git a/scripts/upgrade b/scripts/upgrade index 379d14e..3c57dd0 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -134,7 +134,7 @@ yunohost service add $app --description="A non-linear personal web notebook" --l #================================================= ynh_print_info --message="Starting a systemd service..." --weight=1 -ynh_systemd_action --service_name=$app --action=start --log_path=systemd #--line_match="Serving on" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="Serving on" #================================================= # RELOAD NGINX