fix hamclock service
This commit is contained in:
12
install.sh
12
install.sh
@@ -68,12 +68,16 @@ mkdir -p "$HOME/.local/bin"
|
|||||||
cp "$HOME/.local/share/HamPackServer/hampackserverrefresh" "$HOME/.local/bin/hampackserverrefresh"
|
cp "$HOME/.local/share/HamPackServer/hampackserverrefresh" "$HOME/.local/bin/hampackserverrefresh"
|
||||||
cp "$HOME/.local/share/HamPackServer/hampackserverupdate" "$HOME/.local/bin/hampackserverupdate"
|
cp "$HOME/.local/share/HamPackServer/hampackserverupdate" "$HOME/.local/bin/hampackserverupdate"
|
||||||
|
|
||||||
mkdir -p "$HOME/.config/systemd/user"
|
|
||||||
mkdir -p "$HOME/.local/share/hamclock"
|
mkdir -p "$HOME/.local/share/hamclock"
|
||||||
cp "$HOME/.local/share/HamPackServer/servicefiles/hamclock.service" "$HOME/.config/systemd/user/"
|
# Remove old user-level service if present
|
||||||
systemctl --user enable hamclock
|
if [ -f "$HOME/.config/systemd/user/hamclock.service" ]; then
|
||||||
|
systemctl --user disable --now hamclock 2>/dev/null || true
|
||||||
|
rm "$HOME/.config/systemd/user/hamclock.service"
|
||||||
systemctl --user daemon-reload
|
systemctl --user daemon-reload
|
||||||
systemctl --user restart hamclock
|
fi
|
||||||
|
sed "s/__HAMCLOCK_USER__/$USER/" "$HOME/.local/share/HamPackServer/servicefiles/hamclock.service" | sudo tee /etc/systemd/system/hamclock.service > /dev/null
|
||||||
|
sudo systemctl daemon-reload
|
||||||
|
sudo systemctl enable hamclock
|
||||||
bash "$HOME/.local/share/HamPackServer/scripts/hamclock-cleanup.sh"
|
bash "$HOME/.local/share/HamPackServer/scripts/hamclock-cleanup.sh"
|
||||||
|
|
||||||
cd ~/.local/share/HamPackServer
|
cd ~/.local/share/HamPackServer
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ HAMCLOCK_DATA_FILES=(
|
|||||||
)
|
)
|
||||||
|
|
||||||
echo "Stopping hamclock service..."
|
echo "Stopping hamclock service..."
|
||||||
systemctl --user stop hamclock 2>/dev/null || true
|
sudo systemctl stop hamclock 2>/dev/null || true
|
||||||
|
|
||||||
mkdir -p "$NEW_DIR"
|
mkdir -p "$NEW_DIR"
|
||||||
|
|
||||||
@@ -27,7 +27,7 @@ for f in "${HAMCLOCK_DATA_FILES[@]}"; do
|
|||||||
done
|
done
|
||||||
|
|
||||||
echo "Reloading hamclock service..."
|
echo "Reloading hamclock service..."
|
||||||
systemctl --user daemon-reload
|
sudo systemctl daemon-reload
|
||||||
systemctl --user restart hamclock
|
sudo systemctl restart hamclock
|
||||||
|
|
||||||
echo "hamclock cleanup done."
|
echo "hamclock cleanup done."
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ Wants=network-online.target
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
|
User=__HAMCLOCK_USER__
|
||||||
Environment=HOME=%h
|
Environment=HOME=%h
|
||||||
WorkingDirectory=%h/.local/share/hamclock
|
WorkingDirectory=%h/.local/share/hamclock
|
||||||
ExecStart=%h/.local/bin/hamclock -b ohb.hamclock.app:80
|
ExecStart=%h/.local/bin/hamclock -b ohb.hamclock.app:80
|
||||||
@@ -12,4 +13,4 @@ Restart=on-failure
|
|||||||
RestartSec=5
|
RestartSec=5
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=default.target
|
WantedBy=multi-user.target
|
||||||
|
|||||||
Reference in New Issue
Block a user