blob: 68864f1ed3e06a263d4d60b469492deb8421289f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
From 23f1a7cb34dd4ef88bac5a43057feaf7f50559aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Thu, 25 Jan 2018 14:09:23 +0100
Subject: [PATCH] Install socket activation by default
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ifd10c3800486689ed0ed6271df59760ccfbf6caf
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
packaging/cynara.spec | 5 -----
systemd/CMakeLists.txt | 7 +++++++
systemd/sockets.target.wants/cynara-admin.socket | 1 +
systemd/sockets.target.wants/cynara-agent.socket | 1 +
systemd/sockets.target.wants/cynara.socket | 1 +
5 files changed, 10 insertions(+), 5 deletions(-)
create mode 120000 systemd/sockets.target.wants/cynara-admin.socket
create mode 120000 systemd/sockets.target.wants/cynara-agent.socket
create mode 120000 systemd/sockets.target.wants/cynara.socket
diff --git a/packaging/cynara.spec b/packaging/cynara.spec
index d2e0b80..2c5b326 100644
--- a/packaging/cynara.spec
+++ b/packaging/cynara.spec
@@ -72,12 +72,7 @@ make %{?jobs:-j%jobs}
rm -rf %{buildroot}
%make_install
-mkdir -p %{buildroot}%{_unitdir}/sockets.target.wants
mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
-ln -s ../cynara.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara.socket
-ln -s ../cynara-admin.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-admin.socket
-ln -s ../cynara-agent.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-agent.socket
-ln -s ../cynara-monitor-get.socket %{buildroot}%{_unitdir}/sockets.target.wants/cynara-monitor-get.socket
ln -s ../cynara.service %{buildroot}%{_unitdir}/multi-user.target.wants/cynara.service
%post
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index 1b75c12..9a2d70d 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -38,3 +38,10 @@ INSTALL(FILES
${SYSTEMD_UNIT_DIR}
)
+INSTALL(DIRECTORY
+ ${CMAKE_SOURCE_DIR}/systemd/sockets.target.wants
+ DESTINATION
+ ${SYSTEMD_UNIT_DIR}
+)
+
+
diff --git a/systemd/sockets.target.wants/cynara-admin.socket b/systemd/sockets.target.wants/cynara-admin.socket
new file mode 120000
index 0000000..3d0b1ce
--- /dev/null
+++ b/systemd/sockets.target.wants/cynara-admin.socket
@@ -0,0 +1 @@
+../cynara-admin.socket
\ No newline at end of file
diff --git a/systemd/sockets.target.wants/cynara-agent.socket b/systemd/sockets.target.wants/cynara-agent.socket
new file mode 120000
index 0000000..22b37dd
--- /dev/null
+++ b/systemd/sockets.target.wants/cynara-agent.socket
@@ -0,0 +1 @@
+../cynara-agent.socket
\ No newline at end of file
diff --git a/systemd/sockets.target.wants/cynara.socket b/systemd/sockets.target.wants/cynara.socket
new file mode 120000
index 0000000..c0e5a5b
--- /dev/null
+++ b/systemd/sockets.target.wants/cynara.socket
@@ -0,0 +1 @@
+../cynara.socket
\ No newline at end of file
|
