[master] d455255 Moving Redhat packaging files out of the tree.
Lasse Karstensen
lkarsten at varnish-software.com
Fri Sep 4 11:54:36 CEST 2015
commit d455255536e23f1ca785b43f7ddd10f9a3ef50ab
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date: Fri Sep 4 11:51:30 2015 +0200
Moving Redhat packaging files out of the tree.
Redhat packaging files for the official varnish-cache.org
RPMs will from now on live in a separate git repository.
This decouples source releases (including release tagging) and
the packaging work, which makes the release process easier.
diff --git a/README.Packaging b/README.Packaging
new file mode 100644
index 0000000..dbe4680
--- /dev/null
+++ b/README.Packaging
@@ -0,0 +1,35 @@
+Packaging
+=========
+
+Varnish Cache packaging files are kept outside of the main distribution.
+
+The main reason for this is to decouple the development work from the packaging work.
+
+We want to be able to tag a release and do a tarball release without having
+to wait for the packagers to finish their work/changes.
+
+
+Official packages
+-----------------
+
+The official Debian and Redhat packages are built by the Varnish Cache team
+and made available on http://repo.varnish-cache.org/ .
+
+Packaging files for Debian:
+
+ git://git.varnish-cache.org/varnish-cache-debian.git
+
+Packaging files for Redhat:
+
+ https://github.com/varnish/varnish-cache-redhat
+
+Scripts that run the builds are available on:
+
+ https://github.com/varnish/pkg-varnish-cache
+
+
+Third-party packages
+--------------------
+
+Varnish Cache is built and packaged in many different operating systems and
+distributions. Please see the wiki for more information.
diff --git a/redhat/Makefile.am b/redhat/Makefile.am
deleted file mode 100644
index 62997e1..0000000
--- a/redhat/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-
-EXTRA_DIST = \
- README.redhat \
- varnish.initrc \
- varnish.logrotate \
- varnish_reload_vcl \
- varnish.spec \
- varnish.sysconfig \
- varnishlog.initrc \
- varnishncsa.initrc \
- varnish.params \
- varnish.service \
- varnishncsa.service \
- varnishlog.service \
- find-provides
diff --git a/redhat/README.redhat b/redhat/README.redhat
deleted file mode 100644
index 1f9c016..0000000
--- a/redhat/README.redhat
+++ /dev/null
@@ -1,59 +0,0 @@
-GCC
-===
-Varnish requires a GCC-compiler compatible with the compiler used to
-build varnish with. This means GCC 3.4.6 on a standard RHEL4 system.
-
-Varnish should work fine with GCC 3.3 and above.
-
-Building a RPM package from a git checkout
-==========================================
-
-You may build an rpm package direct from a git checkout. Here is an
-example on how you may do this:
-
-git clone git://git.varnish-cache.org/varnish-cache
-cd varnish-cache
-sed -i "s/^Release: .*/Release: 0.git$(date +%Y%m%d)%{?dist}/" \
- redhat/varnish.spec
-./autogen.sh && ./configure
-make dist && rpmbuild -ts varnish-trunk.tar.gz
-
-This builds a source rpm. Then you can, for example on a RHEL5 system,
-do something like this:
-
-rpmbuild --define "dist .el5" --rebuild /path/to/varnish-3.0-0.git20110203.src.rpm
-
-
-Configuration of addresses and ports
-====================================
-In this package, varnish is configured to make the accelerator daemon
-listen to port 6081. The administration interface listens to port 6082
-on 127.0.0.1. Addresses and ports can be changed in
-/etc/sysconfig/varnish.
-
-The admin interface can be accessed by standard telnet.
-
-The default config will try to forward http requests to
-localhost:80. You may change this in /etc/varnish/vcl.conf. Please
-read the vcl(7) man page for more information on the vcl language.
-
-To gain actual value from varnish, you may want to move the listening
-port to port 80, and your webserver to 8080 or similar.
-
-Running with jemalloc on ppc or ppc64 on fedora: Edit and recompile
-===================================================================
-To get a package through to Fedora, it has to build in Red Hat's Koji
-build environment. Their ppc and ppc64 builders run mock on a RHEL
-ppc64 kernel. Our use of jemalloc does not work on this kernel, and
-the build stays unsuccessful. As ppc64 is not the primary target of
-varnish development, it may take some time to get this bug fixed.
-To get the package through to Fedora, jemalloc is disabled in the ppc
-and ppc64 builds.
-
-Now, varnish with jemalloc enabled is known to work at least on the
-ppc (32bit) kernel in Fedora 9. If you run on ppc, and have a workload
-that suits jemalloc better, you might want to change the specfile and
-recompile. We would very much like feedback from anyone running
-varnish on Fedora's own ppc64 kernel.
-
-
diff --git a/redhat/find-provides b/redhat/find-provides
deleted file mode 100755
index 2545e99..0000000
--- a/redhat/find-provides
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh
-
-# This script is used to inject the Varnish ABI into the provides.
-
-set -x
-
-if [ -x /usr/lib/rpm/redhat/find-provides ]; then
- /usr/lib/rpm/redhat/find-provides "$@"
-elif [ -x /usr/lib/rpm/find-provides ]; then
- /usr/lib/rpm/find-provides "$@"
-fi
-
-cd $(dirname $0)/..
-
-printf '#include "vcs_version.h"\nVCS_Version\n' \
- | cpp - -Iinclude | sed -e '/^"/!d' -e 's/\"//g' -e 's/^/varnishabi-strict-/'
-
-printf '#include "vrt.h"\nvarnishabi- VRT_MAJOR_VERSION . VRT_MINOR_VERSION\n' \
- | cpp - -Iinclude \
- | sed -e '/^varnishabi-/!d' -e 's/U//g' -e 's/ //g'
diff --git a/redhat/varnish.initrc b/redhat/varnish.initrc
deleted file mode 100755
index 67b530a..0000000
--- a/redhat/varnish.initrc
+++ /dev/null
@@ -1,172 +0,0 @@
-#! /bin/sh
-#
-# varnish Control the Varnish Cache
-#
-# chkconfig: - 90 10
-# description: Varnish is a high-perfomance HTTP accelerator
-# processname: varnishd
-# config: /etc/sysconfig/varnish
-# pidfile: /var/run/varnish.pid
-
-### BEGIN INIT INFO
-# Provides: varnish
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Default-Start:
-# Default-Stop:
-# Should-Start: $syslog
-# Short-Description: start and stop varnishd
-# Description: Varnish is a high-perfomance HTTP accelerator
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-retval=0
-pidfile=/var/run/varnish.pid
-
-exec="/usr/sbin/varnishd"
-reload_exec="/usr/sbin/varnish_reload_vcl"
-prog="varnishd"
-config="/etc/sysconfig/varnish"
-lockfile="/var/lock/subsys/varnish"
-
-# Include varnish defaults
-[ -e /etc/sysconfig/varnish ] && . /etc/sysconfig/varnish
-
-
-start() {
-
- if [ ! -x $exec ]
- then
- echo $exec not found
- exit 5
- fi
-
- if [ ! -f $config ]
- then
- echo $config not found
- exit 6
- fi
- echo -n "Starting Varnish Cache: "
-
- # Open files (usually 1024, which is way too small for varnish)
- ulimit -n ${NFILES:-131072}
-
- # Varnish wants to lock shared memory log in memory.
- ulimit -l ${MEMLOCK:-82000}
-
- # Maximum number of threads (default in CentOS is 1024, which
- # is often too small for varnish)
- ulimit -u ${NPROCS:-unlimited}
-
- # If defined, set maximum core size.
- if [ -n "${DAEMON_COREFILE_LIMIT}" ]
- then
- ulimit -c ${DAEMON_COREFILE_LIMIT}
- fi
-
- # $DAEMON_OPTS is set in /etc/sysconfig/varnish. At least, one
- # has to set up a backend, or /tmp will be used, which is a bad idea.
- if [ "$DAEMON_OPTS" = "" ]; then
- echo "\$DAEMON_OPTS empty."
- echo -n "Please put configuration options in $config"
- return 6
- else
- # Varnish always gives output on STDOUT
- daemon --pidfile $pidfile $exec -P $pidfile "$DAEMON_OPTS" > /dev/null 2>&1
- retval=$?
- if [ $retval -eq 0 ]
- then
- touch $lockfile
- echo_success
- echo
- else
- echo_failure
- echo
- fi
- return $retval
- fi
-}
-
-stop() {
- echo -n "Stopping Varnish Cache: "
- killproc -p $pidfile $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- if [ "$RELOAD_VCL" = "1" ]
- then
- $reload_exec
- else
- force_reload
- fi
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- status -p $pidfile $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-configtest() {
- if [ -f "$VARNISH_VCL_CONF" ]; then
- $exec -f "$VARNISH_VCL_CONF" -C "$DAEMON_OPTS" -n /tmp > /dev/null && echo "Syntax ok"
- else
- echo "VARNISH_VCL_CONF is unset or does not point to a file"
- fi
-}
-
-# See how we were called.
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- configtest)
- configtest
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-
- exit 2
-esac
-
-exit $?
-
diff --git a/redhat/varnish.logrotate b/redhat/varnish.logrotate
deleted file mode 100644
index f214d1b..0000000
--- a/redhat/varnish.logrotate
+++ /dev/null
@@ -1,10 +0,0 @@
-/var/log/varnish/varnish.log /var/log/varnish/varnishncsa.log {
- missingok
- notifempty
- sharedscripts
- delaycompress
- postrotate
- /bin/kill -HUP `cat /var/run/varnishlog.pid 2>/dev/null` 2> /dev/null || true
- /bin/kill -HUP `cat /var/run/varnishncsa.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
diff --git a/redhat/varnish.params b/redhat/varnish.params
deleted file mode 100644
index 27a14dd..0000000
--- a/redhat/varnish.params
+++ /dev/null
@@ -1,35 +0,0 @@
-# Varnish environment configuration description. This was derived from
-# the old style sysconfig/defaults settings
-
-# Set this to 1 to make systemd reload try to switch vcl without restart.
-RELOAD_VCL=1
-
-# Main configuration file. You probably want to change it.
-VARNISH_VCL_CONF=/etc/varnish/default.vcl
-
-# Default address and port to bind to. Blank address means all IPv4
-# and IPv6 interfaces, otherwise specify a host name, an IPv4 dotted
-# quad, or an IPv6 address in brackets.
-# VARNISH_LISTEN_ADDRESS=192.168.1.5
-VARNISH_LISTEN_PORT=6081
-
-# Admin interface listen address and port
-VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
-VARNISH_ADMIN_LISTEN_PORT=6082
-
-# Shared secret file for admin interface
-VARNISH_SECRET_FILE=/etc/varnish/secret
-
-# Backend storage specification, see Storage Types in the varnishd(5)
-# man page for details.
-VARNISH_STORAGE="file,/var/lib/varnish/varnish_storage.bin,1G"
-
-# Default TTL used when the backend does not specify one
-VARNISH_TTL=120
-
-# User and group for the varnishd worker processes
-VARNISH_USER=varnish
-VARNISH_GROUP=varnish
-
-# Other options, see the man page varnishd(1)
-#DAEMON_OPTS="-p thread_pool_min=5 -p thread_pool_max=500 -p thread_pool_timeout=300"
diff --git a/redhat/varnish.service b/redhat/varnish.service
deleted file mode 100644
index 659dba2..0000000
--- a/redhat/varnish.service
+++ /dev/null
@@ -1,46 +0,0 @@
-[Unit]
-Description=Varnish a high-perfomance HTTP accelerator
-After=syslog.target network.target
-
-[Service]
-
-#
-# If you want to make changes to this file, please copy it to
-# /etc/systemd/system/varnish.service and make your changes there.
-# This will override the file kept at /lib/systemd/system/varnish.service
-#
-# Enviroment variables may be found in /etc/varnish/varnish.params
-#
-
-# Maximum number of open files (for ulimit -n)
-LimitNOFILE=131072
-
-# Locked shared memory (for ulimit -l)
-# Default log size is 82MB + header
-LimitMEMLOCK=82000
-
-# Maximum size of the corefile.
-LimitCORE=infinity
-
-EnvironmentFile=/etc/varnish/varnish.params
-
-Type=forking
-PIDFile=/var/run/varnish.pid
-PrivateTmp=true
-ExecStart=/usr/sbin/varnishd \
- -P /var/run/varnish.pid \
- -f $VARNISH_VCL_CONF \
- -a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
- -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
- -t $VARNISH_TTL \
- -u $VARNISH_USER \
- -g $VARNISH_GROUP \
- -S $VARNISH_SECRET_FILE \
- -s $VARNISH_STORAGE \
- $DAEMON_OPTS
-
-ExecReload=/usr/sbin/varnish_reload_vcl
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/redhat/varnish.spec b/redhat/varnish.spec
deleted file mode 100644
index 9bce64d..0000000
--- a/redhat/varnish.spec
+++ /dev/null
@@ -1,645 +0,0 @@
-%define XXXv_rc rc1
-%define vd_rc %{?v_rc:-%{?v_rc}}
-%define _use_internal_dependency_generator 0
-%define __find_provides %{_builddir}/varnish-%{version}%{?v_rc:-%{?v_rc}}/redhat/find-provides
-Summary: High-performance HTTP accelerator
-Name: varnish
-Version: 4.0.1
-#Release: 0.20140328%{?v_rc}%{?dist}
-Release: 1%{?v_rc}%{?dist}
-License: BSD
-Group: System Environment/Daemons
-URL: https://www.varnish-cache.org/
-#Source0: http://repo.varnish-cache.org/source/%{name}-%{version}.tar.gz
-Source0: %{name}-%{version}%{?vd_rc}.tar.gz
-#Source0: %{name}-trunk.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: jemalloc-devel
-BuildRequires: libedit-devel
-BuildRequires: libtool
-BuildRequires: ncurses-devel
-BuildRequires: pcre-devel
-BuildRequires: pkgconfig
-BuildRequires: python-docutils >= 0.6
-BuildRequires: python-sphinx
-Requires: jemalloc
-Requires: libedit
-Requires: logrotate
-Requires: ncurses
-Requires: pcre
-Requires: varnish-libs = %{version}-%{release}
-Requires(pre): shadow-utils
-Requires(post): /sbin/chkconfig, /usr/bin/uuidgen
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-%if %{undefined suse_version}
-Requires(preun): initscripts
-%endif
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
-Requires(post): systemd-units
-Requires(post): systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-BuildRequires: systemd-units
-%endif
-
-# Varnish actually needs gcc installed to work. It uses the C compiler
-# at runtime to compile the VCL configuration files. This is by design.
-Requires: gcc
-
-%description
-This is Varnish Cache, a high-performance HTTP accelerator.
-
-Varnish Cache stores web pages in memory so web servers don't have to
-create the same web page over and over again. Varnish serves pages
-much faster than any application server; giving the website a
-significant speed up.
-
-Documentation wiki and additional information about Varnish is
-available on the following web site: https://www.varnish-cache.org/
-
-%package libs
-Summary: Libraries for %{name}
-Group: System Environment/Libraries
-BuildRequires: ncurses-devel
-#Obsoletes: libvarnish1
-
-%description libs
-Libraries for %{name}.
-Varnish Cache is a high-performance HTTP accelerator
-
-%package libs-devel
-Summary: Development files for %{name}-libs
-Group: System Environment/Libraries
-BuildRequires: ncurses-devel
-Requires: varnish-libs = %{version}-%{release}
-Requires: python
-
-%description libs-devel
-Development files for %{name}-libs
-Varnish Cache is a high-performance HTTP accelerator
-
-%package docs
-Summary: Documentation files for %name
-Group: System Environment/Libraries
-
-%description docs
-Documentation files for %name
-
-#%package libs-static
-#Summary: Files for static linking of %{name} library functions
-#Group: System Environment/Libraries
-#BuildRequires: ncurses-devel
-#Requires: varnish-libs-devel = %{version}-%{release}
-#
-#%description libs-static
-#Files for static linking of varnish library functions
-#Varnish Cache is a high-performance HTTP accelerator
-
-%prep
-%setup -n varnish-%{version}%{?vd_rc}
-#%setup -q -n varnish-trunk
-
-%build
-# No pkgconfig/libpcre.pc in rhel4
-%if 0%{?rhel} == 4
- export PCRE_CFLAGS="`pcre-config --cflags`"
- export PCRE_LIBS="`pcre-config --libs`"
-%endif
-
-%if 0%{?rhel} == 6
-export CFLAGS="$CFLAGS -O2 -g -Wp,-D_FORTIFY_SOURCE=0"
-%endif
-
-# Remove "--disable static" if you want to build static libraries
-# jemalloc is not compatible with Red Hat's ppc64 RHEL kernel :-(
-%ifarch ppc64 ppc
- %configure --disable-static --localstatedir=/var/lib --without-jemalloc --without-rst2html
-%else
- %configure --disable-static --localstatedir=/var/lib --without-rst2html
-%endif
-
-# We have to remove rpath - not allowed in Fedora
-# (This problem only visible on 64 bit arches)
-#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g;
-# s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags} V=1
-
-%if 0%{?fedora}%{?rhel} != 0 && 0%{?rhel} <= 4 && 0%{?fedora} <= 8
- # Old style daemon function
- sed -i 's,--pidfile \$pidfile,,g;
- s,status -p \$pidfile,status,g;
- s,killproc -p \$pidfile,killproc,g' \
- redhat/varnish.initrc redhat/varnishlog.initrc redhat/varnishncsa.initrc
-%endif
-
-rm -rf doc/sphinx/build/html/_sources
-mv doc/sphinx/build/html doc
-rm -rf doc/sphinx/build
-
-%check
-# rhel5 on ppc64 is just too strange
-%ifarch ppc64
- %if 0%{?rhel} > 4
- cp bin/varnishd/.libs/varnishd bin/varnishd/lt-varnishd
- %endif
-%endif
-
-# The redhat ppc builders seem to have some ulimit problems?
-# These tests work on a rhel4 ppc/ppc64 instance outside the builders
-%ifarch ppc64 ppc
- %if 0%{?rhel} == 4
- rm bin/varnishtest/tests/c00031.vtc
- rm bin/varnishtest/tests/r00387.vtc
- %endif
-%endif
-
-make check %{?_smp_mflags} LD_LIBRARY_PATH="../../lib/libvarnish/.libs:../../lib/libvarnishcompat/.libs:../../lib/libvarnishapi/.libs:../../lib/libvcc/.libs:../../lib/libvgz/.libs" VERBOSE=1
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} INSTALL="install -p"
-
-# None of these for fedora
-find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
-
-# Remove this line to build a devel package with symlinks
-#find %{buildroot}/%{_libdir}/ -name '*.so' -type l -exec rm -f {} ';'
-
-mkdir -p %{buildroot}/var/lib/varnish
-mkdir -p %{buildroot}/var/log/varnish
-mkdir -p %{buildroot}/var/run/varnish
-mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d/
-install -D -m 0644 etc/example.vcl %{buildroot}%{_sysconfdir}/varnish/default.vcl
-install -D -m 0644 redhat/varnish.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/varnish
-
-# systemd support
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
-mkdir -p %{buildroot}%{_unitdir}
-install -D -m 0644 redhat/varnish.service %{buildroot}%{_unitdir}/varnish.service
-install -D -m 0644 redhat/varnish.params %{buildroot}%{_sysconfdir}/varnish/varnish.params
-install -D -m 0644 redhat/varnishncsa.service %{buildroot}%{_unitdir}/varnishncsa.service
-install -D -m 0644 redhat/varnishlog.service %{buildroot}%{_unitdir}/varnishlog.service
-sed -i 's,sysconfig/varnish,varnish/varnish.params,' redhat/varnish_reload_vcl
-# default is standard sysvinit
-%else
-install -D -m 0644 redhat/varnish.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/varnish
-install -D -m 0755 redhat/varnish.initrc %{buildroot}%{_initrddir}/varnish
-install -D -m 0755 redhat/varnishlog.initrc %{buildroot}%{_initrddir}/varnishlog
-install -D -m 0755 redhat/varnishncsa.initrc %{buildroot}%{_initrddir}/varnishncsa
-%endif
-install -D -m 0755 redhat/varnish_reload_vcl %{buildroot}%{_sbindir}/varnish_reload_vcl
-
-echo %{_libdir}/varnish > %{buildroot}%{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{_sbindir}/*
-%{_bindir}/*
-%{_var}/lib/varnish
-%{_var}/log/varnish
-%{_mandir}/man1/*.1*
-%{_mandir}/man3/*.3*
-%{_mandir}/man7/*.7*
-%doc LICENSE README redhat/README.redhat ChangeLog
-%{_docdir}/varnish/
-%dir %{_sysconfdir}/varnish/
-%config(noreplace) %{_sysconfdir}/varnish/default.vcl
-%config(noreplace) %{_sysconfdir}/logrotate.d/varnish
-
-# systemd from fedora 17 and rhel 7
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
-%{_unitdir}/varnish.service
-%{_unitdir}/varnishncsa.service
-%{_unitdir}/varnishlog.service
-%config(noreplace)%{_sysconfdir}/varnish/varnish.params
-
-# default is standard sysvinit
-%else
-%config(noreplace) %{_sysconfdir}/sysconfig/varnish
-%{_initrddir}/varnish
-%{_initrddir}/varnishlog
-%{_initrddir}/varnishncsa
-%endif
-
-%files libs
-%defattr(-,root,root,-)
-%{_libdir}/*.so.*
-%{_libdir}/varnish
-%doc LICENSE
-%config %{_sysconfdir}/ld.so.conf.d/varnish-%{_arch}.conf
-
-%files libs-devel
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%dir %{_includedir}/varnish
-%{_includedir}/varnish/*
-%{_libdir}/pkgconfig/varnishapi.pc
-/usr/share/varnish
-/usr/share/aclocal
-
-%doc LICENSE
-
-%files docs
-%defattr(-,root,root,-)
-%doc LICENSE
-%doc doc/sphinx
-%doc doc/html
-%doc doc/changes*.html
-
-#%files libs-static
-#%{_libdir}/libvarnish.a
-#%{_libdir}/libvarnishapi.a
-#%{_libdir}/libvarnishcompat.a
-#%{_libdir}/libvcc.a
-#%doc LICENSE
-
-%pre
-getent group varnish >/dev/null || groupadd -r varnish
-getent passwd varnish >/dev/null || \
- useradd -r -g varnish -d /var/lib/varnish -s /sbin/nologin \
- -c "Varnish Cache" varnish
-exit 0
-
-%post
-%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-%else
-/sbin/chkconfig --add varnish
-/sbin/chkconfig --add varnishlog
-/sbin/chkconfig --add varnishncsa
-%endif
-test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc/varnish/secret)
-
-%triggerun -- varnish < 3.0.2-1
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply varnish
-# to migrate them to systemd targets
-%{_bindir}/systemd-sysv-convert --save varnish >/dev/null 2>&1 ||:
-
-# If the package is allowed to autostart:
-#/bin/systemctl --no-reload enable varnish.service >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del varnish >/dev/null 2>&1 || :
-#/bin/systemctl try-restart varnish.service >/dev/null 2>&1 || :
-
-%preun
-if [ $1 -lt 1 ]; then
- # Package removal, not upgrade
- %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
- /bin/systemctl --no-reload disable varnish.service > /dev/null 2>&1 || :
- /bin/systemctl stop varnish.service > /dev/null 2>&1 || :
- %else
- /sbin/service varnish stop > /dev/null 2>&1
- /sbin/service varnishlog stop > /dev/null 2>&1
- /sbin/service varnishncsa stop > /dev/null 2>%1
- /sbin/chkconfig --del varnish
- /sbin/chkconfig --del varnishlog
- /sbin/chkconfig --del varnishncsa
- %endif
-fi
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
-
-%changelog
-* Mon Mar 12 2012 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.0.2-2
-- Added PrivateTmp=true to varnishd unit file, closing #782539
-- Fixed comment typos in varnish unit file
-
-* Tue Mar 06 2012 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.0.2-1
-- New upstream version 3.0.2
-- Removed INSTALL as requested by rpmlint
-- Added a ld.so.conf.d fragment file listing libdir/varnish
-- Removed redundant doc/html/_sources
-- systemd support from fedora 17
-- Stopped using macros for make and install, according to
- Fedora's packaging guidelines
-- Changes merged from upstream:
- - Added suse_version macro
- - Added comments on building from a git checkout
- - mkpasswd -> uuidgen for fewer dependencies
- - Fixed missing quotes around cflags for pcre
- - Removed unnecessary 32/64 bit parallell build hack as this is fixed upstream
- - Fixed typo in configure call, disable -> without
- - Added lib/libvgz/.libs to LD_LIBRARY_PATH in make check
- - Added section 3 manpages
- - Configure with --without-rst2man --without-rst2html
- - changelog entries
-- Removed unnecessary patch for system jemalloc, upstream now supports this
-
-* Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 2.1.5-4
-- Rebuild against PCRE 8.30
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Feb 01 2011 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.5-1
-- New upstream release
-- New download location
-- Moved varnish_reload_vcl to sbin
-- Removed patches included upstream
-- Use jemalloc as system installed library
-
-* Mon Nov 15 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 3.0.0-0.svn20101115r5543
-- Merged some changes from fedora
-- Upped general version to 3.0 prerelease in trunk
-
-* Thu Nov 04 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-4
-- Added a patch fixing a missing echo in the init script that
- masked failure output from the script
-- Added a patch from upstream, fixing a problem with Content-Length
- headers (upstream r5461, upstream bug #801)
-- Added a patch from upstream, adding empty Default-Start and Default-Stop
- to initscripts for better lsb compliance
-- Added varnish_reload_vcl from trunk
-- Synced descriptions from release spec
-
-* Thu Oct 28 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-3
-- Fixed missing manpages because of no rst2man in rhel4 and 5
-
-* Mon Oct 25 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-2
-- Removed RHEL6/ppc64 specific patch that has been included upstream
-
-* Mon Oct 25 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-1
-- New upstream release
-- New URL for source tarball and main website
-- Prebuilt html docs now included, use that instead of running sphinx
-- Putting sphinx generated doc in a separate subpackage
-- Replaced specific include files with a wildcard glob
-- Needs python-sphinx and deps to build sphinx documentation
-
-* Tue Aug 24 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-2
-- Added a RHEL6/ppc64 specific patch that changes the hard coded
- stack size in tests/c00031.vtc
-
-* Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.4-0.svn20100824r5117
-- Replaced specific include files with a wildcard glob
-- Needs python-sphinx and deps to build sphinx documentation
-- Builds html and latex documentation. Put that in a subpackage varnish-docs
-
-* Thu Jul 29 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.3-1
-- New upstream release
-- Add a patch for jemalloc on s390 that lacks upstream
-
-* Wed May 05 2010 Ingvar Hagelund <ingvar at redpill-linpro.com> - 2.1.2-1
-- New upstream release
-- Remove patches merged upstream
-
-* Tue Apr 27 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.1.1-1
-- New upstream release
-- Added a fix for missing pkgconfig/libpcre.pc on rhel4
-- Added a patch from trunk making the rpm buildable on lowspec
- build hosts (like Red Hat's ppc build farm nodes)
-- Removed patches that are merged upstream
-
-* Wed Apr 14 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.1.0-2
-- Added a patch from svn that fixes changes-2.0.6-2.1.0.xml
-
-* Tue Apr 06 2010 Ingvar Hagelund <ingvar at linpro.no> - 2.1.0-1
-- New upstream release; note: Configuration changes, see the README
-- Removed unneeded patches
-- CVE-2009-2936: Added a patch from Debian that adds the -S option
- to the varnisdh(1) manpage and to the sysconfig defaults, thus
- password-protecting the admin interface port (#579536,#579533)
-- Generates that password in the post script, requires mkpasswd
-- Added a patch from Robert Scheck for explicit linking to libm
-- Requires pcre
-
-* Wed Dec 23 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-2
-- Added a test that enables jemalloc on ppc if the kernel is
- not a rhel5 kernel (as on redhat builders)
-- Removed tests c00031.vtc and r00387on rhel4/ppc as they fail
- on the Red Hat ppc builders (but works on my rhel4 ppc instance)
-- Added a patch that fixes broken changes-2.0.6.html in doc
-
-* Mon Dec 14 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.6-1
-- New upstream release
-- Removed patches for libjemalloc, as they are added upstream
-
-* Mon Nov 09 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.5-1
-- New upstream release
-
-* Thu Aug 13 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-4
-- Added a sparc specific patch to libjemalloc.
-
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Thu Jun 04 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-2
-- Added a s390 specific patch to libjemalloc.
-
-* Fri Mar 27 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.4-1
- New upstream release 2.0.4
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Wed Feb 11 2009 Ingvar Hagelund <ingvar at linpro.no> - 2.0.3-1
- New upstream release 2.0.3. A bugfix and feature enhancement release
-
-* Fri Dec 12 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0.2-2
- Added a fix for a timeout bug, backported from trunk
-
-* Mon Nov 10 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0.2-1
- New upstream release 2.0.2. A bugfix release
-
-* Sun Nov 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0.1-2
-- Removed the requirement for kernel => 2.6.0. All supported
- platforms meets this, and it generates strange errors in EPEL
-
-* Fri Oct 17 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0.1-1
-- 2.0.1 released, a bugfix release. New upstream sources
-- Package now also available in EPEL
-
-* Thu Oct 16 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-2
-- Readded the debugflag patch. It's so practical
-- Added a strange workaround for make check on ppc64
-
-* Wed Oct 15 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-1
-- 2.0 released. New upstream sources
-- Disabled jemalloc on ppc and ppc64. Added a note in README.redhat
-- Synced to upstream again. No more patches needed
-
-* Wed Oct 08 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.11.rc1
-- 2.0-rc1 released. New upstream sources
-- Added a patch for pagesize to match redhat's rhel5 ppc64 koji build boxes
-- Added a patch for test a00008, from r3269
-- Removed condrestart in postscript at upgrade. We don't want that
-
-* Fri Sep 26 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.10.beta2
-- 2.0-beta2 released. New upstream sources
-- Whitespace changes to make rpmlint more happy
-
-* Fri Sep 12 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.9.20080912svn3184
-- Added varnisncsa init script (Colin Hill)
-- Corrected varnishlog init script (Colin Hill)
-
-* Tue Sep 09 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.8.beta1
-- Added a patch from r3171 that fixes an endian bug on ppc and ppc64
-- Added a hack that changes the varnishtest ports for 64bits builds,
- so they can run in parallell with 32bits build on same build host
-
-* Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.7.beta1
-- Added a patch from r3156 and r3157, hiding a legit errno in make check
-
-* Tue Sep 02 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.6.beta1
-- Added a commented option for max coresize in the sysconfig script
-- Added a comment in README.redhat about upgrading from 1.x to 2.0
-
-* Fri Aug 29 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.5.beta1
-- Bumped version numbers and source url for first beta release \o/
-- Added a missing directory to the libs-devel package (Michael Schwendt)
-- Added the LICENSE file to the libs-devel package
-- Moved make check to its proper place
-- Removed superfluous definition of lockfile in initscripts
-
-* Wed Aug 27 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.4.20080827svn3136
-- Fixed up init script for varnishlog too
-
-* Mon Aug 25 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.3.20080825svn3125
-- Fixing up init script according to newer Fedora standards
-- The build now runs the test suite after compiling
-- Requires initscripts
-- Change default.vcl from nothing but comments to point to localhost:80,
-
-* Mon Aug 18 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.2.tp2
-- Changed source, version and release to match 2.0-tp2
-
-* Thu Aug 14 2008 Ingvar Hagelund <ingvar at linpro.no> - 2.0-0.1.20080814svn
-- default.vcl has moved
-- Added groff to build requirements
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.1.2-6
-- Autorebuild for GCC 4.3
-
-* Sat Dec 29 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.2-5
-- Added missing configuration examples
-- Corrected the license to "BSD"
-
-* Fri Dec 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.2-4
-- Build for fedora update
-
-* Fri Dec 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.2-2
-- Added missing changelog items
-
-* Thu Dec 20 2007 Stig Sandbeck Mathisen <ssm at linpro.no> - 1.1.2-1
-- Bumped the version number to 1.1.2.
-- Addeed build dependency on libxslt
-
-* Fri Sep 07 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-3
-- Added a patch, changeset 1913 from svn trunk. This makes varnish
- more stable under specific loads.
-
-* Thu Sep 06 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-2
-- Removed autogen call (only diff from relase tarball)
-
-* Mon Aug 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.1-1
-- Bumped the version number to 1.1.1.
-
-* Tue Aug 14 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.1.svn
-- Update for 1.1 branch
-- Added the devel package for the header files and static library files
-- Added a varnish user, and fixed the init script accordingly
-
-* Thu Jul 05 2007 Dag-Erling Smørgrav <des at des.no> - 1.1-1
-- Bump Version and Release for 1.1
-
-* Mon May 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-3
-- Fixed initrc-script bug only visible on el4 (fixes #107)
-
-* Sun May 20 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.4-2
-- Repack from unchanged 1.0.4 tarball
-- Final review request and CVS request for Fedora Extras
-- Repack with extra obsoletes for upgrading from older sf.net package
-
-* Fri May 18 2007 Dag-Erling Smørgrav <des at des.no> - 1.0.4-1
-- Bump Version and Release for 1.0.4
-
-* Wed May 16 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.svn-20070517
-- Wrapping up for 1.0.4
-- Changes in sysconfig and init scripts. Syncing with files in
- trunk/debian
-
-* Fri May 11 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.svn-20070511
-- Threw latest changes into svn trunk
-- Removed the conversion of manpages into utf8. They are all utf8 in trunk
-
-* Wed May 09 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-7
-- Simplified the references to the subpackage names
-- Added init and logrotate scripts for varnishlog
-
-* Mon Apr 23 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-6
-- Removed unnecessary macro lib_name
-- Fixed inconsistently use of brackets in macros
-- Added a condrestart to the initscript
-- All manfiles included, not just the compressed ones
-- Removed explicit requirement for ncurses. rpmbuild figures out the
- correct deps by itself.
-- Added ulimit value to initskript and sysconfig file
-- Many thanks to Matthias Saou for valuable input
-
-* Mon Apr 16 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-5
-- Added the dist tag
-- Exchanged RPM_BUILD_ROOT variable for buildroot macro
-- Removed stripping of binaries to create a meaningful debug package
-- Removed BuildRoot and URL from subpackages, they are picked from the
- main package
-- Removed duplication of documentation files in the subpackages
-- 'chkconfig --list' removed from post script
-- Package now includes _sysconfdir/varnish/
-- Trimmed package information
-- Removed static libs and .so-symlinks. They can be added to a -devel package
- later if anybody misses them
-
-* Wed Feb 28 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-4
-- More small specfile fixes for Fedora Extras Package
- Review Request, see bugzilla ticket 230275
-- Removed rpath (only visible on x86_64 and probably ppc64)
-
-* Tue Feb 27 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-3
-- Made post-1.0.3 changes into a patch to the upstream tarball
-- First Fedora Extras Package Review Request
-
-* Fri Feb 23 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-2
-- A few other small changes to make rpmlint happy
-
-* Thu Feb 22 2007 Ingvar Hagelund <ingvar at linpro.no> - 1.0.3-1
-- New release 1.0.3. See the general ChangeLog
-- Splitted the package into varnish, libvarnish1 and
- libvarnish1-devel
-
-* Thu Oct 19 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.0.2-7
-- Added a Vendor tag
-
-* Thu Oct 19 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.0.2-6
-- Added redhat subdir to svn
-- Removed default vcl config file. Used the new upstream variant instead.
-- Based build on svn. Running autogen.sh as start of build. Also added
- libtool, autoconf and automake to BuildRequires.
-- Removed rule to move varnishd to sbin. This is now fixed in upstream
-- Changed the sysconfig script to include a lot more nice features.
- Most of these were ripped from the Debian package. Updated initscript
- to reflect this.
-
-* Tue Oct 10 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.0.1-3
-- Moved Red Hat specific files to its own subdirectory
-
-* Tue Sep 26 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.0.1-2
-- Added gcc requirement.
-- Changed to an even simpler example vcl in to /etc/varnish (thanks, perbu)
-- Added a sysconfig entry
-
-* Fri Sep 22 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.0.1-1
-- Initial build.
diff --git a/redhat/varnish.sysconfig b/redhat/varnish.sysconfig
deleted file mode 100644
index 6aa2354..0000000
--- a/redhat/varnish.sysconfig
+++ /dev/null
@@ -1,111 +0,0 @@
-# Configuration file for varnish
-#
-# /etc/init.d/varnish expects the variable $DAEMON_OPTS to be set from this
-# shell script fragment.
-#
-
-# Maximum number of open files (for ulimit -n)
-NFILES=131072
-
-# Locked shared memory (for ulimit -l)
-# Default log size is 82MB + header
-MEMLOCK=82000
-
-# Maximum number of threads (for ulimit -u)
-NPROCS="unlimited"
-
-# Maximum size of corefile (for ulimit -c). Default in Fedora is 0
-# DAEMON_COREFILE_LIMIT="unlimited"
-
-# Set this to 1 to make init script reload try to switch vcl without restart.
-# To make this work, you need to set the following variables
-# explicit: VARNISH_VCL_CONF, VARNISH_ADMIN_LISTEN_ADDRESS,
-# VARNISH_ADMIN_LISTEN_PORT, VARNISH_SECRET_FILE, or in short,
-# use Alternative 3, Advanced configuration, below
-RELOAD_VCL=1
-
-# This file contains 4 alternatives, please use only one.
-
-## Alternative 1, Minimal configuration, no VCL
-#
-# Listen on port 6081, administration on localhost:6082, and forward to
-# content server on localhost:8080. Use a fixed-size cache file.
-#
-#DAEMON_OPTS="-a :6081 \
-# -T localhost:6082 \
-# -b localhost:8080 \
-# -u varnish -g varnish \
-# -s file,/var/lib/varnish/varnish_storage.bin,1G"
-
-
-## Alternative 2, Configuration with VCL
-#
-# Listen on port 6081, administration on localhost:6082, and forward to
-# one content server selected by the vcl file, based on the request. Use a
-# fixed-size cache file.
-#
-#DAEMON_OPTS="-a :6081 \
-# -T localhost:6082 \
-# -f /etc/varnish/default.vcl \
-# -u varnish -g varnish \
-# -S /etc/varnish/secret \
-# -s file,/var/lib/varnish/varnish_storage.bin,1G"
-
-
-## Alternative 3, Advanced configuration
-#
-# See varnishd(1) for more information.
-#
-# # Main configuration file. You probably want to change it :)
-VARNISH_VCL_CONF=/etc/varnish/default.vcl
-#
-# # Default address and port to bind to
-# # Blank address means all IPv4 and IPv6 interfaces, otherwise specify
-# # a host name, an IPv4 dotted quad, or an IPv6 address in brackets.
-# VARNISH_LISTEN_ADDRESS=
-VARNISH_LISTEN_PORT=6081
-#
-# # Telnet admin interface listen address and port
-VARNISH_ADMIN_LISTEN_ADDRESS=127.0.0.1
-VARNISH_ADMIN_LISTEN_PORT=6082
-#
-# # Shared secret file for admin interface
-VARNISH_SECRET_FILE=/etc/varnish/secret
-#
-# # The minimum number of worker threads to start
-VARNISH_MIN_THREADS=50
-#
-# # The Maximum number of worker threads to start
-VARNISH_MAX_THREADS=1000
-#
-# # Idle timeout for worker threads
-VARNISH_THREAD_TIMEOUT=120
-#
-# # Cache file size: in bytes, optionally using k / M / G / T suffix,
-# # or in percentage of available disk space using the % suffix.
-VARNISH_STORAGE_SIZE=256M
-#
-# # Backend storage specification
-VARNISH_STORAGE="malloc,${VARNISH_STORAGE_SIZE}"
-#
-# # Default TTL used when the backend does not specify one
-VARNISH_TTL=120
-#
-# # DAEMON_OPTS is used by the init script. If you add or remove options, make
-# # sure you update this section, too.
-DAEMON_OPTS="-a ${VARNISH_LISTEN_ADDRESS}:${VARNISH_LISTEN_PORT} \
- -f ${VARNISH_VCL_CONF} \
- -T ${VARNISH_ADMIN_LISTEN_ADDRESS}:${VARNISH_ADMIN_LISTEN_PORT} \
- -t ${VARNISH_TTL} \
- -p thread_pool_min=${VARNISH_MIN_THREADS} \
- -p thread_pool_max=${VARNISH_MAX_THREADS} \
- -p thread_pool_timeout=${VARNISH_THREAD_TIMEOUT} \
- -u varnish -g varnish \
- -S ${VARNISH_SECRET_FILE} \
- -s ${VARNISH_STORAGE}"
-#
-
-
-## Alternative 4, Do It Yourself. See varnishd(1) for more information.
-#
-# DAEMON_OPTS=""
diff --git a/redhat/varnish_reload_vcl b/redhat/varnish_reload_vcl
deleted file mode 100755
index 2f47f3e..0000000
--- a/redhat/varnish_reload_vcl
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-#
-# reload vcl revisited
-# A script that loads new vcl based on data from /etc/sysconfig/varnish
-# Ingvar Hagelund <ingvar at redpill-linpro.com>
-#
-# This is free software, distributed under the standard 2 clause BSD license,
-# see the LICENSE file in the Varnish documentation directory
-#
-# The following environment variables have to be set:
-# RELOAD_VCL, VARNISH_VCL_CONF, VARNISH_ADMIN_LISTEN_PORT
-# The following are optional:
-# VARNISH_SECRET_FILE, VARNISH_ADMIN_LISTEN_ADDRESS
-#
-# Requires GNU bash and GNU date
-#
-
-debug=false
-
-missing() {
- echo "Missing configuration variable: $1"
- exit 2
-}
-
-print_debug() {
- echo "
-Parsed configuration:
-RELOAD_VCL=\"$RELOAD_VCL\"
-VARNISH_VCL_CONF=\"$VARNISH_VCL_CONF\"
-VARNISH_ADMIN_LISTEN_ADDRESS=\"$VARNISH_ADMIN_LISTEN_ADDRESS\"
-VARNISH_ADMIN_LISTEN_PORT=\"$VARNISH_ADMIN_LISTEN_PORT\"
-VARNISH_SECRET_FILE=\"$VARNISH_SECRET_FILE\"
-"
-}
-
-# Fallback to the default configuration
-if [ -z "$VARNISH_VCL_CONF" ]; then
- . /etc/sysconfig/varnish
-fi
-
-$debug && print_debug
-
-# Check configuration
-if [ ! "$RELOAD_VCL" = "1" ]; then
- echo "Error: RELOAD_VCL is not set to 1"
- exit 2
-
-elif [ -z "$VARNISH_VCL_CONF" ]; then
- echo "Error: VARNISH_VCL_CONF is not set"
- exit 2
-
-elif [ ! -s "$VARNISH_VCL_CONF" ]; then
- echo "Eror: VCL config $VARNISH_VCL_CONF is unreadable or empty"
- exit 2
-
-elif [ -z "$VARNISH_ADMIN_LISTEN_ADDRESS" ]; then
- echo "Warning: VARNISH_ADMIN_LISTEN_ADDRESS is not set, using 127.0.0.1"
- VARNISH_ADMIN_LISTEN_ADDRESS="127.0.0.1"
-
-elif [ -z "$VARNISH_ADMIN_LISTEN_PORT" ]; then
- echo "Error: VARNISH_ADMIN_LISTEN_PORT is not set"
- exit 2
-
-elif [ -z "$VARNISH_SECRET_FILE" ]; then
- echo "Warning: VARNISH_SECRET_FILE is not set"
- secret=""
-
-elif [ ! -s "$VARNISH_SECRET_FILE" ]; then
- echo "Error: varnish secret file $VARNISH_SECRET_FILE is unreadable or empty"
- exit 2
-else
- secret="-S $VARNISH_SECRET_FILE"
-fi
-
-# Done parsing, set up command
-VARNISHADM="varnishadm $secret -T $VARNISH_ADMIN_LISTEN_ADDRESS:$VARNISH_ADMIN_LISTEN_PORT"
-
-# Now do the real work
-new_config="reload_$(date +%FT%H:%M:%S)"
-
-# Check if we are able to connect at all
-if $VARNISHADM vcl.list > /dev/null; then
- $debug && echo vcl.list succeeded
-else
- echo "Unable to run $VARNISHADM vcl.list"
- exit 1
-fi
-
-if $VARNISHADM vcl.list | awk ' { print $3 } ' | grep -q $new_config; then
- echo Trying to use new config $new_config, but that is already in use
- exit 2
-fi
-
-current_config=$( $VARNISHADM vcl.list | awk ' /^active/ { print $3 } ' )
-
-echo "Loading vcl from $VARNISH_VCL_CONF"
-echo "Current running config name is $current_config"
-echo "Using new config name $new_config"
-
-if $VARNISHADM vcl.load $new_config $VARNISH_VCL_CONF; then
- $debug && echo "$VARNISHADM vcl.load succeded"
-else
- echo "$VARNISHADM vcl.load failed"
- exit 1
-fi
-
-if $VARNISHADM vcl.use $new_config; then
- $debug && echo "$VARNISHADM vcl.use succeded"
-else
- echo "$VARNISHADM vcl.use failed"
- exit 1
-fi
-$VARNISHADM vcl.list
-echo Done
-exit 0
-
diff --git a/redhat/varnishlog.initrc b/redhat/varnishlog.initrc
deleted file mode 100644
index 2b5fc51..0000000
--- a/redhat/varnishlog.initrc
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-#
-# varnishlog Control the Varnish logging daemon
-#
-# chkconfig: - 90 10
-# description: Varnish Cache logging daemon
-# processname: varnishlog
-# config:
-# pidfile: /var/run/varnishlog.pid
-
-### BEGIN INIT INFO
-# Provides: varnishlog
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Default-Start:
-# Default-Stop:
-# Short-Description: start and stop varnishlog
-# Description: Varnish Cache logging daemon
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-retval=0
-pidfile="/var/run/varnishlog.pid"
-lockfile="/var/lock/subsys/varnishlog"
-logfile="/var/log/varnish/varnish.log"
-
-exec="/usr/bin/varnishlog"
-prog="varnishlog"
-
-DAEMON_OPTS="-a -w $logfile -D -P $pidfile"
-
-# Include varnishlog defaults
-[ -e /etc/sysconfig/varnishlog ] && . /etc/sysconfig/varnishlog
-
-start() {
-
- if [ ! -x $exec ]
- then
- echo $exec not found
- exit 5
- fi
-
- echo -n "Starting varnish logging daemon: "
-
- daemon --pidfile $pidfile $exec "$DAEMON_OPTS"
- echo
- return $retval
-}
-
-stop() {
- echo -n "Stopping varnish logging daemon: "
- killproc -p $pidfile $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- status -p $pidfile $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-# See how we were called.
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-
- exit 2
-esac
-
-exit $?
-
diff --git a/redhat/varnishlog.service b/redhat/varnishlog.service
deleted file mode 100644
index c7a0193..0000000
--- a/redhat/varnishlog.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Varnish HTTP accelerator logging daemon
-After=varnish.service
-
-[Service]
-Type=forking
-PIDFile=/run/varnishlog.pid
-ExecStart=/usr/bin/varnishlog -a -w /var/log/varnish/varnish.log -D -P /run/varnishlog.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/redhat/varnishncsa.initrc b/redhat/varnishncsa.initrc
deleted file mode 100644
index b23fa48..0000000
--- a/redhat/varnishncsa.initrc
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-#
-# varnishncsa Control the Varnish NCSA logging daemon
-#
-# chkconfig: - 90 10
-# description: Varnish Cache logging daemon
-# processname: varnishncsa
-# config:
-# pidfile: /var/run/varnishncsa.pid
-
-### BEGIN INIT INFO
-# Provides: varnishncsa
-# Required-Start: $network $local_fs $remote_fs
-# Required-Stop: $network $local_fs $remote_fs
-# Default-Start:
-# Default-Stop:
-# Short-Description: start and stop varnishncsa
-# Description: Varnish Cache NCSA logging daemon
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-retval=0
-pidfile="/var/run/varnishncsa.pid"
-lockfile="/var/lock/subsys/varnishncsa"
-logfile="/var/log/varnish/varnishncsa.log"
-
-exec="/usr/bin/varnishncsa"
-prog="varnishncsa"
-
-DAEMON_OPTS="-a -w $logfile -D -P $pidfile"
-
-# Include varnishncsa defaults
-[ -e /etc/sysconfig/varnishncsa ] && . /etc/sysconfig/varnishncsa
-
-start() {
-
- if [ ! -x $exec ]
- then
- echo $exec not found
- exit 5
- fi
-
- echo -n "Starting varnish ncsa logging daemon: "
-
- daemon --pidfile $pidfile $exec "$DAEMON_OPTS"
- echo
- return $retval
-}
-
-stop() {
- echo -n "Stopping varnish ncsa logging daemon: "
- killproc -p $pidfile $prog
- retval=$?
- echo
- [ $retval -eq 0 ] && rm -f $lockfile
- return $retval
-}
-
-restart() {
- stop
- start
-}
-
-reload() {
- restart
-}
-
-force_reload() {
- restart
-}
-
-rh_status() {
- status -p $pidfile $prog
-}
-
-rh_status_q() {
- rh_status >/dev/null 2>&1
-}
-
-# See how we were called.
-case "$1" in
- start)
- rh_status_q && exit 0
- $1
- ;;
- stop)
- rh_status_q || exit 0
- $1
- ;;
- restart)
- $1
- ;;
- reload)
- rh_status_q || exit 7
- $1
- ;;
- force-reload)
- force_reload
- ;;
- status)
- rh_status
- ;;
- condrestart|try-restart)
- rh_status_q || exit 0
- restart
- ;;
- *)
- echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-
- exit 2
-esac
-
-exit $?
-
diff --git a/redhat/varnishncsa.service b/redhat/varnishncsa.service
deleted file mode 100644
index e2ebdcd..0000000
--- a/redhat/varnishncsa.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Varnish HTTP accelerator NCSA daemon
-After=varnish.service
-
-[Service]
-Type=forking
-PIDFile=/run/varnishncsa.pid
-ExecStart=/usr/bin/varnishncsa -a -w /var/log/varnish/varnishncsa.log -D -P /run/varnishncsa.pid
-
-[Install]
-WantedBy=multi-user.target
More information about the varnish-commit
mailing list