Merge pull request #1402 from stevemuskiewicz/sm/rpm-pkg-fixes

Merge PR #1402: RPM package and systemd service file fixes (for CentOS 8)
This commit is contained in:
Ilya Shipitsin authored and GitHub committed 2021-08-16 11:31:13 +05:00
commit 024b68120d
2 files changed
+9 -2

No files matched your search

+4
View File
@@ -87,6 +87,7 @@ if(UNIX)
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_PACKAGE_GROUP "Applications/Internet")
set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
set(CPACK_RPM_COMMON_PACKAGE_PROVIDES "libcedar.so()(64bit)")
# Exclude system directories
if(CPACK_GENERATOR STREQUAL "RPM")
@@ -95,6 +96,9 @@ if(UNIX)
COMMAND tr \n \;
OUTPUT_VARIABLE CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
ERROR_QUIET)
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib")
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd")
list(APPEND CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system")
endif()
include(CPack)
+5 -2
View File
@@ -16,8 +16,11 @@ Restart=on-failure
PrivateTmp=yes
ProtectHome=yes
ProtectSystem=full
ReadOnlyDirectories=/
ReadWriteDirectories=-@DIR@/softether/vpnserver
ReadOnlyPaths=/
ReadWritePaths=-@DIR@/softether/vpnserver
ReadWritePaths=@CPACK_PACKAGING_INSTALL_PREFIX@/run/softether
ReadWritePaths=@CPACK_PACKAGING_INSTALL_PREFIX@/var/log/softether
ReadWritePaths=@CPACK_PACKAGING_INSTALL_PREFIX@/var/lib/softether
CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYSLOG CAP_SETUID
[Install]