spec: remove dnf-json service and socket

dnf-json is a standalone script again.  The service and socket are
removed.
This commit is contained in:
Achilleas Koutsou 2022-04-26 20:59:53 +02:00 committed by Tom Gundersen
parent 8518488028
commit 03e86cc31a
6 changed files with 1 additions and 27 deletions

View file

@ -1,6 +1,5 @@
[Unit]
Description=OSBuild Composer
Requires=osbuild-dnf-json.socket
After=network.target
# Weldr API needs a local worker by default.

View file

@ -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"

View file

@ -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

View file

@ -1,6 +1,5 @@
[Unit]
Description=OSBuild Composer Remote Worker (%i)
Requires=osbuild-dnf-json.socket
After=network.target
[Service]

View file

@ -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]

View file

@ -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}