From 9cffedba0dfcf845c34901051d24a4b967ec824d Mon Sep 17 00:00:00 2001 From: José Bollo Date: Thu, 3 Oct 2019 17:58:02 +0200 Subject: Move to CYNAGORA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename everything to match the new name of cynagora Change-Id: I7e529def486ca5721164b338d2c615996fbc6ca4 Signed-off-by: José Bollo --- systemd/CMakeLists.txt | 16 ++++++------ systemd/cynagora-admin.socket.in | 15 +++++++++++ systemd/cynagora-agent.socket.in | 15 +++++++++++ systemd/cynagora-check.socket.in | 15 +++++++++++ systemd/cynagora.service | 26 +++++++++++++++++++ systemd/cynagora.target | 4 +++ systemd/cynara-admin.socket.in | 15 ----------- systemd/cynara-agent.socket.in | 15 ----------- systemd/cynara-check.socket.in | 15 ----------- systemd/cynara.service | 29 ---------------------- systemd/cynara.target | 4 --- systemd/sockets.target.wants/cynagora-admin.socket | 1 + systemd/sockets.target.wants/cynagora-agent.socket | 1 + systemd/sockets.target.wants/cynagora-check.socket | 1 + systemd/sockets.target.wants/cynara-admin.socket | 1 - systemd/sockets.target.wants/cynara-agent.socket | 1 - systemd/sockets.target.wants/cynara-check.socket | 1 - 17 files changed, 86 insertions(+), 89 deletions(-) create mode 100644 systemd/cynagora-admin.socket.in create mode 100644 systemd/cynagora-agent.socket.in create mode 100644 systemd/cynagora-check.socket.in create mode 100644 systemd/cynagora.service create mode 100644 systemd/cynagora.target delete mode 100644 systemd/cynara-admin.socket.in delete mode 100644 systemd/cynara-agent.socket.in delete mode 100644 systemd/cynara-check.socket.in delete mode 100644 systemd/cynara.service delete mode 100644 systemd/cynara.target create mode 120000 systemd/sockets.target.wants/cynagora-admin.socket create mode 120000 systemd/sockets.target.wants/cynagora-agent.socket create mode 120000 systemd/sockets.target.wants/cynagora-check.socket delete mode 120000 systemd/sockets.target.wants/cynara-admin.socket delete mode 120000 systemd/sockets.target.wants/cynara-agent.socket delete mode 120000 systemd/sockets.target.wants/cynara-check.socket (limited to 'systemd') diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt index 9ea1f7e..c68f7f5 100644 --- a/systemd/CMakeLists.txt +++ b/systemd/CMakeLists.txt @@ -19,16 +19,16 @@ set(SYSTEMD_UNIT_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/systemd/system" CACHE PATH "Path to systemd system unit files") -CONFIGURE_FILE(cynara-admin.socket.in cynara-admin.socket @ONLY) -CONFIGURE_FILE(cynara-check.socket.in cynara-check.socket @ONLY) -CONFIGURE_FILE(cynara-agent.socket.in cynara-agent.socket @ONLY) +CONFIGURE_FILE(cynagora-admin.socket.in cynagora-admin.socket @ONLY) +CONFIGURE_FILE(cynagora-check.socket.in cynagora-check.socket @ONLY) +CONFIGURE_FILE(cynagora-agent.socket.in cynagora-agent.socket @ONLY) INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/cynara.service - ${CMAKE_CURRENT_SOURCE_DIR}/cynara.target - ${CMAKE_CURRENT_BINARY_DIR}/cynara-admin.socket - ${CMAKE_CURRENT_BINARY_DIR}/cynara-check.socket - ${CMAKE_CURRENT_BINARY_DIR}/cynara-agent.socket + ${CMAKE_CURRENT_SOURCE_DIR}/cynagora.service + ${CMAKE_CURRENT_SOURCE_DIR}/cynagora.target + ${CMAKE_CURRENT_BINARY_DIR}/cynagora-admin.socket + ${CMAKE_CURRENT_BINARY_DIR}/cynagora-check.socket + ${CMAKE_CURRENT_BINARY_DIR}/cynagora-agent.socket DESTINATION ${SYSTEMD_UNIT_DIR} ) diff --git a/systemd/cynagora-admin.socket.in b/systemd/cynagora-admin.socket.in new file mode 100644 index 0000000..622c023 --- /dev/null +++ b/systemd/cynagora-admin.socket.in @@ -0,0 +1,15 @@ +[Socket] +FileDescriptorName=admin +ListenStream=@DEFAULT_SOCKET_DIR@/cynagora.admin +SocketMode=0600 +SmackLabelIPIn=@ +SmackLabelIPOut=@ + +Service=cynagora.service + +[Unit] +Wants=cynagora.target +Before=cynagora.target + +[Install] +WantedBy=sockets.target diff --git a/systemd/cynagora-agent.socket.in b/systemd/cynagora-agent.socket.in new file mode 100644 index 0000000..a5e66b8 --- /dev/null +++ b/systemd/cynagora-agent.socket.in @@ -0,0 +1,15 @@ +[Socket] +FileDescriptorName=agent +ListenStream=@DEFAULT_SOCKET_DIR@/cynagora.agent +SocketMode=0600 +SmackLabelIPIn=@ +SmackLabelIPOut=@ + +Service=cynagora.service + +[Unit] +Wants=cynagora.target +Before=cynagora.target + +[Install] +WantedBy=sockets.target diff --git a/systemd/cynagora-check.socket.in b/systemd/cynagora-check.socket.in new file mode 100644 index 0000000..fcd6ed1 --- /dev/null +++ b/systemd/cynagora-check.socket.in @@ -0,0 +1,15 @@ +[Socket] +FileDescriptorName=check +ListenStream=@DEFAULT_SOCKET_DIR@/cynagora.check +SocketMode=0666 +SmackLabelIPIn=* +SmackLabelIPOut=@ + +Service=cynagora.service + +[Unit] +Wants=cynagora.target +Before=cynagora.target + +[Install] +WantedBy=sockets.target diff --git a/systemd/cynagora.service b/systemd/cynagora.service new file mode 100644 index 0000000..97a0f36 --- /dev/null +++ b/systemd/cynagora.service @@ -0,0 +1,26 @@ +[Unit] +Description=Cynagora service +Requires=afm-system-setup.service +After=afm-system-setup.service + +[Service] +ExecStart=/usr/bin/cynagorad --systemd --user cynagora --group cynagora --make-db-dir --own-db-dir + +Type=notify + +KillMode=process +TimeoutStopSec=3 +Restart=always + +Sockets=cynagora-admin.socket +Sockets=cynagora-check.socket +Sockets=cynagora-agent.socket +SmackProcessLabel=System + +#UMask=0000 +#User=cynagora +#Group=cynagora +#NoNewPrivileges=true + +[Install] +WantedBy=multi-user.target diff --git a/systemd/cynagora.target b/systemd/cynagora.target new file mode 100644 index 0000000..e41ed4c --- /dev/null +++ b/systemd/cynagora.target @@ -0,0 +1,4 @@ +[Unit] +Description=cynagora sockets +DefaultDependencies=true + diff --git a/systemd/cynara-admin.socket.in b/systemd/cynara-admin.socket.in deleted file mode 100644 index 25c3b2c..0000000 --- a/systemd/cynara-admin.socket.in +++ /dev/null @@ -1,15 +0,0 @@ -[Socket] -FileDescriptorName=admin -ListenStream=@DEFAULT_SOCKET_DIR@/cynara.admin -SocketMode=0600 -SmackLabelIPIn=@ -SmackLabelIPOut=@ - -Service=cynara.service - -[Unit] -Wants=cynara.target -Before=cynara.target - -[Install] -WantedBy=sockets.target diff --git a/systemd/cynara-agent.socket.in b/systemd/cynara-agent.socket.in deleted file mode 100644 index 12dd064..0000000 --- a/systemd/cynara-agent.socket.in +++ /dev/null @@ -1,15 +0,0 @@ -[Socket] -FileDescriptorName=agent -ListenStream=@DEFAULT_SOCKET_DIR@/cynara.agent -SocketMode=0600 -SmackLabelIPIn=@ -SmackLabelIPOut=@ - -Service=cynara.service - -[Unit] -Wants=cynara.target -Before=cynara.target - -[Install] -WantedBy=sockets.target diff --git a/systemd/cynara-check.socket.in b/systemd/cynara-check.socket.in deleted file mode 100644 index b0606e0..0000000 --- a/systemd/cynara-check.socket.in +++ /dev/null @@ -1,15 +0,0 @@ -[Socket] -FileDescriptorName=check -ListenStream=@DEFAULT_SOCKET_DIR@/cynara.check -SocketMode=0666 -SmackLabelIPIn=* -SmackLabelIPOut=@ - -Service=cynara.service - -[Unit] -Wants=cynara.target -Before=cynara.target - -[Install] -WantedBy=sockets.target diff --git a/systemd/cynara.service b/systemd/cynara.service deleted file mode 100644 index b7bfd5a..0000000 --- a/systemd/cynara.service +++ /dev/null @@ -1,29 +0,0 @@ -[Unit] -Description=Cynara service -Requires=afm-system-setup.service -After=afm-system-setup.service - -[Service] -ExecStart=/usr/bin/cynarad --systemd --user cynara --group cynara --make-db-dir --own-db-dir - -Type=notify - -KillMode=process -TimeoutStopSec=3 -Restart=always - -Sockets=cynara-admin.socket -Sockets=cynara-check.socket -Sockets=cynara-agent.socket -SmackProcessLabel=System - -#UMask=0000 -#User=cynara -#Group=cynara -#NoNewPrivileges=true - -#Environment="CYNARA_LOG_LEVEL=LOG_DEBUG" -#Environment="CYNARA_AUDIT_LEVEL=ALL" - -[Install] -WantedBy=multi-user.target diff --git a/systemd/cynara.target b/systemd/cynara.target deleted file mode 100644 index 9b2dee4..0000000 --- a/systemd/cynara.target +++ /dev/null @@ -1,4 +0,0 @@ -[Unit] -Description=cynara sockets -DefaultDependencies=true - diff --git a/systemd/sockets.target.wants/cynagora-admin.socket b/systemd/sockets.target.wants/cynagora-admin.socket new file mode 120000 index 0000000..d16bdde --- /dev/null +++ b/systemd/sockets.target.wants/cynagora-admin.socket @@ -0,0 +1 @@ +../cynagora-admin.socket \ No newline at end of file diff --git a/systemd/sockets.target.wants/cynagora-agent.socket b/systemd/sockets.target.wants/cynagora-agent.socket new file mode 120000 index 0000000..e22a713 --- /dev/null +++ b/systemd/sockets.target.wants/cynagora-agent.socket @@ -0,0 +1 @@ +../cynagora-agent.socket \ No newline at end of file diff --git a/systemd/sockets.target.wants/cynagora-check.socket b/systemd/sockets.target.wants/cynagora-check.socket new file mode 120000 index 0000000..ad41243 --- /dev/null +++ b/systemd/sockets.target.wants/cynagora-check.socket @@ -0,0 +1 @@ +../cynagora-check.socket \ No newline at end of file diff --git a/systemd/sockets.target.wants/cynara-admin.socket b/systemd/sockets.target.wants/cynara-admin.socket deleted file mode 120000 index 3d0b1ce..0000000 --- a/systemd/sockets.target.wants/cynara-admin.socket +++ /dev/null @@ -1 +0,0 @@ -../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 deleted file mode 120000 index 22b37dd..0000000 --- a/systemd/sockets.target.wants/cynara-agent.socket +++ /dev/null @@ -1 +0,0 @@ -../cynara-agent.socket \ No newline at end of file diff --git a/systemd/sockets.target.wants/cynara-check.socket b/systemd/sockets.target.wants/cynara-check.socket deleted file mode 120000 index 921ca66..0000000 --- a/systemd/sockets.target.wants/cynara-check.socket +++ /dev/null @@ -1 +0,0 @@ -../cynara-check.socket \ No newline at end of file -- cgit 1.2.3-korg