particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

distribution: deprecate osbuild-composer-koji.socket

Browse source 
Instead, call it osbuild-composer-api.socket, but provide a symlink for
backwards compatibility. Change `schutzbot/provision.sh` to only enable
osbuild-composer-api.socket.

In the future, this new socket is the only API socket, which provides
both the "cloud" API and the one for koji.

This means that the koji API is always enabled.
This commit is contained in:
Lars Karlitski 2020-10-02 19:11:23 +02:00 • committed by Ondřej Budai
parent d5a22097b8
commit 835b556db7
5 changed files with 20 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/osbuild-composer/main.go
View file

@ -77,9 +77,9 @@ func main() {
log.Fatalf("osbuild-composer.socket doesn't exist")
}
if l, exists := listeners["osbuild-composer-koji.socket"]; exists {
if l, exists := listeners["osbuild-composer-api.socket"]; exists {
if len(l) != 1 {
log.Fatal("The osbuild-composer-koji.socket unit is misconfigured. It should contain only one socket.")
log.Fatal("The osbuild-composer-api.socket unit is misconfigured. It should contain only one socket.")
}
err = composer.InitKoji(ServerCertFile, ServerKeyFile, l[0])

9
distribution/osbuild-composer-api.socket Normal file
View file

@ -0,0 +1,9 @@
[Unit]
Description=OSBuild Composer API socket
[Socket]
Service=osbuild-composer.service
ListenStream=443
[Install]
WantedBy=sockets.target

9
distribution/osbuild-composer-koji.socket
View file

@ -1,9 +0,0 @@
[Unit]
Description=OSBuild Composer Koji API socket
[Socket]
Service=osbuild-composer.service
ListenStream=443
[Install]
WantedBy=sockets.target

1
distribution/osbuild-composer-koji.socket Symbolic link
View file

@ -0,0 +1 @@
osbuild-composer-api.socket

11
osbuild-composer.spec
View file

@ -158,6 +158,7 @@ install -m 0644 -vp distribution/osbuild-composer.socket %{buildroot}%{_u
install -m 0644 -vp distribution/osbuild-remote-worker.socket %{buildroot}%{_unitdir}/
install -m 0644 -vp distribution/osbuild-remote-worker@.service %{buildroot}%{_unitdir}/
install -m 0644 -vp distribution/osbuild-worker@.service %{buildroot}%{_unitdir}/
install -m 0644 -vp distribution/osbuild-composer-api.socket %{buildroot}%{_unitdir}/
install -m 0644 -vp distribution/osbuild-composer-koji.socket %{buildroot}%{_unitdir}/
install -m 0755 -vd %{buildroot}%{_unitdir}
install -m 0644 -vp distribution/osbuild-composer.{service,socket} %{buildroot}%{_unitdir}/
@ -232,13 +233,13 @@ cd $PWD/_build/src/%{goipath}
%endif
%post
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
%systemd_post osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%preun
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
%systemd_preun osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%postun
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-remote-worker.socket
%systemd_postun_with_restart osbuild-composer.service osbuild-composer.socket osbuild-composer-api.socket osbuild-remote-worker.socket
%files
%license LICENSE
@ -248,6 +249,7 @@ cd $PWD/_build/src/%{goipath}
%{_datadir}/osbuild-composer/
%{_unitdir}/osbuild-composer.service
%{_unitdir}/osbuild-composer.socket
%{_unitdir}/osbuild-composer-api.socket
%{_unitdir}/osbuild-remote-worker.socket
%{_sysusersdir}/osbuild-composer.conf
@ -377,7 +379,8 @@ Obsoletes: osbuild-composer-rcm < %{version}-%{release}
Provides: osbuild-composer-rcm = %{version}-%{release}
%description koji
osbulid-composer specifically for pushing images to Koji.
osbuild-composer specifically for pushing images to Koji. This package is only
needed for backwards compatibility and will be removed in the future.
%files koji
%{_unitdir}/osbuild-composer-koji.socket

9
schutzbot/provision.sh
View file

@ -11,14 +11,7 @@ sudo chown _osbuild-composer /etc/osbuild-composer/composer-*.pem
sudo systemctl start osbuild-remote-worker.socket
sudo systemctl start osbuild-composer.socket
if rpm -q osbuild-composer-koji; then
sudo systemctl start osbuild-composer-koji.socket
fi
if rpm -q osbuild-composer-cloud; then
sudo systemctl start osbuild-composer-cloud.socket
fi
sudo systemctl start osbuild-composer-api.socket
# Basic verification
sudo composer-cli status show