Skip to content

Commit

Permalink
Fix dev:oidc npm script
Browse files Browse the repository at this point in the history
* generate public/client-config.js at foreman startup
* remove nginx's special handling for client-config.js

Closes getodk#1034
  • Loading branch information
alxndrsn committed Oct 15, 2024
1 parent 6fd5f28 commit 13480ee
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,4 @@ npm-debug.log*
!/.nginx/.gitkeep

/.eslintcache
/public/client-config.json
4 changes: 2 additions & 2 deletions Procfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
vue: vue-cli-service build --mode development --watch
nginx: nginx -c "$PWD/main.nginx.conf" -p "$PWD" -e stderr
vue: echo "{\"oidcEnabled\":${VUE_APP_OIDC_ENABLED-false}}" >./public/client-config.json && vue-cli-service build --mode development --watch
nginx: docker run --rm --network=host -v $PWD/nginx-conf:/etc/nginx/:ro -v $PWD/dist:/odk-central-frontend/dist nginx
5 changes: 0 additions & 5 deletions main.nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -94,11 +94,6 @@ http {
proxy_set_header X-Forwarded-Proto https;
}

location = /client-config.json {
include ./common-headers.nginx.conf;
return 200 "{}";
}

location / {
root ./dist;

Expand Down

0 comments on commit 13480ee

Please sign in to comment.