From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 14 Jul 2022 15:29:18 +0000 (+0000)
Subject: web: Drop the second web service
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2105299c2763eba685fc78e83840906a8f91aa4b;p=pbs.git

web: Drop the second web service

We should be able to run this all fast enough and non-blocking that
there is no need for a second process.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index 3bf33e36..79a53a21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -408,8 +408,7 @@ static_fontsdir = $(staticdir)/fonts
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = \
 	src/systemd/pakfire-hub.service \
-	src/systemd/pakfire-web-1.service \
-	src/systemd/pakfire-web-2.service
+	src/systemd/pakfire-web.service
 
 CLEANFILES += \
 	 $(systemdsystemunit_DATA)
@@ -420,8 +419,7 @@ endif
 
 EXTRA_DIST += \
 	src/systemd/pakfire-hub.service.in \
-	src/systemd/pakfire-web-1.service.in \
-	src/systemd/pakfire-web-2.service.in
+	src/systemd/pakfire-web.service.in
 
 dist_database_DATA = \
 	src/database.sql
diff --git a/src/systemd/pakfire-web-2.service.in b/src/systemd/pakfire-web-2.service.in
deleted file mode 100644
index ac082a51..00000000
--- a/src/systemd/pakfire-web-2.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Pakfire Web UI #2
-After=network.target
-
-[Service]
-ExecStart=@bindir@/pakfire-web --port=9002
-User=nobody
-Group=nogroup
-
-[Install]
-WantedBy=multi-user.target
diff --git a/src/systemd/pakfire-web-1.service.in b/src/systemd/pakfire-web.service.in
similarity index 82%
rename from src/systemd/pakfire-web-1.service.in
rename to src/systemd/pakfire-web.service.in
index ddc67792..1ac4d60a 100644
--- a/src/systemd/pakfire-web-1.service.in
+++ b/src/systemd/pakfire-web.service.in
@@ -1,5 +1,5 @@
 [Unit]
-Description=Pakfire Web UI #1
+Description=Pakfire Web Service
 After=network.target
 
 [Service]