diff --git a/sysadm/network-architecture/service-urls.rst b/sysadm/network-architecture/service-urls.rst --- a/sysadm/network-architecture/service-urls.rst +++ b/sysadm/network-architecture/service-urls.rst @@ -22,17 +22,14 @@ Public urls ~~~~~~~~~~~ -+---------------------------------------+-------------------------------------------+ -| Service | URL | -+=======================================+===========================================+ -| swh-web | https://webapp.staging.swh.network | -+---------------------------------------+-------------------------------------------+ -| swh-deposit | https://deposit.staging.swh.network | -+---------------------------------------+-------------------------------------------+ -| swh-objstorage read-only (for mirror) | https://objstorage.staging.swh.network | -+---------------------------------------+-------------------------------------------+ -| Journal TLS | broker1.journal.staging.swh.network:9093 | -+---------------------------------------+-------------------------------------------+ +============================ ======================================== +Service URL +============================ ======================================== +swh-web https://webapp.staging.swh.network +swh-deposit https://deposit.staging.swh.network +swh-objstorage read-only [4] https://objstorage.staging.swh.network +Journal TLS broker0.journal.staging.swh.network:9093 +============================ ======================================== Internal services ~~~~~~~~~~~~~~~~~ @@ -96,54 +93,54 @@ Public urls ~~~~~~~~~~~ -+---------------------------------------+-----------------------------------------------+ -| Service | URL | -+=======================================+===============================================+ -| swh-web | https://archive.softwareheritage.org | -+---------------------------------------+-----------------------------------------------+ -| swh-deposit | https://deposit.softwareheritage.org | -+---------------------------------------+-----------------------------------------------+ -| swh-objstorage read-only (for mirror) | N/A | -+---------------------------------------+-----------------------------------------------+ -| Journal TLS | broker[1-4].journal.softwareheritage.org:9093 | -+---------------------------------------+-----------------------------------------------+ ++---------------------------------+-----------------------------------------------+ +| Service | URL | ++=================================+===============================================+ +| swh-web | https://archive.softwareheritage.org | ++---------------------------------+-----------------------------------------------+ +| swh-deposit | https://deposit.softwareheritage.org | ++---------------------------------+-----------------------------------------------+ +| swh-objstorage read-only [3][4] | https://objstorage.softwareheritage.org | ++---------------------------------+-----------------------------------------------+ +| Journal TLS | broker[1-4].journal.softwareheritage.org:9093 | ++---------------------------------+-----------------------------------------------+ .. _internal-services-1: Internal services ~~~~~~~~~~~~~~~~~ -+--------------------------+----------------------------------------------------------------+--------+------------+ -| Service | URL | VPN[1] | Private[2] | -+==========================+================================================================+========+============+ -| swh-web test/validation | https://webapp1.internal.softwareheritage.org | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-storage | http://saam.internal.softwareheritage.org:5002 | | X | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-storage read-only | http://webapp1.internal.softwareheritage.org:5002 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-storage read-only | http://moma.internal.softwareheritage.org:5002 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-objstorage | http://saam.internal.softwareheritage.org:5003 | | X | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-objstorage read-only | N/A | | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-scheduler | http://saatchi.internal.softwareheritage.org:5008 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-counters | http://counters1.internal.softwareheritage.org:5011 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-search | http://webapp1.internal.softwareheritage.org:5010 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-search | http://moma.internal.softwareheritage.org:5010 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-search | http://search1.internal.softwareheritage.org:5010 | | X | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| swh-vault | http://vangogh.euwest.azure.internal.softwareheritage.org:5005 | | X | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| Journal plaintext | kafka[1-4].internal.softwareheritage.org:9092 | | X | -+--------------------------+----------------------------------------------------------------+--------+------------+ -| Journal internal TLS | kafka[1-4].internal.softwareheritage.org:9094 | X | | -+--------------------------+----------------------------------------------------------------+--------+------------+ ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| Service | URL | VPN[1] | Private[2] | ++=============================+================================================================+========+============+ +| swh-web test/validation | https://webapp1.internal.softwareheritage.org | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-storage | http://saam.internal.softwareheritage.org:5002 | | X | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-storage read-only | http://webapp1.internal.softwareheritage.org:5002 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-storage read-only | http://moma.internal.softwareheritage.org:5002 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-objstorage | http://saam.internal.softwareheritage.org:5003 | | X | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-objstorage read-only[3] | http://objstorage.internal.softwareheritage.org:5003 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-scheduler | http://saatchi.internal.softwareheritage.org:5008 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-counters | http://counters1.internal.softwareheritage.org:5011 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-search | http://webapp1.internal.softwareheritage.org:5010 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-search | http://moma.internal.softwareheritage.org:5010 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-search | http://search1.internal.softwareheritage.org:5010 | | X | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| swh-vault | http://vangogh.euwest.azure.internal.softwareheritage.org:5005 | | X | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| Journal plaintext | kafka[1-4].internal.softwareheritage.org:9092 | | X | ++-----------------------------+----------------------------------------------------------------+--------+------------+ +| Journal internal TLS | kafka[1-4].internal.softwareheritage.org:9094 | X | | ++-----------------------------+----------------------------------------------------------------+--------+------------+ .. _swh-backends-1: @@ -194,3 +191,7 @@ [1] VPN: URL only accessible when connected to the SoftwareHeritage VPN [2] Private: URL only accessible from the internal network, i.e nor public neither accessible through the VPN. + +[3] Use banco and samm as underlying objstorage + +[4] Protected by a basic authentication. Credentials are available in the credential store.