From 03e86cc31a292b0aaffabe454f1dfceb3acee1c2 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Tue, 26 Apr 2022 20:59:53 +0200
Subject: [PATCH] spec: remove dnf-json service and socket

dnf-json is a standalone script again.  The service and socket are
removed.
---
 distribution/osbuild-composer.service       |  1 -
 distribution/osbuild-dnf-json.service       | 13 -------------
 distribution/osbuild-dnf-json.socket        |  9 ---------
 distribution/osbuild-remote-worker@.service |  1 -
 distribution/osbuild-worker@.service        |  2 +-
 osbuild-composer.spec                       |  2 --
 6 files changed, 1 insertion(+), 27 deletions(-)
 delete mode 100644 distribution/osbuild-dnf-json.service
 delete mode 100644 distribution/osbuild-dnf-json.socket

diff --git a/distribution/osbuild-composer.service b/distribution/osbuild-composer.service
index 9d88b0d81..a277c8604 100644
--- a/distribution/osbuild-composer.service
+++ b/distribution/osbuild-composer.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=OSBuild Composer
-Requires=osbuild-dnf-json.socket
 After=network.target
 
 # Weldr API needs a local worker by default.
diff --git a/distribution/osbuild-dnf-json.service b/distribution/osbuild-dnf-json.service
deleted file mode 100644
index 1f012fb46..000000000
--- a/distribution/osbuild-dnf-json.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OSbuild dnf-json service
-Requires=osbuild-dnf-json.socket
-
-[Service]
-Type=simple
-PrivateTmp=true
-ExecStart=/usr/libexec/osbuild-composer/dnf-json
-Restart=always
-RestartSec=1s
-CacheDirectory=osbuild-dnf-json
-# systemd >= 240 sets this, but osbuild-worker runs on earlier versions
-Environment="CACHE_DIRECTORY=/var/cache/osbuild-dnf-json"
diff --git a/distribution/osbuild-dnf-json.socket b/distribution/osbuild-dnf-json.socket
deleted file mode 100644
index 231f75e1a..000000000
--- a/distribution/osbuild-dnf-json.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=OSbuild dnf-json socket
-
-[Socket]
-Service=osbuild-dnf-json.service
-ListenStream=/run/osbuild-dnf-json/api.sock
-
-[Install]
-WantedBy=sockets.target
diff --git a/distribution/osbuild-remote-worker@.service b/distribution/osbuild-remote-worker@.service
index 965c5b7ed..ab19e95c3 100644
--- a/distribution/osbuild-remote-worker@.service
+++ b/distribution/osbuild-remote-worker@.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=OSBuild Composer Remote Worker (%i)
-Requires=osbuild-dnf-json.socket
 After=network.target
 
 [Service]
diff --git a/distribution/osbuild-worker@.service b/distribution/osbuild-worker@.service
index 335122304..4423085d8 100644
--- a/distribution/osbuild-worker@.service
+++ b/distribution/osbuild-worker@.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=OSBuild Composer Worker (%i)
-Requires=osbuild-local-worker.socket osbuild-dnf-json.socket
+Requires=osbuild-local-worker.socket
 After=network.target osbuild-local-worker.socket
 
 [Service]
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index ab4a65b89..34074711f 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -375,8 +375,6 @@ The dnf-json binary used by osbuild-composer and the workers.
 
 %files dnf-json
 %{_libexecdir}/osbuild-composer/dnf-json
-%{_unitdir}/osbuild-dnf-json.service
-%{_unitdir}/osbuild-dnf-json.socket
 
 %if %{with tests} || 0%{?rhel}