diff --git a/maintenance/finish_install.sh b/maintenance/finish_install.sh index 9913e32..4053c45 100755 --- a/maintenance/finish_install.sh +++ b/maintenance/finish_install.sh @@ -36,17 +36,17 @@ echo_bold () { # ----------------------------------------------------------------- - + function tweak_yunohost() { - + #echo_bold "> Setting up Yunohost..." #local DIST="bullseye" #local INSTALL_SCRIPT="https://install.yunohost.org/$DIST" #curl $INSTALL_SCRIPT | bash -s -- -a - + #echo_bold "> Running yunohost postinstall" #yunohost tools postinstall --domain $domain --password $yuno_pwd - + # What is it used for :| ... #echo_bold "> Create Yunohost CI user" #local ynh_ci_user=ynhci @@ -65,8 +65,8 @@ function tweak_yunohost() { function tweak_yunorunner() { echo_bold "> Tweaking YunoRunner..." - - + + #if ! yunohost app list --output-as json --quiet | jq -e '.apps[] | select(.id == "yunorunner")' >/dev/null #then # yunohost app install --force https://github.com/YunoHost-Apps/yunorunner_ynh -a "domain=$domain&path=/$ci_path" @@ -202,7 +202,7 @@ EOF function add_cron_jobs() { echo_bold "> Configuring the CI..." - + # Cron tasks cat >> "/etc/cron.d/yunorunner" << EOF # self-upgrade every night diff --git a/run.py b/run.py index e4d9660..62c9c7f 100644 --- a/run.py +++ b/run.py @@ -570,6 +570,7 @@ async def cleanup_old_package_check_if_lock_exists(worker, job, ignore_error=Fal # Dirty hack to kill ~zombi processes adopted by init doing funky stuff -_- os.system("for PID in $(ps -ef --forest | grep 'lxc exec' | grep ' 1 ' | awk '{print $2}'); do kill -9 $PID; done") + os.system("for PID in $(ps -ef --forest | grep 'incus exec' | grep ' 1 ' | awk '{print $2}'); do kill -9 $PID; done") os.system("for PID in $(ps -ef --forest | grep 'script -qefc' | grep ' 1 ' | awk '{print $2}' ); do kill $PID; done")