[arch-commits] Commit in varnish/trunk (PKGBUILD varnish-vcl-reload varnish.service)

[Sven-Hendrik Haase]

    Date: Monday, February 24, 2020 @ 10:16:03
  Author: svenstaro
Revision: 376121

upgpkg: varnish 6.3.1-2: Use upstream suggestions for systemd stuff

Modified:
  varnish/trunk/PKGBUILD
Deleted:
  varnish/trunk/varnish-vcl-reload
  varnish/trunk/varnish.service

--------------------+
 PKGBUILD           |   18 +++++++++---------
 varnish-vcl-reload |   20 --------------------
 varnish.service    |   16 ----------------
 3 files changed, 9 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-24 09:28:19 UTC (rev 376120)
+++ PKGBUILD	2020-02-24 10:16:03 UTC (rev 376121)
@@ -6,23 +6,21 @@
 
 pkgname=varnish
 pkgver=6.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="High-performance HTTP accelerator"
 arch=('x86_64')
 url="https://www.varnish-cache.org/"
 license=('BSD')
 depends=('gcc' 'libedit' 'pcre' 'libnsl')
-makedepends=('python-docutils' 'python-sphinx')
+makedepends=('python-docutils' 'python-sphinx' 'git')
 optdepends=('python: needed for vmod development')
 backup=('etc/varnish/default.vcl')
 install=$pkgname.install
 source=("https://varnish-cache.org/_downloads/varnish-$pkgver.tgz"
-        varnish-vcl-reload
-        varnish.service
+        "git+https://github.com/varnishcache/pkg-varnish-cache.git#commit=711b56b"
         varnish.sysusers)
 sha256sums=('d1a26c7dad43b842c97e48f1c6422bb0b24c02cd6a74c53a2cf17e64da254175'
-            '0369e3e735e4c6150f08677df8b7cdae1a36ea75fd0e03734abe814a94312f80'
-            '49b48981ccb97aee77ef59373db3856652d7badc909f2504df01970d834183f2'
+            'SKIP'
             'b58dd6b00eb81c75e4bb30421b85b2be88c049d5b72a8ee553ba690a5414972b')
 
 prepare() {
@@ -54,11 +52,13 @@
 
   make DESTDIR="$pkgdir" install
 
-  install -m755 "$srcdir/varnish-vcl-reload" "$pkgdir/usr/bin"
-  install -Dm644 "$srcdir/$pkgname.service" "$pkgdir/usr/lib/systemd/system/$pkgname.service"
+  install -Dm644 "$srcdir/pkg-varnish-cache/systemd/varnish.service" "$pkgdir/usr/lib/systemd/system/varnish.service"
+  install -Dm644 "$srcdir/pkg-varnish-cache/systemd/varnishncsa.service" "$pkgdir/usr/lib/systemd/system/varnishncsa.service"
+  install -Dm755 "$srcdir/pkg-varnish-cache/systemd/varnishreload" "$pkgdir/usr/bin/varnishreload"
+  install -Dm755 "$srcdir/pkg-varnish-cache/systemd/varnish.logrotate" "$pkgdir/etc/logrotate.d/varnish"
 
   # create varnish:varnish user/group
-  install -Dm644 "$srcdir/$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/varnish.conf"
+  install -Dm644 "$srcdir/varnish.sysusers" "$pkgdir/usr/lib/sysusers.d/varnish.conf"
 
   # config
   install -Dm644 "etc/example.vcl" "$pkgdir/etc/varnish/default.vcl"

Deleted: varnish-vcl-reload
===================================================================
--- varnish-vcl-reload	2020-02-24 09:28:19 UTC (rev 376120)
+++ varnish-vcl-reload	2020-02-24 10:16:03 UTC (rev 376121)
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-cfg=${1:-/etc/varnish/default.vcl}
-if [ ! -e "$cfg" ]; then
-  printf 'ERROR: VCL file %s does not exist\n' "$cfg" >&2
-  exit 1
-fi
-
-activecfg=$(varnishadm 'vcl.list' | awk '/active/ { print $4 }')
-if [ -z "$activecfg" ]; then
-  printf 'ERROR: No active VCL found!\n' >&2
-  exit 1
-fi
-
-newcfg=$(date +'vcl-%s')
-printf 'INFO: using new config %s\n' "$cfg"
-
-varnishadm "vcl.load $newcfg $cfg" &&
-varnishadm "vcl.use $newcfg" &&
-varnishadm "vcl.discard $activecfg"

Deleted: varnish.service
===================================================================
--- varnish.service	2020-02-24 09:28:19 UTC (rev 376120)
+++ varnish.service	2020-02-24 10:16:03 UTC (rev 376121)
@@ -1,16 +0,0 @@
-[Unit]
-Description=High-perfomance HTTP accelerator
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/varnishd -j unix -a 0.0.0.0:80 -a [::]:80 -f /etc/varnish/default.vcl -T localhost:6082 -s malloc,64M
-ExecReload=/usr/bin/varnish-vcl-reload
-PrivateTmp=true
-PrivateDevices=true
-LimitNOFILE=131072
-LimitMEMLOCK=82000
-LimitCORE=infinity
-
-[Install]
-WantedBy=multi-user.target