mptcp/openmptcprouter-vps
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-vps.git synced 2025-03-09 15:50:00 +00:00
Code Issues Releases Wiki Activity

Add a test for a China compatible script

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-03-23 19:41:26 +00:00
parent 9a764d0eaf
commit 98ee07f6a6
1 changed files with 38 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

46
debian9-x86_64.sh
View file

@ -60,6 +60,7 @@ VPS_DOMAIN=${VPS_DOMAIN:-$(wget -4 -qO- -T 2 http://hostname.openmptcprouter.com
VPSPATH="server-test" VPSPATH="server-test"
VPSURL="https://www.openmptcprouter.com/" VPSURL="https://www.openmptcprouter.com/"
REPO="repo.openmptcprouter.com" REPO="repo.openmptcprouter.com"
CHINA=${CHINA:-no}
OMR_VERSION="0.1025-test" OMR_VERSION="0.1025-test"
@ -176,16 +177,45 @@ if [ "$ID" = "ubuntu" ] && [ "$VERSION_ID" = "18.04" ] && [ "$UPDATE_OS" = "yes"
apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" dist-upgrade apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confnew" dist-upgrade
VERSION_ID="20.04" VERSION_ID="20.04"
fi fi
# Add OpenMPTCProuter repo # Add OpenMPTCProuter repo
echo "Add OpenMPTCProuter repo..." echo "Add OpenMPTCProuter repo..."
echo "deb [arch=amd64] https://${REPO} buster main" > /etc/apt/sources.list.d/openmptcprouter.list if [ "$CHINA" = "yes" ]; then
cat <<EOF | tee /etc/apt/preferences.d/openmptcprouter.pref echo "Install git..."
Explanation: Prefer OpenMPTCProuter provided packages over the Debian native ones apt-get -y install git
Package: * if [ ! -d /var/lib/openmptcprouter-vps-debian ]; then
Pin: origin ${REPO} git clone https://gitee.com/ysurac/openmptcprouter-vps-debian.git /var/lib/openmptcprouter-vps-debian
Pin-Priority: 1001 fi
EOF cd /var/lib/openmptcprouter-vps-debian
wget -O - https://${REPO}/openmptcprouter.gpg.key | apt-key add - git pull
# if [ "$VPS_PATH" = "server-test" ]; then
# git checkout develop
# else
# git checkout main
# fi
echo "deb [arch=amd64] file:/var/lib/openmptcprouter-vps-debian ./" > /etc/apt/sources.list.d/openmptcprouter.list
cat /var/lib/openmptcprouter-vps-debian | apt-key add -
if [ ! -d /usr/share/omr-server ]; then
git clone https://gitee.com/ysurac/openmptcprouter-vps.git /usr/share/omr-server
fi
cd /usr/share/omr-server
git pull
if [ "$VPS_PATH" = "server-test" ]; then
git checkout develop
else
git checkout master
fi
DIR="/usr/share/omr-server"
else
echo "deb [arch=amd64] https://${REPO} buster main" > /etc/apt/sources.list.d/openmptcprouter.list
cat <<-EOF | tee /etc/apt/preferences.d/openmptcprouter.pref
Explanation: Prefer OpenMPTCProuter provided packages over the Debian native ones
Package: *
Pin: origin ${REPO}
Pin-Priority: 1001
EOF
wget -O - https://${REPO}/openmptcprouter.gpg.key | apt-key add -
fi
#apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys 379CE192D401AB61 #apt-key adv --keyserver hkp://keys.gnupg.net --recv-keys 379CE192D401AB61
if [ "$ID" = "debian" ]; then if [ "$ID" = "debian" ]; then