gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#165 增加PostInstall脚本，用于创建临时文件存储的目录。

Browse Source
This commit is contained in:
luqiuwen
2019-09-17 10:51:31 +08:00
parent 1d45bebe4f
commit fb22ab1cb6
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/Package.cmake
View File

@@ -19,9 +19,9 @@ set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_RPM_PACKAGE_AUTOREQPROV "no") set(CPACK_RPM_PACKAGE_AUTOREQPROV "no")
set(CPACK_RPM_PACKAGE_RELEASE_DIST on) set(CPACK_RPM_PACKAGE_RELEASE_DIST on)
set(CPACK_RPM_DEBUGINFO_PACKAGE on) set(CPACK_RPM_DEBUGINFO_PACKAGE on)
#set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in) set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostInstall.in)
#set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in) set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PostUninstall.in)
#set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in) set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE ${CMAKE_SOURCE_DIR}/cmake/PreUninstall.in)
# Must uninstall the debug package before install release package # Must uninstall the debug package before install release package
if(CMAKE_BUILD_TYPE STREQUAL "Debug") if(CMAKE_BUILD_TYPE STREQUAL "Debug")

6
cmake/PostInstall.in
View File

@@ -1,2 +1,4 @@
%systemd_post mrenv.service mrzcpd.service mrtunnat.service %systemd_post tfe-env.service tfe-env-tun-mode.service tfe.service
/sbin/ldconfig %sysctl_apply
%tmpfiles_create
/sbin/ldconfig

6
cmake/PostUninstall.in
View File

@@ -1,2 +1,4 @@
%systemd_postun_with_restart mrenv.service mrzcpd.service mrtunnat.service %systemd_postun_with_restart tfe-env.service tfe-env-tun-mode.service tfe.service
/sbin/ldconfig %sysctl_apply
%tmpfiles_create
/sbin/ldconfig

4
cmake/PreUninstall.in
View File

@@ -1 +1,3 @@
%systemd_preun mrenv.service mrzcpd.service mrtunnat.service %systemd_preun tfe-env.service tfe-env-tun-mode.service tfe.service
%sysctl_apply
%tmpfiles_create

2
script/service/tfe-env-config
View File

@@ -1,4 +1,3 @@
TFE_DEVICE_DATA_INCOMING=tun_kni TFE_DEVICE_DATA_INCOMING=tun_kni
TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:00:00:01 TFE_LOCAL_MAC_DATA_INCOMING=fe:65:b7:00:00:01
TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff TFE_PEER_MAC_DATA_INCOMING=aa:bb:cc:dd:ee:ff
@@ -6,4 +5,3 @@ TFE_LOCAL_IP_DATA_INCOMING=172.16.241.2
TFE_PEER_IP_DATA_INCOMING=172.16.241.1 TFE_PEER_IP_DATA_INCOMING=172.16.241.1
TFE_WATCHDOG_DEVICE=enp2s0 TFE_WATCHDOG_DEVICE=enp2s0
TFE_WATCHDOG_IP=192.168.100.1 TFE_WATCHDOG_IP=192.168.100.1

1
script/service/tfe.service
View File

@@ -6,6 +6,7 @@ After=tfe-env.service
[Service] [Service]
Type=simple Type=simple
ExecStart=/opt/tsg/tfe/bin/tfe ExecStart=/opt/tsg/tfe/bin/tfe
WorkingDirectory=/opt/tsg/tfe/
TimeoutSec=180s TimeoutSec=180s
RestartSec=10s RestartSec=10s
Restart=always Restart=always