diff --git a/conf/deposit.yml b/conf/deposit.yml new file mode 100644 --- /dev/null +++ b/conf/deposit.yml @@ -0,0 +1,14 @@ +scheduler: + cls: remote + args: + url: http://swh-scheduler:5008 + +private: + secret_key: prod-in-docker + db: + host: swh-deposit-db + port: 5432 + name: softwareheritage-deposit + user: postgres + password: testpassword + media_root: /tmp/swh-deposit/uploads diff --git a/conf/deposit_private.yml b/conf/deposit_private.yml deleted file mode 100644 --- a/conf/deposit_private.yml +++ /dev/null @@ -1,8 +0,0 @@ -secret_key: prod-in-docker -db: - host: swh-deposit-db - port: 5432 - name: softwareheritage-deposit - user: postgres - password: testpassword -media_root: /tmp/swh-deposit/uploads diff --git a/conf/deposit_server.yml b/conf/deposit_server.yml deleted file mode 100644 --- a/conf/deposit_server.yml +++ /dev/null @@ -1,4 +0,0 @@ -scheduler: - cls: remote - args: - url: http://swh-scheduler:5008 diff --git a/docker-compose.yml b/docker-compose.yml --- a/docker-compose.yml +++ b/docker-compose.yml @@ -195,8 +195,7 @@ environment: PGHOST: swh-deposit-db volumes: - - "./conf/deposit_server.yml:/etc/softwareheritage/deposit/server.yml:ro" - - "./conf/deposit_private.yml:/etc/softwareheritage/deposit/private.yml:ro" + - "./conf/deposit.yml:/deposit.yml:ro" swh-vault-db: image: postgres:10 diff --git a/dockerfiles/swh-deposit/loader.yml b/dockerfiles/swh-deposit/loader.yml deleted file mode 100644 --- a/dockerfiles/swh-deposit/loader.yml +++ /dev/null @@ -1 +0,0 @@ -extraction_dir: /tmp/swh.deposit.loader/ diff --git a/env/deposit.env b/env/deposit.env --- a/env/deposit.env +++ b/env/deposit.env @@ -1,3 +1,5 @@ POSTGRES_DB=softwareheritage-deposit POSTGRES_PASSWORD=testpassword PGUSER=postgres +SWH_CONFIG_FILENAME=/deposit.yml +DJANGO_SETTINGS_MODULE=swh.deposit.settings.production \ No newline at end of file