diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-10-12 10:58:40 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-11-24 17:44:57 +0100 |
| commit | 1a67d1b401cbf132687b5aaea52ca7875edaa1f9 (patch) | |
| tree | 083ad7c8f235bfe255ca00ad47ccccef19f62f05 /conf | |
| parent | dd87fc32c026b4fba9b13ab52f032e3b403b04bf (diff) | |
Remove afm-system-daemon
Change-Id: I1e6c0488b7183724a65fcc06fd3cf6909e0efd53
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | conf/afm-system-daemon.service.in | 3 | ||||
| -rw-r--r-- | conf/afm-system-daemon.socket.in | 13 |
3 files changed, 16 insertions, 4 deletions
diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt index 2188dc0..ad2090d 100644 --- a/conf/CMakeLists.txt +++ b/conf/CMakeLists.txt @@ -21,16 +21,16 @@ cmake_minimum_required(VERSION 2.8) configure_file(afm-unit.conf.in afm-unit.conf) configure_file(afm-unit-debug.conf.in afm-unit-debug.conf) configure_file(afm-system-daemon.service.in afm-system-daemon.service) +configure_file(afm-system-daemon.socket.in afm-system-daemon.socket) configure_file(afm-user-daemon.service.in afm-user-daemon.service) if(NOT USE_SDK) - set(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d CACHE STRING "Path to dbus system configuration files") set(SYSCONFDIR_DBUS_USER ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/session.d CACHE STRING "Path to dbus session configuration files") set(UNITDIR_SYSTEM ${CMAKE_INSTALL_LIBDIR}/systemd/system CACHE STRING "Path to systemd system unit files") set(UNITDIR_USER ${CMAKE_INSTALL_LIBDIR}/systemd/user CACHE STRING "Path to systemd system unit files") - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-system-daemon.conf DESTINATION ${SYSCONFDIR_DBUS_SYSTEM}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service DESTINATION ${UNITDIR_SYSTEM}) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket DESTINATION ${UNITDIR_SYSTEM}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-user-daemon.conf DESTINATION ${SYSCONFDIR_DBUS_USER}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/afm-user-daemon.service DESTINATION ${UNITDIR_USER}) install(DIRECTORY DESTINATION ${afm_confdir}/unit.env.d) diff --git a/conf/afm-system-daemon.service.in b/conf/afm-system-daemon.service.in index 77e1f1b..75a45f9 100644 --- a/conf/afm-system-daemon.service.in +++ b/conf/afm-system-daemon.service.in @@ -2,10 +2,9 @@ Description=Application Framework Master, system side [Service] -BusName=org.AGL.afm.system User=afm Group=afm -ExecStart=/usr/bin/afm-system-daemon +ExecStart=/usr/bin/afb-daemon --name=afm-system-daemon -no-httpd --no-ldpaths --binding=@CMAKE_INSTALL_LIBEXECDIR@/afm/afm-binding.so --ws-server=sd:afm-main Restart=on-failure RestartSec=5 CapabilityBoundingSet=CAP_DAC_OVERRIDE CAP_MAC_OVERRIDE diff --git a/conf/afm-system-daemon.socket.in b/conf/afm-system-daemon.socket.in new file mode 100644 index 0000000..d3f0285 --- /dev/null +++ b/conf/afm-system-daemon.socket.in @@ -0,0 +1,13 @@ + +[Socket] +SmackLabel=* +ListenStream=/run/afm/apis/ws/afm-main +FileDescriptorName=afm-main +SocketUser=afm +SocketGroup=afm + +Service=afm-system-daemon.service + +[Install] +WantedBy=sockets.target + |