13 files changed, 50 insertions, 53 deletions
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/cynara-admin.socket.in b/systemd/cynagora-admin.socket.in
index 25c3b2c..622c023 100644
--- a/systemd/cynara-admin.socket.in
+++ b/systemd/cynagora-admin.socket.in
@@ -1,15 +1,15 @@
 [Socket]
 FileDescriptorName=admin
-ListenStream=@DEFAULT_SOCKET_DIR@/cynara.admin
+ListenStream=@DEFAULT_SOCKET_DIR@/cynagora.admin
 SocketMode=0600
 SmackLabelIPIn=@
 SmackLabelIPOut=@
 
-Service=cynara.service
+Service=cynagora.service
 
 [Unit]
-Wants=cynara.target
-Before=cynara.target
+Wants=cynagora.target
+Before=cynagora.target
 
 [Install]
 WantedBy=sockets.target
diff --git a/systemd/cynara-agent.socket.in b/systemd/cynagora-agent.socket.in
index 12dd064..a5e66b8 100644
--- a/systemd/cynara-agent.socket.in
+++ b/systemd/cynagora-agent.socket.in
@@ -1,15 +1,15 @@
 [Socket]
 FileDescriptorName=agent
-ListenStream=@DEFAULT_SOCKET_DIR@/cynara.agent
+ListenStream=@DEFAULT_SOCKET_DIR@/cynagora.agent
 SocketMode=0600
 SmackLabelIPIn=@
 SmackLabelIPOut=@
 
-Service=cynara.service
+Service=cynagora.service
 
 [Unit]
-Wants=cynara.target
-Before=cynara.target
+Wants=cynagora.target
+Before=cynagora.target
 
 [Install]
 WantedBy=sockets.target
diff --git a/systemd/cynara-check.socket.in b/systemd/cynagora-check.socket.in
index b0606e0..fcd6ed1 100644
--- a/systemd/cynara-check.socket.in
+++ b/systemd/cynagora-check.socket.in
@@ -1,15 +1,15 @@
 [Socket]
 FileDescriptorName=check
-ListenStream=@DEFAULT_SOCKET_DIR@/cynara.check
+ListenStream=@DEFAULT_SOCKET_DIR@/cynagora.check
 SocketMode=0666
 SmackLabelIPIn=*
 SmackLabelIPOut=@
 
-Service=cynara.service
+Service=cynagora.service
 
 [Unit]
-Wants=cynara.target
-Before=cynara.target
+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/cynara.target b/systemd/cynagora.target
index 9b2dee4..e41ed4c 100644
--- a/systemd/cynara.target
+++ b/systemd/cynagora.target
@@ -1,4 +1,4 @@
 [Unit]
-Description=cynara sockets
+Description=cynagora sockets
 DefaultDependencies=true
 
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/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