From c25b53b2d2a41a3aa9b44580ece702d74a789109 Mon Sep 17 00:00:00 2001 From: "Daniel (Fourdee)" Date: Wed, 18 Jul 2018 19:46:39 +0100 Subject: [PATCH] v6.12 + finalise mineos: https://github.com/Fourdee/DietPi/issues/1880 --- CHANGELOG.txt | 1 + dietpi/dietpi-software | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index c9c5ad0f0a..1cced1ec2f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,7 @@ DietPi-Drive_Manager | Resolved an issue where the program could remove a non-em DietPi-Software | Resolved a potential Mono instability issue with Radarr, Sonarr and Jackett, due to using '--optimize=all --server'. This has now been removed for new installations. Many thanks to @hellfirehd for debugging/testing and @Taloth for dev insights: https://github.com/Fourdee/DietPi/issues/1896 DietPi-Software | Mono: Temp mono files are now cleared from memory once installed, preventing out of memory errors for additional software installs afterwards: https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403856446 DietPi-Software | Xserver: Resolved rarely occuring uninstall issus by not purging dependencies, but leaving them for autoremove: https://github.com/Fourdee/DietPi/issues/1921 +DietPi-Software | MineOS: Resolved failed installation due to incompatibilities with nodejs v10. v8 is now installed: https://github.com/Fourdee/DietPi/issues/1880 DietPi-Update | Resolved an issue where incorrect version would be displayed, once update was completed. This is due to '| tee' on a function, making var changes local: https://github.com/Fourdee/DietPi/issues/1877#issuecomment-403866204 ----------------------------------------------------------------------------------------------------------- diff --git a/dietpi/dietpi-software b/dietpi/dietpi-software index 3e1e529731..945e07b0c7 100644 --- a/dietpi/dietpi-software +++ b/dietpi/dietpi-software @@ -7740,7 +7740,9 @@ _EOF_ chown -R ubooquity:dietpi $G_FP_DIETPI_USERDATA/ubooquity # - Mineos - chown -R mineos:mineos $G_FP_DIETPI_USERDATA/mineos/serverdata + chown -R mineos:dietpi $G_FP_DIETPI_USERDATA/mineos + chown -R mineos:dietpi /var/games/minecraft + chown mineos:dietpi /etc/ssl/certs/mineos* # - cubrite chown -R cuberite:dietpi $G_FP_DIETPI_USERDATA/cubrite @@ -10725,7 +10727,7 @@ _EOF_ Banner_Configuration - # - Add underprivilged user for web access + # - Add underprivilged user for web access | no longer works, could be a nodejs v8 issue? useradd mineos echo -e "$GLOBAL_PW\n$GLOBAL_PW\n" | passwd mineos @@ -10745,7 +10747,6 @@ _EOF_ mkdir -p /var/games mkdir -p $G_FP_DIETPI_USERDATA/mineos/serverdata ln -sf $G_FP_DIETPI_USERDATA/mineos/serverdata /var/games/minecraft - chown -R mineos:mineos /var/games/minecraft # - setup SSL cert cd $G_FP_DIETPI_USERDATA/mineos/minecraft @@ -10753,13 +10754,16 @@ _EOF_ cd "$HOME" # - Supervisor service - cp $G_FP_DIETPI_USERDATA/mineos/minecraft/init/supervisor_conf /etc/supervisor/conf.d/mineos.conf - - # - correct the node filepath for supervisor mineos - sed -i '/^command=/c\command=/usr/local/bin/node webui.js' /etc/supervisor/conf.d/mineos.conf - - # - Set directory to G_FP_DIETPI_USERDATA - sed -i "/^directory=/c\directory=$G_FP_DIETPI_USERDATA/mineos/minecraft" /etc/supervisor/conf.d/mineos.conf + cat << _EOF_ > /etc/supervisor/conf.d/mineos.conf +[program:mineos] +command=/usr/local/bin/node webui.js +directory=$G_FP_DIETPI_USERDATA/mineos/minecraft +environment=HOME=$G_FP_DIETPI_USERDATA/mineos +user=root +autostart=true +autorestart=true +redirect_stderr=true +_EOF_ supervisorctl reload