1 From ebde8e9fdba7bc1c8152f7e45c551030a36ece82 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 13:47:37 +0100
4 Subject: [PATCH] Allow to tune sockets
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 Allow to change the directory of sockets
10 through a true integration of SOCKET_DIR
12 Allow to override the socket's group of
13 - /run/cynara/cynara-agent.socket
14 - /run/cynara/cynara-monitor-get.socket
16 through the newly defined variable CYNARA_ADMIN_SOCKET_GROUP
18 Change-Id: I7d58854c328e948e3d6d7fa3fc00569fd08f8aef
19 Signed-off-by: José Bollo <jose.bollo@iot.bzh>
22 systemd/CMakeLists.txt | 19 +++++++++++++++----
23 systemd/cynara-admin.socket | 14 --------------
24 systemd/cynara-admin.socket.in | 14 ++++++++++++++
25 systemd/cynara-agent.socket | 15 ---------------
26 systemd/cynara-agent.socket.in | 15 +++++++++++++++
27 systemd/cynara-monitor-get.socket | 15 ---------------
28 systemd/cynara-monitor-get.socket.in | 15 +++++++++++++++
29 systemd/cynara.socket | 14 --------------
30 systemd/cynara.socket.in | 14 ++++++++++++++
31 9 files changed, 73 insertions(+), 62 deletions(-)
32 delete mode 100644 systemd/cynara-admin.socket
33 create mode 100644 systemd/cynara-admin.socket.in
34 delete mode 100644 systemd/cynara-agent.socket
35 create mode 100644 systemd/cynara-agent.socket.in
36 delete mode 100644 systemd/cynara-monitor-get.socket
37 create mode 100644 systemd/cynara-monitor-get.socket.in
38 delete mode 100644 systemd/cynara.socket
39 create mode 100644 systemd/cynara.socket.in
41 diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
42 index 20accf0..1b75c12 100644
43 --- a/systemd/CMakeLists.txt
44 +++ b/systemd/CMakeLists.txt
46 # @author Lukasz Wojciechowski <l.wojciechow@partner.samsung.com>
49 +SET(CYNARA_ADMIN_SOCKET_GROUP
52 + "Group to apply on administrative sockets")
55 +CONFIGURE_FILE(cynara.socket.in cynara.socket @ONLY)
56 +CONFIGURE_FILE(cynara-admin.socket.in cynara-admin.socket @ONLY)
57 +CONFIGURE_FILE(cynara-agent.socket.in cynara-agent.socket @ONLY)
58 +CONFIGURE_FILE(cynara-monitor-get.socket.in cynara-monitor-get.socket @ONLY)
61 ${CMAKE_SOURCE_DIR}/systemd/cynara.service
62 ${CMAKE_SOURCE_DIR}/systemd/cynara.target
63 - ${CMAKE_SOURCE_DIR}/systemd/cynara.socket
64 - ${CMAKE_SOURCE_DIR}/systemd/cynara-admin.socket
65 - ${CMAKE_SOURCE_DIR}/systemd/cynara-agent.socket
66 - ${CMAKE_SOURCE_DIR}/systemd/cynara-monitor-get.socket
67 + ${CMAKE_BINARY_DIR}/systemd/cynara.socket
68 + ${CMAKE_BINARY_DIR}/systemd/cynara-admin.socket
69 + ${CMAKE_BINARY_DIR}/systemd/cynara-agent.socket
70 + ${CMAKE_BINARY_DIR}/systemd/cynara-monitor-get.socket
74 diff --git a/systemd/cynara-admin.socket b/systemd/cynara-admin.socket
75 deleted file mode 100644
76 index ed38386..0000000
77 --- a/systemd/cynara-admin.socket
81 -ListenStream=/run/cynara/cynara-admin.socket
86 -Service=cynara.service
93 -WantedBy=sockets.target
94 diff --git a/systemd/cynara-admin.socket.in b/systemd/cynara-admin.socket.in
96 index 0000000..2364c3e
98 +++ b/systemd/cynara-admin.socket.in
101 +ListenStream=@SOCKET_DIR@/cynara-admin.socket
106 +Service=cynara.service
110 +Before=cynara.target
113 +WantedBy=sockets.target
114 diff --git a/systemd/cynara-agent.socket b/systemd/cynara-agent.socket
115 deleted file mode 100644
116 index 5a677e0..0000000
117 --- a/systemd/cynara-agent.socket
121 -ListenStream=/run/cynara/cynara-agent.socket
122 -SocketGroup=security_fw
127 -Service=cynara.service
131 -Before=cynara.target
134 -WantedBy=sockets.target
135 diff --git a/systemd/cynara-agent.socket.in b/systemd/cynara-agent.socket.in
137 index 0000000..4f86c9d
139 +++ b/systemd/cynara-agent.socket.in
142 +ListenStream=@SOCKET_DIR@/cynara-agent.socket
143 +SocketGroup=@CYNARA_ADMIN_SOCKET_GROUP@
148 +Service=cynara.service
152 +Before=cynara.target
155 +WantedBy=sockets.target
156 diff --git a/systemd/cynara-monitor-get.socket b/systemd/cynara-monitor-get.socket
157 deleted file mode 100644
158 index a50feeb..0000000
159 --- a/systemd/cynara-monitor-get.socket
163 -ListenStream=/run/cynara/cynara-monitor-get.socket
164 -SocketGroup=security_fw
169 -Service=cynara.service
173 -Before=cynara.target
176 -WantedBy=sockets.target
177 diff --git a/systemd/cynara-monitor-get.socket.in b/systemd/cynara-monitor-get.socket.in
179 index 0000000..b88dbf7
181 +++ b/systemd/cynara-monitor-get.socket.in
184 +ListenStream=@SOCKET_DIR@/cynara-monitor-get.socket
185 +SocketGroup=@CYNARA_ADMIN_SOCKET_GROUP@
190 +Service=cynara.service
194 +Before=cynara.target
197 +WantedBy=sockets.target
198 diff --git a/systemd/cynara.socket b/systemd/cynara.socket
199 deleted file mode 100644
200 index fad2745..0000000
201 --- a/systemd/cynara.socket
205 -ListenStream=/run/cynara/cynara.socket
210 -Service=cynara.service
214 -Before=cynara.target
217 -WantedBy=sockets.target
218 diff --git a/systemd/cynara.socket.in b/systemd/cynara.socket.in
220 index 0000000..ba76549
222 +++ b/systemd/cynara.socket.in
225 +ListenStream=@SOCKET_DIR@/cynara.socket
230 +Service=cynara.service
234 +Before=cynara.target
237 +WantedBy=sockets.target