Code Review
/
src
/
app-framework-main.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "afm-unit: Restore removal of capabilities"
[src/app-framework-main.git]
/
conf
/
system
/
CMakeLists.txt
diff --git
a/conf/system/CMakeLists.txt
b/conf/system/CMakeLists.txt
index
f0e4c6a
..
26fc562
100644
(file)
--- a/
conf/system/CMakeLists.txt
+++ b/
conf/system/CMakeLists.txt
@@
-1,5
+1,5
@@
###########################################################################
###########################################################################
-# Copyright
2015, 2016, 2017
IoT.bzh
+# Copyright
(C) 2015-2018
IoT.bzh
#
# author: José Bollo <jose.bollo@iot.bzh>
#
#
# author: José Bollo <jose.bollo@iot.bzh>
#
@@
-20,20
+20,23
@@
cmake_minimum_required(VERSION 2.8)
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-system-daemon.service.in afm-system-daemon.service)
configure_file(afm-system-daemon.socket.in afm-system-daemon.socket)
+configure_file(afm-api-afm-main@.service.in afm-api-afm-main@.service)
if(NOT USE_SDK)
set(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d CACHE STRING "Path to dbus system configuration files")
if(NOT USE_SDK)
set(SYSCONFDIR_DBUS_SYSTEM ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d CACHE STRING "Path to dbus system configuration files")
- set(UNITDIR_SYSTEM ${CMAKE_INSTALL_LIBDIR}/systemd/system CACHE STRING "Path to systemd system unit files")
+ set(SYSCONFDIR_PAMD ${CMAKE_INSTALL_SYSCONFDIR}/pam.d CACHE STRING "Path to pam configuration files")
+ set(UNITDIR_SYSTEM ${CMAKE_INSTALL_LIBDIR}/systemd/system 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_SOURCE_DIR}/afm-system-daemon.conf DESTINATION ${SYSCONFDIR_DBUS_SYSTEM})
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session.pamd DESTINATION ${SYSCONFDIR_PAMD} RENAME afm-user-session)
install(
FILES
install(
FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/afm-api-afm-main@.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.service
${CMAKE_CURRENT_BINARY_DIR}/afm-system-daemon.socket
- ${CMAKE_CURRENT_SOURCE_DIR}/afm-system-
daemon.conf
+ ${CMAKE_CURRENT_SOURCE_DIR}/afm-system-
setup.service
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.service
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.target
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.service
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-session@.target
- ${CMAKE_CURRENT_SOURCE_DIR}/afm-user-setup@.path
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-setup@.service
DESTINATION
${UNITDIR_SYSTEM}
${CMAKE_CURRENT_SOURCE_DIR}/afm-user-setup@.service
DESTINATION
${UNITDIR_SYSTEM}