From 40e62f975b198f5b096bbf95745f71b61881dd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=9D=A6?= Date: Sat, 15 Mar 2025 19:47:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=B0=86=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E4=BB=8E=20www=20=E9=87=8D=E5=91=BD=E5=90=8D?= =?UTF-8?q?=E4=B8=BA=20nginx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 default、git、note 目录下的 README.md 文件从 www目录移动到 nginx 目录 - 更新文件内容中的下载路径,从 www 改为 nginx- 修改 note 目录下的 deploy.sh 脚本执行路径 --- nginx/{git => git.sugarscat.cn}/README.md | 4 +-- nginx/{git => git.sugarscat.cn}/nginx.conf | 0 nginx/{note => note.sugarscat.cn}/README.md | 4 +-- nginx/{note => note.sugarscat.cn}/deploy.sh | 0 nginx/{note => note.sugarscat.cn}/nginx.conf | 0 nginx/website/deploy.sh | 33 -------------------- 6 files changed, 4 insertions(+), 37 deletions(-) rename nginx/{git => git.sugarscat.cn}/README.md (82%) rename nginx/{git => git.sugarscat.cn}/nginx.conf (100%) rename nginx/{note => note.sugarscat.cn}/README.md (90%) rename nginx/{note => note.sugarscat.cn}/deploy.sh (100%) rename nginx/{note => note.sugarscat.cn}/nginx.conf (100%) diff --git a/nginx/git/README.md b/nginx/git.sugarscat.cn/README.md similarity index 82% rename from nginx/git/README.md rename to nginx/git.sugarscat.cn/README.md index 79a0f79..f66faac 100644 --- a/nginx/git/README.md +++ b/nginx/git.sugarscat.cn/README.md @@ -7,13 +7,13 @@ 下载配置 ```bash -curl -fsSL https://git.sugarscat.cn/me/bash/-/raw/main/nginx/git/nginx.conf > /etc/nginx/sites-available/git.sugarscat.cn +curl -fsSL https://git.sugarscat.cn/me/bash/-/raw/main/nginx/git.sugarscat.cn/nginx.conf > /etc/nginx/sites-available/git.sugarscat.cn ``` 启用配置 ```bash -ln -s /etc/nginx/sites-available/git.sugarscat.cn /etc/nginx/sites-enabled/git.sugarscat.cn +ln -s /etc/nginx/sites-available/git.sugarscat.cn /etc/nginx/sites-enabled/ ``` 测试配置 diff --git a/nginx/git/nginx.conf b/nginx/git.sugarscat.cn/nginx.conf similarity index 100% rename from nginx/git/nginx.conf rename to nginx/git.sugarscat.cn/nginx.conf diff --git a/nginx/note/README.md b/nginx/note.sugarscat.cn/README.md similarity index 90% rename from nginx/note/README.md rename to nginx/note.sugarscat.cn/README.md index 9234dea..36a7544 100644 --- a/nginx/note/README.md +++ b/nginx/note.sugarscat.cn/README.md @@ -35,13 +35,13 @@ crontab -l 下载配置 ```bash -curl -fsSL https://git.sugarscat.cn/me/bash/-/raw/main/nginx/note/nginx.conf > /etc/nginx/sites-available/note.sugarscat.cn +curl -fsSL https://git.sugarscat.cn/me/bash/-/raw/main/nginx/note.sugarscat.cn/nginx.conf > /etc/nginx/sites-available/note.sugarscat.cn ``` 启用配置 ```bash -ln -s /etc/nginx/sites-available/note.sugarscat.cn /etc/nginx/sites-enabled/note.sugarscat.cn +ln -s /etc/nginx/sites-available/note.sugarscat.cn /etc/nginx/sites-enabled/ ``` 测试配置 diff --git a/nginx/note/deploy.sh b/nginx/note.sugarscat.cn/deploy.sh similarity index 100% rename from nginx/note/deploy.sh rename to nginx/note.sugarscat.cn/deploy.sh diff --git a/nginx/note/nginx.conf b/nginx/note.sugarscat.cn/nginx.conf similarity index 100% rename from nginx/note/nginx.conf rename to nginx/note.sugarscat.cn/nginx.conf diff --git a/nginx/website/deploy.sh b/nginx/website/deploy.sh index 9e0d577..e69de29 100644 --- a/nginx/website/deploy.sh +++ b/nginx/website/deploy.sh @@ -1,33 +0,0 @@ -#!/bin/bash - -# 开启严格模式 -set -e - -# 定义变量 -REPO_URL="https://git.sugarscat.cn/me/website" -TARGET_DIR="/var/www/website" -DIST_DIR="dist" -TEMP_DIR=$(mktemp -d) # 生成临时目录 - -# 清理临时目录的函数(在脚本退出时执行) -cleanup() { - rm -rf "$TEMP_DIR" -} -trap cleanup EXIT - -echo "开始下载最新构建产物..." -curl -L -o "$TEMP_DIR/artifact.zip" "$REPO_URL/-/jobs/artifacts/main/download?job=build" - -echo "解压文件..." -unzip -q "$TEMP_DIR/artifact.zip" -d "$TEMP_DIR" - -# 确保目标目录存在 -sudo mkdir -p "$TARGET_DIR" - -echo "清空目标目录..." -sudo rm -rf "$TARGET_DIR"/* - -echo "移动文件到目标目录..." -sudo mv "$TEMP_DIR/$DIST_DIR"/* "$TARGET_DIR" - -echo "部署完成!"