Refactoring central-key-manager.service and central-key-manager-OOO.socket

 - "central-key-manager.target" is a typo mistaken for "central-key-manager.service"
 - All four sockets are required for central-key-manager.service. So, "Requires=OOO.socket" must be in central-key-manager.service.
 - "Sockets=" in the central-key-manager.service is replaced by "Requires=OOO.socket".

Change-Id: I547431abead19ae5a0f9ae3680318a476de269dd

diff --git a/packaging/key-manager.spec b/packaging/key-manager.spec
index 92dcf41..dcb4e63 100644 (file)
--- a/packaging/key-manager.spec
+++ b/packaging/key-manager.spec
@@ -271,7 +271,6 @@ fi
 %{bin_dir}/key-manager
 %{_unitdir}/multi-user.target.wants/central-key-manager.service
 %{_unitdir}/central-key-manager.service
-%{_unitdir}/central-key-manager.target
 %{_unitdir}/sockets.target.wants/central-key-manager-api-control.socket
 %{_unitdir}/central-key-manager-api-control.socket
 %{_unitdir}/sockets.target.wants/central-key-manager-api-storage.socket

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 32b6023..c230e23 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -3,7 +3,6 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/central-key-manager.service.in
 
 INSTALL(FILES
     ${CMAKE_SOURCE_DIR}/systemd/central-key-manager.service
-    ${CMAKE_SOURCE_DIR}/systemd/central-key-manager.target
     ${CMAKE_SOURCE_DIR}/systemd/central-key-manager-api-control.socket
     ${CMAKE_SOURCE_DIR}/systemd/central-key-manager-api-storage.socket
     ${CMAKE_SOURCE_DIR}/systemd/central-key-manager-api-ocsp.socket

diff --git a/systemd/central-key-manager-api-control.socket b/systemd/central-key-manager-api-control.socket
index c5719aa..8f990ee 100644 (file)
--- a/systemd/central-key-manager-api-control.socket
+++ b/systemd/central-key-manager-api-control.socket
@@ -3,12 +3,7 @@ ListenStream=/tmp/.central-key-manager-api-control.sock
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=central-key-manager.service
 
-[Unit]
-Wants=central-key-manager.target
-Before=central-key-manager.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/central-key-manager-api-encryption.socket b/systemd/central-key-manager-api-encryption.socket
index bd8a47c..469791b 100644 (file)
--- a/systemd/central-key-manager-api-encryption.socket
+++ b/systemd/central-key-manager-api-encryption.socket
@@ -3,12 +3,7 @@ ListenStream=/tmp/.central-key-manager-api-encryption.sock
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=central-key-manager.service
 
-[Unit]
-Wants=central-key-manager.target
-Before=central-key-manager.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/central-key-manager-api-ocsp.socket b/systemd/central-key-manager-api-ocsp.socket
index ee5307c..dbcbfbe 100644 (file)
--- a/systemd/central-key-manager-api-ocsp.socket
+++ b/systemd/central-key-manager-api-ocsp.socket
@@ -3,12 +3,7 @@ ListenStream=/tmp/.central-key-manager-api-ocsp.sock
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=central-key-manager.service
 
-[Unit]
-Wants=central-key-manager.target
-Before=central-key-manager.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/central-key-manager-api-storage.socket b/systemd/central-key-manager-api-storage.socket
index 359923c..a38c571 100644 (file)
--- a/systemd/central-key-manager-api-storage.socket
+++ b/systemd/central-key-manager-api-storage.socket
@@ -3,12 +3,7 @@ ListenStream=/tmp/.central-key-manager-api-storage.sock
 SocketMode=0777
 SmackLabelIPIn=*
 SmackLabelIPOut=@
-
 Service=central-key-manager.service
 
-[Unit]
-Wants=central-key-manager.target
-Before=central-key-manager.target
-
 [Install]
 WantedBy=sockets.target

diff --git a/systemd/central-key-manager.service.in b/systemd/central-key-manager.service.in
index 3562f07..025aa3d 100644 (file)
--- a/systemd/central-key-manager.service.in
+++ b/systemd/central-key-manager.service.in
@@ -2,6 +2,7 @@
 Description=Start the Central Key Manager
 DefaultDependencies=no
 RequiresMountsFor=/opt
+Requires=central-key-manager-api-storage.socket central-key-manager-api-control.socket central-key-manager-api-ocsp.socket central-key-manager-api-encryption.socket
 
 [Service]
 User=@USER_NAME@
@@ -10,10 +11,6 @@ SupplementaryGroups=@SUPPLEMENTARY_GROUP_NAMES@
 SmackProcessLabel=@SMACK_DOMAIN_NAME@
 Type=notify
 ExecStart=@BIN_DIR@/key-manager
-Sockets=central-key-manager-api-storage.socket
-Sockets=central-key-manager-api-control.socket
-Sockets=central-key-manager-api-ocsp.socket
-Sockets=central-key-manager-api-encryption.socket
 EnvironmentFile=-@SYSTEMD_ENV_FILE@
 RuntimeDirectory=@SERVICE_NAME@
 @WATCHDOG_DECLARE@

diff --git a/systemd/central-key-manager.target b/systemd/central-key-manager.target
deleted file mode 100644 (file)
index 07c4c65..0000000
--- a/systemd/central-key-manager.target
+++ /dev/null
@@ -1,3 +0,0 @@
-[Unit]
-Description=Central Key Manager sockets
-