From a3ed5a9d9114a290ca6bffed4b1565bb2061f5ec Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Thu, 26 Jan 2017 20:56:58 -0500
Subject: [PATCH] add working varnish config

---
 contrib/configs/varnish/default.vcl | 86 +++++++++++++++++++++++++++++
 contrib/configs/varnish/srndv2.vcl  | 82 ---------------------------
 2 files changed, 86 insertions(+), 82 deletions(-)
 create mode 100644 contrib/configs/varnish/default.vcl
 delete mode 100644 contrib/configs/varnish/srndv2.vcl

diff --git a/contrib/configs/varnish/default.vcl b/contrib/configs/varnish/default.vcl
new file mode 100644
index 0000000..7f16169
--- /dev/null
+++ b/contrib/configs/varnish/default.vcl
@@ -0,0 +1,86 @@
+# nntpchan varnish config
+vcl 4.0;
+
+# Default backend definition. Set this to point to your content server.
+backend default {
+    .host = "127.0.0.1";
+    .port = "18000";
+}
+
+
+acl purge {
+  # ACL we'll use later to allow purges
+  "127.0.1.1";
+}
+
+sub vcl_miss {
+	return (fetch) ;
+}
+
+sub vcl_recv {
+	if (req.method == "PURGE") {
+		if (!client.ip ~ purge) { # purge is the ACL defined at the begining
+			# Not from an allowed IP? Then die with an error.
+			return (synth(405, "This IP is not allowed to send PURGE requests."));
+		}
+		return (purge);
+	}
+
+	if (req.method != "GET" &&
+		req.method != "HEAD" &&
+		req.method != "PUT" &&
+		req.method != "POST" &&
+		req.method != "TRACE" &&
+		req.method != "OPTIONS" &&
+		req.method != "PATCH" &&
+		req.method != "DELETE") {
+		/* Non-RFC2616 or CONNECT which is weird. */
+		return (pipe);
+	}
+	# Strip hash, server doesn't need it.
+	if (req.url ~ "\#") {
+		set req.url = regsub(req.url, "\#.*$", "");
+	}
+	# Strip a trailing ? if it exists
+	if (req.url ~ "\?$") {
+		set req.url = regsub(req.url, "\?$", "");
+	}
+	return (hash);
+}
+
+sub vcl_pipe {
+	return (pipe);
+}
+
+sub vcl_hit {
+	# Called when a cache lookup is successful.
+	return (deliver);
+	#if (obj.ttl >= 0s) {
+	# A pure unadultered hit, deliver it
+	#	return (deliver);
+	#}
+	#return (fetch);
+}
+
+sub vcl_backend_response {
+	if (beresp.status == 500 || beresp.status == 502 || beresp.status == 503 || beresp.status == 504) {
+		return (abandon);
+	}
+	set beresp.ttl = 10s;
+	set beresp.grace = 1h;
+	return (deliver);
+}
+
+sub vcl_deliver {
+    # Happens when we have all the pieces we need, and are about to send the
+    # response to the client.
+    #
+    # You can do accounting or modifying the final object here.
+	if (obj.hits > 0) { # Add debug header to see if it's a HIT/MISS and the number of hits, disable when not needed
+		set resp.http.X-Cache = "HIT";
+	} else {
+		set resp.http.X-Cache = "MISS";
+	}
+	set resp.http.X-Cache-Hits = obj.hits;
+	return (deliver);
+}
diff --git a/contrib/configs/varnish/srndv2.vcl b/contrib/configs/varnish/srndv2.vcl
deleted file mode 100644
index da66257..0000000
--- a/contrib/configs/varnish/srndv2.vcl
+++ /dev/null
@@ -1,82 +0,0 @@
-vcl 4.0;
-
-backend default { 
-    .host = "127.0.0.1";
-    .port = "18000";
-}
- 
-
-acl purge {
-  # ACL we'll use later to allow purges
-  "127.0.1.1";
-}
-
-sub vcl_miss {
-        return (fetch) ;
-}
-
-sub vcl_recv {
-        if (req.method == "PURGE") {
-                if (!client.ip ~ purge) { # purge is the ACL defined at the begining
-                        # Not from an allowed IP? Then die with an error.
-                        return (synth(405, "This IP is not allowed to send PURGE requests."));
-                }
-                return (purge);
-        }
-
-        if (req.method != "GET" &&
-                req.method != "HEAD" &&
-                req.method != "PUT" &&
-                req.method != "POST" &&
-                req.method != "TRACE" &&
-                req.method != "OPTIONS" &&
-                req.method != "PATCH" &&
-                req.method != "DELETE") {
-                /* Non-RFC2616 or CONNECT which is weird. */
-                return (pipe);
-        }
-        # Strip hash, server doesn't need it.
-        if (req.url ~ "\#") {
-                set req.url = regsub(req.url, "\#.*$", "");
-        }
-        # Strip a trailing ? if it exists
-        if (req.url ~ "\?$") {
-                set req.url = regsub(req.url, "\?$", "");
-        }
-        return (hash);
-}
-
-sub vcl_pipe {
-        return (pipe);
-}
-
-sub vcl_hit {
-        return (deliver);
-}
-
-sub vcl_backend_response {
-        if (beresp.status == 500 || beresp.status == 502 || beresp.status == 503 || beresp.status == 504) {
-                return (abandon);
-        }
-        if (bereq.url == "/") {
-                set beresp.ttl = 60s;
-        } else {
-                if (bereq.url == "/ukko.html") {
-                        set beresp.ttl = 5s;
-                } else {
-                        set beresp.ttl = 10s;
-                }
-        }
-        set beresp.grace = 1h;
-        return (deliver);
-}
-
-sub vcl_deliver {
-        if (obj.hits > 0) {
-                set resp.http.X-Cache = "HIT";
-        } else {
-                set resp.http.X-Cache = "MISS";
-        }
-        set resp.http.X-Cache-Hits = obj.hits;
-        return (deliver);
-}