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 3bf33e364eb9472334cab555ebe01a0af0a3cd77..79a53a21edb1a230f788de48bcfcc882036cd2f5 100644 (file)
--- 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 (file)
index ac082a5..0000000
--- 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 ddc6779266fbccc2d173481552ca4edf9d77a89d..1ac4d60aaa324b60360cbb460ab803a53534fd0f 100644 (file)
--- 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]