github
/
v2ray-agent
mirror of https://github.com/mack-a/v2ray-agent
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(脚本): merge

pull/534/merge
mack-a 2020-12-25 10:15:22 +08:00
parent 4c5c803727 6c68d36542
commit 22909fdca3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
install.sh
View File

@ -479,7 +479,7 @@ initTLSNginxConfig(){
# 修改配置 # 修改配置
echoContent green "\n ---> 配置Nginx" echoContent green "\n ---> 配置Nginx"
touch /etc/nginx/conf.d/alone.conf touch /etc/nginx/conf.d/alone.conf
echo "server {listen [::]:80;server_name ${domain};root /usr/share/nginx/html;location ~ /.well-known {allow all;}location /test {return 200 'fjkvymb6len';}}" > /etc/nginx/conf.d/alone.conf echo "server {listen 80;listen [::]:80;server_name ${domain};root /usr/share/nginx/html;location ~ /.well-known {allow all;}location /test {return 200 'fjkvymb6len';}}" > /etc/nginx/conf.d/alone.conf
# 启动nginx # 启动nginx
handleNginx start handleNginx start
echoContent yellow "\n检查IP是否设置为当前VPS" echoContent yellow "\n检查IP是否设置为当前VPS"
@ -503,6 +503,7 @@ updateRedirectNginxConf(){
cat << EOF > /etc/nginx/conf.d/alone.conf cat << EOF > /etc/nginx/conf.d/alone.conf
server { server {
listen 80; listen 80;
listen [::]:80;
server_name ${domain}; server_name ${domain};
return 301 https://${domain}$request_uri; return 301 https://${domain}$request_uri;
} }
@ -521,11 +522,11 @@ EOF
# 检查ip # 检查ip
checkIP(){ checkIP(){
echoContent skyblue " ---> 检查ipv4中" echoContent skyBlue " ---> 检查ipv4中"
pingIP=`ping -c 1 -W 1000 ${domain}|sed '1{s/[^(]*(//;s/).*//;q;}'` pingIP=`ping -c 1 -W 1000 ${domain}|sed '1{s/[^(]*(//;s/).*//;q;}'`
if [[ -z "${pingIP}" ]] if [[ -z "${pingIP}" ]]
then then
echoContent skyblue " ---> 检查ipv6中" echoContent skyBlue " ---> 检查ipv6中"
pingIP=`ping6 -c 1 ${domain}|sed '1{s/[^(]*(//;s/).*//;q;}'` pingIP=`ping6 -c 1 ${domain}|sed '1{s/[^(]*(//;s/).*//;q;}'`
pingIPv6=${pingIP} pingIPv6=${pingIP}
fi fi
@ -558,17 +559,13 @@ installTLS(){
if [[ -z `ls /etc/v2ray-agent/tls|grep ${domain}.crt` ]] && [[ -z `ls /etc/v2ray-agent/tls|grep ${domain}.key` ]] if [[ -z `ls /etc/v2ray-agent/tls|grep ${domain}.crt` ]] && [[ -z `ls /etc/v2ray-agent/tls|grep ${domain}.key` ]]
then then
echoContent green " ---> 安装TLS证书" echoContent green " ---> 安装TLS证书"
echoContent red pingIPv6:${pingIPv6}
if [[ ! -z "${pingIPv6}" ]] if [[ ! -z "${pingIPv6}" ]]
then then
echo
sudo ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --listen-v6 >/dev/null sudo ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 --listen-v6 >/dev/null
else else
echo
sudo ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 >/dev/null sudo ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 >/dev/null
fi fi
# sudo ~/.acme.sh/acme.sh --issue -d ${domain} --standalone -k ec-256 >/dev/null
~/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /etc/v2ray-agent/tls/${domain}.crt --keypath /etc/v2ray-agent/tls/${domain}.key --ecc >/dev/null ~/.acme.sh/acme.sh --installcert -d ${domain} --fullchainpath /etc/v2ray-agent/tls/${domain}.crt --keypath /etc/v2ray-agent/tls/${domain}.key --ecc >/dev/null
if [[ -z `cat /etc/v2ray-agent/tls/${domain}.crt` ]] if [[ -z `cat /etc/v2ray-agent/tls/${domain}.crt` ]]
then then
@ -609,6 +606,7 @@ initNginxConfig(){
cat << EOF > /etc/nginx/conf.d/alone.conf cat << EOF > /etc/nginx/conf.d/alone.conf
server { server {
listen 80;
listen [::]:80; listen [::]:80;
server_name ${domain}; server_name ${domain};
root /usr/share/nginx/html; root /usr/share/nginx/html;