Run cert-server service at boot time

* This is for bundle re-make (support migration 3.0)

Change-Id: I8d77e498a8783c632de4ec67b6043e3ab0e2f3b5

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index ae4aa87..9fa19dd 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,5 +1,6 @@
 SET(CERT_SERVER "cert-server")
 
+CONFIGURE_FILE(${CERT_SERVER}.socket.in ${CERT_SERVER}.socket @ONLY)
 CONFIGURE_FILE(${CERT_SERVER}.service.in ${CERT_SERVER}.service @ONLY)
 
 INSTALL(

diff --git a/systemd/cert-server.service.in b/systemd/cert-server.service.in
index 6b2aeb5..456962f 100644 (file)
--- a/systemd/cert-server.service.in
+++ b/systemd/cert-server.service.in
@@ -1,9 +1,10 @@
 [Unit]
-Description=Start cert server for cert-svc managing root ssl certs
+Description=cert server for cert-svc managing root ssl certs
+Wants=cert-server.socket
 
 [Service]
 ExecStart=@TZ_SYS_BIN@/cert-server
-User=security_fw
-Group=security_fw
-SmackProcessLabel=System
+User=@USER_NAME@
+Group=@GROUP_NAME@
+SmackProcessLabel=@SMACK_DOMAIN_NAME@
 Sockets=cert-server.socket

diff --git a/systemd/cert-server.socket b/systemd/cert-server.socket
deleted file mode 100644 (file)
index 9da7b39..0000000
--- a/systemd/cert-server.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Socket]
-ListenStream=/tmp/CertSocket
-SocketUser=security_fw
-SocketGroup=security_fw
-SocketMode=0777
-
-Service=cert-server.service
-
-[Install]
-WantedBy=sockets.target

diff --git a/systemd/cert-server.socket.in b/systemd/cert-server.socket.in
new file mode 100644 (file)
index 0000000..7b763a0
--- /dev/null
+++ b/systemd/cert-server.socket.in
@@ -0,0 +1,13 @@
+[Unit]
+Wants=cert-server.service
+Before=cert-server.service
+
+[Socket]
+ListenStream=/tmp/.cert-server.socket
+SocketUser=@USER_NAME@
+SocketGroup=@GROUP_NAME@
+SocketMode=0777
+Service=cert-server.service
+
+[Install]
+WantedBy=sockets.target