Page MenuHomeSoftware Heritage

deposit:config: Update deposit server config with swh_authority_url
ClosedPublic

Authored by ardumont on Mar 16 2021, 6:30 PM.

Details

Summary

Without this, the deposit server is not happy for metadata-only deposit.

Related to T3144#60940

Test Plan

octocatalog:

$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging deposit.internal.staging.swh.network
Found host deposit.internal.staging.swh.network
*** Running octocatalog-diff on host deposit.internal.staging.swh.network
I, [2021-03-17T09:09:44.287272 #11794]  INFO -- : Catalogs compiled for deposit.internal.staging.swh.network
I, [2021-03-17T09:09:45.557798 #11794]  INFO -- : Diffs computed for deposit.internal.staging.swh.network
diff origin/production/deposit.internal.staging.swh.network current/deposit.internal.staging.swh.network
*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -23,4 +23,5 @@
         media_root: "/srv/softwareheritage/deposit"
       extraction_dir: "/tmp/swh-deposit/archive/"
      +swh_authority_url: https://deposit.staging.swh.network/
       allowed_hosts:
       - deposit.staging.swh.network
*******************************************
*** End octocatalog-diff on deposit.internal.staging.swh.network
$ bin/octocatalog-diff --octocatalog-diff-args --no-truncate-details --to staging moma
*** Running octocatalog-diff on host moma.softwareheritage.org
I, [2021-03-17T09:09:15.742135 #6120]  INFO -- : Catalogs compiled for moma.softwareheritage.org
I, [2021-03-17T09:09:17.453704 #6120]  INFO -- : Diffs computed for moma.softwareheritage.org
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  File[/etc/softwareheritage/deposit/server.yml] =>
   parameters =>
     content =>
      @@ -22,4 +22,5 @@
         media_root: "/srv/storage/space/swh-deposit/uploads/"
       extraction_dir: "/tmp/swh-deposit/archive/"
      +swh_authority_url: https://deposit.softwareheritage.org/
       allowed_hosts:
       - deposit.softwareheritage.org
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org

Diff Detail

Repository
rSPSITE puppet-swh-site
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ardumont created this revision.

https://deposit.softwareheritate.org/

both for staging and prod?

prod is ok already, see the diff in the test plan.

no, for staging it should be something like https://deposit.staging.swh.network/

note the slash at the end, for consistency with existing authorities

ack, ok so i just need to make sure this ends with a /

cool, thanks.

ardumont retitled this revision from deposit:config: Add missing swh_authority_url key to deposit:config: Update deposit server config with swh_authority_url.Mar 17 2021, 9:11 AM
ardumont edited the test plan for this revision. (Show Details)
ardumont edited the summary of this revision. (Show Details)
ardumont edited the test plan for this revision. (Show Details)

Adapt according to review

This revision is now accepted and ready to land.Mar 17 2021, 9:13 AM