Merge branch 'cuttingedge' into defaultApiUrl
This commit is contained in:
commit
6a5e340882
12
.github/workflows/docker-image-cuttingedge.yml
vendored
12
.github/workflows/docker-image-cuttingedge.yml
vendored
@ -3,6 +3,8 @@ name: Docker Image CI
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "cuttingedge" ]
|
branches: [ "cuttingedge" ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ "cuttingedge" ]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@ -17,12 +19,12 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/docker/setup-qemu-action#usage
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2.2.0
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
# https://github.com/marketplace/actions/docker-setup-buildx
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
id: buildx
|
||||||
uses: docker/setup-buildx-action@v3.3.0
|
uses: docker/setup-buildx-action@v3.6.1
|
||||||
|
|
||||||
# https://github.com/docker/login-action#docker-hub
|
# https://github.com/docker/login-action#docker-hub
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
@ -33,12 +35,12 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/docker/build-push-action#multi-platform-image
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
- name: Build and push Website
|
- name: Build and push Website
|
||||||
uses: docker/build-push-action@v4.1.1
|
uses: docker/build-push-action@v6.7.0
|
||||||
with:
|
with:
|
||||||
context: ./Website
|
context: .
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64,linux/arm64
|
||||||
pull: true
|
pull: true
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
|
14
.github/workflows/docker-image-dev.yml
vendored
14
.github/workflows/docker-image-dev.yml
vendored
@ -2,7 +2,9 @@ name: Docker Image CI
|
|||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ "cuttingedge" ]
|
branches: [ "dev" ]
|
||||||
|
pull_request:
|
||||||
|
branches: [ "dev" ]
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@ -17,12 +19,12 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/docker/setup-qemu-action#usage
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2.2.0
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
# https://github.com/marketplace/actions/docker-setup-buildx
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
id: buildx
|
||||||
uses: docker/setup-buildx-action@v3.3.0
|
uses: docker/setup-buildx-action@v3.6.1
|
||||||
|
|
||||||
# https://github.com/docker/login-action#docker-hub
|
# https://github.com/docker/login-action#docker-hub
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
@ -33,12 +35,12 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/docker/build-push-action#multi-platform-image
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
- name: Build and push Website
|
- name: Build and push Website
|
||||||
uses: docker/build-push-action@v4.1.1
|
uses: docker/build-push-action@v6.7.0
|
||||||
with:
|
with:
|
||||||
context: ./Website
|
context: ./
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64,linux/arm64
|
||||||
pull: true
|
pull: true
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
|
10
.github/workflows/docker-image-master.yml
vendored
10
.github/workflows/docker-image-master.yml
vendored
@ -19,12 +19,12 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/docker/setup-qemu-action#usage
|
# https://github.com/docker/setup-qemu-action#usage
|
||||||
- name: Set up QEMU
|
- name: Set up QEMU
|
||||||
uses: docker/setup-qemu-action@v2.2.0
|
uses: docker/setup-qemu-action@v3.2.0
|
||||||
|
|
||||||
# https://github.com/marketplace/actions/docker-setup-buildx
|
# https://github.com/marketplace/actions/docker-setup-buildx
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
id: buildx
|
id: buildx
|
||||||
uses: docker/setup-buildx-action@v3.3.0
|
uses: docker/setup-buildx-action@v3.6.1
|
||||||
|
|
||||||
# https://github.com/docker/login-action#docker-hub
|
# https://github.com/docker/login-action#docker-hub
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
@ -35,12 +35,12 @@ jobs:
|
|||||||
|
|
||||||
# https://github.com/docker/build-push-action#multi-platform-image
|
# https://github.com/docker/build-push-action#multi-platform-image
|
||||||
- name: Build and push Website
|
- name: Build and push Website
|
||||||
uses: docker/build-push-action@v4.1.1
|
uses: docker/build-push-action@v6.7.0
|
||||||
with:
|
with:
|
||||||
context: ./Website
|
context: ./
|
||||||
file: ./Dockerfile
|
file: ./Dockerfile
|
||||||
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
#platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
|
||||||
platforms: linux/amd64
|
platforms: linux/amd64,linux/arm64
|
||||||
pull: true
|
pull: true
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
|
@ -1,4 +1,6 @@
|
|||||||
FROM nginx:alpine3.17-slim
|
FROM nginx:alpine3.17-slim
|
||||||
COPY . /usr/share/nginx/html
|
COPY ./Website /usr/share/nginx/html
|
||||||
|
COPY ./nginx /etc/nginx
|
||||||
EXPOSE 80
|
EXPOSE 80
|
||||||
|
ENV API_URL=http://tranga-api:6531
|
||||||
CMD ["nginx", "-g", "daemon off;"]
|
CMD ["nginx", "-g", "daemon off;"]
|
@ -131,7 +131,6 @@
|
|||||||
</div> -->
|
</div> -->
|
||||||
<div class="section-item dyn-height">
|
<div class="section-item dyn-height">
|
||||||
<span class="title"><img src="connector-icons/mangadex-logo.svg"><a href="https://mangadex.org">MangaDex</a></span>
|
<span class="title"><img src="connector-icons/mangadex-logo.svg"><a href="https://mangadex.org">MangaDex</a></span>
|
||||||
<row><label for="mDexAuthorRL">Author Rate Limit:</label><input id="mDexAuthorRL" type="text"></row>
|
|
||||||
<row><label for="mDexFeedRL">Feed Rate Limit:</label><input id="mDexFeedRL" type="text"></row>
|
<row><label for="mDexFeedRL">Feed Rate Limit:</label><input id="mDexFeedRL" type="text"></row>
|
||||||
<row><label for="mDexImageRL">Image Rate Limit:</label><input id="mDexImageRL" type="text"></row>
|
<row><label for="mDexImageRL">Image Rate Limit:</label><input id="mDexImageRL" type="text"></row>
|
||||||
</div>
|
</div>
|
||||||
|
@ -40,7 +40,6 @@ const imageRL = document.querySelector("#imageRL");
|
|||||||
const infoRL = document.querySelector("#infoRL");
|
const infoRL = document.querySelector("#infoRL");
|
||||||
|
|
||||||
//MangaDex Rate Limits
|
//MangaDex Rate Limits
|
||||||
const mDexAuthorRL = document.querySelector("#mDexAuthorRL");
|
|
||||||
const mDexFeedRL = document.querySelector("#mDexFeedRL");
|
const mDexFeedRL = document.querySelector("#mDexFeedRL");
|
||||||
const mDexImageRL = document.querySelector("#mDexImageRL");
|
const mDexImageRL = document.querySelector("#mDexImageRL");
|
||||||
|
|
||||||
@ -158,7 +157,6 @@ function Setup(){
|
|||||||
coverRL.placeholder = json.MangaCover + ' Requests/Minute';
|
coverRL.placeholder = json.MangaCover + ' Requests/Minute';
|
||||||
imageRL.placeholder = json.MangaImage + ' Requests/Minute';
|
imageRL.placeholder = json.MangaImage + ' Requests/Minute';
|
||||||
infoRL.placeholder = json.MangaInfo + ' Requests/Minute';
|
infoRL.placeholder = json.MangaInfo + ' Requests/Minute';
|
||||||
mDexAuthorRL.placeholder = json.MangaDexAuthor + ' Requests/Minute';
|
|
||||||
mDexFeedRL.placeholder = json.MangaDexFeed + ' Requests/Minute';
|
mDexFeedRL.placeholder = json.MangaDexFeed + ' Requests/Minute';
|
||||||
mDexImageRL.placeholder = json.MangaDexImage + ' Requests/Minute';
|
mDexImageRL.placeholder = json.MangaDexImage + ' Requests/Minute';
|
||||||
});
|
});
|
||||||
@ -176,7 +174,7 @@ function Setup(){
|
|||||||
}
|
}
|
||||||
setInterval(() => {
|
setInterval(() => {
|
||||||
UpdateJobs();
|
UpdateJobs();
|
||||||
}, 1000);
|
}, 5000);
|
||||||
});
|
});
|
||||||
//Clear the previous values if any exist.
|
//Clear the previous values if any exist.
|
||||||
searchBox.value = "";
|
searchBox.value = "";
|
||||||
@ -530,7 +528,6 @@ defaultRL.addEventListener("keypress", (event) => { if(event.key === "Enter") Up
|
|||||||
coverRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
coverRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
||||||
imageRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
imageRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
||||||
infoRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
infoRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
||||||
mDexAuthorRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
|
||||||
mDexFeedRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
mDexFeedRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
||||||
mDexImageRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
mDexImageRL.addEventListener("keypress", (event) => { if(event.key === "Enter") UpdateSettings();});
|
||||||
|
|
||||||
@ -558,14 +555,13 @@ function OpenSettings(){
|
|||||||
coverRL.value = "";
|
coverRL.value = "";
|
||||||
imageRL.value = "";
|
imageRL.value = "";
|
||||||
infoRL.value = "";
|
infoRL.value = "";
|
||||||
mDexAuthorRL.value = "";
|
|
||||||
mDexFeedRL.value = "";
|
mDexFeedRL.value = "";
|
||||||
mDexImageRL.value = "";
|
mDexImageRL.value = "";
|
||||||
|
|
||||||
GetSettings().then((json) => {
|
GetSettings().then((json) => {
|
||||||
//console.log(json);
|
//console.log(json);
|
||||||
settingApiUri.value = apiUri;
|
settingApiUri.placeholder = apiUri;
|
||||||
settingUserAgent.value = json.userAgent;
|
settingUserAgent.placeholder = json.userAgent;
|
||||||
//console.log(json.styleSheet);
|
//console.log(json.styleSheet);
|
||||||
});
|
});
|
||||||
GetRateLimits().then((json) => {
|
GetRateLimits().then((json) => {
|
||||||
@ -573,7 +569,6 @@ function OpenSettings(){
|
|||||||
coverRL.placeholder = json.MangaCover + ' Requests/Minute';
|
coverRL.placeholder = json.MangaCover + ' Requests/Minute';
|
||||||
imageRL.placeholder = json.MangaImage + ' Requests/Minute';
|
imageRL.placeholder = json.MangaImage + ' Requests/Minute';
|
||||||
infoRL.placeholder = json.MangaInfo + ' Requests/Minute';
|
infoRL.placeholder = json.MangaInfo + ' Requests/Minute';
|
||||||
mDexAuthorRL.placeholder = json.MangaDexAuthor + ' Requests/Minute';
|
|
||||||
mDexFeedRL.placeholder = json.MangaDexFeed + ' Requests/Minute';
|
mDexFeedRL.placeholder = json.MangaDexFeed + ' Requests/Minute';
|
||||||
mDexImageRL.placeholder = json.MangaDexImage + ' Requests/Minute';
|
mDexImageRL.placeholder = json.MangaDexImage + ' Requests/Minute';
|
||||||
});
|
});
|
||||||
@ -583,15 +578,15 @@ function OpenSettings(){
|
|||||||
switch(libraryConnectorTypes[connector.libraryType]){
|
switch(libraryConnectorTypes[connector.libraryType]){
|
||||||
case "Kavita":
|
case "Kavita":
|
||||||
settingKavitaConfigured.setAttribute("configuration", "Active");
|
settingKavitaConfigured.setAttribute("configuration", "Active");
|
||||||
settingKavitaUrl.value = connector.baseUrl;
|
settingKavitaUrl.placeholder = connector.baseUrl;
|
||||||
settingKavitaUser.value = "***";
|
settingKavitaUser.placeholder = "***";
|
||||||
settingKavitaPass.value = "***";
|
settingKavitaPass.placeholder = "***";
|
||||||
break;
|
break;
|
||||||
case "Komga":
|
case "Komga":
|
||||||
settingKomgaConfigured.setAttribute("configuration", "Active");
|
settingKomgaConfigured.setAttribute("configuration", "Active");
|
||||||
settingKomgaUrl.value = connector.baseUrl;
|
settingKomgaUrl.placeholder = connector.baseUrl;
|
||||||
settingKomgaUser.value = "***";
|
settingKomgaUser.placeholder = "***";
|
||||||
settingKomgaPass.value = "***";
|
settingKomgaPass.placeholder = "***";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
console.log("Unknown type");
|
console.log("Unknown type");
|
||||||
@ -604,18 +599,18 @@ function OpenSettings(){
|
|||||||
json.forEach(connector => {
|
json.forEach(connector => {
|
||||||
switch(notificationConnectorTypes[connector.notificationConnectorType]){
|
switch(notificationConnectorTypes[connector.notificationConnectorType]){
|
||||||
case "Gotify":
|
case "Gotify":
|
||||||
settingGotifyUrl.value = connector.endpoint;
|
settingGotifyUrl.placeholder = connector.endpoint;
|
||||||
settingGotifyAppToken.value = "***";
|
settingGotifyAppToken.placeholder = "***";
|
||||||
settingGotifyConfigured.setAttribute("configuration", "Active");
|
settingGotifyConfigured.setAttribute("configuration", "Active");
|
||||||
break;
|
break;
|
||||||
case "LunaSea":
|
case "LunaSea":
|
||||||
settingLunaseaConfigured.setAttribute("configuration", "Active");
|
settingLunaseaConfigured.setAttribute("configuration", "Active");
|
||||||
settingLunaseaWebhook.value = connector.id;
|
settingLunaseaWebhook.placeholder = connector.id;
|
||||||
break;
|
break;
|
||||||
case "Ntfy":
|
case "Ntfy":
|
||||||
settingNtfyConfigured.setAttribute("configuration", "Active");
|
settingNtfyConfigured.setAttribute("configuration", "Active");
|
||||||
settingNtfyEndpoint.value = connector.endpoint;
|
settingNtfyEndpoint.placeholder = connector.endpoint;
|
||||||
settingNtfyAuth.value = "***";
|
settingNtfyAuth.placeholder = "***";
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
console.log("Unknown type");
|
console.log("Unknown type");
|
||||||
@ -716,10 +711,6 @@ function UpdateSettings(){
|
|||||||
UpdateRateLimit(6, infoRL.value);
|
UpdateRateLimit(6, infoRL.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mDexAuthorRL.value != "") {
|
|
||||||
UpdateRateLimit(5, mDexAuthorRL.value);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (mDexFeedRL.value != "") {
|
if (mDexFeedRL.value != "") {
|
||||||
UpdateRateLimit(1, mDexFeedRL.value);
|
UpdateRateLimit(1, mDexFeedRL.value);
|
||||||
}
|
}
|
||||||
|
26
nginx/fastcgi.conf
Normal file
26
nginx/fastcgi.conf
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
|
||||||
|
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
|
||||||
|
fastcgi_param QUERY_STRING $query_string;
|
||||||
|
fastcgi_param REQUEST_METHOD $request_method;
|
||||||
|
fastcgi_param CONTENT_TYPE $content_type;
|
||||||
|
fastcgi_param CONTENT_LENGTH $content_length;
|
||||||
|
|
||||||
|
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
|
||||||
|
fastcgi_param REQUEST_URI $request_uri;
|
||||||
|
fastcgi_param DOCUMENT_URI $document_uri;
|
||||||
|
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||||
|
fastcgi_param SERVER_PROTOCOL $server_protocol;
|
||||||
|
fastcgi_param REQUEST_SCHEME $scheme;
|
||||||
|
fastcgi_param HTTPS $https if_not_empty;
|
||||||
|
|
||||||
|
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
|
||||||
|
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
|
||||||
|
|
||||||
|
fastcgi_param REMOTE_ADDR $remote_addr;
|
||||||
|
fastcgi_param REMOTE_PORT $remote_port;
|
||||||
|
fastcgi_param SERVER_ADDR $server_addr;
|
||||||
|
fastcgi_param SERVER_PORT $server_port;
|
||||||
|
fastcgi_param SERVER_NAME $server_name;
|
||||||
|
|
||||||
|
# PHP only, required if PHP was built with --enable-force-cgi-redirect
|
||||||
|
fastcgi_param REDIRECT_STATUS 200;
|
25
nginx/fastcgi_params
Normal file
25
nginx/fastcgi_params
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
|
||||||
|
fastcgi_param QUERY_STRING $query_string;
|
||||||
|
fastcgi_param REQUEST_METHOD $request_method;
|
||||||
|
fastcgi_param CONTENT_TYPE $content_type;
|
||||||
|
fastcgi_param CONTENT_LENGTH $content_length;
|
||||||
|
|
||||||
|
fastcgi_param SCRIPT_NAME $fastcgi_script_name;
|
||||||
|
fastcgi_param REQUEST_URI $request_uri;
|
||||||
|
fastcgi_param DOCUMENT_URI $document_uri;
|
||||||
|
fastcgi_param DOCUMENT_ROOT $document_root;
|
||||||
|
fastcgi_param SERVER_PROTOCOL $server_protocol;
|
||||||
|
fastcgi_param REQUEST_SCHEME $scheme;
|
||||||
|
fastcgi_param HTTPS $https if_not_empty;
|
||||||
|
|
||||||
|
fastcgi_param GATEWAY_INTERFACE CGI/1.1;
|
||||||
|
fastcgi_param SERVER_SOFTWARE nginx/$nginx_version;
|
||||||
|
|
||||||
|
fastcgi_param REMOTE_ADDR $remote_addr;
|
||||||
|
fastcgi_param REMOTE_PORT $remote_port;
|
||||||
|
fastcgi_param SERVER_ADDR $server_addr;
|
||||||
|
fastcgi_param SERVER_PORT $server_port;
|
||||||
|
fastcgi_param SERVER_NAME $server_name;
|
||||||
|
|
||||||
|
# PHP only, required if PHP was built with --enable-force-cgi-redirect
|
||||||
|
fastcgi_param REDIRECT_STATUS 200
|
99
nginx/mimes.types
Normal file
99
nginx/mimes.types
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
|
||||||
|
types {
|
||||||
|
text/html html htm shtml;
|
||||||
|
text/css css;
|
||||||
|
text/xml xml;
|
||||||
|
image/gif gif;
|
||||||
|
image/jpeg jpeg jpg;
|
||||||
|
application/javascript js;
|
||||||
|
application/atom+xml atom;
|
||||||
|
application/rss+xml rss;
|
||||||
|
|
||||||
|
text/mathml mml;
|
||||||
|
text/plain txt;
|
||||||
|
text/vnd.sun.j2me.app-descriptor jad;
|
||||||
|
text/vnd.wap.wml wml;
|
||||||
|
text/x-component htc;
|
||||||
|
|
||||||
|
image/avif avif;
|
||||||
|
image/png png;
|
||||||
|
image/svg+xml svg svgz;
|
||||||
|
image/tiff tif tiff;
|
||||||
|
image/vnd.wap.wbmp wbmp;
|
||||||
|
image/webp webp;
|
||||||
|
image/x-icon ico;
|
||||||
|
image/x-jng jng;
|
||||||
|
image/x-ms-bmp bmp;
|
||||||
|
|
||||||
|
font/woff woff;
|
||||||
|
font/woff2 woff2;
|
||||||
|
|
||||||
|
application/java-archive jar war ear;
|
||||||
|
application/json json;
|
||||||
|
application/mac-binhex40 hqx;
|
||||||
|
application/msword doc;
|
||||||
|
application/pdf pdf;
|
||||||
|
application/postscript ps eps ai;
|
||||||
|
application/rtf rtf;
|
||||||
|
application/vnd.apple.mpegurl m3u8;
|
||||||
|
application/vnd.google-earth.kml+xml kml;
|
||||||
|
application/vnd.google-earth.kmz kmz;
|
||||||
|
application/vnd.ms-excel xls;
|
||||||
|
application/vnd.ms-fontobject eot;
|
||||||
|
application/vnd.ms-powerpoint ppt;
|
||||||
|
application/vnd.oasis.opendocument.graphics odg;
|
||||||
|
application/vnd.oasis.opendocument.presentation odp;
|
||||||
|
application/vnd.oasis.opendocument.spreadsheet ods;
|
||||||
|
application/vnd.oasis.opendocument.text odt;
|
||||||
|
application/vnd.openxmlformats-officedocument.presentationml.presentation
|
||||||
|
pptx;
|
||||||
|
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
|
||||||
|
xlsx;
|
||||||
|
application/vnd.openxmlformats-officedocument.wordprocessingml.document
|
||||||
|
docx;
|
||||||
|
application/vnd.wap.wmlc wmlc;
|
||||||
|
application/wasm wasm;
|
||||||
|
application/x-7z-compressed 7z;
|
||||||
|
application/x-cocoa cco;
|
||||||
|
application/x-java-archive-diff jardiff;
|
||||||
|
application/x-java-jnlp-file jnlp;
|
||||||
|
application/x-makeself run;
|
||||||
|
application/x-perl pl pm;
|
||||||
|
application/x-pilot prc pdb;
|
||||||
|
application/x-rar-compressed rar;
|
||||||
|
application/x-redhat-package-manager rpm;
|
||||||
|
application/x-sea sea;
|
||||||
|
application/x-shockwave-flash swf;
|
||||||
|
application/x-stuffit sit;
|
||||||
|
application/x-tcl tcl tk;
|
||||||
|
application/x-x509-ca-cert der pem crt;
|
||||||
|
application/x-xpinstall xpi;
|
||||||
|
application/xhtml+xml xhtml;
|
||||||
|
application/xspf+xml xspf;
|
||||||
|
application/zip zip;
|
||||||
|
|
||||||
|
application/octet-stream bin exe dll;
|
||||||
|
application/octet-stream deb;
|
||||||
|
application/octet-stream dmg;
|
||||||
|
application/octet-stream iso img;
|
||||||
|
application/octet-stream msi msp msm;
|
||||||
|
|
||||||
|
audio/midi mid midi kar;
|
||||||
|
audio/mpeg mp3;
|
||||||
|
audio/ogg ogg;
|
||||||
|
audio/x-m4a m4a;
|
||||||
|
audio/x-realaudio ra;
|
||||||
|
|
||||||
|
video/3gpp 3gpp 3gp;
|
||||||
|
video/mp2t ts;
|
||||||
|
video/mp4 mp4;
|
||||||
|
video/mpeg mpeg mpg;
|
||||||
|
video/quicktime mov;
|
||||||
|
video/webm webm;
|
||||||
|
video/x-flv flv;
|
||||||
|
video/x-m4v m4v;
|
||||||
|
video/x-mng mng;
|
||||||
|
video/x-ms-asf asx asf;
|
||||||
|
video/x-ms-wmv wmv;
|
||||||
|
video/x-msvideo avi;
|
||||||
|
}
|
32
nginx/nginx.conf
Normal file
32
nginx/nginx.conf
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
|
||||||
|
user nginx;
|
||||||
|
worker_processes auto;
|
||||||
|
|
||||||
|
error_log /var/log/nginx/error.log notice;
|
||||||
|
pid /var/run/nginx.pid;
|
||||||
|
|
||||||
|
|
||||||
|
events {
|
||||||
|
worker_connections 1024;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
http {
|
||||||
|
include /etc/nginx/mime.types;
|
||||||
|
default_type application/octet-stream;
|
||||||
|
|
||||||
|
log_format main '$remote_addr - $remote_user [$time_local] "$request" '
|
||||||
|
'$status $body_bytes_sent "$http_referer" '
|
||||||
|
'"$http_user_agent" "$http_x_forwarded_for"';
|
||||||
|
|
||||||
|
access_log /var/log/nginx/access.log main;
|
||||||
|
|
||||||
|
sendfile on;
|
||||||
|
#tcp_nopush on;
|
||||||
|
|
||||||
|
keepalive_timeout 65;
|
||||||
|
|
||||||
|
#gzip on;
|
||||||
|
|
||||||
|
include /etc/nginx/conf.d/*.conf;
|
||||||
|
}
|
17
nginx/scgi_params
Normal file
17
nginx/scgi_params
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
|
||||||
|
scgi_param REQUEST_METHOD $request_method;
|
||||||
|
scgi_param REQUEST_URI $request_uri;
|
||||||
|
scgi_param QUERY_STRING $query_string;
|
||||||
|
scgi_param CONTENT_TYPE $content_type;
|
||||||
|
|
||||||
|
scgi_param DOCUMENT_URI $document_uri;
|
||||||
|
scgi_param DOCUMENT_ROOT $document_root;
|
||||||
|
scgi_param SCGI 1;
|
||||||
|
scgi_param SERVER_PROTOCOL $server_protocol;
|
||||||
|
scgi_param REQUEST_SCHEME $scheme;
|
||||||
|
scgi_param HTTPS $https if_not_empty;
|
||||||
|
|
||||||
|
scgi_param REMOTE_ADDR $remote_addr;
|
||||||
|
scgi_param REMOTE_PORT $remote_port;
|
||||||
|
scgi_param SERVER_PORT $server_port;
|
||||||
|
scgi_param SERVER_NAME $server_name;
|
29
nginx/templates/default.conf.template
Normal file
29
nginx/templates/default.conf.template
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
server {
|
||||||
|
listen 80 default_server;
|
||||||
|
listen [::]:80 default_server;
|
||||||
|
|
||||||
|
http2 on;
|
||||||
|
|
||||||
|
server_name _;
|
||||||
|
|
||||||
|
access_log /dev/stdout main;
|
||||||
|
error_log /dev/stderr;
|
||||||
|
|
||||||
|
location /api/ {
|
||||||
|
proxy_pass_request_headers on;
|
||||||
|
rewrite ^/api/(.*)$ /$1 break;
|
||||||
|
proxy_pass $API_URL;
|
||||||
|
}
|
||||||
|
|
||||||
|
location / {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
index index.html index.htm;
|
||||||
|
}
|
||||||
|
|
||||||
|
# redirect server error pages to the static page /50x.html
|
||||||
|
#
|
||||||
|
error_page 500 502 503 504 /50x.html;
|
||||||
|
location = /50x.html {
|
||||||
|
root /usr/share/nginx/html;
|
||||||
|
}
|
||||||
|
}
|
17
nginx/uwsgi_params
Normal file
17
nginx/uwsgi_params
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
|
||||||
|
uwsgi_param QUERY_STRING $query_string;
|
||||||
|
uwsgi_param REQUEST_METHOD $request_method;
|
||||||
|
uwsgi_param CONTENT_TYPE $content_type;
|
||||||
|
uwsgi_param CONTENT_LENGTH $content_length;
|
||||||
|
|
||||||
|
uwsgi_param REQUEST_URI $request_uri;
|
||||||
|
uwsgi_param PATH_INFO $document_uri;
|
||||||
|
uwsgi_param DOCUMENT_ROOT $document_root;
|
||||||
|
uwsgi_param SERVER_PROTOCOL $server_protocol;
|
||||||
|
uwsgi_param REQUEST_SCHEME $scheme;
|
||||||
|
uwsgi_param HTTPS $https if_not_empty;
|
||||||
|
|
||||||
|
uwsgi_param REMOTE_ADDR $remote_addr;
|
||||||
|
uwsgi_param REMOTE_PORT $remote_port;
|
||||||
|
uwsgi_param SERVER_PORT $server_port;
|
||||||
|
uwsgi_param SERVER_NAME $server_name;
|
Loading…
Reference in New Issue
Block a user