voltron/octodocker_deploy
1
0
Fork 0
Code Issues Pull Requests Releases Activity

begin steamlining with settings

Browse Source
This commit is contained in:
paukstelis
2022-05-27 14:42:11 -04:00
parent 2c9e051a13
commit 68c134f476
1 changed files with 90 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
octoprint_deploy.sh
View File

@@ -9,7 +9,19 @@ fi
#Get abbreviated architecture #Get abbreviated architecture
ARCH=$(arch) ARCH=$(arch)
ARCH=${ARCH:0:3} ARCH=${ARCH:0:3}
#echo $ARCH
get_settings() {
#Get octoprint_deploy settings, all of which are written on system prepare
if [ -f /etc/octoprint_deploy ]; then
TYPE=$(cat /etc/octoprint_deploy | sed -n -e 's/^type: \([[:alnum:]]*\) .*/\1/p')
echo $TYPE
STREAMER=$(cat /etc/octoprint_deploy | sed -n -e 's/^streamer: \([[:alnum:]]*\) .*/\1/p')
echo $STREAMER
HAPROXY=$(cat /etc/octoprint_deploy | sed -n -e 's/^haproxy: \([[:alnum:]]*\) .*/\1/p')
echo $HAPROXY
fi
}
# from stackoverflow.com/questions/3231804 # from stackoverflow.com/questions/3231804
prompt_confirm() { prompt_confirm() {
while true; do while true; do
@@ -33,37 +45,26 @@ log () {
new_instance () { new_instance () {
echo "$(date) starting instance installation" | log echo "$(date) starting instance installation" | log
get_settings
if [ $SUDO_USER ]; then user=$SUDO_USER; fi if [ $SUDO_USER ]; then user=$SUDO_USER; fi
SCRIPTDIR=$(dirname $(readlink -f $0)) SCRIPTDIR=$(dirname $(readlink -f $0))
PIDEFAULT="/home/$user/oprint/bin/octoprint" PIDEFAULT="/home/$user/oprint/bin/octoprint"
BUDEFAULT="/home/$user/OctoPrint/bin/octoprint" BUDEFAULT="/home/$user/OctoPrint/bin/octoprint"
OTHERDEFAULT="" if [ -z "$TYPE" ]; then
PS3='Installation type: ' echo "No installation type found. Have you run system prepare?"
options=("OctoPi" "Linux/OctoBuntu" "Other" "Quit") main_menu
select opt in "${options[@]}" fi
do
case $opt in if [ "$TYPE" == octopi ]; then
"OctoPi")
DAEMONPATH=$PIDEFAULT
INSTALL=1 INSTALL=1
break DAEMONPATH=$PIDEFAULT
;; fi
"Linux/OctoBuntu")
DAEMONPATH=$BUDEFAULT if [ "$TYPE" == linux ]; then
INSTALL=2 INSTALL=2
break DAEMONPATH=$BUDEFAULT
;; fi
"Other")
DAEMONPATH=$OTHERDEFAULT
break
;;
"Quit")
exit 1
;;
*) echo "invalid option $REPLY";;
esac
done
echo "UNPLUG PRINTER YOU ARE INSTALLING NOW (other printers can remain)" echo "UNPLUG PRINTER YOU ARE INSTALLING NOW (other printers can remain)"
echo "Enter the name for new printer/instance (no spaces):" echo "Enter the name for new printer/instance (no spaces):"
@@ -148,7 +149,6 @@ new_instance () {
if prompt_confirm "Begin auto-detect printer serial number for udev entry?" if prompt_confirm "Begin auto-detect printer serial number for udev entry?"
then then
echo echo
#clear out journalctl - probably a better way to do this
journalctl --rotate > /dev/null 2>&1 journalctl --rotate > /dev/null 2>&1
journalctl --vacuum-time=1seconds > /dev/null 2>&1 journalctl --vacuum-time=1seconds > /dev/null 2>&1
echo "Plug your printer in via USB now (detection time-out in 1 min)" echo "Plug your printer in via USB now (detection time-out in 1 min)"
@@ -267,10 +267,9 @@ new_instance () {
systemctl enable cam_$INSTANCE.service systemctl enable cam_$INSTANCE.service
fi fi
#if we are on octopi, add in haproxy entry #need to find a way to know if haproxy is being used
#get haproxy version
HAversion=$(haproxy -v | sed -n 's/^.*version \([0-9]\).*/\1/p') HAversion=$(haproxy -v | sed -n 's/^.*version \([0-9]\).*/\1/p')
if [ $INSTALL -gt 1 ]; then if [ "$HAPROXY" == true ]; then
#find frontend line, do insert #find frontend line, do insert
sed -i "/option forwardfor except 127.0.0.1/a\ use_backend $INSTANCE if { path_beg /$INSTANCE/ }" /etc/haproxy/haproxy.cfg sed -i "/option forwardfor except 127.0.0.1/a\ use_backend $INSTANCE if { path_beg /$INSTANCE/ }" /etc/haproxy/haproxy.cfg
echo "#$INSTANCE start" >> /etc/haproxy/haproxy.cfg echo "#$INSTANCE start" >> /etc/haproxy/haproxy.cfg
@@ -302,9 +301,8 @@ new_instance () {
} }
write_camera() { write_camera() {
#Establish which streamer system is using, default mjpg-streamer
STREAMER=$(cat /etc/octoprint_streamer) get_settings
echo $STREAMER
if [ -z "$STREAMER" ]; then if [ -z "$STREAMER" ]; then
$STREAMER='mjpg-streamer' $STREAMER='mjpg-streamer'
fi fi
@@ -368,7 +366,6 @@ add_camera() {
done done
fi fi
#clear out journalctl - probably a better way to do this
journalctl --rotate > /dev/null 2>&1 journalctl --rotate > /dev/null 2>&1
journalctl --vacuum-time=1seconds > /dev/null 2>&1 journalctl --vacuum-time=1seconds > /dev/null 2>&1
echo "Plug your CAMERA in via USB now (detection time-out in 1 min)" echo "Plug your CAMERA in via USB now (detection time-out in 1 min)"
@@ -437,7 +434,7 @@ add_camera() {
remove_instance() { remove_instance() {
if [ $SUDO_USER ]; then user=$SUDO_USER; fi if [ $SUDO_USER ]; then user=$SUDO_USER; fi
#TODO Check to see that octoprint_instances exists before continuing if [ -f "/etc/octoprint_instances"]; then
echo 'Do not remove the generic instance!' | log echo 'Do not remove the generic instance!' | log
PS3='Select instance to remove: ' PS3='Select instance to remove: '
readarray -t options < <(cat /etc/octoprint_instances | sed -n -e 's/^instance:\([[:alnum:]]*\) .*/\1/p') readarray -t options < <(cat /etc/octoprint_instances | sed -n -e 's/^instance:\([[:alnum:]]*\) .*/\1/p')
@@ -475,6 +472,7 @@ remove_instance() {
systemctl restart haproxy.service systemctl restart haproxy.service
fi fi
fi fi
fi
main_menu main_menu
} }
@@ -584,12 +582,13 @@ prepare () {
touch /etc/camera_ports touch /etc/camera_ports
echo 'Adding current user to dialout and video groups.' echo 'Adding current user to dialout and video groups.'
usermod -a -G dialout,video $user usermod -a -G dialout,video $user
echo 'type: octopi' >> /etc/octoprint_deploy
if [ $INSTALL -eq 1 ]; then if [ $INSTALL -eq 1 ]; then
if grep -q 'firstRun: false' /home/$user/.octoprint/config.yaml; then if grep -q 'firstRun: false' /home/$user/.octoprint/config.yaml; then
echo "It looks as though this OctoPi installation may have already been used." | log echo "It looks as though this OctoPi installation has already been in use." | log
echo "In order to use the script, the files must be backed up and then moved." echo "In order to use the script, the files must be moved."
echo "If you chose to continue with the installation these files will be moved (not erased)." echo "If you chose to continue with the installation these files will be moved (not erased)."
echo "They will be found at /home/$user/.old-octo" echo "They will be found at /home/$user/.old-octo"
if prompt_confirm "Continue with installation?"; then if prompt_confirm "Continue with installation?"; then
@@ -603,6 +602,15 @@ prepare () {
fi fi
fi fi
if prompt_confirm "Would you like to install and use ustreamer instead of mjpg-streamer?"; then
echo 'streamer: ustreamer' >> /etc/octoprint_deploy
apt-get -y install libevent-dev libbsd-dev
sudo -u $user git clone --depth=1 https://github.com/pikvm/ustreamer
sudo -u $user make -C ustreamer > /dev/null
else
echo 'streamer: mjpg-streamer' >> /etc/octoprint_deploy
fi
echo 'Disabling unneeded services....' echo 'Disabling unneeded services....'
systemctl disable octoprint.service systemctl disable octoprint.service
systemctl disable webcamd.service systemctl disable webcamd.service
@@ -614,9 +622,8 @@ prepare () {
echo "Adding systemctl and reboot to sudo" echo "Adding systemctl and reboot to sudo"
echo "$user ALL=NOPASSWD: /usr/bin/systemctl" >> /etc/sudoers.d/octoprint_systemctl echo "$user ALL=NOPASSWD: /usr/bin/systemctl" >> /etc/sudoers.d/octoprint_systemctl
echo "$user ALL=NOPASSWD: /usr/sbin/reboot" >> /etc/sudoers.d/octoprint_reboot echo "$user ALL=NOPASSWD: /usr/sbin/reboot" >> /etc/sudoers.d/octoprint_reboot
#webcamd gets restarted? why? get it out of there for now
#mv /etc/systemd/system/webcamd.service /home/$user/ echo 'haproxy: true' >> /etc/octoprint_deploy
echo mjpg-streamer > /etc/octoprint_streamer
echo 'Modifying config.yaml' echo 'Modifying config.yaml'
cp -p $SCRIPTDIR/config.basic /home/pi/.octoprint/config.yaml cp -p $SCRIPTDIR/config.basic /home/pi/.octoprint/config.yaml
echo 'Connect to your octoprint instance and setup admin user' echo 'Connect to your octoprint instance and setup admin user'
@@ -624,6 +631,7 @@ prepare () {
fi fi
if [ $INSTALL -gt 1 ]; then if [ $INSTALL -gt 1 ]; then
echo 'type: linux' >> /etc/octoprint_deploy
echo "Creating OctoBuntu installation equivalent." echo "Creating OctoBuntu installation equivalent."
echo "Adding systemctl and reboot to sudo" echo "Adding systemctl and reboot to sudo"
echo "$user ALL=NOPASSWD: /usr/bin/systemctl" >> /etc/sudoers.d/octoprint_systemctl echo "$user ALL=NOPASSWD: /usr/bin/systemctl" >> /etc/sudoers.d/octoprint_systemctl
@@ -661,9 +669,11 @@ prepare () {
#Add this is as an option #Add this is as an option
echo echo
echo echo
echo 'You have the option of setting up haproxy. This binds instances to a name on port 80 instead of having to type the port.' echo 'You now have the option of setting up haproxy. This binds instances to a name on port 80 instead of having to type the port.'
echo 'If you intend to use this machine only for OctoPrint, it is safe to select yes.' echo 'If you intend to use this machine only for OctoPrint, it is safe to select yes.'
if prompt_confirm "Use haproxy?" then echo
if prompt_confirm "Use haproxy?"; then
echo 'haproxy: true' >> /etc/octoprint_deploy
systemctl stop haproxy systemctl stop haproxy
#get haproxy version #get haproxy version
HAversion=$(haproxy -v | sed -n 's/^.*version \([0-9]\).*/\1/p') HAversion=$(haproxy -v | sed -n 's/^.*version \([0-9]\).*/\1/p')
@@ -704,7 +714,7 @@ prepare () {
done done
if [ $VID -eq 1 ]; then if [ $VID -eq 1 ]; then
echo mjpg-streamer > /etc/octoprint_streamer echo 'streamer: mjpg-streamer' >> /etc/octoprint_deploy
#install mjpg-streamer, not doing any error checking or anything #install mjpg-streamer, not doing any error checking or anything
echo 'Installing mjpeg-streamer' echo 'Installing mjpeg-streamer'
sudo -u $user git clone https://github.com/jacksonliam/mjpg-streamer.git mjpeg sudo -u $user git clone https://github.com/jacksonliam/mjpg-streamer.git mjpeg
@@ -715,7 +725,7 @@ prepare () {
fi fi
if [ $VID -eq 2 ]; then if [ $VID -eq 2 ]; then
echo ustreamer > /etc/octoprint_streamer echo 'streamer: ustreamer' >> /etc/octoprint_deploy
#install ustreamer #install ustreamer
sudo -u $user git clone --depth=1 https://github.com/pikvm/ustreamer sudo -u $user git clone --depth=1 https://github.com/pikvm/ustreamer
sudo -u $user make -C ustreamer > /dev/null sudo -u $user make -C ustreamer > /dev/null
@@ -779,6 +789,7 @@ remove_everything() {
echo "Removing system stuff" echo "Removing system stuff"
rm /etc/systemd/system/octoprint_default.service rm /etc/systemd/system/octoprint_default.service
rm /etc/octoprint_streamer rm /etc/octoprint_streamer
rm /etc/octoprint_deploy
rm /etc/octoprint_instances rm /etc/octoprint_instances
rm /etc/camera_ports rm /etc/camera_ports
rm /etc/udev/rules.d/99-octoprint.rules rm /etc/udev/rules.d/99-octoprint.rules