Merge remote-tracking branch 'origin/master'

v2ray示例/Xray-中级方案/香港实际使用的Xray配置-新.json

@@ -0,0 +1,77 @@
+{
+  "log": {
+    "loglevel": "error"
+  },
+  "inbounds": [
+    {
+      "protocol": "trojan",
+      "listen": "0.0.0.0",
+      "port": 443,
+      "settings": {
+        "clients": [
+          {
+            "password": "V2ryStr0ngP0ss"
+          }
+        ]
+      },
+      "streamSettings": {
+        "network": "tcp",
+        "security": "tls",
+        "tlsSettings": {
+          "alpn": [
+            "h2",
+            "http/1.1"
+          ],
+          "certificates": [
+            {
+              "certificateFile": "/root/.acme.sh/xx.tc.hk.go.107421.xyz_ecc/fullchain.cer",
+              "keyFile": "/root/.acme.sh/xx.tc.hk.go.107421.xyz_ecc/xx.tc.hk.go.107421.xyz.key"
+            }
+          ]
+        }
+      },
+      "tag": "hongkong-trojan"
+    },
+    {
+      "port": 29999,
+      "protocol": "vless",
+      "settings": {
+        "clients": [
+          {
+            "id": "fc903f5d-a007-482b-928c-570da9a851f9",
+            "flow": "xtls-rprx-vision"
+          }
+        ],
+        "decryption": "none"
+      },
+      "streamSettings": {
+        "network": "tcp",
+        "security": "reality",
+        "realitySettings": {
+          "dest": "xx.tc.hk.go.107421.xyz:443",
+          "serverNames": [
+            "xx.tc.hk.go.107421.xyz"
+          ],
+          "privateKey": "eOuEdWwYFkhKHAq6lhx3Txq2H7rZ9uy1csbKt4Jkq0E",
+          "shortIds": [
+            "ad570cbfab"
+          ]
+        }
+      },
+      "sniffing": {
+        "enabled": true,
+        "destOverride": [
+          "http",
+          "tls",
+          "quic"
+        ],
+        "routeOnly": true
+      }
+    }
+  ],
+  "outbounds": [
+    {
+      "protocol": "freedom"
+    }
+  ]
+}

v2ray示例/Xray-中级方案/香港证书申请模板.txt

@@ -0,0 +1,12 @@
+export DOMAIN_NAME=xx.tc.hk.go.107421.xyz
+
+export CF_Token="oXJRP5XI8Zhipa_PtYtB_jy6qWL0I9BosrJEYE8p"
+export CF_Account_ID="dfaadeb83406ef5ad35da02617af9191"
+export CF_Zone_ID="511894a4f1357feb905e974e16241ebb"
+
+acme.sh   --issue   --dns dns_cf -d ${DOMAIN_NAME} --keylength ec-256
+
+chmod -R 644 /root/.acme.sh/xx.tc.hk.go.107421.xyz_ecc/fullchain.cer
+chmod 644 /root/.acme.sh/xx.tc.hk.go.107421.xyz_ecc/xx.tc.hk.go.107421.xyz.key
+
+systemctl restart xray && sleep 1 && systemctl status xray

常用脚本/磁盘扩容.sh

@@ -5,7 +5,7 @@ echo "n
 p
 
 
-
++5G
 t
 
 8e
@@ -15,11 +15,11 @@ w
 
 
 partprobe
-pvcreate /dev/sdc1
-vgextend rootvg /dev/sdc1
-export selfpesize=$(vgdisplay rootvg | grep 'Total PE' | awk '{print $3}')
-lvextend -l+${selfpesize} /dev/mapper/rootvg-lvvar
-xfs_growfs /dev/mapper/rootvg-lvroot
+pvcreate /dev/sdc2
+vgextend rootvg /dev/sdc2
+export selfpesize=$(vgdisplay rootvg | grep 'Free' | awk '{print $5}')
+lvextend -l+${selfpesize} /dev/mapper/rootvg-lvusr
+xfs_growfs /dev/mapper/rootvg-lvusr
 
 
 <h3>k8s节点扩容</h3>
@@ -163,6 +163,12 @@ repo_gpgcheck=0
 gpgkey=https://mirrors.aliyun.com/kubernetes/yum/doc/yum-key.gpg https://mirrors.aliyun.com/kubernetes/yum/doc/rpm-package-key.gpg
 EOF
 
+yum install -y kubelet-1.18.0-0.x86_64 --disableexcludes=kubernetes
+yum install -y kubeadm-1.18.0-0.x86_64 --disableexcludes=kubernetes
+yum downgrade -y kubectl-1.18.0-0.x86_64 --disableexcludes=kubernetes
+rpm -qa |grep kube
+systemctl enable --now kubelet
+
 
 yum install -y kubelet-1.20.4-0.x86_64 --disableexcludes=kubernetes
 yum install -y kubeadm-1.20.4-0.x86_64 --disableexcludes=kubernetes
@@ -171,11 +177,6 @@ rpm -qa |grep kube
 systemctl enable --now kubelet （这里kubelet会一直报错重启，这是正常的，因为需要等待kubeadmin）
 
 
-yum install -y kubelet-1.18.0-0.x86_64 --disableexcludes=kubernetes
-yum install -y kubeadm-1.18.0-0.x86_64 --disableexcludes=kubernetes
-yum downgrade -y kubectl-1.18.0-0.x86_64 --disableexcludes=kubernetes
-rpm -qa |grep kube
-systemctl enable --now kubelet
 ```
 
 <h5>6.加入集群</h5>