From 6bd6020f74c0c343ebeead539f16510e1e8807bc Mon Sep 17 00:00:00 2001
From: mcguirepr89 <mcguirepr89@gmail.com>
Date: Thu, 3 Mar 2022 10:22:32 -0500
Subject: [PATCH] new location for services

---
 scripts/install_services.sh            | 35 +++++++++++++++++---------
 templates/avahi-alias@.service         | 10 --------
 templates/birdnet_analysis.service     | 14 -----------
 templates/birdnet_log.service          | 11 --------
 templates/birdnet_recording.service    | 11 --------
 templates/birdstats.service            | 11 --------
 templates/birdterminal.service         | 13 ----------
 templates/extraction.service           | 10 --------
 templates/extraction.timer             |  8 ------
 templates/extraction_log.service       | 11 --------
 templates/pushed_notifications.service | 10 --------
 11 files changed, 23 insertions(+), 121 deletions(-)
 delete mode 100644 templates/avahi-alias@.service
 delete mode 100644 templates/birdnet_analysis.service
 delete mode 100644 templates/birdnet_log.service
 delete mode 100644 templates/birdnet_recording.service
 delete mode 100644 templates/birdstats.service
 delete mode 100644 templates/birdterminal.service
 delete mode 100644 templates/extraction.service
 delete mode 100644 templates/extraction.timer
 delete mode 100644 templates/extraction_log.service
 delete mode 100644 templates/pushed_notifications.service

diff --git a/scripts/install_services.sh b/scripts/install_services.sh
index 262b3d4..1f929f8 100755
--- a/scripts/install_services.sh
+++ b/scripts/install_services.sh
@@ -40,7 +40,7 @@ install_scripts() {
 }
 
 install_birdnet_analysis() {
-  cat << EOF > /usr/lib/systemd/system/birdnet_analysis.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/birdnet_analysis.service
 [Unit]
 Description=BirdNET Analysis
 After=birdnet_server.service
@@ -54,11 +54,12 @@ ExecStart=/usr/local/bin/birdnet_analysis.sh
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/birdnet_analysis.service /usr/lib/systemd/system
   systemctl enable birdnet_analysis.service
 }
 
 install_birdnet_server() {
-  cat << EOF > /usr/lib/systemd/system/birdnet_server.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/birdnet_server.service
 [Unit]
 Description=BirdNET Analysis Server
 Before=birdnet_analysis.service
@@ -71,11 +72,12 @@ ExecStart=/usr/local/bin/server.py
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/birdnet_server.service /usr/lib/systemd/system
   systemctl enable birdnet_server.service
 }
 
 install_extraction_service() {
-  cat << EOF > /usr/lib/systemd/system/extraction.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/extraction.service
 [Unit]
 Description=BirdNET BirdSound Extraction
 [Service]
@@ -87,11 +89,12 @@ ExecStart=/usr/bin/env bash -c 'while true;do extract_new_birdsounds.sh;sleep 3;
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/extraction.service /usr/lib/systemd/system
   systemctl enable extraction.service
 }
 
 install_pushed_notifications() {
-  cat << EOF > /usr/lib/systemd/system/pushed_notifications.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/pushed_notifications.service
 [Unit]
 Description=BirdNET-Pi Pushed.co Notifications
 [Service]
@@ -103,6 +106,7 @@ ExecStart=/usr/local/bin/species_notifier.sh
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/pushed_notification.service /usr/lib/systemd/system
   systemctl enable pushed_notifications.service
 }
 
@@ -182,7 +186,7 @@ EOF
 
 install_recording_service() {
   echo "Installing birdnet_recording.service"
-  cat << EOF > /usr/lib/systemd/system/birdnet_recording.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/birdnet_recording.service
 [Unit]
 Description=BirdNET Recording
 [Service]
@@ -195,6 +199,7 @@ ExecStart=/usr/local/bin/birdnet_recording.sh
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/birdnet_recording.service /usr/lib/systemd/system
   systemctl enable birdnet_recording.service
 }
 
@@ -275,7 +280,7 @@ EOF
 }
 
 install_avahi_aliases() {
-  cat << 'EOF' > /usr/lib/systemd/system/avahi-alias@.service
+  cat << 'EOF' > /home/pi/BirdNET-Pi/templates/avahi-alias@.service
 [Unit]
 Description=Publish %I as alias for %H.local via mdns
 After=network.target network-online.target
@@ -288,11 +293,12 @@ ExecStart=/bin/bash -c "/usr/bin/avahi-publish -a -R %I $(hostname -I |cut -d' '
 [Install]
 WantedBy=multi-user.target
 EOF
-systemctl enable avahi-alias@"$(hostname)".local.service
+  ln -sf /home/pi/BirdNET-Pi/templates/avahi-aliase@.service /usr/lib/systemd/system
+  systemctl enable avahi-alias@"$(hostname)".local.service
 }
 
 install_spectrogram_service() {
-  cat << EOF > /usr/lib/systemd/system/spectrogram_viewer.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/spectrogram_viewer.service
 [Unit]
 Description=BirdNET-Pi Spectrogram Viewer
 [Service]
@@ -304,12 +310,13 @@ ExecStart=/usr/local/bin/spectrogram.sh
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/spectrogram_viewer.service /usr/lib/systemd/system
   systemctl enable spectrogram_viewer.service
 }
 
 install_chart_viewer_service() {
   echo "Installing the chart_viewer.service"
-  cat << EOF > /usr/lib/systemd/system/chart_viewer.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/chart_viewer.service
 [Unit]
 Description=BirdNET-Pi Chart Viewer Service
 [Service]
@@ -321,6 +328,7 @@ ExecStart=/usr/local/bin/daily_plot.py
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/chart_viewer.service /usr/lib/systemd/system
   systemctl enable chart_viewer.service
 }
 
@@ -329,7 +337,7 @@ install_gotty_logs() {
     ${HOME}/.gotty
   sudo -u ${USER} ln -sf $(dirname ${my_dir})/templates/bashrc \
     ${HOME}/.bashrc
-  cat << EOF > /usr/lib/systemd/system/birdnet_log.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/birdnet_log.service
 [Unit]
 Description=BirdNET Analysis Log
 [Service]
@@ -342,8 +350,9 @@ ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Pi Log" birdnet_l
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/birdnet_log.service /usr/lib/systemd/system
   systemctl enable birdnet_log.service
-  cat << EOF > /usr/lib/systemd/system/web_terminal.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/web_terminal.service
 [Unit]
 Description=BirdNET-Pi Web Terminal
 [Service]
@@ -356,6 +365,7 @@ ExecStart=/usr/local/bin/gotty -w -p 8888 --title-format "BirdNET-Pi Terminal" b
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/web_terminal.service /usr/lib/systemd/system
   systemctl enable web_terminal.service
 }
 
@@ -388,7 +398,7 @@ config_icecast() {
 }
 
 install_livestream_service() {
-  cat << EOF > /usr/lib/systemd/system/livestream.service
+  cat << EOF > /home/pi/BirdNET-Pi/templates/livestream.service
 [Unit]
 Description=BirdNET-Pi Live Stream
 After=network-online.target
@@ -403,6 +413,7 @@ ExecStart=/usr/local/bin/livestream.sh
 [Install]
 WantedBy=multi-user.target
 EOF
+  ln -sf /home/pi/BirdNET-Pi/templates/livestream.service /usr/lib/systemd/system
   systemctl enable livestream.service
 }
 
diff --git a/templates/avahi-alias@.service b/templates/avahi-alias@.service
deleted file mode 100644
index 6bcc3e7..0000000
--- a/templates/avahi-alias@.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Publish %I as alias for %H.local via mdns
-After=network.target network-online.target
-Requires=network-online.target
-[Service]
-Restart=always
-Type=simple
-ExecStart=/bin/bash -c "/usr/bin/avahi-publish -a -R %I $(avahi-resolve -4 -n %H.local | cut -f 2)"
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/birdnet_analysis.service b/templates/birdnet_analysis.service
deleted file mode 100644
index 0817d89..0000000
--- a/templates/birdnet_analysis.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=BirdNET Analysis
-Requires=${SYSTEMD_MOUNT}
-After=network-online.target ${SYSTEMD_MOUNT}
-
-[Service]
-Restart=always
-Type=simple
-RestartSec=1
-User=${BIRDNET_USER}
-ExecStart=/usr/local/bin/birdnet_analysis.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/birdnet_log.service b/templates/birdnet_log.service
deleted file mode 100644
index 75f5c75..0000000
--- a/templates/birdnet_log.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=BirdNET Analysis Log
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${BIRDNET_USER}
-Environment=TERM=xterm-256color
-ExecStart=/usr/local/bin/gotty -p 8080 --title-format "BirdNET-Lite Log" journalctl -fu birdnet_analysis.service
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/birdnet_recording.service b/templates/birdnet_recording.service
deleted file mode 100644
index 6f7c4f4..0000000
--- a/templates/birdnet_recording.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=BirdNET Recording
-[Service]
-Environment=XDG_RUNTIME_DIR=/run/user/1000
-Restart=always
-Type=simple
-RestartSec=3
-User=${BIRDNET_USER}
-ExecStart=/usr/local/bin/birdnet_recording.sh
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/birdstats.service b/templates/birdstats.service
deleted file mode 100644
index 10ddf7e..0000000
--- a/templates/birdstats.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=BirdNET Statistics Log
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${BIRDNET_USER}
-Environment=TERM=xterm-256color
-ExecStart=/usr/local/bin/gotty -p 9090 --title-format "BirdNET-Lite Statistics" /usr/local/bin/birdnet_stats.sh
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/birdterminal.service b/templates/birdterminal.service
deleted file mode 100644
index d564374..0000000
--- a/templates/birdterminal.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=A BirdNET-Lite Web Terminal
-
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${BIRDNET_USER}
-Environment=TERM=xterm-256color
-ExecStart=/usr/local/bin/gotty -w --title-format "Login!" -p 9111 tmux new -A -s Login sudo bash -c login
-
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/extraction.service b/templates/extraction.service
deleted file mode 100644
index 00d3f73..0000000
--- a/templates/extraction.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=BirdNET BirdSound Extraction
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${BIRDNET_USER}
-ExecStart=/usr/local/bin/extract_new_birdsounds.sh
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/extraction.timer b/templates/extraction.timer
deleted file mode 100644
index ce36129..0000000
--- a/templates/extraction.timer
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=BirdNET BirdSound Extraction Timer
-Requires=extraction.service
-[Timer]
-Unit=extraction.service
-OnCalendar=*:*:0/10
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/extraction_log.service b/templates/extraction_log.service
deleted file mode 100644
index 76d87db..0000000
--- a/templates/extraction_log.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=BirdNET Extraction Log
-[Service]
-Restart=on-failure
-RestartSec=3
-Type=simple
-User=${BIRDNET_USER}
-Environment=TERM=xterm-256color
-ExecStart=/usr/local/bin/gotty -p 8888 --title-format "Extractions Log" journalctl -fu extraction.service
-[Install]
-WantedBy=multi-user.target
diff --git a/templates/pushed_notifications.service b/templates/pushed_notifications.service
deleted file mode 100644
index 4df4e9b..0000000
--- a/templates/pushed_notifications.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=BirdNET-Pi Pushed.co Notifications
-[Service]
-Restart=on-success
-RestartSec=3
-Type=simple
-User=pi
-ExecStart=/usr/local/bin/species_notifier.sh
-[Install]
-WantedBy=multi-user.target