Skip to content

Commit 29ff992

Browse files
committed
Fix nginx break from new API_FQDN format
- Remove unused script
1 parent 2d66e2d commit 29ff992

File tree

2 files changed

+3
-67
lines changed

2 files changed

+3
-67
lines changed

main/k8s_runserver.sh

Lines changed: 0 additions & 64 deletions
This file was deleted.

main/runserver.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ python manage.py collectstatic --noinput -l
99
#python manage.py make_permissions
1010

1111
# Add server name(s) to django settings and nginx - later maybe only nginx would be enough, and ALLOWED_HOSTS could be "*"
12-
# TODO: Allow API_FQDN with https
12+
NGINX_API_FQDN=$(echo $API_FQDN | sed 's|https://||')
1313
if [ "$GO_ENVIRONMENT"x = productionx ]; then
14-
sed -i 's/\$NGINX_SERVER_NAME/'$API_FQDN' api.go.ifrc.org/g' /etc/nginx/sites-available/nginx.conf
14+
sed -i 's/\$NGINX_SERVER_NAME/'$NGINX_API_FQDN' api.go.ifrc.org/g' /etc/nginx/sites-available/nginx.conf
1515
sed -i 's/CHANGE_ME_BEFORE_START/prod/' /etc/nginx/sites-available/nginx.conf
1616
else
17-
sed -i 's/\$NGINX_SERVER_NAME/'$API_FQDN'/g' /etc/nginx/sites-available/nginx.conf
17+
sed -i 's/\$NGINX_SERVER_NAME/'$NGINX_API_FQDN'/g' /etc/nginx/sites-available/nginx.conf
1818
sed -i 's/CHANGE_ME_BEFORE_START/'$GO_ENVIRONMENT'/' /etc/nginx/sites-available/nginx.conf
1919
fi
2020

0 commit comments

Comments
 (0)