elections: clean up some old stuff from the old site and add redirect to new.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>

playbooks/include/proxies-redirects.yml

@@ -79,6 +79,12 @@
     regex: /(.*)$
     target: https://paste.fedoraproject.org/$1
 
+  - role: httpd/redirectmatch
+    shortname: elections
+    website: admin.fedoraproject.org
+    regex: /voting
+    target: https://elections.fedoraproject.org/
+
   - role: httpd/redirectmatch
     shortname: mailman
     website: admin.fedoraproject.org

roles/apps-fp-o/files/apps.yaml

@@ -307,7 +307,7 @@ children:
                 automatically.
     -   name:   Elections
         data:
-            url:    https://admin.fedoraproject.org/voting
+            url:    https://elections.fedoraproject.org/
             source_url: https://github.com/fedora-infra/elections
             bugs_url:   https://github.com/fedora-infra/elections/issues
             docs_url:   https://github.com/fedora-infra/elections/blob/develop/README.rst

roles/haproxy/templates/haproxy.cfg

@@ -64,18 +64,6 @@ backend mirror-lists-backend
     option  httpchk GET /metalink?repo=epel-7&arch=x86_64
     option  allbackups
 
-frontend voting-frontend
-    bind 0.0.0.0:10007
-    default_backend voting-backend
-
-backend voting-backend
-    balance hdr(appserver)
-    server  elections01 elections01:80 check inter 10s rise 2 fall 4
-{% if env == "production" %}
-    server  elections02 elections02:80 check inter 10s rise 2 fall 4
-{% endif %}
-    option  httpchk GET /voting/
-
 frontend mirrormanager-frontend
     bind 0.0.0.0:10008
     default_backend mirrormanager-backend

roles/varnish/templates/proxies.vcl.j2

@@ -47,12 +47,6 @@ backend nuancier {
     .port = "10035";
 }
 
-backend voting {
-    .host = "localhost";
-    .port = "10007";
-    .first_byte_timeout = 160s;
-}
-
 backend mirrormanager {
     .host = "localhost";
     .port = "10008";
@@ -184,14 +178,6 @@ sub vcl_recv {
             set req.url = regsub(req.url, "\?.*", "");
         }
     }
-    if (req.url ~ "^/voting/") {
-        set req.backend_hint = voting;
-        if (req.url ~ "^/voting/static/") {
-            unset req.http.cookie;
-            set req.http.clear-cookies = "yes";
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
     if (req.url ~ "^/mirrormanager") {
         set req.backend_hint = mirrormanager;
         if (req.url ~ "^/mirrormanager/static/") {