Prepare for moin migration to 20.04 (#270)

* widen pattern for moin role

we'll match a host moin-2004.nyc1.psf.io temporarily during migration, then rename it to just moin.nyc1.psf.io after migration is complete!

* configure a health check for the moin role

This will allow us to bring up a new moin host and have it _not_ be part of the load balancer until we are ready

* lint: pillar/prod/roles.sls

pillar/base/haproxy.sls

@@ -68,6 +68,7 @@ haproxy:
         - wiki.python.org
         - wiki.jython.org
       verify_host: moin.psf.io
+      check: "HEAD /moin/HelpContents HTTP/1.1\\r\\nHost:\\ wiki.python.org"
 
     svn:
       domains:

pillar/prod/roles.sls

@@ -18,15 +18,15 @@ roles:
     pattern:  "buildbot.nyc1.psf.io"
     purpose:  "Hosting for CPython buildbot server"
     contact:  "zware, haypo, pablogsa"
-  cdn-logs: 
+  cdn-logs:
     pattern:  "cdn-logs.nyc1.psf.io"
     purpose:  "Realtime log streaming from Fastly CDN for debug"
     contact:  "Infrastructure Staff"
-  codespeed: 
+  codespeed:
     pattern:  "codespeed*.nyc1.psf.io"
     purpose:  "Hosting for speed.python.org and speed.pypy.org"
     contact:  ""
-  consul: 
+  consul:
     pattern:  "consul*.nyc1.psf.io"
     purpose:  "Runs `Consul <https://www.consul.io/>`_ discovery service"
     contact:  "Infrastructure Staff"
@@ -46,28 +46,28 @@ roles:
     pattern:  "lb*.nyc1.psf.io"
     purpose:  "Load balancer"
     contact:  "Infrastructure Staff"
-  mail: 
+  mail:
     pattern:  "mail.ams1.psf.io"
     purpose:  "Mail and mailman server"
     contact:  "postmasters"
-  planet: 
+  planet:
     pattern:  "planet.nyc1.psf.io"
     purpose:  "Planet Python"
     contact:  "benjamin"
-  pypy-web: 
+  pypy-web:
     pattern:  "pypy-web.nyc1.psf.io"
     purpose:  "Serves www.pypy.org"
     contact:  "mattip, fijal"
-  pythontest: 
+  pythontest:
     pattern:  "pythontest.nyc3.psf.io"
     purpose:  "Test resources for CPython's test suite."
     contact:  "Infrastructure Staff"
-  salt-master: 
+  salt-master:
     pattern:  "salt*.nyc1.psf.io"
     purpose:  "Salt server"
     contact:  "Infrastructure Staff"
-  moin: 
-    pattern:  "moin.nyc1.psf.io"
+  moin:
+    pattern:  "moin*.nyc1.psf.io"
     purpose:  "Hosts moin sites for wiki.python.org, wiki.jython.org"
     contact:  "lemburg"