Page MenuHomeSoftware Heritage
Differential D5965

swh-search: bind the service to the internal network address
ClosedPublic
Actions

Authored by vsellier on Jul 2 2021, 7:35 PM.

Details

Reviewers
ardumont
Group Reviewers
System administrators
Maniphest Tasks
T3408: Provide read-only access to production servers
Commits
rSPSITE415363937661: swh-search: bind the service to the internal network address
Summary

It's necessary to allow developpers to perform some r/o tests.
Actually the service is allowing r/w but it something will work on.

Related to T3408

Test Plan
  • search0.staging
diff origin/production/search0.internal.staging.swh.network current/search0.internal.staging.swh.network
*******************************************
  Concat::Fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 default_server;
      +  listen search0.internal.staging.swh.network:5010 default_server;
      _
      _
*******************************************
  Concat::Fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 deferred;
      +  listen search0.internal.staging.swh.network:5010 deferred;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 default_server;
      +  listen search0.internal.staging.swh.network:5010 default_server;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 deferred;
      +  listen search0.internal.staging.swh.network:5010 deferred;
      _
      _
*******************************************
  Nginx::Resource::Server[nginx-swh-search-default] =>
   parameters =>
     listen_ip =>
      - 0.0.0.0
      + search0.internal.staging.swh.network
*******************************************
  Nginx::Resource::Server[nginx-swh-search] =>
   parameters =>
     listen_ip =>
      - 0.0.0.0
      + search0.internal.staging.swh.network
*******************************************
*** End octocatalog-diff on search0.internal.staging.swh.network
  • moma
diff origin/production/moma.softwareheritage.org current/moma.softwareheritage.org
*******************************************
  Concat::Fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 default_server;
      +  listen moma.internal.softwareheritage.org:5010 default_server;
      _
      _
*******************************************
  Concat::Fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 deferred;
      +  listen moma.internal.softwareheritage.org:5010 deferred;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 default_server;
      +  listen moma.internal.softwareheritage.org:5010 default_server;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 deferred;
      +  listen moma.internal.softwareheritage.org:5010 deferred;
      _
      _
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -2,5 +2,5 @@
       search:
         cls: remote
      -  url: http://localhost:5010/
      +  url: http://moma.internal.softwareheritage.org:5010/
       metadata_search_backend: swh-indexer-storage
       storage:
*******************************************
  Nginx::Resource::Server[nginx-swh-search-default] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + moma.internal.softwareheritage.org
*******************************************
  Nginx::Resource::Server[nginx-swh-search] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + moma.internal.softwareheritage.org
*******************************************
*** End octocatalog-diff on moma.softwareheritage.org
  • webapp1
diff origin/production/webapp1.internal.softwareheritage.org current/webapp1.internal.softwareheritage.org
*******************************************
  Concat::Fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 default_server;
      +  listen webapp1.internal.softwareheritage.org:5010 default_server;
      _
      _
*******************************************
  Concat::Fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 deferred;
      +  listen webapp1.internal.softwareheritage.org:5010 deferred;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 default_server;
      +  listen webapp1.internal.softwareheritage.org:5010 default_server;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 127.0.0.1:5010 deferred;
      +  listen webapp1.internal.softwareheritage.org:5010 deferred;
      _
      _
*******************************************
  File[/etc/softwareheritage/web/web.yml] =>
   parameters =>
     content =>
      @@ -2,5 +2,5 @@
       search:
         cls: remote
      -  url: http://localhost:5010/
      +  url: http://webapp1.internal.softwareheritage.org:5010/
       metadata_search_backend: swh-search
       storage:
*******************************************
  Nginx::Resource::Server[nginx-swh-search-default] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + webapp1.internal.softwareheritage.org
*******************************************
  Nginx::Resource::Server[nginx-swh-search] =>
   parameters =>
     listen_ip =>
      - 127.0.0.1
      + webapp1.internal.softwareheritage.org
*******************************************
*** End octocatalog-diff on webapp1.internal.softwareheritage.org
  • search1:
diff origin/production/search1.internal.softwareheritage.org current/search1.internal.softwareheritage.org
*******************************************
  Concat::Fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 default_server;
      +  listen search1.internal.softwareheritage.org:5010 default_server;
      _
      _
*******************************************
  Concat::Fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 deferred;
      +  listen search1.internal.softwareheritage.org:5010 deferred;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-default-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 default_server;
      +  listen search1.internal.softwareheritage.org:5010 default_server;
      _
      _
*******************************************
  Concat_fragment[nginx-swh-search-header] =>
   parameters =>
     content =>
      @@ -1,5 +1,5 @@
       # MANAGED BY PUPPET
       server {
      -  listen 0.0.0.0:5010 deferred;
      +  listen search1.internal.softwareheritage.org:5010 deferred;
      _
      _
*******************************************
  Nginx::Resource::Server[nginx-swh-search-default] =>
   parameters =>
     listen_ip =>
      - 0.0.0.0
      + search1.internal.softwareheritage.org
*******************************************
  Nginx::Resource::Server[nginx-swh-search] =>
   parameters =>
     listen_ip =>
      - 0.0.0.0
      + search1.internal.softwareheritage.org
*******************************************
*** End octocatalog-diff on search1.internal.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

vsellier requested review of this revision.Jul 2 2021, 7:35 PM
vsellier created this revision.
Harbormaster completed remote builds in B22450: Diff 21473.Jul 2 2021, 7:35 PM
ardumont requested changes to this revision.Jul 5 2021, 10:28 AM
ardumont added a subscriber: ardumont.

There is a suspicious state in the diff on moma and webapp1 which resets the search instance configuration entry.
Can you please check?

This revision now requires changes to proceed.Jul 5 2021, 10:28 AM
vsellier updated this revision to Diff 21484.Jul 5 2021, 4:33 PM

Good catch. A variable renaming was missing.

Harbormaster completed remote builds in B22463: Diff 21484.Jul 5 2021, 4:33 PM
vsellier edited the test plan for this revision. (Show Details)Jul 5 2021, 4:35 PM
vsellier edited the test plan for this revision. (Show Details)
ardumont accepted this revision.Jul 5 2021, 4:46 PM

\o/

This revision is now accepted and ready to land.Jul 5 2021, 4:46 PM
Closed by commit rSPSITE415363937661: swh-search: bind the service to the internal network address (authored by vsellier). · Explain WhyJul 5 2021, 5:39 PM
This revision was automatically updated to reflect the committed changes.
vsellier added a commit: rSPSITE415363937661: swh-search: bind the service to the internal network address.

Revision Contents
Changeset List

PathSize
data/
common/
8 lines
deployments/
staging/
1 line
hostname/
1 line

Diff 21491

View Options

data/common/common.yaml

Loading...
View Options

data/deployments/staging/common.yaml

Loading...
View Options

data/hostname/moma.softwareheritage.org.yaml

Loading...
View Options

data/hostname/search1.internal.softwareheritage.org.yaml

Loading...
About · Developer information · Legal