From c19613a7ca5fcd218a76ac4182adea9aa1357e48 Mon Sep 17 00:00:00 2001 From: spiritlhl <103393591+spiritLHLS@users.noreply.github.com> Date: Thu, 2 Nov 2023 03:32:09 +0000 Subject: [PATCH] 2023.11.02 --- scripts/buildct.sh | 8 ++++++-- scripts/buildct_onlyv6.sh | 8 ++++++-- scripts/buildvm.sh | 8 ++++++-- scripts/buildvm_extraip.sh | 8 ++++++-- scripts/buildvm_manual_ip.sh | 8 ++++++-- scripts/buildvm_onlyv6.sh | 8 ++++++-- 6 files changed, 36 insertions(+), 12 deletions(-) diff --git a/scripts/buildct.sh b/scripts/buildct.sh index c0ae5c1..12a7698 100644 --- a/scripts/buildct.sh +++ b/scripts/buildct.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.10.22 +# 2023.11.02 # ./buildct.sh CTID 密码 CPU核数 内存 硬盘 SSH端口 80端口 443端口 外网端口起 外网端口止 系统 存储盘 独立IPV6 # ./buildct.sh 102 1234567 1 512 5 20001 20002 20003 30000 30025 debian11 local N @@ -256,7 +256,11 @@ if [ "$independent_ipv6" == "y" ]; then if [ "$ipv6_prefixlen" -le 64 ]; then if [ ! -z "$ipv6_address" ] && [ ! -z "$ipv6_prefixlen" ] && [ ! -z "$ipv6_gateway" ] && [ ! -z "$ipv6_address_without_last_segment" ]; then if grep -q "vmbr2" /etc/network/interfaces; then - pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${ipv6_address_without_last_segment}1" + if grep -q "he-ipv6" /etc/network/interfaces > /dev/null; then + pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${ipv6_address_without_last_segment}2" + else + pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${ipv6_address_without_last_segment}1" + fi pct set $CTID --net1 name=eth1,ip=${user_ip}/24,bridge=vmbr1,gw=172.16.1.1 pct set $CTID --nameserver 8.8.8.8,2001:4860:4860::8888 --nameserver 8.8.4.4,2001:4860:4860::8844 independent_ipv6_status="Y" diff --git a/scripts/buildct_onlyv6.sh b/scripts/buildct_onlyv6.sh index a8fe732..7d5145f 100644 --- a/scripts/buildct_onlyv6.sh +++ b/scripts/buildct_onlyv6.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.10.22 +# 2023.11.02 # ./buildct_onlyv6.sh CTID 密码 CPU核数 内存 硬盘 系统 存储盘 # ./buildct_onlyv6.sh 102 1234567 1 512 5 debian11 local @@ -223,7 +223,11 @@ fi pct start $CTID pct set $CTID --hostname $CTID user_ip="172.16.1.${num}" -pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${ipv6_address_without_last_segment}1" +if grep -q "he-ipv6" /etc/network/interfaces > /dev/null; then + pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${ipv6_address_without_last_segment}2" +else + pct set $CTID --net0 name=eth0,ip6="${ipv6_address_without_last_segment}${CTID}/128",bridge=vmbr2,gw6="${ipv6_address_without_last_segment}1" +fi pct set $CTID --net1 name=eth1,ip=${user_ip}/24,bridge=vmbr1,gw=172.16.1.1 pct set $CTID --nameserver 8.8.8.8,2001:4860:4860::8888 --nameserver 8.8.4.4,2001:4860:4860::8844 sleep 3 diff --git a/scripts/buildvm.sh b/scripts/buildvm.sh index 37f3c7e..62090b6 100644 --- a/scripts/buildvm.sh +++ b/scripts/buildvm.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.10.03 +# 2023.11.02 # ./buildvm.sh VMID 用户名 密码 CPU核数 内存 硬盘 SSH端口 80端口 443端口 外网端口起 外网端口止 系统 存储盘 独立IPV6 # ./buildvm.sh 102 test1 1234567 1 512 5 40001 40002 40003 50000 50025 debian11 local N @@ -280,7 +280,11 @@ if [ "$independent_ipv6" == "y" ]; then if [ ! -z "$ipv6_address" ] && [ ! -z "$ipv6_prefixlen" ] && [ ! -z "$ipv6_gateway" ] && [ ! -z "$ipv6_address_without_last_segment" ]; then if grep -q "vmbr2" /etc/network/interfaces; then qm set $vm_num --ipconfig0 ip=${user_ip}/24,gw=172.16.1.1 - qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" + if grep -q "he-ipv6" /etc/network/interfaces > /dev/null; then + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}2" + else + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" + fi qm set $vm_num --nameserver 1.1.1.1 # qm set $vm_num --nameserver 1.0.0.1 qm set $vm_num --searchdomain local diff --git a/scripts/buildvm_extraip.sh b/scripts/buildvm_extraip.sh index e4505e9..1d9dab6 100644 --- a/scripts/buildvm_extraip.sh +++ b/scripts/buildvm_extraip.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.10.03 +# 2023.11.02 # 自动选择要绑定的IPV4地址 # ./buildvm_extraip.sh VMID 用户名 密码 CPU核数 内存 硬盘 系统 存储盘 是否附加IPV6(默认为N) # ./buildvm_extraip.sh 152 test1 1234567 1 512 5 debian11 local N @@ -325,7 +325,11 @@ if [ "$independent_ipv6" == "y" ]; then if [ ! -z "$ipv6_address" ] && [ ! -z "$ipv6_prefixlen" ] && [ ! -z "$ipv6_gateway" ] && [ ! -z "$ipv6_address_without_last_segment" ]; then if grep -q "vmbr2" /etc/network/interfaces; then qm set $vm_num --ipconfig0 ip=${user_ip}/${user_ip_range},gw=${gateway} - qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" + if grep -q "he-ipv6" /etc/network/interfaces > /dev/null; then + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}2" + else + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" + fi qm set $vm_num --nameserver 1.1.1.1 # qm set $vm_num --nameserver 1.0.0.1 qm set $vm_num --searchdomain local diff --git a/scripts/buildvm_manual_ip.sh b/scripts/buildvm_manual_ip.sh index de46474..46c40b1 100644 --- a/scripts/buildvm_manual_ip.sh +++ b/scripts/buildvm_manual_ip.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.10.03 +# 2023.11.02 # 手动指定要绑定的IPV4地址 # ./buildvm_manual_ip.sh VMID 用户名 密码 CPU核数 内存 硬盘 系统 存储盘 IPV4地址 是否附加IPV6(默认为N) @@ -328,7 +328,11 @@ if [ "$independent_ipv6" == "y" ]; then if [ ! -z "$ipv6_address" ] && [ ! -z "$ipv6_prefixlen" ] && [ ! -z "$ipv6_gateway" ] && [ ! -z "$ipv6_address_without_last_segment" ]; then if grep -q "vmbr2" /etc/network/interfaces; then qm set $vm_num --ipconfig0 ip=${user_ip}/${user_ip_range},gw=${gateway} - qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" + if grep -q "he-ipv6" /etc/network/interfaces > /dev/null; then + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}2" + else + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" + fi qm set $vm_num --nameserver 1.1.1.1 # qm set $vm_num --nameserver 1.0.0.1 qm set $vm_num --searchdomain local diff --git a/scripts/buildvm_onlyv6.sh b/scripts/buildvm_onlyv6.sh index 5f31772..d9176a8 100644 --- a/scripts/buildvm_onlyv6.sh +++ b/scripts/buildvm_onlyv6.sh @@ -1,7 +1,7 @@ #!/bin/bash # from # https://github.com/spiritLHLS/pve -# 2023.10.03 +# 2023.11.02 # 自动选择要绑定的IPV6地址 # ./buildvm_onlyv6.sh VMID 用户名 密码 CPU核数 内存 硬盘 系统 存储盘 # ./buildvm_onlyv6.sh 152 test1 1234567 1 512 5 debian11 local @@ -248,7 +248,11 @@ qm set $vm_num --nameserver 1.1.1.1 qm set $vm_num --searchdomain local user_ip="172.16.1.${num}" qm set $vm_num --ipconfig0 ip=${user_ip}/24,gw=172.16.1.1 -qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" +if grep -q "he-ipv6" /etc/network/interfaces > /dev/null; then + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}2" +else + qm set $vm_num --ipconfig1 ip6="${ipv6_address_without_last_segment}${vm_num}/128",gw6="${ipv6_address_without_last_segment}1" +fi qm set $vm_num --cipassword $password --ciuser $user sleep 5 qm resize $vm_num scsi0 ${disk}G