diff --git a/CMakeLists.txt b/CMakeLists.txt index 4279541..8f1880d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set (CMAKE_INSTALL_PREFIX "/home/mesasoft/tfe" CACHE PATH "default install path" FORCE ) + set (CMAKE_INSTALL_PREFIX "/opt/tsg/tfe" CACHE PATH "default install path" FORCE ) endif() # Global compile options diff --git a/script/CMakeLists.txt b/script/CMakeLists.txt index 791e1d5..b9f1fd9 100644 --- a/script/CMakeLists.txt +++ b/script/CMakeLists.txt @@ -1,7 +1,6 @@ -install(PROGRAMS user/r2_tfe DESTINATION ./ COMPONENT Program) -install(PROGRAMS user/r3_tfe DESTINATION ./ COMPONENT Program) -install(FILES sysctl/80-tfe.conf DESTINATION /etc/sysctl.d/ COMPONENT Program) install(FILES service/tfe.service DESTINATION /usr/lib/systemd/system/ COMPONENT Program) install(FILES service/tfe-env-tun-mode.service DESTINATION /usr/lib/systemd/system/ COMPONENT Program) install(FILES service/tfe-env.service DESTINATION /usr/lib/systemd/system/ COMPONENT Program) +install(FILES sysctl/80-tfe.conf DESTINATION /etc/sysctl.d/ COMPONENT Profile) +install(FILES tmpfiles/tfe.conf DESTINATION /usr/lib/tmpfiles.d/ COMPONENT Profile) install(FILES service/tfe-env-config DESTINATION /etc/sysconfig/ COMPONENT Profile) diff --git a/script/service/tsgkni.service b/script/service/tsgkni.service deleted file mode 100644 index 993a8f5..0000000 --- a/script/service/tsgkni.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=tsg kni module -Requires=tfe-env.service -After=tfe-env.service - -[Service] -WorkingDirectory=/home/tsg/kni -#ExecStart=/home/tsg/kni/kni_service_scipt start -ExecStart=/home/tsg/kni/sapp -#ExecStop=/home/tsg/kni/kni_service_scipt stop -#Type=forking -Restart=always -RestartSec=5s - -[Install] -WantedBy=multi-user.target diff --git a/script/service/tsgtfe.service b/script/service/tsgtfe.service deleted file mode 100644 index 7d490a4..0000000 --- a/script/service/tsgtfe.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=tsg tfe module -Requires=tsgkni.service -After=tsgkni.service - -[Service] -WorkingDirectory=/home/tsg/tfe/ -ExecStart=/home/tsg/tfe/bin/tfe -ExecStop=/bin/kill -9 $MAINPID -Restart=always -RestartSec=5s - -[Install] -WantedBy=multi-user.target diff --git a/script/tmpfiles/tfe.conf b/script/tmpfiles/tfe.conf new file mode 100644 index 0000000..fd69fcf --- /dev/null +++ b/script/tmpfiles/tfe.conf @@ -0,0 +1,8 @@ +#Type Path Mode User Group Age Argument +d /var/log/tfe/ 0755 - - 7d - +d /var/tmp/tfe/crashreport 0755 - - 30d - +d /var/tmp/tfe/pangu_files 0755 - - - 30d - +d /var/tmp/tfe/rulescan_tmp 0755 - - - 30d - +L /opt/tsg/tfe/log - - - - /var/log/tfe +L /opt/tsg/tfe/pangu_files - - - - /var/tmp/tfe/pangu_files +L /opt/tsg/tfe/rulescan_tmp - - - - /var/tmp/tfe/rulescan_tmp