Andrey/OCSInventory-Docker-Image
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #94 from OCSInventory-NG/docker_update

Browse Source 
Docker update
This commit is contained in:
Gilles Dubois 2022-11-14 15:14:24 +01:00 committed by GitHub
commit 655da1a5c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
2.11/nginx/conf/ocsinventory.conf.template
View File

@ -37,6 +37,7 @@ server {
location /ocsapi { location /ocsapi {
auth_basic "OCS Api area"; auth_basic "OCS Api area";
auth_basic_user_file /etc/nginx/auth/${API_AUTH_FILE}; auth_basic_user_file /etc/nginx/auth/${API_AUTH_FILE};
proxy_pass http://ocsapplication/ocsapi;
} }
location /download { location /download {
@ -44,5 +45,6 @@ server {
proxy_connect_timeout ${CONNECT_TIMEOUT}; proxy_connect_timeout ${CONNECT_TIMEOUT};
proxy_send_timeout ${SEND_TIMEOUT}; proxy_send_timeout ${SEND_TIMEOUT};
client_max_body_size ${MAX_BODY_SIZE}; client_max_body_size ${MAX_BODY_SIZE};
proxy_pass http://ocsapplication/download;
} }
} }

2
latest
View File

@ -1 +1 @@
2.9.2 2.11/