Update salt-server-list.rst

python · Sep 19, 2022 · 63517de · 63517de
1 parent 6171038
commit 63517de
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/docs/salt-server-list.rst b/docs/salt-server-list.rst
@@ -4,29 +4,29 @@
 
 
 .. csv-table::
-   :header: "Name", "Purpose", "Contact", "Datacener"
+   :header: "Name", "Purpose", "Contact", "Distro", "Datacener"
 
 
-   "backup.sfo1.psf.io", "Automated backup of infrastructure", "Infrastructure staff", "sfo1"
-   "bugs.ams1.psf.io", "Roundup hosting for CPython, Jython, and Roundup", "Infrastructure staff", "ams1"
-   "buildbot.nyc1.psf.io", "Hosting for CPython buildbot server", "zware, haypo, pablogsa", "nyc1"
-   "cdn-logs.nyc1.psf.io", "Realtime log streaming from Fastly CDN for debug", "Infrastructure Staff", "nyc1"
-   "codespeed.nyc1.psf.io", "Hosting for speed.python.org and speed.pypy.org", "", "nyc1"
-   "consul-a.nyc1.psf.io", "Runs `Consul <https://www.consul.io/>`_ discovery service", "Infrastructure Staff", "nyc1"
-   "consul-b.nyc1.psf.io", "Runs `Consul <https://www.consul.io/>`_ discovery service", "Infrastructure Staff", "nyc1"
-   "consul-c.nyc1.psf.io", "Runs `Consul <https://www.consul.io/>`_ discovery service", "Infrastructure Staff", "nyc1"
-   "docs.nyc1.psf.io", "Builds and serves CPython's documentation", "mdk", "nyc1"
-   "downloads.nyc1.psf.io", "Serves python.org downloads", "CPython Release Managers", "nyc1"
-   "hg.nyc1.psf.io", "Version Control Archives, serves hg.python.org and svn.python.org", "Infrastructure Staff", "nyc1"
-   "lb-a.nyc1.psf.io", "Load balancer", "Infrastructure Staff", "nyc1"
-   "lb-b.nyc1.psf.io", "Load balancer", "Infrastructure Staff", "nyc1"
-   "mail.ams1.psf.io", "Mail and mailman server", "postmasters", "ams1"
-   "moin.nyc1.psf.io", "Hosts moin sites for wiki.python.org, wiki.jython.org", "lemburg", "nyc1"
-   "planet.nyc1.psf.io", "Planet Python", "benjamin", "nyc1"
-   "pypy-web.nyc1.psf.io", "Serves www.pypy.org", "mattip, fijal", "nyc1"
-   "pythontest.nyc3.psf.io", "Test resources for CPython's test suite.", "Infrastructure Staff", "nyc3"
-   "salt.nyc1.psf.io", "Salt server", "Infrastructure Staff", "nyc1"
-   "web0.pypa.nyc1.psf.io", "Python Packaging Authority", "dstufft", "nyc1"
+   "backup.sfo1.psf.io", "Automated backup of infrastructure", "Infrastructure staff", "Ubuntu-20.04", "sfo1"
+   "bugs.ams1.psf.io", "Roundup hosting for CPython, Jython, and Roundup", "Infrastructure staff", "Ubuntu-16.04", "ams1"
+   "buildbot.nyc1.psf.io", "Hosting for CPython buildbot server", "zware, haypo, pablogsa", "Ubuntu-20.04", "nyc1"
+   "cdn-logs.nyc1.psf.io", "Realtime log streaming from Fastly CDN for debug", "Infrastructure Staff", "Ubuntu-18.04", "nyc1"
+   "codespeed.nyc1.psf.io", "Hosting for speed.python.org and speed.pypy.org", "", "Ubuntu-18.04", "nyc1"
+   "consul-a.nyc1.psf.io", "Runs `Consul <https://www.consul.io/>`_ discovery service", "Infrastructure Staff", "Ubuntu-20.04", "nyc1"
+   "consul-b.nyc1.psf.io", "Runs `Consul <https://www.consul.io/>`_ discovery service", "Infrastructure Staff", "Ubuntu-20.04", "nyc1"
+   "consul-c.nyc1.psf.io", "Runs `Consul <https://www.consul.io/>`_ discovery service", "Infrastructure Staff", "Ubuntu-20.04", "nyc1"
+   "docs.nyc1.psf.io", "Builds and serves CPython's documentation", "mdk", "Ubuntu-20.04", "nyc1"
+   "downloads.nyc1.psf.io", "Serves python.org downloads", "CPython Release Managers", "Ubuntu-20.04", "nyc1"
+   "hg.nyc1.psf.io", "Version Control Archives, serves hg.python.org and svn.python.org", "Infrastructure Staff", "Ubuntu-18.04", "nyc1"
+   "lb-a.nyc1.psf.io", "Load balancer", "Infrastructure Staff", "Ubuntu-20.04", "nyc1"
+   "lb-b.nyc1.psf.io", "Load balancer", "Infrastructure Staff", "Ubuntu-20.04", "nyc1"
+   "mail.ams1.psf.io", "Mail and mailman server", "postmasters", "Ubuntu-14.04", "ams1"
+   "moin.nyc1.psf.io", "Hosts moin sites for wiki.python.org, wiki.jython.org", "lemburg", "Ubuntu-20.04", "nyc1"
+   "planet.nyc1.psf.io", "Planet Python", "benjamin", "Ubuntu-18.04", "nyc1"
+   "pypy-web.nyc1.psf.io", "Serves www.pypy.org", "mattip, fijal", "Ubuntu-18.04", "nyc1"
+   "pythontest.nyc3.psf.io", "Test resources for CPython's test suite.", "Infrastructure Staff", "Ubuntu-18.04", "nyc3"
+   "salt.nyc1.psf.io", "Salt server", "Infrastructure Staff", "Ubuntu-20.04", "nyc1"
+   "web0.pypa.nyc1.psf.io", "Python Packaging Authority", "dstufft", "Ubuntu-18.04", "nyc1"
 
 ..
     END AUTOMATED SECTION **DO NOT DIRECTLY EDIT - Salt will blow away your changes!!!**