diff --git a/docker/conf/deposit.yml b/docker/conf/deposit.yml index 3b788aa..033bdff 100644 --- a/docker/conf/deposit.yml +++ b/docker/conf/deposit.yml @@ -1,19 +1,19 @@ scheduler: cls: remote args: url: http://swh-scheduler:5008 allowed_hosts: - - swh-deposit + - '*' loader-version: 2 private: secret_key: prod-in-docker db: host: swh-deposit-db port: 5432 name: swh-deposit user: postgres password: testpassword media_root: /tmp/swh-deposit/uploads diff --git a/docker/conf/loader.yml b/docker/conf/loader.yml index 0116924..f613620 100644 --- a/docker/conf/loader.yml +++ b/docker/conf/loader.yml @@ -1,44 +1,47 @@ storage: cls: filter args: storage: cls: buffer args: storage: cls: remote args: url: http://swh-storage:5002/ min_batch_size: content: 10000 content_bytes: 104857600 directory: 1000 revision: 1000 scheduler: cls: remote args: url: http://swh-scheduler:5008/ +deposit: + url: http://swh-deposit:5006/1/private + celery: task_broker: amqp://guest:guest@amqp// task_queues: - swh.loader.dir.tasks.LoadDirRepository - swh.loader.git.tasks.LoadDiskGitRepository - swh.loader.git.tasks.UncompressAndLoadDiskGitRepository - swh.loader.git.tasks.UpdateGitRepository - swh.loader.mercurial.tasks.LoadArchiveMercurial - swh.loader.mercurial.tasks.LoadMercurial - swh.loader.package.tasks.archive.LoadArchive - swh.loader.package.tasks.debian.LoadDebian - swh.loader.package.tasks.deposit.LoadDeposit - swh.loader.package.tasks.npm.LoadNpm - swh.loader.package.tasks.pypi.LoadPyPI - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository - swh.loader.svn.tasks.LoadSvnRepository - swh.loader.svn.tasks.MountAndLoadSvnRepository - swh.deposit.loader.tasks.ChecksDepositTsk lister_db_url: postgresql://postgres@swh-listers-db/swh-listers url: 'http://swh-deposit:5006' diff --git a/docker/conf/nginx.conf b/docker/conf/nginx.conf index d82c32b..dcfcaf7 100644 --- a/docker/conf/nginx.conf +++ b/docker/conf/nginx.conf @@ -1,107 +1,108 @@ worker_processes 1; # Show startup logs on stderr; switch to debug to print, well, debug logs when # running nginx-debug error_log /dev/stderr info; events { worker_connections 1024; } http { include mime.types; default_type application/octet-stream; sendfile on; keepalive_timeout 65; # Built-in Docker resolver. Needed to allow on-demand resolution of proxy # upstreams. resolver 127.0.0.11 valid=30s; server { listen 80 default_server; # Add a trailing slash to top level requests (e.g. http://localhost:5080/flower) rewrite ^/([^/]+)$ /$1/ permanent; # In this pile of proxies, all upstreams are set using a variable. This # makes nginx DNS-resolve the name of the upstream when clients request # them, rather than on start. This avoids an unstarted container preventing # nginx from starting. # # Variables need to be set as early as possible, as they're statements from # the rewrite module and `rewrite [...] break;` will prevent these # statements from being executed. location /flower/ { set $upstream "http://flower:5555"; rewrite ^/flower/(.*)$ /$1 break; proxy_pass $upstream; proxy_set_header X-Real-IP $remote_addr; proxy_set_header Host $host; proxy_redirect off; proxy_http_version 1.1; proxy_set_header Upgrade $http_upgrade; proxy_set_header Connection "upgrade"; } location /rabbitmq/ { set $upstream "http://amqp:15672"; rewrite ^ $request_uri; rewrite ^/rabbitmq(/.*)$ $1 break; proxy_pass $upstream$uri; } location /scheduler { set $upstream "http://swh-scheduler:5008"; rewrite ^/scheduler/(.*)$ /$1 break; proxy_pass $upstream; } location /storage { set $upstream "http://swh-storage:5002"; rewrite ^/storage/(.*)$ /$1 break; proxy_pass $upstream; } location /indexer-storage { set $upstream "http://swh-idx-storage:5007"; rewrite ^/indexer-storage/(.*)$ /$1 break; proxy_pass $upstream; } location /deposit { set $upstream "http://swh-deposit:5006"; - rewrite ^/deposit/(.*)$ /$1 break; + rewrite ^/deposit/(.*)$ /deposit/$1 break; proxy_pass $upstream; proxy_set_header X-Real-IP $remote_addr; - proxy_set_header Host $host; + proxy_set_header X-Forwarded-Host $host:5080; + proxy_set_header SCRIPT_NAME /deposit; proxy_redirect off; } location /objstorage { set $upstream "http://swh-objstorage:5003"; rewrite ^/objstorage/(.*)$ /$1 break; proxy_pass $upstream; } location /prometheus { set $upstream "http://prometheus:9090"; proxy_pass $upstream; } location /grafana { set $upstream "http://grafana:3000"; rewrite ^/grafana/(.*)$ /$1 break; proxy_pass $upstream; } location / { set $upstream "http://swh-web:5004"; proxy_pass $upstream; } } }