1 From d54e425b0685c9e3e06f5b4efcbd206950d14f3c Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
3 Date: Thu, 25 Jan 2018 14:09:23 +0100
4 Subject: [PATCH 6/6] Install socket activation by default
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Change-Id: Ifd10c3800486689ed0ed6271df59760ccfbf6caf
10 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
12 packaging/cynara.spec | 5 -----
13 systemd/CMakeLists.txt | 7 +++++++
14 systemd/sockets.target.wants/cynara-admin.socket | 1 +
15 systemd/sockets.target.wants/cynara-agent.socket | 1 +
16 systemd/sockets.target.wants/cynara.socket | 1 +
17 5 files changed, 10 insertions(+), 5 deletions(-)
18 create mode 120000 systemd/sockets.target.wants/cynara-admin.socket
19 create mode 120000 systemd/sockets.target.wants/cynara-agent.socket
20 create mode 120000 systemd/sockets.target.wants/cynara.socket
22 diff --git a/packaging/cynara.spec b/packaging/cynara.spec
23 index d2e0b80..2c5b326 100644
24 --- a/packaging/cynara.spec
25 +++ b/packaging/cynara.spec
26 @@ -72,12 +72,7 @@ make %{?jobs:-j%jobs}
30 -mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
31 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
32 -ln -s ../cynara.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara.socket
33 -ln -s ../cynara-admin.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-admin.socket
34 -ln -s ../cynara-agent.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-agent.socket
35 -ln -s ../cynara-monitor-get.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-monitor-get.socket
36 ln -s ../cynara.service %{buildroot}%{_unitdir}/multi-user.target.wants/cynara.service
39 diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
40 index 1b75c12..9a2d70d 100644
41 --- a/systemd/CMakeLists.txt
42 +++ b/systemd/CMakeLists.txt
43 @@ -38,3 +38,10 @@ INSTALL(FILES
48 + ${CMAKE_SOURCE_DIR}/systemd/sockets.target.wants
54 diff --git a/systemd/sockets.target.wants/cynara-admin.socket b/systemd/sockets.target.wants/cynara-admin.socket
56 index 0000000..3d0b1ce
58 +++ b/systemd/sockets.target.wants/cynara-admin.socket
60 +../cynara-admin.socket
61 \ No newline at end of file
62 diff --git a/systemd/sockets.target.wants/cynara-agent.socket b/systemd/sockets.target.wants/cynara-agent.socket
64 index 0000000..22b37dd
66 +++ b/systemd/sockets.target.wants/cynara-agent.socket
68 +../cynara-agent.socket
69 \ No newline at end of file
70 diff --git a/systemd/sockets.target.wants/cynara.socket b/systemd/sockets.target.wants/cynara.socket
72 index 0000000..c0e5a5b
74 +++ b/systemd/sockets.target.wants/cynara.socket
77 \ No newline at end of file