Consolidate prod and stg varnish

2 files changed, 1 insertions, 312 deletions

diff --git a/roles/varnish/files/proxy.vcl.stg b/roles/varnish/files/proxy.vcl.stg
deleted file mode 100644
index 549d0a1cc..000000000
--- a/roles/varnish/files/proxy.vcl.stg
+++ /dev/null
@@ -1,299 +0,0 @@
-vcl 4.0;
-
-import directors;
-
-backend wiki {
-    .host = "localhost";
-    .port = "10001";
-    .first_byte_timeout = 120s;
-}
-
-backend mirrorlists {
-    .host = "localhost";
-    .port = "10002";
-}
-
-backend pkgdb {
-    .host = "localhost";
-    .port = "10003";
-    .first_byte_timeout = 160s;
-}
-
-backend fas01 {
-    .host = "fas01";
-    .port = "http";
-    .probe = {
-        .url = "/accounts/";
-        .interval = 5s;
-        .timeout = 5s;
-        .window = 5;
-        .threshold = 5;
-    }
-}
-
-backend fas02 {
-    .host = "fas02";
-    .port = "http";
-    .probe = {
-        .url = "/accounts/";
-        .interval = 5s;
-        .timeout = 5s;
-        .window = 5;
-        .threshold = 5;
-    }
-}
-
-backend fas03 {
-    .host = "fas03";
-    .port = "http";
-    .probe = {
-        .url = "/accounts/";
-        .interval = 5s;
-        .timeout = 5s;
-        .window = 5;
-        .threshold = 5;
-    }
-}
-
-sub vcl_init {
-  new fas = directors.round_robin();
-  fas.add_backend(fas01);
-  fas.add_backend(fas02);
-  fas.add_backend(fas03);
-}
-
-backend voting {
-    .host = "localhost";
-    .port = "10007";
-    .first_byte_timeout = 160s;
-}
-
-backend mirrormanager {
-    .host = "localhost";
-    .port = "10008";
-}
-
-backend bodhi {
-    .host = "localhost";
-    .port = "10009";
-}
-
-backend freemedia {
-    .host = "localhost";
-    .port = "10011";
-}
-
-backend packages {
-    .host = "localhost";
-    .port = "10016";
-}
-
-backend tagger {
-    .host = "localhost";
-    .port = "10017";
-}
-
-backend askbot {
-    .host = "localhost";
-    .port = "10021";
-}
-
-backend blockerbugs {
-    .host = "localhost";
-    .port = "10022";
-}
-
-backend fedocal {
-    .host = "localhost";
-    .port = "10023";
-}
-
-backend kerneltest {
-    .host = "localhost";
-    .port = "10038";
-}
-
-backend paste {
-    .host = "localhost";
-    .port = "10027";
-}
-
-backend mirrormanager2 {
-    .host = "localhost";
-    .port = "10039";
-}
-
-
-#acl purge {
-#    "192.168.1.3";
-#    "192.168.1.4";
-#    "192.168.1.5";
-#    "192.168.1.6";
-#    "192.168.1.13";
-#    "192.168.1.24";
-#    "192.168.1.23";
-#    "192.168.1.41";
-#    "10.5.126.31";
-#    "10.5.126.32";
-#    "10.5.126.33";
-#    "10.5.126.34";
-#    "10.5.126.37";
-#    "10.5.126.38";
-#}
-
-sub vcl_recv {
-#    if (req.request == "PURGE") {
-#        if (!client.ip ~ purge) {
-#            error 405 "Not allowed.";
-#        }
-#        if (req.url ~ "^http://") {
-#            set req.url = regsub(req.url, "http://localhost:6081","");
-#        }
-#        purge_url(req.url);
-#    }
-
-    if (req.url ~ "^/wiki/") {
-        set req.backend_hint = wiki;
-    }
-    if (req.url ~ "^/w/") {
-        set req.backend_hint = wiki;
-        if (req.url ~ "^/w/skins/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/mirrorlist/") {
-        set req.backend_hint = mirrorlists;
-    }
-    if (req.url ~ "^/pkgdb") {
-        set req.backend_hint = pkgdb;
-        if (req.url ~ "^/pkgdb/static/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/accounts/") {
-        set req.backend_hint = fas.backend();
-        if (req.url ~ "^/accounts/static/") {
-            unset req.http.cookie;
-            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.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/mirrormanager/") {
-        set req.backend_hint = mirrormanager;
-        if (req.url ~ "^/mirrormanager/static/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/mirrormanager2/") {
-        set req.backend_hint = mirrormanager2;
-    }
-    if (req.url ~ "^/updates/") {
-        set req.backend_hint = bodhi;
-        if (req.url ~ "^/updates/static/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/freemedia/") {
-        set req.backend_hint = freemedia;
-    }
-    if (req.url ~ "^/packages/") {
-        set req.backend_hint = packages;
-        if (req.url ~ "^/packages/_res/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-        if (req.url ~ "^/packages/css/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/tagger/") {
-        set req.backend_hint = tagger;
-        if (req.url ~ "^/tagger/ui/static/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/calendar") {
-        set req.backend_hint = fedocal;
-        if (req.url ~ "^/calendar/static/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.url ~ "^/kerneltest") {
-        set req.backend_hint = kerneltest;
-        if (req.url ~ "^/kerneltest/static/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.http.X-Forwarded-Server ~ "^paste.fedoraproject.org") {
-        set req.backend_hint = paste;
-        if (req.url ~ "^/skins/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-        if (req.url ~ "^/addons/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.http.X-Forwarded-Server ~ "^ask.fedoraproject.org") {
-        set req.backend_hint = askbot;
-        if (req.url ~ "^/m/") {
-            unset req.http.cookie;
-            set req.url = regsub(req.url, "\?.*", "");
-        }
-    }
-    if (req.http.X-Forwarded-Server ~ "^qa.fedoraproject.org") {
-        if (req.url ~ "^/blockerbugs") {
-             set req.backend_hint = blockerbugs;
-            if (req.url ~ "^/blockerbugs/static/") {
-                unset req.http.cookie;
-                set req.url = regsub(req.url, "\?.*", "");
-            }
-        }
-    }
-
-    # Pass any requests with the "If-None-Match" header directly.
-    if (req.http.If-None-Match) {
-        return (pass);
-    }
-
-    # Force lookup if the request is a no-cache request from the client.
-#    if (req.http.Cache-Control ~ "no-cache") {
-#        purge_url(req.url);
-#    }
-#    if (req.http.Accept-Encoding) {
-#        if (req.url ~ "\.(jpg|png|gif|gz|tgz|bz2|tbz|mp3|ogg)$") {
-#            # No point in compressing these
-#            remove req.http.Accept-Encoding;
-#        } elsif (req.http.Accept-Encoding ~ "gzip") {
-#            # This is currently a bug with ipv6, so we need to nuke it.
-#            remove req.http.Accept-Encoding;
-#        } elsif (req.http.Accept-Encoding ~ "deflate") {
-#            set req.http.Accept-Encoding = "deflate";
-#        } else {
-#            # unknown algorithm
-#            remove req.http.Accept-Encoding;
-#        }
-#    }
-}
-
-# When requesting application icons, don't allow cherrypy to set cookies
-#sub vcl_backend_fetch {
-#    if (req.url ~ "^/pkgdb/appicon/show/") {
-#        unset beresp.http.set-cookie;
-#    }
-#}
diff --git a/roles/varnish/tasks/main.yml b/roles/varnish/tasks/main.yml
index 9dc09be88..f201b0bf9 100644
--- a/roles/varnish/tasks/main.yml
+++ b/roles/varnish/tasks/main.yml
@@ -19,23 +19,11 @@
   tags:
   - varnish
 
-- name: install /etc/varnish/default.vcl - stg
-  copy: src={{ item }} dest=/etc/varnish/default.vcl
-        owner=root group=root
-  with_items:
-  - proxy.vcl.stg
-  when: env == 'staging'
-  notify:
-  - restart varnish
-  tags:
-  - varnish
-
-- name: install /etc/varnish/default.vcl - prod
+- name: install /etc/varnish/default.vcl
   copy: src={{ item }} dest=/etc/varnish/default.vcl
         owner=root group=root
   with_items:
   - proxy.vcl
-  when: env != 'staging'
   notify:
   - restart varnish
   tags: