Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2025-01-02 09:35:58 +00:00
Code Issues Projects Releases Wiki Activity

Add checks for running services before stopping + stop&start monitor_rascsi when installing rascsi proper

Browse Source
This commit is contained in:
Daniel Markstedt 2021-10-20 22:06:00 -07:00
parent 269b718ec7
commit 192bbb6391
1 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
easyinstall.sh
View File

@ -79,7 +79,8 @@ function installPackages() {
# compile and install RaSCSI Service # compile and install RaSCSI Service
function installRaScsi() { function installRaScsi() {
sudo systemctl stop rascsi || true stopRaScsiScreen
stopRaScsi
if [ -f /etc/systemd/system/rascsi.service ]; then if [ -f /etc/systemd/system/rascsi.service ]; then
sudo cp /etc/systemd/system/rascsi.service /etc/systemd/system/rascsi.service.old sudo cp /etc/systemd/system/rascsi.service /etc/systemd/system/rascsi.service.old
@ -109,6 +110,8 @@ www-data ALL=NOPASSWD: /sbin/shutdown, /sbin/reboot
sudo systemctl restart rsyslog sudo systemctl restart rsyslog
sudo systemctl enable rascsi # optional - start rascsi at boot sudo systemctl enable rascsi # optional - start rascsi at boot
sudo systemctl start rascsi sudo systemctl start rascsi
startRaScsiScreen
} }
# install everything required to run an HTTP server (Nginx + Python Flask App) # install everything required to run an HTTP server (Nginx + Python Flask App)
@ -151,7 +154,7 @@ function installRaScsiScreen() {
ROTATION="180" ROTATION="180"
fi fi
sudo systemctl stop monitor_rascsi || true stopRaScsiScreen
updateRaScsiGit updateRaScsiGit
sudo apt-get update && sudo apt-get install python3-dev python3-pip python3-venv libjpeg-dev libpng-dev libopenjp2-7-dev i2c-tools -y </dev/null sudo apt-get update && sudo apt-get install python3-dev python3-pip python3-venv libjpeg-dev libpng-dev libopenjp2-7-dev i2c-tools -y </dev/null
@ -218,7 +221,8 @@ function createImagesDir() {
} }
function stopOldWebInterface() { function stopOldWebInterface() {
sudo systemctl stop rascsi-web || true stopRaScsiWeb
APACHE_STATUS=$(sudo systemctl status apache2 &> /dev/null; echo $?) APACHE_STATUS=$(sudo systemctl status apache2 &> /dev/null; echo $?)
if [ "$APACHE_STATUS" -eq 0 ] ; then if [ "$APACHE_STATUS" -eq 0 ] ; then
echo "Stopping old Apache2 RaSCSI Web..." echo "Stopping old Apache2 RaSCSI Web..."
@ -249,6 +253,31 @@ function updateRaScsiGit() {
fi fi
} }
function stopRaScsi() {
if [[ `systemctl list-units | grep -c rascsi.service` -ge 1 ]]; then
sudo systemctl stop rascsi.service
fi
}
function stopRaScsiWeb() {
if [[ `systemctl list-units | grep -c rascsi-web.service` -ge 1 ]]; then
sudo systemctl stop rascsi-web.service
fi
}
function stopRaScsiScreen() {
if [[ `systemctl list-units | grep -c monitor_rascsi.service` -ge 1 ]]; then
sudo systemctl stop monitor_rascsi.service
fi
}
function startRaScsiScreen() {
if [[ -f "/etc/systemd/system/monitor_rascsi.service" ]]; then
sudo systemctl start monitor_rascsi.service
showRaScsiScreenStatus
fi
}
function showRaScsiStatus() { function showRaScsiStatus() {
sudo systemctl status rascsi | tee sudo systemctl status rascsi | tee
} }