From 81980cc47257afd7f348449ed6f8a0c9883f41b7 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Tue, 10 Oct 2023 15:16:56 +0800
Subject: [PATCH] =?UTF-8?q?[init]=20=E6=9B=B4=E6=96=B0Osaka=E8=8A=82?=
 =?UTF-8?q?=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/dataSources.local.xml                |  2 +-
 Public/dep/wdd-server-host.txt             |  4 ++++
 Public/init-script-wdd.sh                  | 27 +++++++++++++++-------
 Public/lib/wdd-lib-clean.sh                |  3 ---
 部署应用/Oracle-Cloud/所有集群的IP网段.txt | 10 +++-----
 5 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index bc152f7..339453d 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="dataSourceStorageLocal" created-in="IU-231.9225.16">
+  <component name="dataSourceStorageLocal" created-in="IU-231.9392.1">
     <data-source name="腾讯云-成都" uuid="79c9466f-d8a3-418a-b54a-f6e314306a0c">
       <database-info product="MySQL" version="8.0.27" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-java-8.0.25 (Revision: 08be9e9b4cba6aa115f9b27b215887af40b159e0)" dbms="MYSQL" exact-version="8.0.27" exact-driver-version="8.0">
         <extra-name-characters>#@</extra-name-characters>
diff --git a/Public/dep/wdd-server-host.txt b/Public/dep/wdd-server-host.txt
index 69b45d1..87536fa 100644
--- a/Public/dep/wdd-server-host.txt
+++ b/Public/dep/wdd-server-host.txt
@@ -22,6 +22,10 @@
 
 140.238.52.228 tokyo-2 t2
 
+140.83.84.142 osaka-1 o1
+
+140.83.58.96 osaka-2 o2
+
 42.192.52.227 tc-sh
 
 43.128.39.232 tc-hk
diff --git a/Public/init-script-wdd.sh b/Public/init-script-wdd.sh
index ca480de..f2cd1d0 100644
--- a/Public/init-script-wdd.sh
+++ b/Public/init-script-wdd.sh
@@ -108,13 +108,24 @@ shutdown_firewall() {
 add_octopus_host() {
   FunctionStart "添加Octopus自定义Hosts！"
 
-  if grep -q "140.238" </etc/hosts; then
-      warn "自定义的Hosts已经配置完成！ 跳过！"
-  else
-      log "开始下载 自定义的Hosts文件"
-      wget "$oss_url_prefix/wdd-server-host.txt" -O /tmp/wdd-server-host.txt
-      cat /tmp/wdd-server-host.txt >>/etc/hosts
-  fi
+  cat >/etc/hosts<<EOF
+127.0.0.1       localhost $(hostname)
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost   ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+ff02::3 ip6-allhosts
+127.0.1.1     $(hostname)
+
+EOF
+
+
+  log "开始下载 自定义的Hosts文件"
+  wget "$oss_url_prefix/wdd-server-host.txt" -O /tmp/wdd-server-host.txt
+  cat /tmp/wdd-server-host.txt >>/etc/hosts
+
 
   if grep -q "140.238" </etc/hosts; then
     colorEchoGreen "自定义hosts添加成功！"
@@ -870,7 +881,7 @@ main() {
   fi
 
   if [[ $is_install_host -eq 1 ]]; then
-      # 安装宇宙第一shell的zsh
+      # 添加自我服务器的所有hosts
       add_octopus_host
   fi
 
diff --git a/Public/lib/wdd-lib-clean.sh b/Public/lib/wdd-lib-clean.sh
index 0631f08..434e1f6 100644
--- a/Public/lib/wdd-lib-clean.sh
+++ b/Public/lib/wdd-lib-clean.sh
@@ -5,8 +5,6 @@ if [[ ! -f /root/wdd/lib/wdd-lib-log.sh ]]; then
 fi
 source /root/wdd/lib/wdd-lib-log.sh
 
-. ./wdd-lib-log.sh
-
 CleanOracleAgent() {
 
   FunctionStart
@@ -15,7 +13,6 @@ CleanOracleAgent() {
   snap stop oracle-cloud-agent
   snap remove oracle-cloud-agent
 
-  systemctl status snapd.service
 
   for i in $(ls /lib/systemd/system/ | grep snapd | awk '{print$1}'); do
     echo $i
diff --git a/部署应用/Oracle-Cloud/所有集群的IP网段.txt b/部署应用/Oracle-Cloud/所有集群的IP网段.txt
index 02fd2ec..c4976cd 100644
--- a/部署应用/Oracle-Cloud/所有集群的IP网段.txt
+++ b/部署应用/Oracle-Cloud/所有集群的IP网段.txt
@@ -6,16 +6,12 @@
 140.238.0.0/16
 # phonix send to boge
 #144.24.0.0/16
-# phonix
+# phonix amd
 129.146.0.0/16
-# london x64
-141.147.0.0/16
-# london arm
-132.145.0.0/16
+# osaka amd64
+140.83.0.0/16
 
 # tencent-shanghai
 42.192.52.227/32
-# tencent-chengdu
-43.136.177.228/32
 # tencent-hongkong
 43.154.83.213/32
\ No newline at end of file