forked from linux/WebHosting
Merge pull request 'archive costs app' (#74) from archive_cost into main
Reviewed-on: linux/WebHosting#74
This commit is contained in:
@@ -0,0 +1,44 @@
|
||||
server {
|
||||
listen 80;
|
||||
server_name archivecostwebapp.psi.ch;
|
||||
return 301 https://$host$request_uri;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 443 ssl;
|
||||
server_name archivecostwebapp.psi.ch;
|
||||
|
||||
ssl_certificate /etc/nginx/certs/archivecostwebapp.psi.ch.crt;
|
||||
ssl_certificate_key /etc/nginx/private/archivecostwebapp.psi.ch.key;
|
||||
|
||||
ssl_protocols TLSv1.2 TLSv1.3;
|
||||
ssl_ciphers HIGH:!aNULL:!MD5;
|
||||
ssl_prefer_server_ciphers on;
|
||||
|
||||
location / {
|
||||
proxy_pass http://archive_cost_analytics:8501;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location /logic/ {
|
||||
proxy_pass http://archive_cost_logic:1880/;
|
||||
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Upgrade $http_upgrade;
|
||||
proxy_set_header Connection "upgrade";
|
||||
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -518,6 +518,46 @@ services:
|
||||
volumes:
|
||||
- /opt/webcontent/rocrate-dev/dev:/ro-crate:rw
|
||||
|
||||
# Datacenter and DB Services (9522), Peter Hüsser (HP95)
|
||||
# Archivkostenberechnung, logic-red und analytics-app gehoeren zusammen
|
||||
logic-red:
|
||||
image: gitea.psi.ch/data-catalog-services/archivecostwebapp-logic:latest
|
||||
container_name: archive_cost_logic
|
||||
restart: always
|
||||
volumes:
|
||||
- /opt/webcontent/archivecost/logic/node-red-data:/data
|
||||
- /opt/webcontent/archivecost/hared_data:/data/results
|
||||
- /opt/webcontent/archivecost/logic/scripts:/data/scripts
|
||||
environment:
|
||||
- TZ=Europe/Zurich
|
||||
- GROUPINFO_JSON_LNK_NAME_WITH_PATH=/data/archivegroup_information.json
|
||||
- BEGIN_NAME_GROUPINFO_JSON_FILE_WITH_PATH=/data/size_by_ownergroup_and_number_of_copies_
|
||||
- JSON_CACHE_WITH_PATH=/data/results/json_cache.json
|
||||
- NON_SPECIFIED_GROUPS=/data/non_specified_groups.csv
|
||||
- ERROR_LOGFILE=/data/logs/get_new_groupinfo_error.log
|
||||
- AD_SERVER=d.psi.ch
|
||||
- AD_SEARCH_BASE=DC=d,DC=psi,DC=ch
|
||||
- AD_USER=${ARCHIVECOST_AD_USER}
|
||||
- AD_PASSWORD=${ARCHIVE_COST_AD_PASSWORD}
|
||||
- METABASE_API_KEY=${ARCHIVECOST_METABASE_API_KEY}
|
||||
- MAIN_WORKFLOW_CRON=0 6 * * *
|
||||
- CLEANUP_TIME=20
|
||||
- CLEANUP_CRON=0 7 * * *
|
||||
- CLEANUP_SCRIPT_PATH=/data/scripts/cleanup.sh
|
||||
- CLEANUP_LOGFILE_PATH=/data/logs/cleanup.log
|
||||
networks:
|
||||
- backend
|
||||
analytics-app:
|
||||
image: gitea.psi.ch/data-catalog-services/archivecostwebapp-analytics:latest
|
||||
container_name: archive_cost_analytics
|
||||
restart: always
|
||||
volumes:
|
||||
- /opt/webcontent/archivecost/hared_data:/data/results:ro
|
||||
environment:
|
||||
- TZ=Europe/Zurich
|
||||
networks:
|
||||
- backend
|
||||
|
||||
networks:
|
||||
public:
|
||||
backend:
|
||||
|
||||
Reference in New Issue
Block a user