jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2025-12-13 10:34:28 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use service specific directories in templates (#355)

Browse Source
This commit is contained in:
phizev
2023-06-17 18:22:16 +02:00
committed by GitHub
parent 8eb2924832
commit 345b7b66a3
9 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/klipper.env
View File

@@ -1 +1 @@
KLIPPER_ARGS="/home/%USER%/klipper/klippy/klippy.py %CFG% -I %PRINTER% -l %LOG% -a %UDS%" KLIPPER_ARGS="%KLIPPER_DIR%/klippy/klippy.py %CFG% -I %PRINTER% -l %LOG% -a %UDS%"

2
resources/klipper.service
View File

@@ -11,7 +11,7 @@ WantedBy=multi-user.target
Type=simple Type=simple
User=%USER% User=%USER%
RemainAfterExit=yes RemainAfterExit=yes
WorkingDirectory=/home/%USER%/klipper WorkingDirectory=%KLIPPER_DIR%
EnvironmentFile=%ENV_FILE% EnvironmentFile=%ENV_FILE%
ExecStart=%ENV%/bin/python $KLIPPER_ARGS ExecStart=%ENV%/bin/python $KLIPPER_ARGS
Restart=always Restart=always

2
resources/moonraker-telegram-bot.env
View File

@@ -1 +1 @@
TELEGRAM_BOT_ARGS="/home/%USER%/moonraker-telegram-bot/bot/main.py -c %CFG% -l %LOG%" TELEGRAM_BOT_ARGS="%TELEGRAM_BOT_DIR%/bot/main.py -c %CFG% -l %LOG%"

2
resources/moonraker-telegram-bot.service
View File

@@ -9,7 +9,7 @@ WantedBy=multi-user.target
[Service] [Service]
Type=simple Type=simple
User=%USER% User=%USER%
WorkingDirectory=/home/%USER%/moonraker-telegram-bot WorkingDirectory=%TELEGRAM_BOT_DIR%
EnvironmentFile=%ENV_FILE% EnvironmentFile=%ENV_FILE%
ExecStart=%ENV%/bin/python $TELEGRAM_BOT_ARGS ExecStart=%ENV%/bin/python $TELEGRAM_BOT_ARGS
Restart=always Restart=always

2
resources/moonraker.env
View File

@@ -1 +1 @@
MOONRAKER_ARGS="/home/%USER%/moonraker/moonraker/moonraker.py -d %PRINTER_DATA%" MOONRAKER_ARGS="%MOONRAKER_DIR%/moonraker/moonraker.py -d %PRINTER_DATA%"

2
resources/moonraker.service
View File

@@ -12,7 +12,7 @@ Type=simple
User=%USER% User=%USER%
SupplementaryGroups=moonraker-admin SupplementaryGroups=moonraker-admin
RemainAfterExit=yes RemainAfterExit=yes
WorkingDirectory=/home/%USER%/moonraker WorkingDirectory=%MOONRAKER_DIR%
EnvironmentFile=%ENV_FILE% EnvironmentFile=%ENV_FILE%
ExecStart=%ENV%/bin/python $MOONRAKER_ARGS ExecStart=%ENV%/bin/python $MOONRAKER_ARGS
Restart=always Restart=always

4
scripts/klipper.sh
View File

@@ -368,8 +368,8 @@ function create_klipper_service() {
sudo cp "${service_template}" "${service}" sudo cp "${service_template}" "${service}"
sudo cp "${env_template}" "${env_file}" sudo cp "${env_template}" "${env_file}"
sudo sed -i "s|%USER%|${USER}|g; s|%ENV%|${KLIPPY_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}" sudo sed -i "s|%USER%|${USER}|g; s|%KLIPPER_DIR%|${KLIPPER_DIR}|; s|%ENV%|${KLIPPY_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
sudo sed -i "s|%USER%|${USER}|; s|%LOG%|${log}|; s|%CFG%|${cfg}|; s|%PRINTER%|${klippy_serial}|; s|%UDS%|${klippy_socket}|" "${env_file}" sudo sed -i "s|%USER%|${USER}|; s|%KLIPPER_DIR%|${KLIPPER_DIR}|; s|%LOG%|${log}|; s|%CFG%|${cfg}|; s|%PRINTER%|${klippy_serial}|; s|%UDS%|${klippy_socket}|" "${env_file}"
ok_msg "Klipper service file created!" ok_msg "Klipper service file created!"
fi fi

4
scripts/moonraker-telegram-bot.sh
View File

@@ -318,11 +318,11 @@ function write_telegram_bot_service() {
else else
sudo sed -i "s|%INST%|${i}|" "${service}" sudo sed -i "s|%INST%|${i}|" "${service}"
fi fi
sudo sed -i "s|%USER%|${USER}|g; s|%ENV%|${TELEGRAM_BOT_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}" sudo sed -i "s|%USER%|${USER}|g; s|%TELEGRAM_BOT_DIR%|${TELEGRAM_BOT_DIR}|; s|%ENV%|${TELEGRAM_BOT_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
status_msg "Creating environment file for instance ${i} ..." status_msg "Creating environment file for instance ${i} ..."
cp "${env_template}" "${env_file}" cp "${env_template}" "${env_file}"
sed -i "s|%USER%|${USER}|; s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${env_file}" sed -i "s|%USER%|${USER}|; s|%TELEGRAM_BOT_DIR%|${TELEGRAM_BOT_DIR}|; s|%CFG%|${cfg}|; s|%LOG%|${log}|" "${env_file}"
fi fi
} }

4
scripts/moonraker.sh
View File

@@ -360,8 +360,8 @@ function write_moonraker_service() {
[[ -z ${i} ]] && sudo sed -i "s| %INST%||" "${service}" [[ -z ${i} ]] && sudo sed -i "s| %INST%||" "${service}"
[[ -n ${i} ]] && sudo sed -i "s|%INST%|${i}|" "${service}" [[ -n ${i} ]] && sudo sed -i "s|%INST%|${i}|" "${service}"
sudo sed -i "s|%USER%|${USER}|g; s|%ENV%|${MOONRAKER_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}" sudo sed -i "s|%USER%|${USER}|g; s|%MOONRAKER_DIR%|${MOONRAKER_DIR}|; s|%ENV%|${MOONRAKER_ENV}|; s|%ENV_FILE%|${env_file}|" "${service}"
sudo sed -i "s|%USER%|${USER}|; s|%PRINTER_DATA%|${printer_data}|" "${env_file}" sudo sed -i "s|%USER%|${USER}|; s|%MOONRAKER_DIR%|${MOONRAKER_DIR}|; s|%PRINTER_DATA%|${printer_data}|" "${env_file}"
fi fi
} }