diff options
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | deployment/solo-tool.service | 14 | ||||
| -rwxr-xr-x[-rw-r--r--] | deployment/start-solo-tool.sh | 10 |
3 files changed, 17 insertions, 26 deletions
@@ -21,17 +21,16 @@ gui: .venv/touchfile ./.venv/bin/python web-project/src/solo_tool_web.py 8080 install: deployment/solo-tool.service deployment/start-solo-tool.sh - sudo install -o root -g root -m 644 deployment/solo-tool.service /etc/systemd/system - sudo mkdir -p /var/lib/solo-tool - sudo install -o eddy -g eddy -m 700 deployment/start-solo-tool.sh /var/lib/solo-tool - sudo systemctl daemon-reload - sudo systemctl enable solo-tool.service - sudo systemctl restart solo-tool.service + mkdir -p ~/.config/systemd/user + install -o eddy -g eddy -m 644 deployment/solo-tool.service ~/.config/systemd/user + chmod 755 deployment/start-solo-tool.sh + systemctl --user daemon-reload + systemctl --user enable solo-tool.service + systemctl --user restart solo-tool.service uninstall: - sudo systemctl disable --now solo-tool.service - sudo rm -rf /var/lib/solo-tool - sudo rm /etc/systemd/system/solo-tool.service - sudo systemctl daemon-reload + systemctl --user disable --now solo-tool.service + rm ~/.config/systemd/user/solo-tool.service + systemctl --user daemon-reload .PHONY: all test clean gui install uninstall diff --git a/deployment/solo-tool.service b/deployment/solo-tool.service index 9e24f4b..e33a036 100644 --- a/deployment/solo-tool.service +++ b/deployment/solo-tool.service @@ -1,14 +1,12 @@ [Unit] Description=Solo tool web frontend service -After=network-online.target +After=network-online.target sound.target [Service] -User=eddy -Group=eddy -Environment="SERVICE_DIR=/var/lib/solo-tool" -Environment="SESSION_DIR=/var/lib/solo-tool/sessions" -Environment="SONG_POOL=/var/lib/solo-tool/songs" -ExecStart=/var/lib/solo-tool/start-solo-tool.sh +WorkingDirectory=/home/eddy/git/solo-tool +Environment="SESSION_DIR=/home/eddy/music/sessions" +Environment="SONG_POOL=/home/eddy/music/songs" +ExecStart=/home/eddy/git/solo-tool/deployment/start-solo-tool.sh [Install] -WantedBy=multi-user.target +WantedBy=default.target diff --git a/deployment/start-solo-tool.sh b/deployment/start-solo-tool.sh index a293a61..d1d38f7 100644..100755 --- a/deployment/start-solo-tool.sh +++ b/deployment/start-solo-tool.sh @@ -1,15 +1,9 @@ #!/usr/bin/bash -# Ensure that necessary directories exist -mkdir -p "${SESSION_DIR}" "${SONG_POOL}" - -# Get latest revision -cd "${SERVICE_DIR}" -rm -rf repo -git clone https://git.0xf7.com/solo-tool.git repo +# Get latest version +git pull # Bootstrap venv -cd repo make # Run web UI |