mirror of
https://github.com/akuker/RASCSI.git
synced 2024-11-26 13:49:21 +00:00
Add --headless option to easyinstall.sh, enable web auth by default on standalone web UI installs
This commit is contained in:
parent
dd40d7156a
commit
6ad436c085
@ -691,6 +691,8 @@ function setupWiredNetworking() {
|
|||||||
echo "WARNING: If you continue, the IP address of your Pi may change upon reboot."
|
echo "WARNING: If you continue, the IP address of your Pi may change upon reboot."
|
||||||
echo "Please make sure you will not lose access to the Pi system."
|
echo "Please make sure you will not lose access to the Pi system."
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
if [[ -z $HEADLESS ]]; then
|
||||||
echo "Do you want to proceed with network configuration using the default settings? [Y/n]"
|
echo "Do you want to proceed with network configuration using the default settings? [Y/n]"
|
||||||
read REPLY
|
read REPLY
|
||||||
|
|
||||||
@ -701,13 +703,19 @@ function setupWiredNetworking() {
|
|||||||
read SELECTED
|
read SELECTED
|
||||||
LAN_INTERFACE=$SELECTED
|
LAN_INTERFACE=$SELECTED
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "$(grep -c "^denyinterfaces" /etc/dhcpcd.conf)" -ge 1 ]; then
|
if [ "$(grep -c "^denyinterfaces" /etc/dhcpcd.conf)" -ge 1 ]; then
|
||||||
echo "WARNING: Network forwarding may already have been configured. Proceeding will overwrite the configuration."
|
echo "WARNING: Network forwarding may already have been configured. Proceeding will overwrite the configuration."
|
||||||
|
|
||||||
|
if [[ -z $HEADLESS ]]; then
|
||||||
echo "Press enter to continue or CTRL-C to exit"
|
echo "Press enter to continue or CTRL-C to exit"
|
||||||
read REPLY
|
read REPLY
|
||||||
|
fi
|
||||||
|
|
||||||
sudo sed -i /^denyinterfaces/d /etc/dhcpcd.conf
|
sudo sed -i /^denyinterfaces/d /etc/dhcpcd.conf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo bash -c 'echo "denyinterfaces '$LAN_INTERFACE'" >> /etc/dhcpcd.conf'
|
sudo bash -c 'echo "denyinterfaces '$LAN_INTERFACE'" >> /etc/dhcpcd.conf'
|
||||||
echo "Modified /etc/dhcpcd.conf"
|
echo "Modified /etc/dhcpcd.conf"
|
||||||
|
|
||||||
@ -720,6 +728,12 @@ function setupWiredNetworking() {
|
|||||||
echo "Either use the Web UI, or do this on the command line (assuming SCSI ID 6):"
|
echo "Either use the Web UI, or do this on the command line (assuming SCSI ID 6):"
|
||||||
echo "rasctl -i 6 -c attach -t scdp -f $LAN_INTERFACE"
|
echo "rasctl -i 6 -c attach -t scdp -f $LAN_INTERFACE"
|
||||||
echo ""
|
echo ""
|
||||||
|
|
||||||
|
if [[ $HEADLESS ]]; then
|
||||||
|
echo "Skipping reboot in headless mode"
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
|
|
||||||
echo "We need to reboot your Pi"
|
echo "We need to reboot your Pi"
|
||||||
echo "Press Enter to reboot or CTRL-C to exit"
|
echo "Press Enter to reboot or CTRL-C to exit"
|
||||||
read
|
read
|
||||||
@ -1269,6 +1283,7 @@ function runChoice() {
|
|||||||
preparePythonCommon
|
preparePythonCommon
|
||||||
cachePipPackages
|
cachePipPackages
|
||||||
installRaScsiWebInterface
|
installRaScsiWebInterface
|
||||||
|
enableWebInterfaceAuth
|
||||||
echo "Configuring RaSCSI Web Interface stand-alone - Complete!"
|
echo "Configuring RaSCSI Web Interface stand-alone - Complete!"
|
||||||
echo "Launch the Web Interface with the 'start.sh' script. To use a custom port for the web server: 'start.sh --web-port=8081"
|
echo "Launch the Web Interface with the 'start.sh' script. To use a custom port for the web server: 'start.sh --web-port=8081"
|
||||||
;;
|
;;
|
||||||
@ -1367,6 +1382,9 @@ while [ "$1" != "" ]; do
|
|||||||
-s | --skip-token)
|
-s | --skip-token)
|
||||||
SKIP_TOKEN=1
|
SKIP_TOKEN=1
|
||||||
;;
|
;;
|
||||||
|
-h | --headless)
|
||||||
|
HEADLESS=1
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
echo "ERROR: Unknown parameter \"$PARAM\""
|
echo "ERROR: Unknown parameter \"$PARAM\""
|
||||||
exit 1
|
exit 1
|
||||||
|
Loading…
Reference in New Issue
Block a user