From 47db5cdbfc9cd1b0be59b7d2d8ba95015d36a806 Mon Sep 17 00:00:00 2001 From: paukstelis Date: Sun, 28 Feb 2021 11:41:55 -0500 Subject: [PATCH] remove v1 defaults --- octoprint_default | 29 -------- octoprint_init | 165 ---------------------------------------------- octoprint_udev | 1 - 3 files changed, 195 deletions(-) delete mode 100644 octoprint_default delete mode 100644 octoprint_init delete mode 100644 octoprint_udev diff --git a/octoprint_default b/octoprint_default deleted file mode 100644 index adf2049..0000000 --- a/octoprint_default +++ /dev/null @@ -1,29 +0,0 @@ -# Configuration for /etc/init.d/NEWINSTANCE - -# The init.d script will only run if this variable non-empty. -OCTOPRINT_USER=OCTOUSER - -# base directory to use -BASEDIR=OCTOCONFIG/.NEWINSTANCE - -# configuration file to use -CONFIGFILE=OCTOCONFIG/.NEWINSTANCE/config.yaml - -# On what port to run daemon, default is 5000 -PORT=NEWPORT - -# Path to the OctoPrint executable, you need to set this to match your installation! -DAEMON=OCTOPATH - -# What arguments to pass to octoprint, usually no need to touch this -DAEMON_ARGS="--port=$PORT" - -# Umask of files octoprint generates, Change this to 000 if running octoprint as its own, separate user -UMASK=022 - -# Process priority, 0 here will result in a priority 20 process. -# -2 ensures Octoprint has a slight priority over user processes. -NICELEVEL=-2 - -# Should we run at startup? -START=yes diff --git a/octoprint_init b/octoprint_init deleted file mode 100644 index 6a4c866..0000000 --- a/octoprint_init +++ /dev/null @@ -1,165 +0,0 @@ -#!/bin/sh - -### BEGIN INIT INFO -# Provides: octoprint -# Required-Start: $local_fs networking -# Required-Stop: -# Should-Start: -# Should-Stop: -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: OctoPrint daemon -# Description: Starts the OctoPrint daemon with the user specified in -# /etc/default/octoprint. -### END INIT INFO - -# Author: Sami Olmari & Gina Häußge - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DESC="OctoPrint Daemon NEWINSTANCE" -NAME="NEWINSTANCE" -PKGNAME=NEWINSTANCE -PIDFILE=/var/run/$PKGNAME.pid -SCRIPTNAME=/etc/init.d/$PKGNAME -DEFAULTS=/etc/default/$PKGNAME - -# Read configuration variable file if it is present -[ -r $DEFAULTS ] && . $DEFAULTS - -# Define LSB log_* functions. -# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. -. /lib/lsb/init-functions - -log_daemon_msg() { logger "$@"; } -log_end_msg() { [ $1 -eq 0 ] && RES=OK; logger ${RES:=FAIL}; } - -# Exit if the DAEMON is not set -if [ -z "$DAEMON" ] -then - log_warning_msg "Not starting $PKGNAME, DAEMON not set in /etc/default/$PKGNAME." - exit 0 -fi - -# Exit if the DAEMON is not installed -[ -x "$DAEMON" ] || exit 0 - -# Load the VERBOSE setting and other rcS variables -[ -f /etc/default/rcS ] && . /etc/default/rcS - -if [ -z "$START" -o "$START" != "yes" ] -then - log_warning_msg "Not starting $PKGNAME, edit /etc/default/$PKGNAME to start it." - exit 0 -fi - -if [ -z "$OCTOPRINT_USER" ] -then - log_warning_msg "Not starting $PKGNAME, OCTOPRINT_USER not set in /etc/default/$PKGNAME." - exit 0 -fi - -COMMAND_ARGS= -if [ -n "$BASEDIR" ] -then - COMMAND_ARGS="--basedir $BASEDIR $COMMAND_ARGS" -fi - -if [ -n "$CONFIGFILE" ] -then - COMMAND_ARGS="--config $CONFIGFILE $COMMAND_ARGS" -fi - -# -# Function to verify if a pid is alive -# -is_alive() -{ - pid=`cat $1` > /dev/null 2>&1 - kill -0 $pid > /dev/null 2>&1 - return $? -} - -# -# Function that starts the daemon/service -# -do_start() -{ - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - - is_alive $PIDFILE - RETVAL="$?" - - if [ $RETVAL != 0 ]; then - start-stop-daemon --start --background --quiet --pidfile $PIDFILE --make-pidfile \ - --exec $DAEMON --chuid $OCTOPRINT_USER --user $OCTOPRINT_USER --umask $UMASK --nicelevel=$NICELEVEL \ - -- serve $COMMAND_ARGS $DAEMON_ARGS - RETVAL="$?" - fi -} - -# -# Function that stops the daemon/service -# -do_stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --user $OCTOPRINT_USER --pidfile $PIDFILE - RETVAL="$?" - [ "$RETVAL" = "2" ] && return 2 - - rm -f $PIDFILE - - [ "$RETVAL" = "0" ] && return 0 || return 1 -} - -case "$1" in - start) - [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME" - do_start - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - stop) - [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" - do_stop - case "$?" in - 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; - 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; - esac - ;; - status) - status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $? - ;; - restart) - log_daemon_msg "Restarting $DESC" "$NAME" - do_stop - case "$?" in - 0|1) - do_start - case "$?" in - 0) log_end_msg 0 ;; - 1) log_end_msg 1 ;; # Old process is still running - *) log_end_msg 1 ;; # Failed to start - esac - ;; - *) - # Failed to stop - log_end_msg 1 - ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|status|restart}" >&2 - exit 3 - ;; -esac diff --git a/octoprint_udev b/octoprint_udev deleted file mode 100644 index 95234a9..0000000 --- a/octoprint_udev +++ /dev/null @@ -1 +0,0 @@ -SUBSYSTEM=="tty", ATTRS{serial}=="UDEV", SYMLINK+="NEWINSTANCE"