Skip to content

Commit 3c4455f

Browse files
author
hubert
committed
chore: deploy config changes
1 parent e6355a8 commit 3c4455f

File tree

4 files changed

+18
-35
lines changed

4 files changed

+18
-35
lines changed

nginx.conf

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
server 127.0.0.1:9080;
55
}
66

7-
upstream pomelo_infrastructure_bff {
8-
server 127.0.0.1:3002;
9-
}
10-
117
upstream pomelo_identity_server {
128
server 127.0.0.1:3003;
139
}
@@ -72,11 +68,11 @@
7268
proxy_set_header X-Forwarded-Proto $scheme;
7369
}
7470

75-
location ~* /(uploads|languages)/(.*) {
71+
location ~* /(uploads|languages|themes|plugins)/(.*) {
7672
proxy_read_timeout 90;
7773
proxy_connect_timeout 90;
7874
proxy_redirect off;
79-
proxy_pass http://pomelo_infrastructure_bff/$1/$2$is_args$args;
75+
proxy_pass http://pomelo_static_content/$1/$2$is_args$args;
8076

8177
proxy_set_header Host $http_host;
8278
proxy_set_header X-Real-IP $remote_addr;
@@ -98,18 +94,6 @@
9894
proxy_set_header X-Forwarded-Proto $scheme;
9995
}
10096

101-
location /resources/ {
102-
proxy_read_timeout 90;
103-
proxy_connect_timeout 90;
104-
proxy_redirect off;
105-
proxy_pass http://pomelo_static_content/;
106-
107-
proxy_set_header Host $http_host;
108-
proxy_set_header X-Real-IP $remote_addr;
109-
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
110-
proxy_set_header X-Forwarded-Proto $scheme;
111-
}
112-
11397
# common error page config
11498
error_page 500 502 503 504 /50x.html;
11599
location = /50x.html {

servers/conf/apisix.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ consumers:
44
key-auth:
55
key: pomelo-oidc
66
openid-connect:
7-
bearer_only: true
87
# set client metadata
98
# client_id: CLIENT_ID
109
# client_secret: CLIENT_SECRET

servers/conf/config.fly.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ graphql:
1616
# - "*"
1717
# credentials: true
1818
# upload configuration
19-
upload:
20-
# upload path
21-
dest: "uploads"
22-
# upload file size limit, a byte number,
23-
# or string(https://github.com/visionmedia/bytes.js), default: 10MB
24-
maxFileSize: 1000000
25-
# upload file count limit, default: 10
26-
maxFiles: 10
19+
# upload:
20+
# # upload path
21+
# dest: "./content"
22+
# # upload file size limit, a byte number,
23+
# # or string(https://github.com/visionmedia/bytes.js), default: 10MB
24+
# maxFileSize: 1000000
25+
# # upload file count limit, default: 10
26+
# maxFiles: 10
2727
# redis connection, from fly secrets
2828
# REDIS_URL: "redis://host:port/db"
2929
# infrastructure database connection, from fly secrets

servers/conf/config.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ graphql:
2121
# - "https://example.com:3000"
2222
# credentials: true
2323
# upload configuration
24-
upload:
25-
# upload path
26-
dest: "uploads"
27-
# upload file size limit, a byte number,
28-
# or string(https://github.com/visionmedia/bytes.js), default: 10MB
29-
maxFileSize: 1000000
30-
# upload file count limit, default: 10
31-
maxFiles: 10
24+
# upload:
25+
# # upload path
26+
# dest: "./content"
27+
# # upload file size limit, a byte number,
28+
# # or string(https://github.com/visionmedia/bytes.js), default: 10MB
29+
# maxFileSize: 1000000
30+
# # upload file count limit, default: 10
31+
# maxFiles: 10
3232
# # redis connection string
3333
# # redis[s] :// [[username :] password@] host [:port][/database]
3434
# # [?[timeout=timeout[d|h|m|s|ms|us|ns]] [&clientName=clientName]

0 commit comments

Comments
 (0)