diff --git a/.gitmodules b/.gitmodules index e69de29..41fce24 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "deps/ac-scripts"] + path = deps/ac-scripts + url = git://f0xx.org/ac/ac-scripts + branch = next diff --git a/deps/ac-scripts b/deps/ac-scripts new file mode 160000 index 0000000..fb275cc --- /dev/null +++ b/deps/ac-scripts @@ -0,0 +1 @@ +Subproject commit fb275ccada524834c1ba8bbb16bd9b0d25a56dde diff --git a/sim/cluster0/lab-seeds/backend/nginx/fe/apps.conf b/sim/cluster0/lab-seeds/backend/nginx/fe/apps.conf index b2a8068..f171238 100644 --- a/sim/cluster0/lab-seeds/backend/nginx/fe/apps.conf +++ b/sim/cluster0/lab-seeds/backend/nginx/fe/apps.conf @@ -1,10 +1,8 @@ # apps.f0xx.org — Android Cast public vhost (FE Gentoo). -# Included from nginx.conf: include /etc/nginx/apps.conf; +# Symlink: /etc/nginx/apps.conf → ac-platform-edge/fe/apps.conf +# Requires: include /etc/nginx/ac-fe-upstream.conf; in http {} # -# Upstream: BE nginx on artc0.intra.raptor.org:80 (hub PHP, crashes, graphs, build, OTA). -# Git browser: BE :3000 (Gitea). Do not proxy androidcast to BE :443 or :8089. -# -# Reload: nginx -t && rc-service nginx reload +# Upstream: cast01–03 staging cluster. Legacy artc0 BE deprecated. server { listen 80; @@ -22,9 +20,8 @@ server { ssl_certificate /etc/letsencrypt/live/apps.f0xx.org/fullchain.pem; ssl_certificate_key /etc/letsencrypt/live/apps.f0xx.org/privkey.pem; - # --- OTA artifacts (BE static tree on listen 80) --- location ^~ /v0/ota/ { - proxy_pass http://artc0.intra.raptor.org:80; + proxy_pass http://ac_be_backend; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -32,12 +29,11 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } - # --- APK builder (long-running Docker builds) --- location = /app/androidcast_project/build { return 301 $scheme://$host/app/androidcast_project/build/; } location ^~ /app/androidcast_project/build/ { - proxy_pass http://artc0.intra.raptor.org:80; + proxy_pass http://ac_be_backend; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -51,26 +47,13 @@ server { client_max_body_size 512m; } - # --- Crash / ticket console --- - location = /app/androidcast_project/crashes { - return 301 $scheme://$host/app/androidcast_project/crashes/; - } - location ^~ /app/androidcast_project/crashes/ { - proxy_pass http://artc0.intra.raptor.org:80; - proxy_http_version 1.1; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - client_max_body_size 16m; - } + include /etc/nginx/ac-fe.fragment; - # --- Graphs dashboard --- location = /app/androidcast_project/graphs { return 301 $scheme://$host/app/androidcast_project/graphs/; } location ^~ /app/androidcast_project/graphs/ { - proxy_pass http://artc0.intra.raptor.org:80; + proxy_pass http://ac_be_backend; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -78,12 +61,11 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } - # --- Hub landing (PHP index) --- location = /app/androidcast_project { return 301 $scheme://$host/app/androidcast_project/; } location ^~ /app/androidcast_project/ { - proxy_pass http://artc0.intra.raptor.org:80; + proxy_pass http://ac_be_backend; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -91,12 +73,11 @@ server { proxy_set_header X-Forwarded-Proto $scheme; } - # --- Gitea web UI --- location = /app/androidcast_project/git { return 301 $scheme://$host/app/androidcast_project/git/; } location ^~ /app/androidcast_project/git/ { - proxy_pass http://artc0.intra.raptor.org:3000/; + proxy_pass http://ac_be_backend; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; @@ -110,9 +91,8 @@ server { client_max_body_size 512m; } - # --- Default: anything else on this vhost → BE :80 --- location / { - proxy_pass http://artc0.intra.raptor.org:80; + proxy_pass http://ac_be_backend; proxy_http_version 1.1; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr;