v/xiringuito
1
0
Fork 0
mirror of https://github.com/ivanilves/xiringuito.git synced 2025-05-19 08:40:09 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/server-path-env-var'

Browse Source 
* fix/server-path-env-var:
  Solve (?) CentOS6 environment / PATH issue
This commit is contained in:
Ivan Ilves 2017-04-24 15:35:41 +02:00
commit 0d0669c335
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/server-execute.sh
View File

@ -15,6 +15,10 @@ declare -r NETWORK_DEVICE=tun${TUNNEL_ID}
let CLIENT_LAST_IP_ADDR_OCTET="4*(${TUNNEL_ID}-1)+1" let CLIENT_LAST_IP_ADDR_OCTET="4*(${TUNNEL_ID}-1)+1"
declare -r CLIENT_IP_ADDR=${IP_BASE}.${CLIENT_LAST_IP_ADDR_OCTET} declare -r CLIENT_IP_ADDR=${IP_BASE}.${CLIENT_LAST_IP_ADDR_OCTET}
if [[ ! $(echo "${PATH}" | egrep "(^|:)/sbin($|:)") ]]; then
export PATH="/sbin:${PATH}"
fi
trap teardown EXIT trap teardown EXIT
function teardown() { function teardown() {

4
scripts/server-setup.sh
View File

@ -20,6 +20,10 @@ declare -r SERVER_IP_ADDR=${IP_BASE}.${SERVER_LAST_IP_ADDR_OCTET}
declare -r SSHD_CONFIG_FILE=/etc/ssh/sshd_config declare -r SSHD_CONFIG_FILE=/etc/ssh/sshd_config
if [[ ! $(echo "${PATH}" | egrep "(^|:)/sbin($|:)") ]]; then
export PATH="/sbin:${PATH}"
fi
if [[ -x /bin/systemctl && -f /lib/systemd/system/ssh.service ]]; then if [[ -x /bin/systemctl && -f /lib/systemd/system/ssh.service ]]; then
declare -r SSHD_RESTART_CMD="systemctl reload ssh" declare -r SSHD_RESTART_CMD="systemctl reload ssh"
elif [[ -f /etc/init/ssh.conf ]]; then elif [[ -f /etc/init/ssh.conf ]]; then