diff --git a/bin/create_config_hysteria.sh b/bin/create_config_hysteria.sh index a607746..e46f788 100644 --- a/bin/create_config_hysteria.sh +++ b/bin/create_config_hysteria.sh @@ -32,9 +32,7 @@ create_hysteria_self_tls_config() { cp "$SCRIPT_DIR/../config/template/hysteria/hysteria_self_tls_config.json" "$CONFIG_FILE" # 生成自签名证书和设置域名 - local DOMAIN="bing.com" - create_self_tls_file "$DOMAIN" - sed -i "s/你的域名/$DOMAIN/g" "$CONFIG_FILE" + update_self_tls "$CONFIG_FILE" "bing.com" # 设置端口 update_port @@ -54,32 +52,7 @@ create_hysteria_acme_tls_config() { cp "$SCRIPT_DIR/../config/template/hysteria/hysteria_acme_tls_config.json" "$CONFIG_FILE" - # 获取邮箱 - local USER_EMAIL - read -p "请输入你的邮箱(可留空): " USER_EMAIL - if [[ -z "$USER_EMAIL" ]]; then - USER_EMAIL="example@example.com" - fi - - # 获取域名 - local USER_DOMAIN - read -p "请输入你的域名 (例如: example.com): " USER_DOMAIN - while [[ -z "$USER_DOMAIN" ]]; do - echo "[错误] 域名不能为空" - read -p "请输入你的域名: " USER_DOMAIN - done - - # 获取 Cloudflare API Token - local CLOUDFLARE_TOKEN - read -p "请输入你的 Cloudflare API Token: " CLOUDFLARE_TOKEN - while [[ -z "$CLOUDFLARE_TOKEN" ]]; do - echo "[错误] Cloudflare API Token 不能为空" - read -p "请输入你的 Cloudflare API Token: " CLOUDFLARE_TOKEN - done - - sed -i "s/你的邮箱/$USER_EMAIL/g" "$CONFIG_FILE" - sed -i "s/你的域名/$USER_DOMAIN/g" "$CONFIG_FILE" - sed -i "s/你的Cloudflare_API_Token/$CLOUDFLARE_TOKEN/g" "$CONFIG_FILE" + update_acme_tls "$CONFIG_FILE" # 设置端口 update_port diff --git a/bin/create_config_tuic.sh b/bin/create_config_tuic.sh index dc92f44..851bb64 100644 --- a/bin/create_config_tuic.sh +++ b/bin/create_config_tuic.sh @@ -32,32 +32,7 @@ create_tuic_acme_tls_config() { cp "$CONFIG_DIR/template/tuic/tuic_acme_tls_config.json" "$CONFIG_FILE" - # 获取邮箱 - local USER_EMAIL - read -p "请输入你的邮箱(可留空): " USER_EMAIL - if [[ -z "$USER_EMAIL" ]]; then - USER_EMAIL="example@example.com" - fi - - # 获取域名 - local USER_DOMAIN - read -p "请输入你的域名 (例如: example.com): " USER_DOMAIN - while [[ -z "$USER_DOMAIN" ]]; do - echo "[错误] 域名不能为空" - read -p "请输入你的域名: " USER_DOMAIN - done - - # 获取 Cloudflare API Token - local CLOUDFLARE_TOKEN - read -p "请输入你的 Cloudflare API Token: " CLOUDFLARE_TOKEN - while [[ -z "$CLOUDFLARE_TOKEN" ]]; do - echo "[错误] Cloudflare API Token 不能为空" - read -p "请输入你的 Cloudflare API Token: " CLOUDFLARE_TOKEN - done - - sed -i "s/你的邮箱/$USER_EMAIL/g" "$CONFIG_FILE" - sed -i "s/你的域名/$USER_DOMAIN/g" "$CONFIG_FILE" - sed -i "s/你的Cloudflare_API_Token/$CLOUDFLARE_TOKEN/g" "$CONFIG_FILE" + update_acme_tls "$CONFIG_FILE" # 设置端口 update_port @@ -78,9 +53,7 @@ create_tuic_self_tls_config() { cp "$SCRIPT_DIR/../config/template/tuic/tuic_self_tls_config.json" "$CONFIG_FILE" # 生成自签名证书和设置域名 - local DOMAIN="bing.com" - create_self_tls_file "$DOMAIN" - sed -i "s/你的域名/$DOMAIN/g" "$CONFIG_FILE" + update_self_tls "$CONFIG_FILE" "bing.com" # 设置端口 update_port diff --git a/bin/tls.sh b/bin/tls.sh index ccf9dcf..b7b4abd 100644 --- a/bin/tls.sh +++ b/bin/tls.sh @@ -18,28 +18,36 @@ create_self_tls_file() { } update_self_tls(){ - local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 - local CONFIG_DIR=$(readlink -f "$SCRIPT_DIR/../config") - local CONFIG_FILE="$CONFIG_DIR/config.json" + local CONFIG_FILE="${1:-}" + local DOMAIN="${2:-bing.com}" # 域名,默认为bing.com + + if [[ -z "$CONFIG_FILE" ]]; then + local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + local CONFIG_DIR=$(readlink -f "$SCRIPT_DIR/../config") + CONFIG_FILE="$CONFIG_DIR/config.json" + fi # 生成自签名证书, 设置域名 - local DOMAIN="${1:-bing.com}" # 域名,默认为bing.com create_self_tls_file "$DOMAIN" sed -i "s/你的域名/$DOMAIN/g" "$CONFIG_FILE" } update_acme_tls(){ - local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 - local CONFIG_DIR=$(readlink -f "$SCRIPT_DIR/../config") - local CONFIG_FILE="$CONFIG_DIR/config.json" + local CONFIG_FILE="${1:-}" + + if [[ -z "$CONFIG_FILE" ]]; then + local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + local CONFIG_DIR=$(readlink -f "$SCRIPT_DIR/../config") + CONFIG_FILE="$CONFIG_DIR/config.json" + fi # 获取邮箱 local USER_EMAIL read -p "请输入你的邮箱: " USER_EMAIL - if [[ -z "$USER_EMAIL" ]]; then - echo "[错误] 域名不能为空" - read -p "请输入你的邮箱: " USER_EMAIL - fi + while [[ -z "$USER_EMAIL" ]]; do + echo "[错误] 邮箱不能为空" + read -p "请输入你的邮箱: " USER_EMAIL + done # 获取域名 local USER_DOMAIN