Make files executable
This commit is contained in:
Fredrik Baberg
parent
f313ec8c55
commit
f437a1f61d
@ -1,10 +1,10 @@
|
|||||||
{
|
{
|
||||||
# debug
|
# debug
|
||||||
log {
|
log {
|
||||||
format console
|
format console
|
||||||
output file /var/log/caddy/caddy.log
|
output file /var/log/caddy/caddy.log
|
||||||
}
|
}
|
||||||
auto_https disable_redirects
|
auto_https disable_redirects
|
||||||
}
|
}
|
||||||
|
|
||||||
import sites-enabled/*.caddy
|
import sites-enabled/*.caddy
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
XDG_CONFIG_HOME="/data/config"
|
XDG_CONFIG_HOME="/data/config"
|
||||||
XDG_DATA_HOME="/data/config"
|
XDG_DATA_HOME="/data/config"
|
||||||
|
|||||||
@ -1,46 +1,46 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
|
|
||||||
SRC_PATH=$ADDON_SRC_PATH/klipper
|
SRC_PATH=$ADDON_SRC_PATH/klipper
|
||||||
VENV_PATH=$ADDON_VENV_PATH/klipper
|
VENV_PATH=$ADDON_VENV_PATH/klipper
|
||||||
CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config
|
CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config
|
||||||
|
|
||||||
# Get Klipper source.
|
# Get Klipper source.
|
||||||
if [ ! -d "$SRC_PATH" ]; then
|
if [ ! -d "$SRC_PATH" ]; then
|
||||||
bashio::log "Get Klipper source"
|
bashio::log "Get Klipper source"
|
||||||
git clone https://github.com/Klipper3d/klipper "$SRC_PATH"
|
git clone https://github.com/Klipper3d/klipper "$SRC_PATH"
|
||||||
else
|
else
|
||||||
echo "Klipper already installed"
|
echo "Klipper already installed"
|
||||||
fi
|
fi
|
||||||
# Install Klipper in virtual environment.
|
# Install Klipper in virtual environment.
|
||||||
if [ ! -d "$VENV_PATH" ]; then
|
if [ ! -d "$VENV_PATH" ]; then
|
||||||
bashio::log "Prepare Klippy-env"
|
bashio::log "Prepare Klippy-env"
|
||||||
virtualenv "$VENV_PATH"
|
virtualenv "$VENV_PATH"
|
||||||
"$VENV_PATH"/bin/python -m pip install --upgrade pip
|
"$VENV_PATH"/bin/python -m pip install --upgrade pip
|
||||||
"$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/klippy-requirements.txt
|
"$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/klippy-requirements.txt
|
||||||
else
|
else
|
||||||
bashio::log "Klippy env already installed"
|
bashio::log "Klippy env already installed"
|
||||||
fi
|
fi
|
||||||
# Make sure config file(s) exists.
|
# Make sure config file(s) exists.
|
||||||
if [ ! -d "$CONFIG_PATH" ]; then
|
if [ ! -d "$CONFIG_PATH" ]; then
|
||||||
mkdir -p "$CONFIG_PATH"
|
mkdir -p "$CONFIG_PATH"
|
||||||
cp -R /etc/klipper/config/* "$CONFIG_PATH"
|
cp -R /etc/klipper/config/* "$CONFIG_PATH"
|
||||||
## Create log folder and file
|
## Create log folder and file
|
||||||
mkdir -p $ADDON_CONFIG_PATH/moonraker/logs
|
mkdir -p $ADDON_CONFIG_PATH/moonraker/logs
|
||||||
touch $ADDON_CONFIG_PATH/moonraker/logs/klippy.log
|
touch $ADDON_CONFIG_PATH/moonraker/logs/klippy.log
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Build and add host process, if set.
|
# Build and add host process, if set.
|
||||||
if bashio::config.true 'host_mcu'; then
|
if bashio::config.true 'host_mcu'; then
|
||||||
bashio::log "Enable host process."
|
bashio::log "Enable host process."
|
||||||
BIN_PATH=$ADDON_CONFIG_PATH/bin
|
BIN_PATH=$ADDON_CONFIG_PATH/bin
|
||||||
if [ ! -f "$BIN_PATH"/klipper_mcu_host ]; then
|
if [ ! -f "$BIN_PATH"/klipper_mcu_host ]; then
|
||||||
mkdir -p "$BIN_PATH"
|
mkdir -p "$BIN_PATH"
|
||||||
cp /etc/klipper/config_host_mcu "$SRC_PATH"/.config
|
cp /etc/klipper/config_host_mcu "$SRC_PATH"/.config
|
||||||
cd "$SRC_PATH" || exit
|
cd "$SRC_PATH" || exit
|
||||||
make
|
make
|
||||||
cp out/klipper.elf "$BIN_PATH"/klipper_mcu_host
|
cp out/klipper.elf "$BIN_PATH"/klipper_mcu_host
|
||||||
fi
|
fi
|
||||||
rm -f /etc/services.d/klipper_host/down
|
rm -f /etc/services.d/klipper_host/down
|
||||||
else
|
else
|
||||||
touch /etc/services.d/klipper_host/down
|
touch /etc/services.d/klipper_host/down
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,29 +1,29 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
|
|
||||||
SRC_PATH=$ADDON_SRC_PATH/moonraker
|
SRC_PATH=$ADDON_SRC_PATH/moonraker
|
||||||
VENV_PATH=$ADDON_VENV_PATH/moonraker
|
VENV_PATH=$ADDON_VENV_PATH/moonraker
|
||||||
CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config
|
CONFIG_PATH=$ADDON_CONFIG_PATH/moonraker/config
|
||||||
|
|
||||||
# Get Moonraker source.
|
# Get Moonraker source.
|
||||||
if [ ! -d "$SRC_PATH" ]; then
|
if [ ! -d "$SRC_PATH" ]; then
|
||||||
bashio::log "Get Moonraker source"
|
bashio::log "Get Moonraker source"
|
||||||
git clone https://github.com/Arksine/moonraker.git "$SRC_PATH"
|
git clone https://github.com/Arksine/moonraker.git "$SRC_PATH"
|
||||||
fi
|
fi
|
||||||
# Install Moonraker in virtual environment.
|
# Install Moonraker in virtual environment.
|
||||||
if [ ! -d "$VENV_PATH" ]; then
|
if [ ! -d "$VENV_PATH" ]; then
|
||||||
bashio::log "Prepare Moonraker-env"
|
bashio::log "Prepare Moonraker-env"
|
||||||
virtualenv "$VENV_PATH"
|
virtualenv "$VENV_PATH"
|
||||||
"$VENV_PATH"/bin/python -m pip install --upgrade pip
|
"$VENV_PATH"/bin/python -m pip install --upgrade pip
|
||||||
"$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/moonraker-requirements.txt
|
"$VENV_PATH"/bin/pip install -r "$SRC_PATH"/scripts/moonraker-requirements.txt
|
||||||
"$VENV_PATH"/bin/pip install msgspec uvloop
|
"$VENV_PATH"/bin/pip install msgspec uvloop
|
||||||
else
|
else
|
||||||
bashio::log "Moonraker env already installed"
|
bashio::log "Moonraker env already installed"
|
||||||
fi
|
fi
|
||||||
# Make sure config exists.
|
# Make sure config exists.
|
||||||
if [ ! -f "$CONFIG_PATH"/moonraker.conf ]; then
|
if [ ! -f "$CONFIG_PATH"/moonraker.conf ]; then
|
||||||
mkdir -p "$CONFIG_PATH"
|
mkdir -p "$CONFIG_PATH"
|
||||||
cp /etc/klipper/config/moonraker.conf "$CONFIG_PATH"/moonraker.conf
|
cp /etc/klipper/config/moonraker.conf "$CONFIG_PATH"/moonraker.conf
|
||||||
## Create log folder and file
|
## Create log folder and file
|
||||||
mkdir -p $ADDON_CONFIG_PATH/moonraker/logs
|
mkdir -p $ADDON_CONFIG_PATH/moonraker/logs
|
||||||
touch $ADDON_CONFIG_PATH/moonraker/logs/moonraker.log
|
touch $ADDON_CONFIG_PATH/moonraker/logs/moonraker.log
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,21 +1,21 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Add-on: 3dprinter-octoprint
|
# Add-on: 3dprinter-octoprint
|
||||||
# Configures proxy
|
# Configures proxy
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
# Generate proxy configuration
|
# Generate proxy configuration
|
||||||
bashio::var.json \
|
bashio::var.json \
|
||||||
addon_hostname "$(bashio::addon.hostname)" \
|
addon_hostname "$(bashio::addon.hostname)" \
|
||||||
addon_ip "$(bashio::addon.ip_address)" \
|
addon_ip "$(bashio::addon.ip_address)" \
|
||||||
trusted_proxies "$(bashio::config 'trusted_proxies')" \
|
trusted_proxies "$(bashio::config 'trusted_proxies')" \
|
||||||
camera_url "$(bashio::config 'camera_url')" \
|
camera_url "$(bashio::config 'camera_url')" \
|
||||||
ingress_port "^$(bashio::addon.ingress_port)" \
|
ingress_port "^$(bashio::addon.ingress_port)" \
|
||||||
fluidd_src "$ADDON_SRC_PATH/fluidd" \
|
fluidd_src "$ADDON_SRC_PATH/fluidd" \
|
||||||
mainsail_src "$ADDON_SRC_PATH/mainsail" \
|
mainsail_src "$ADDON_SRC_PATH/mainsail" \
|
||||||
| tempio \
|
| tempio \
|
||||||
-template /usr/share/tempio/caddy/Caddyfile.gtpl \
|
-template /usr/share/tempio/caddy/Caddyfile.gtpl \
|
||||||
-out /etc/caddy/sites-enabled/moonraker.caddy
|
-out /etc/caddy/sites-enabled/moonraker.caddy
|
||||||
|
|
||||||
# Make sure config is correctly formatted.
|
# Make sure config is correctly formatted.
|
||||||
caddy fmt --overwrite /etc/caddy/Caddyfile
|
caddy fmt --overwrite /etc/caddy/Caddyfile
|
||||||
|
|||||||
@ -1,30 +1,30 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
|
|
||||||
SRC_PATH=$ADDON_SRC_PATH/simulavr
|
SRC_PATH=$ADDON_SRC_PATH/simulavr
|
||||||
|
|
||||||
if bashio::config.false 'simulavr'; then
|
if bashio::config.false 'simulavr'; then
|
||||||
bashio::log "Keep Simulavr disabled."
|
bashio::log "Keep Simulavr disabled."
|
||||||
touch /etc/services.d/simulavr/down
|
touch /etc/services.d/simulavr/down
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
rm -f /etc/services.d/simulavr/down
|
rm -f /etc/services.d/simulavr/down
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Install Simuavr
|
# Install Simuavr
|
||||||
if [ ! -d "$SRC_PATH" ]; then
|
if [ ! -d "$SRC_PATH" ]; then
|
||||||
echo "Get SimulAVR source"
|
echo "Get SimulAVR source"
|
||||||
git clone git://git.savannah.nongnu.org/simulavr.git "$SRC_PATH"
|
git clone git://git.savannah.nongnu.org/simulavr.git "$SRC_PATH"
|
||||||
cd "$SRC_PATH" || exit
|
cd "$SRC_PATH" || exit
|
||||||
make python
|
make python
|
||||||
make build
|
make build
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Add simulavr process
|
# Add simulavr process
|
||||||
BIN_PATH=$ADDON_CONFIG_PATH/bin
|
BIN_PATH=$ADDON_CONFIG_PATH/bin
|
||||||
if [ ! -f "$BIN_PATH"/klipper_mcu_simulavr ]; then
|
if [ ! -f "$BIN_PATH"/klipper_mcu_simulavr ]; then
|
||||||
mkdir -p "$BIN_PATH"
|
mkdir -p "$BIN_PATH"
|
||||||
cp /etc/klipper/config_simulavr "$ADDON_SRC_PATH"/klipper/.config
|
cp /etc/klipper/config_simulavr "$ADDON_SRC_PATH"/klipper/.config
|
||||||
cd "$ADDON_SRC_PATH"/klipper || exit
|
cd "$ADDON_SRC_PATH"/klipper || exit
|
||||||
make
|
make
|
||||||
cp out/klipper.elf "$BIN_PATH"/klipper_mcu_simulavr.elf
|
cp out/klipper.elf "$BIN_PATH"/klipper_mcu_simulavr.elf
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,32 +1,32 @@
|
|||||||
# CONFIG_LOW_LEVEL_OPTIONS is not set
|
# CONFIG_LOW_LEVEL_OPTIONS is not set
|
||||||
# CONFIG_MACH_AVR is not set
|
# CONFIG_MACH_AVR is not set
|
||||||
# CONFIG_MACH_ATSAM is not set
|
# CONFIG_MACH_ATSAM is not set
|
||||||
# CONFIG_MACH_ATSAMD is not set
|
# CONFIG_MACH_ATSAMD is not set
|
||||||
# CONFIG_MACH_LPC176X is not set
|
# CONFIG_MACH_LPC176X is not set
|
||||||
# CONFIG_MACH_STM32 is not set
|
# CONFIG_MACH_STM32 is not set
|
||||||
# CONFIG_MACH_HC32F460 is not set
|
# CONFIG_MACH_HC32F460 is not set
|
||||||
# CONFIG_MACH_RP2040 is not set
|
# CONFIG_MACH_RP2040 is not set
|
||||||
# CONFIG_MACH_PRU is not set
|
# CONFIG_MACH_PRU is not set
|
||||||
# CONFIG_MACH_AR100 is not set
|
# CONFIG_MACH_AR100 is not set
|
||||||
CONFIG_MACH_LINUX=y
|
CONFIG_MACH_LINUX=y
|
||||||
# CONFIG_MACH_SIMU is not set
|
# CONFIG_MACH_SIMU is not set
|
||||||
CONFIG_BOARD_DIRECTORY="linux"
|
CONFIG_BOARD_DIRECTORY="linux"
|
||||||
CONFIG_CLOCK_FREQ=50000000
|
CONFIG_CLOCK_FREQ=50000000
|
||||||
CONFIG_LINUX_SELECT=y
|
CONFIG_LINUX_SELECT=y
|
||||||
CONFIG_USB_VENDOR_ID=0x1d50
|
CONFIG_USB_VENDOR_ID=0x1d50
|
||||||
CONFIG_USB_DEVICE_ID=0x614e
|
CONFIG_USB_DEVICE_ID=0x614e
|
||||||
CONFIG_USB_SERIAL_NUMBER="12345"
|
CONFIG_USB_SERIAL_NUMBER="12345"
|
||||||
CONFIG_WANT_GPIO_BITBANGING=y
|
CONFIG_WANT_GPIO_BITBANGING=y
|
||||||
CONFIG_WANT_DISPLAYS=y
|
CONFIG_WANT_DISPLAYS=y
|
||||||
CONFIG_WANT_SENSORS=y
|
CONFIG_WANT_SENSORS=y
|
||||||
CONFIG_WANT_LIS2DW=y
|
CONFIG_WANT_LIS2DW=y
|
||||||
CONFIG_WANT_SOFTWARE_I2C=y
|
CONFIG_WANT_SOFTWARE_I2C=y
|
||||||
CONFIG_WANT_SOFTWARE_SPI=y
|
CONFIG_WANT_SOFTWARE_SPI=y
|
||||||
CONFIG_NEED_SENSOR_BULK=y
|
CONFIG_NEED_SENSOR_BULK=y
|
||||||
CONFIG_CANBUS_FREQUENCY=1000000
|
CONFIG_CANBUS_FREQUENCY=1000000
|
||||||
CONFIG_HAVE_GPIO=y
|
CONFIG_HAVE_GPIO=y
|
||||||
CONFIG_HAVE_GPIO_ADC=y
|
CONFIG_HAVE_GPIO_ADC=y
|
||||||
CONFIG_HAVE_GPIO_SPI=y
|
CONFIG_HAVE_GPIO_SPI=y
|
||||||
CONFIG_HAVE_GPIO_I2C=y
|
CONFIG_HAVE_GPIO_I2C=y
|
||||||
CONFIG_HAVE_GPIO_HARD_PWM=y
|
CONFIG_HAVE_GPIO_HARD_PWM=y
|
||||||
CONFIG_INLINE_STEPPER_HACK=y
|
CONFIG_INLINE_STEPPER_HACK=y
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Add-on: 3dprinter-Klipper
|
# Add-on: 3dprinter-Klipper
|
||||||
# Runs Host Sim MCU
|
# Runs Host Sim MCU
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
bashio::log.info "Starting Host MCU..."
|
bashio::log.info "Starting Host MCU..."
|
||||||
|
|
||||||
## Run your program
|
## Run your program
|
||||||
exec "$ADDON_CONFIG_PATH"/bin/klipper_mcu_host
|
exec "$ADDON_CONFIG_PATH"/bin/klipper_mcu_host
|
||||||
|
|||||||
@ -1,19 +1,19 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Add-on: 3dprinter-Klipper
|
# Add-on: 3dprinter-Klipper
|
||||||
# Runs Klippy
|
# Runs Klippy
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
bashio::log.info "Starting Klippy..."
|
bashio::log.info "Starting Klippy..."
|
||||||
|
|
||||||
|
|
||||||
if bashio::config.true 'host_mcu'; then
|
if bashio::config.true 'host_mcu'; then
|
||||||
while [ ! -e /tmp/klipper_host_mcu ]
|
while [ ! -e /tmp/klipper_host_mcu ]
|
||||||
do
|
do
|
||||||
bashio::log "Wait for klipper_host_mcu"
|
bashio::log "Wait for klipper_host_mcu"
|
||||||
sleep 5
|
sleep 5
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## Run your program
|
## Run your program
|
||||||
exec "$ADDON_VENV_PATH"/klipper/bin/python "$ADDON_SRC_PATH"/klipper/klippy/klippy.py "$ADDON_CONFIG_PATH"/moonraker/config/printer.cfg -a /tmp/klippy_uds -l "$ADDON_CONFIG_PATH"/moonraker/logs/klippy.log
|
exec "$ADDON_VENV_PATH"/klipper/bin/python "$ADDON_SRC_PATH"/klipper/klippy/klippy.py "$ADDON_CONFIG_PATH"/moonraker/config/printer.cfg -a /tmp/klippy_uds -l "$ADDON_CONFIG_PATH"/moonraker/logs/klippy.log
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Add-on: 3dprinter-Klipper
|
# Add-on: 3dprinter-Klipper
|
||||||
# Runs Moonraker
|
# Runs Moonraker
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
bashio::log.info "Starting Moonraker..."
|
bashio::log.info "Starting Moonraker..."
|
||||||
|
|
||||||
## Preparations, create log folder and file
|
## Preparations, create log folder and file
|
||||||
mkdir -p "$ADDON_CONFIG_PATH"/moonraker/logs
|
mkdir -p "$ADDON_CONFIG_PATH"/moonraker/logs
|
||||||
touch "$ADDON_CONFIG_PATH"/moonraker/logs/moonraker.log
|
touch "$ADDON_CONFIG_PATH"/moonraker/logs/moonraker.log
|
||||||
|
|
||||||
## Run your program
|
## Run your program
|
||||||
exec "$ADDON_VENV_PATH"/moonraker/bin/python "$ADDON_SRC_PATH"/moonraker/moonraker/moonraker.py -d "$ADDON_CONFIG_PATH"/moonraker -v
|
exec "$ADDON_VENV_PATH"/moonraker/bin/python "$ADDON_SRC_PATH"/moonraker/moonraker/moonraker.py -d "$ADDON_CONFIG_PATH"/moonraker -v
|
||||||
|
|||||||
@ -1,9 +1,9 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Add-on: 3dprinter-octoprint
|
# Add-on: 3dprinter-octoprint
|
||||||
# Runs the reverse proxy.
|
# Runs the reverse proxy.
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
bashio::log.info "Starting proxy..."
|
bashio::log.info "Starting proxy..."
|
||||||
|
|
||||||
exec caddy run --config /etc/caddy/Caddyfile --envfile /etc/caddy/env
|
exec caddy run --config /etc/caddy/Caddyfile --envfile /etc/caddy/env
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
#!/usr/bin/with-contenv bashio
|
#!/usr/bin/with-contenv bashio
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
# Add-on: 3dprinter-Klipper
|
# Add-on: 3dprinter-Klipper
|
||||||
# Runs Host SimulAVR MCU
|
# Runs Host SimulAVR MCU
|
||||||
# ==============================================================================
|
# ==============================================================================
|
||||||
|
|
||||||
bashio::log.info "Starting SimulAVR MCU..."
|
bashio::log.info "Starting SimulAVR MCU..."
|
||||||
|
|
||||||
## Run your program
|
## Run your program
|
||||||
export PYTHONPATH=$ADDON_SRC_PATH/simulavr/build/pysimulavr
|
export PYTHONPATH=$ADDON_SRC_PATH/simulavr/build/pysimulavr
|
||||||
exec "$ADDON_SRC_PATH"/klipper/scripts/avrsim.py "$ADDON_CONFIG_PATH"/bin/klipper_mcu_simulavr.elf
|
exec "$ADDON_SRC_PATH"/klipper/scripts/avrsim.py "$ADDON_CONFIG_PATH"/bin/klipper_mcu_simulavr.elf
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user