-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #223 from nolim1t/master-softwareupgrade
Will put this into master now as its working. Can deal with some of the other coding style issues later.
- Loading branch information
Showing
9 changed files
with
242 additions
and
148 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,35 @@ | ||
| # This is a default site configuration which will simply return 404, preventing | ||
| # chance access to any other virtualhost. | ||
|
|
||
| server { | ||
| listen 80 default_server; | ||
| listen [::]:80 default_server; | ||
| listen 80 default_server; | ||
| listen [::]:80 default_server; | ||
| # by default but currently is overridden | ||
| root /www; | ||
|
|
||
| location = / { | ||
| root /www/pos; | ||
| try_files $uri $uri/index.html =404; | ||
| } | ||
|
|
||
| # Default root | ||
| root /www; | ||
| # No special handling for / | ||
| location / { | ||
| } | ||
| location = /wifi { | ||
| root /www; | ||
| auth_basic "WiFi"; | ||
| auth_basic_user_file /etc/nginx/.htpasswd; | ||
| try_files $uri $uri/index.html =404; | ||
| } | ||
|
|
||
| # You may need this to prevent return 404 recursion. | ||
| location = /404.html { | ||
| internal; | ||
| } | ||
| location /invoicer/ { | ||
| add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; | ||
| proxy_pass http://invoicer:8080/api/; | ||
| } | ||
| } | ||
| # invoicer | ||
| location /api { | ||
| add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS'; | ||
| proxy_pass http://localhost:8088/api; | ||
| } | ||
|
|
||
| # iotwifi endpoints | ||
| location /connect { | ||
| proxy_pass http://localhost:8080/connect; | ||
| } | ||
| location /status { | ||
| proxy_pass http://localhost:8080/status; | ||
| } | ||
| location /scan { | ||
| proxy_pass http://localhost:8080/scan; | ||
| } | ||
| } |
Oops, something went wrong.