AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2024-11-22 17:39:53 +03:00
Code Releases Activity

Merge pull request #1456 from SoftEtherVPN/revert-1402-sm/rpm-pkg-fixes

Browse Source 
Merge PR #1456: Revert "RPM package and systemd service file fixes (for CentOS 8)"
This commit is contained in:
Ilya Shipitsin 2021-08-16 16:09:39 +05:00 committed by GitHub
commit 1e6806bee7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -87,7 +87,6 @@ if(UNIX)
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_PACKAGE_GROUP "Applications/Internet") set(CPACK_RPM_PACKAGE_GROUP "Applications/Internet")
set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0") set(CPACK_RPM_PACKAGE_LICENSE "ASL 2.0")
set(CPACK_RPM_COMMON_PACKAGE_PROVIDES "libcedar.so()(64bit)")
# Exclude system directories # Exclude system directories
if(CPACK_GENERATOR STREQUAL "RPM") if(CPACK_GENERATOR STREQUAL "RPM")
@ -96,9 +95,6 @@ if(UNIX)
COMMAND tr \n \; COMMAND tr \n \;
OUTPUT_VARIABLE CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION OUTPUT_VARIABLE CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
ERROR_QUIET) 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() endif()
include(CPack) include(CPack)

7
systemd/softether-vpnserver.service
View File

@ -16,11 +16,8 @@ Restart=on-failure
PrivateTmp=yes PrivateTmp=yes
ProtectHome=yes ProtectHome=yes
ProtectSystem=full ProtectSystem=full
ReadOnlyPaths=/ ReadOnlyDirectories=/
ReadWritePaths=-@DIR@/softether/vpnserver ReadWriteDirectories=-@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 CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYSLOG CAP_SETUID
[Install] [Install]