GuanM/hysteria
1
0
Fork 0
mirror of https://github.com/cedar2025/hysteria.git synced 2025-06-09 05:59:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1100 from apernet/fix-systemd-wd-centos7

Browse Source 
fix(scripts): WorkingDirectory on CentOS 7
This commit is contained in:
Toby 2024-05-25 11:11:05 -07:00 committed by GitHub
commit 146d077124
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/install_server.sh
View File

@ -187,6 +187,28 @@ chcon() {
command chcon "$@" command chcon "$@"
} }
get_systemd_version() {
if ! has_command systemctl; then
return
fi
command systemctl --version | head -1 | cut -d ' ' -f 2
}
systemd_unit_working_directory() {
local _systemd_version="$(get_systemd_version || true)"
# WorkingDirectory=~ requires systemd v227 or later.
# (released on Oct 2015, only CentOS 7 use an earlier version)
# ref: systemd/systemd@5f5d8eab1f2f5f5e088bc301533b3e4636de96c7
if [[ -n "$_systemd_version" && "$_systemd_version" -lt "227" ]]; then
echo "$HYSTERIA_HOME_DIR"
return
fi
echo "~"
}
get_selinux_context() { get_selinux_context() {
local _file="$1" local _file="$1"
@ -738,7 +760,7 @@ After=network.target
[Service] [Service]
Type=simple Type=simple
ExecStart=$EXECUTABLE_INSTALL_PATH server --config ${CONFIG_DIR}/${_config_name}.yaml ExecStart=$EXECUTABLE_INSTALL_PATH server --config ${CONFIG_DIR}/${_config_name}.yaml
WorkingDirectory=~ WorkingDirectory=$(systemd_unit_working_directory)
User=$HYSTERIA_USER User=$HYSTERIA_USER
Group=$HYSTERIA_USER Group=$HYSTERIA_USER
Environment=HYSTERIA_LOG_LEVEL=info Environment=HYSTERIA_LOG_LEVEL=info
@ -1023,22 +1045,26 @@ perform_install() {
_is_update_required=1 _is_update_required=1
fi fi
if [[ -z "$_is_update_required" ]]; then
echo "$(tgreen)Installed version is up-to-date, there is nothing to do.$(treset)"
return
fi
if is_hysteria1_version "$VERSION"; then if is_hysteria1_version "$VERSION"; then
error "This script can only install Hysteria 2." error "This script can only install Hysteria 2."
exit 95 exit 95
fi fi
if [[ -n "$_is_update_required" ]]; then
perform_install_hysteria_binary perform_install_hysteria_binary
fi
# Always install additional files, regardless of $_is_update_required.
# This allows changes to be made with environment variables (e.g. change HYSTERIA_USER without --force).
perform_install_hysteria_example_config perform_install_hysteria_example_config
perform_install_hysteria_home_legacy perform_install_hysteria_home_legacy
perform_install_hysteria_systemd perform_install_hysteria_systemd
if [[ -n "$_is_frash_install" ]]; then if [[ -z "$_is_update_required" ]]; then
echo
echo "$(tgreen)Installed version is up-to-date, there is nothing to do.$(treset)"
echo
elif [[ -n "$_is_frash_install" ]]; then
echo echo
echo -e "$(tbold)Congratulation! Hysteria 2 has been successfully installed on your server.$(treset)" echo -e "$(tbold)Congratulation! Hysteria 2 has been successfully installed on your server.$(treset)"
echo echo