refactor(paths): 拆 source/ 包层,顶层与 ipass/ipass 对齐
- source/rust → rust/ - source/conf → conf/ - source/www → www/ - source/data-seed → data-seed/ - source/data → data/ - scripts/ 保留(语义不对应 ipass deploy/) - /build/ 加入 .gitignore(本机 nginx 源码树) - README.md 目录树同步 + build 路径 /tmp/sso-build → ./build - Cargo.toml path 依赖 '../../deps/ipass' → '../deps/ipass' - CLAUDE.md 同步路径示例 cargo check 通过(52s);release build 通过(1m26s),产物 libsso_gateway.dylib
This commit is contained in:
1 parent
f9c2324c47
commit
1e2b117218
50 files changed
+138
-136
No files matched your search
+10
-10
@@ -6,9 +6,9 @@
|
||||
#
|
||||
# 不依赖 Docker。动态模块必须对着「同一份 nginx 源码 + 相同 configure」的
|
||||
# nginx 二进制编译加载,所以本脚本假定:
|
||||
# - nginx 源码树:${NGINX_SRC}(默认 /tmp/sso-build/src/nginx-1.30.4)
|
||||
# - nginx 源码树:${NGINX_SRC}(默认 ./build/src/nginx-1.30.4)
|
||||
# - nginx 二进制:${NGINX_BIN}(默认 $NGINX_SRC/objs/nginx)
|
||||
# - Rust 模块 :$ROOT/source/rust/target/release/libsso_gateway.{dylib,so}
|
||||
# - Rust 模块 :$ROOT/rust/target/release/libsso_gateway.{dylib,so}
|
||||
#
|
||||
# 会一并拉起 demo-system(Python 标准库,:18096),用于验证:
|
||||
# - MaxKey 端点别名 / context-path 归一化 (tests/oauth2-maxkey-e2e.sh)
|
||||
@@ -32,23 +32,23 @@ ROOT="$(cd "$HERE/.." && pwd)"
|
||||
# shellcheck source=scripts/load-env.sh
|
||||
. "$HERE/load-env.sh"
|
||||
|
||||
NGINX_SRC="${NGINX_SRC:-/tmp/sso-build/src/nginx-1.30.4}"
|
||||
NGINX_SRC="${NGINX_SRC:-./build/src/nginx-1.30.4}"
|
||||
NGINX_BIN="${NGINX_BIN:-$NGINX_SRC/objs/nginx}"
|
||||
MIME_TYPES="${MIME_TYPES:-$NGINX_SRC/conf/mime.types}"
|
||||
PYTHON="${PYTHON:-python3}"
|
||||
|
||||
# macOS 上 cdylib 产物是 .dylib;Linux 是 .so。优先 .dylib,回退 .so。
|
||||
MODULE_DIR="$ROOT/source/rust/target/release"
|
||||
MODULE_DIR="$ROOT/rust/target/release"
|
||||
if [ -f "$MODULE_DIR/libsso_gateway.dylib" ]; then
|
||||
MODULE="$MODULE_DIR/libsso_gateway.dylib"
|
||||
else
|
||||
MODULE="$MODULE_DIR/libsso_gateway.so"
|
||||
fi
|
||||
|
||||
CONF_SRC="$ROOT/source/conf/nginx.test.conf"
|
||||
WWW_DIR="$ROOT/source/www"
|
||||
CONF_SRC="$ROOT/conf/nginx.test.conf"
|
||||
WWW_DIR="$ROOT/www"
|
||||
DEMO_APP="$ROOT/tests/demo-system/app.py"
|
||||
DATA_DIR="$ROOT/source/data"
|
||||
DATA_DIR="$ROOT/data"
|
||||
|
||||
CONF_LOCAL="/tmp/sso-nginx-test.conf"
|
||||
PID="/tmp/sso-nginx.pid"
|
||||
@@ -79,14 +79,14 @@ mkdir -p "$NGINX_PREFIX"/{client_body_temp,proxy_temp,fastcgi_temp,uwsgi_temp,sc
|
||||
}
|
||||
[ -f "$MODULE" ] || {
|
||||
echo "!! Rust 模块缺失:$MODULE" >&2
|
||||
echo " cd $ROOT/source/rust && NGINX_SOURCE_DIR=$NGINX_SRC NGINX_BUILD_DIR=$NGINX_SRC/objs cargo build --release" >&2
|
||||
echo " cd $ROOT/rust && NGINX_SOURCE_DIR=$NGINX_SRC NGINX_BUILD_DIR=$NGINX_SRC/objs cargo build --release" >&2
|
||||
exit 1
|
||||
}
|
||||
[ -f "$MIME_TYPES" ] || { echo "!! mime.types 缺失:$MIME_TYPES" >&2; exit 1; }
|
||||
[ -f "$DEMO_APP" ] || { echo "!! demo 系统缺失:$DEMO_APP" >&2; exit 1; }
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# 种子数据:source/data-seed/ -> source/data/(幂等,不覆盖已有 users.json)
|
||||
# 种子数据:data-seed/ -> data/(幂等,不覆盖已有 users.json)
|
||||
# ---------------------------------------------------------------------------
|
||||
echo "## [seed] 物化数据目录 $DATA_DIR"
|
||||
bash "$HERE/seed-data.sh"
|
||||
@@ -120,7 +120,7 @@ for ln in src:
|
||||
out.append("error_log %s info;" % os.environ["ERR_LOG"]); continue
|
||||
if s.startswith("pid "):
|
||||
out.append("pid %s;" % os.environ["PID"]); continue
|
||||
# 管理台静态页:模板里的 /usr/local/nginx/www → 仓库 source/www/
|
||||
# 管理台静态页:模板里的 /usr/local/nginx/www → 仓库 www/
|
||||
if "/usr/local/nginx/www/" in ln:
|
||||
out.append(ln.replace("/usr/local/nginx/www/", os.environ["WWW_DIR"] + "/")); continue
|
||||
# 正则 server_name(生产用子域捕获)→ 普通 server_name:本机 nginx 无 PCRE
|
||||
|
||||
Reference in new issue
Block a user