Skip to content

Feature: Angular Migration patch #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 1, 2025
Merged

Feature: Angular Migration patch #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
831d2dd
Feature: Angular rewrite and subdomain migration
jbriones1 Aug 31, 2025
a0bce4d
Update: Main site
jbriones1 Aug 31, 2025
32dab36
fix: missing semi-colon on fall-hacks server_name
jbriones1 Aug 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend
Open in desktop
Submodule frontend updated 791 files
344 changes: 157 additions & 187 deletions nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,172 +2,72 @@ upstream backend {
server unix:/var/www/gunicorn.sock fail_timeout=0;
}

# Redirect from the first rewrite to the Angular rewrite
server {
server_name new.sfucsss.org;
server_name www.new.sfucsss.org new.sfucsss.org;
listen 80;

root /var/www/html;

access_log /var/www/logs/csss-site-backend/nginx-access.log;
error_log /var/www/logs/csss-site-backend/nginx-error.log;

# proxy csss-site-backend
location /api/ {
rewrite ^/api/(.*)$ /$1 break;

keepalive_timeout 5;
client_max_body_size 1G; # Was 4G

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;
proxy_pass http://backend;

add_header Access-Control-Allow-Origin https://new.sfucsss.org always;
add_header Access-Control-Allow-Credentials true;
}

# redirects old 2024 mountain madness requests to the new URL
location ~ ^/events/2024/mm(/|/index.html)?$ {
return 301 /mountain_madness/2024/index.html;
}

# any other matching path
location / {
charset utf-8;
try_files $uri $uri/ $uri/index.html =404;
}
return 301 $scheme://sfucsss.org$request_uri;
}

# TODO: When redirecting sfucsss.org to the Angular rewrite, delete the other new.sfucsss.org block and uncomment this one.
# Redirect from the first rewrite to the Angular rewrite
# suitable for testing new deployments
# server {
# server_name www.new.sfucsss.org new.sfucsss.org;
# server_name test.sfucsss.org;
# listen 80;
# return 301 $scheme://sfucsss.org$request_uri;
# }

# TODO: Uncomment me once the A record points to this VPS
# server {
# server_name test.sfucsss.org;
# listen 80;
#
# root /var/www/html;
#
# access_log /var/www/logs/csss-site-backend/nginx-access.log;
# error_log /var/www/logs/csss-site-backend/nginx-error.log;
#
# error_page 404 /404.html;
#
# # proxy csss-site-backend
# location /api/ {
# rewrite ^/api/(.*)$ /$1 break;
#
# keepalive_timeout 5;
# client_max_body_size 1G; # Was 4G
#
# 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;
# proxy_pass http://backend;
#
# # update cors header to allow requests from test site
# add_header Access-Control-Allow-Origin https://sfucsss.org always;
# add_header Access-Control-Allow-Credentials true;
# }
#
# # Events had a URL scheme like `sfucsss.org/events/<event>/<year>[/page]`
# # We want to redirect them to `<event>.sfucsss.org/<year>[/page]`
# location ~ "^/events/(mm|mountain_madness)/(?<year>\d{4})(?<page>/.*)$" {
# return 301 https://madness.sfucsss.org/$year$page;
# }
#
# # Since they used underscores before, we'll need to redirect URLs to the hyphenated version
# location ~ "^/events/(?<event>tech_fair|fall_hacks)/(?<year>\d{4})(?<page>/.*)?$" {
# set $new_event "";
# if ($event = "tech_fair") {
# set $new_event "tech-fair";
# }
# if ($event = "fall_hacks") {
# set $new_event "fall-hacks";
# }
# return 301 /events/$new_event/$year$page;
# }
#
# # for the rest of the subdomains
# location ~ "^/events/(?<event>frosh|tech-fair|fall-hacks)/(?<year>\d{4})(?<page>/.*)?$" {
# return 301 https://$event.sfucsss.org/$year$page;
# }
#
# # No 404 page since that will be handled by Angular
# location / {
# charset utf-8;
# try_files $uri $uri/ index.html;
# }
#
# root /var/www/test-sfucsss;
#
# access_log /var/www/logs/csss-site-backend/test-nginx-access.log;
# error_log /var/www/logs/csss-site-backend/test-nginx-error.log;
#
# error_page 404 /404.html;
#
# # proxy csss-site-backend
# location /api/ {
# rewrite ^/api/(.*)$ /$1 break;
#
# keepalive_timeout 5;
# client_max_body_size 1G; # Was 4G
#
# 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;
# proxy_pass http://backend;
#
# # update cors header to allow requests from test site
# add_header Access-Control-Allow-Origin https://test.sfucsss.org always;
# add_header Access-Control-Allow-Credentials true;
# }
#
# # Events had a URL scheme like `sfucsss.org/events/<event>/<year>[/page]`
# # We want to redirect them to `<event>.sfucsss.org/<year>[/page]`
# location ~ "^/events/(mm|mountain_madness)/(?<year>\d{4})(?<page>/.*)$" {
# return 301 https://madness.sfucsss.org/$year$page;
# }
#
# # Since they used underscores before, we'll need to redirect URLs to the hyphenated version
# location ~ "^/events/(?<event>tech-fair|fall-hacks)/(?<year>\d{4})(?<page>/.*)?$" {
# set $new_event "";
# if ($event = "tech_fair") {
# set $new_event "tech-fair";
# }
# if ($event = "fall_hacks") {
# set $new_event "fall-hacks";
# }
# return 301 /events/$new_event/$year$page;
# }
#
# # for the rest of the subdomains
# location ~ "^/events/(?<event>frosh|tech-fair|fall-hacks)/(?<year>\d{4})(?<page>/.*)?$" {
# return 301 https://$event.sfucsss.org/$year$page;
# }
#
# location / {
# charset utf-8;
# try_files $uri $uri/ $uri.html $uri/index.html =404;
# }
# }

# serves the test version of the site
# suitable for testing new deployments
server {
server_name test.sfucsss.org;
listen 80;

root /var/www/test-sfucsss;

access_log /var/www/logs/csss-site-backend/test-nginx-access.log;
error_log /var/www/logs/csss-site-backend/test-nginx-error.log;

error_page 404 /404.html;

# proxy csss-site-backend
location /api/ {
rewrite ^/api/(.*)$ /$1 break;

keepalive_timeout 5;
client_max_body_size 1G; # Was 4G

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;
proxy_pass http://backend;

# update cors header to allow requests from test site
add_header Access-Control-Allow-Origin https://test.sfucsss.org always;
add_header Access-Control-Allow-Credentials true;
}

# Events had a URL scheme like `sfucsss.org/events/<event>/<year>[/page]`
# We want to redirect them to `<event>.sfucsss.org/<year>[/page]`
location ~ "^/events/(mm|mountain_madness)/(?<year>\d{4})(?<page>/.*)$" {
return 301 https://madness.sfucsss.org/$year$page;
}

# Since they used underscores before, we'll need to redirect URLs to the hyphenated version
location ~ "^/events/(?<event>tech_fair|fall_hacks)/(?<year>\d{4})(?<page>/.*)?$" {
set $new_event "";
if ($event = "tech_fair") {
set $new_event "tech-fair";
}
if ($event = "fall_hacks") {
set $new_event "fall-hacks";
}
return 301 /events/$new_event/$year$page;
}

# for the rest of the subdomains
location ~ "^/events/(?<event>frosh|tech-fair|fall-hacks)/(?<year>\d{4})(?<page>/.*)?$" {
return 301 https://$event.sfucsss.org/$year$page;
}

location / {
charset utf-8;
try_files $uri $uri/ index.html;
}
}

# TODO: Figure out how to do a wildcard domain
# Serves the event pages
# server {
Expand Down Expand Up @@ -240,38 +140,51 @@ server {
}

location / {
# TODO: When the rest of the static pages are migrated, uncomment the next line
# root /var/www/html/frosh/latest;
root /var/www/html/tech-fair/latest;
try_files $uri $uri/ /index.html =404;
}
}

# TODO: Uncomment this when Fall Hacks A record made
# server {
# server_name fall-hacks.sfucsss.org
# listen 80;
#
# root /var/www/html;
#
# location / {
# try_files /404.html =404;
# }
# }
server {
server_name fall-hacks.sfucsss.org;
listen 80;

# TODO: Uncomment this when Madness A record made
# server {
# server_name madness.sfucsss.org
# listen 80;
#
# root /var/www/html;
#
# location / {
# try_files /404.html =404;
# }
# }
root /var/www/html/fall-hacks;

location /static/ {
alias /var/www/html/static;
}

location ~ "^/(?<year>\d{4})(/.*)?$" {
try_files $uri $uri/ $year/index.html;
}

location / {
root /var/www/html/fall-hacks/latest;
try_files $uri $uri/ /index.html =404;
}
}

server {
server_name madness.sfucsss.org
listen 80;

root /var/www/html/madness;

location /static/ {
alias /var/www/html/static;
}

location ~ "^/(?<year>\d{4})(/.*)?$" {
try_files $uri $uri/ $year/index.html;
}

location / {
root /var/www/html/madness/latest;
try_files $uri $uri/ /index.html =404;
}
}

# TODO: Comment this block out if there are no pages under construction.
# For pages under construction
server {
server_name www.sfucsss.org sfucsss.org;
listen 80;
Expand All @@ -281,12 +194,69 @@ server {
access_log /var/www/logs/csss-site-backend/nginx-access.log;
error_log /var/www/logs/csss-site-backend/nginx-error.log;

location ~* .(css|webp|png|svg) {
try_files $uri =404;
# proxy csss-site-backend
location /api/ {
rewrite ^/api/(.*)$ /$1 break;

keepalive_timeout 5;
client_max_body_size 1G; # Was 4G

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;
proxy_pass http://backend;

add_header Access-Control-Allow-Origin https://sfucsss.org always;
add_header Access-Control-Allow-Credentials true;
}

# Events had a URL scheme like `sfucsss.org/events/<event>/<year>[/page]`
# We want to redirect them to `<event>.sfucsss.org/<year>[/page]`
location ~ "^/events/(mm|mountain_madness)/(?<year>\d{4})(?<page>/.*)$" {
return 301 https://madness.sfucsss.org/$year$page;
}

# Since they used underscores before, we'll need to redirect URLs to the hyphenated version
location ~ "^/events/(?<event>tech_fair|fall-hacks)/(?<year>\d{4})(?<page>/.*)?$" {
set $new_event "";
if ($event = "tech_fair") {
set $new_event "tech-fair";
}
if ($event = "fall_hacks") {
set $new_event "fall-hacks";
}
return 301 /events/$new_event/$year$page;
}

# for the rest of the subdomains
location ~ "^/events/(?<event>frosh|tech-fair|fall-hacks)/(?<year>\d{4})(?<page>/.*)?$" {
return 301 https://$event.sfucsss.org/$year$page;
}

location / {
charset utf-8;
try_files /construction.html =503;
# Main site is a SPA, so we always serve the main Angular application
try_files $uri $uri/ $uri.html $uri/index.html;
}
}

# For pages under construction
# server {
# server_name www.sfucsss.org sfucsss.org;
# listen 80;
#
# root /var/www/html;
#
# access_log /var/www/logs/csss-site-backend/nginx-access.log;
# error_log /var/www/logs/csss-site-backend/nginx-error.log;
#
# location ~* .(css|webp|png|svg) {
# try_files $uri =404;
# }
#
# location / {
# charset utf-8;
# try_files /construction.html =503;
# }
# }