[packages/varnish] do not overwrite upstream default.vcl with an outdated copy

[glen]

commit ee5266e53e1c6b383b43938104b9fe88f00cffb2
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Nov 28 13:39:47 2012 +0200

    do not overwrite upstream default.vcl with an outdated copy

 varnish.conf | 124 -----------------------------------------------------------
 varnish.spec |   7 +---
 2 files changed, 2 insertions(+), 129 deletions(-)
---
diff --git a/varnish.spec b/varnish.spec
index 38295ff..27641c6 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -11,7 +11,7 @@ Summary:	Varnish - a high-performance HTTP accelerator
 Summary(pl.UTF-8):	Varnish - wydajny akcelerator HTTP
 Name:		varnish
 Version:	3.0.3
-Release:	1
+Release:	2
 License:	BSD
 Group:		Networking/Daemons/HTTP
 Source0:	http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
@@ -21,7 +21,6 @@ Source3:	%{name}ncsa.init
 Source4:	%{name}.sysconfig
 Source5:	%{name}ncsa.sysconfig
 Source6:	%{name}.logrotate
-Source7:	%{name}.conf
 Source8:	%{name}.tmpfiles
 #Patch100:	branch.diff
 Patch0:		no-ccache.patch
@@ -142,9 +141,7 @@ install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/varnishncsa
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/varnish
 cp -p %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/varnishncsa
 cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/logrotate.d/varnish
-cp -p %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/default.vcl
-
-install %{SOURCE8} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
+cp -p %{SOURCE8} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/vmods/*.la
diff --git a/varnish.conf b/varnish.conf
deleted file mode 100644
index 244a8de..0000000
--- a/varnish.conf
+++ /dev/null
@@ -1,124 +0,0 @@
-# This is a basic VCL configuration file for varnish.  See the vcl(7)
-# man page for details on VCL syntax and semantics.
-
-# Default backend definition.  Set this to point to your content
-# server.
-backend default {
-	.host = "127.0.0.1";
-	.port = "8080";
-}
-
-# Below is a commented-out copy of the default VCL logic.  If you
-# redefine any of these subroutines, the built-in logic will be
-# appended to your code.
-#
-#sub vcl_recv {
-#    if (req.request != "GET" &&
-#      req.request != "HEAD" &&
-#      req.request != "PUT" &&
-#      req.request != "POST" &&
-#      req.request != "TRACE" &&
-#      req.request != "OPTIONS" &&
-#      req.request != "DELETE") {
-#        /* Non-RFC2616 or CONNECT which is weird. */
-#        return (pipe);
-#    }
-#    if (req.request != "GET" && req.request != "HEAD") {
-#        /* We only deal with GET and HEAD by default */
-#        return (pass);
-#    }
-#    if (req.http.Authorization || req.http.Cookie) {
-#        /* Not cacheable by default */
-#        return (pass);
-#    }
-#    return (lookup);
-#}
-#
-#sub vcl_pipe {
-#    # Note that only the first request to the backend will have
-#    # X-Forwarded-For set.  If you use X-Forwarded-For and want to
-#    # have it set for all requests, make sure to have:
-#    # set req.http.connection = "close";
-#    # here.  It is not set by default as it might break some broken web
-#    # applications, like IIS with NTLM authentication.
-#    return (pipe);
-#}
-#
-#sub vcl_pass {
-#    return (pass);
-#}
-#
-#sub vcl_hash {
-#    set req.hash += req.url;
-#    if (req.http.host) {
-#        set req.hash += req.http.host;
-#    } else {
-#        set req.hash += server.ip;
-#    }
-#    return (hash);
-#}
-#
-#sub vcl_hit {
-#    if (!obj.cacheable) {
-#        return (pass);
-#    }
-#    return (deliver);
-#}
-#
-#sub vcl_miss {
-#    return (fetch);
-#}
-#
-#sub vcl_fetch {
-#    if (!obj.cacheable) {
-#        return (pass);
-#    }
-#    if (obj.http.Set-Cookie) {
-#        return (pass);
-#    }
-#    set obj.prefetch =  -30s;
-#    return (deliver);
-#}
-#
-#sub vcl_deliver {
-#    return (deliver);
-#}
-#
-#sub vcl_discard {
-#    /* XXX: Do not redefine vcl_discard{}, it is not yet supported */
-#    return (discard);
-#}
-#
-#sub vcl_prefetch {
-#    /* XXX: Do not redefine vcl_prefetch{}, it is not yet supported */
-#    return (fetch);
-#}
-#
-#sub vcl_timeout {
-#    /* XXX: Do not redefine vcl_timeout{}, it is not yet supported */
-#    return (discard);
-#}
-#
-#sub vcl_error {
-#    set obj.http.Content-Type = "text/html; charset=utf-8";
-#    synthetic {"
-#<?xml version="1.0" encoding="utf-8"?>
-#<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-# "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-#<html>
-#  <head>
-#    <title>"} obj.status " " obj.response {"</title>
-#  </head>
-#  <body>
-#    <h1>Error "} obj.status " " obj.response {"</h1>
-#    <p>"} obj.response {"</p>
-#    <h3>Guru Meditation:</h3>
-#    <p>XID: "} req.xid {"</p>
-#    <address>
-#       <a href="http://www.varnish-cache.org/">Varnish</a>
-#    </address>
-#  </body>
-#</html>
-#"};
-#    return (deliver);
-#}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/varnish.git/commitdiff/ee5266e53e1c6b383b43938104b9fe88f00cffb2