Staging instance, all changes can be removed at any time

Skip to content

webapp: bind the local storage to the internal network address

Vincent Sellier requested to merge generated-differential-D5960-source into generated-differential-D5960-target

Bound the read-only storage on the local network address of the server (192.168.100.xxx) instead of localhost to let the dev environment access them

Related to T3408

Test Plan

  • saam
*** Running octocatalog-diff on host saam.internal.softwareheritage.org
I, [2021-07-01T19:25:28.876581 #23571]  INFO -- : Catalogs compiled for saam.internal.softwareheritage.org
I, [2021-07-01T19:25:30.517152 #23571]  INFO -- : Diffs computed for saam.internal.softwareheritage.org
I, [2021-07-01T19:25:30.517197 #23571]  INFO -- : No differences
*** End octocatalog-diff on saam.internal.softwareheritage.org
  • moma
*******************************************
  Concat::Fragment[nginx-swh-storage-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 default_server;
      +  listen moma.internal.softwareheritage.org:5002 default_server;
      _
      _
*******************************************
  Concat::Fragment[nginx-swh-storage-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 deferred;
      +  listen moma.internal.softwareheritage.org:5002 deferred;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-storage-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 default_server;
      +  listen moma.internal.softwareheritage.org:5002 default_server;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-storage-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 deferred;
      +  listen moma.internal.softwareheritage.org:5002 deferred;
      _
      _
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -7,5 +7,5 @@
         cls: remote
         args:
      -    url: http://localhost:5002/
      +    url: http://moma.internal.softwareheritage.org:5002/
       vault:
         cls: remote
*******************************************
  Nginx::Resource::Server[nginx-swh-storage-default] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + moma.internal.softwareheritage.org
*******************************************
  Nginx::Resource::Server[nginx-swh-storage] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + moma.internal.softwareheritage.org
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org
  • webapp1
*******************************************
  Concat::Fragment[nginx-swh-storage-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 default_server;
      +  listen webapp1.internal.softwareheritage.org:5002 default_server;
      _
      _
*******************************************
  Concat::Fragment[nginx-swh-storage-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 deferred;
      +  listen webapp1.internal.softwareheritage.org:5002 deferred;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-storage-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 default_server;
      +  listen webapp1.internal.softwareheritage.org:5002 default_server;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-storage-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5002 deferred;
      +  listen webapp1.internal.softwareheritage.org:5002 deferred;
      _
      _
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -7,5 +7,5 @@
         cls: remote
         args:
      -    url: http://localhost:5002/
      +    url: http://webapp1.internal.softwareheritage.org:5002/
       vault:
         cls: remote
*******************************************
  Nginx::Resource::Server[nginx-swh-storage-default] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + webapp1.internal.softwareheritage.org
*******************************************
  Nginx::Resource::Server[nginx-swh-storage] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + webapp1.internal.softwareheritage.org
*******************************************
*** End octocatalog-diff on webapp1.internal.softwareheritage.org

Migrated from D5960 (view on Phabricator)

Merge request reports