Consolidate services

pugip · Nov 5, 2023 · b3896e8 · b3896e8
1 parent 128a07b
commit b3896e8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 27 deletions.
diff --git a/devops/install_systemd_units.sh b/devops/install_systemd_units.sh
@@ -5,8 +5,6 @@ cp ./systemd/*.{service,path} /etc/systemd/system/
 systemctl daemon-reload
 
 systemctl enable deploy-caddy.{path,service}
-systemctl enable princetonpy-cron.service
-systemctl enable princetonpy-web.service
+systemctl enable princetonpy.service
 systemctl start deploy-caddy.{path,service}
-systemctl start princetonpy-cron.service
-systemctl start princetonpy-web.service
+systemctl start princetonpy.service
diff --git a/devops/systemd/princetonpy-cron.service b/devops/systemd/princetonpy-cron.service
diff --git a/devops/systemd/princetonpy-web.service → devops/systemd/princetonpy.service b/devops/systemd/princetonpy-web.service → devops/systemd/princetonpy.service
@@ -1,17 +1,17 @@
 [Unit]
-Description=PrincetonPy web service
+Description=PrincetonPy services
 After=docker.service
 Requires=docker.service
 
 [Service]
 TimeoutStartSec=120
-Restart=always
+RemainAfterExit=yes
 ExecStart=/usr/bin/docker compose \
     -f /home/princeton/deployed/docker-compose.prod.yml \
-    up web
+    up -d
 ExecStop=/usr/bin/docker compose \
     -f /home/princeton/deployed/docker-compose.prod.yml \
-    down web
+    down -d
 
 [Install]
 WantedBy=default.target
diff --git a/devops/uninstall_systemd_units.sh b/devops/uninstall_systemd_units.sh
@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 systemctl disable deploy-caddy.{path,service}
-systemctl disable princetonpy-cron.service
-systemctl disable princetonpy-web.service
+systemctl disable princetonpy.service
 systemctl daemon-reload
 # rm ./systemd/deploy-caddy.{path,service}