BBlack has submitted this change and it was merged. Change subject: varnish (3.0.6plus-wm6) jessie-wikimedia; urgency=low ......................................................................
varnish (3.0.6plus-wm6) jessie-wikimedia; urgency=low * debian/rules update to not start varnishd on pkg install * postrm compatibility with /var/lib/varnish as a mountpoint -- Brandon Black <[email protected]> Thu, 26 Feb 2015 20:34:00 +0000 Change-Id: Ie58406dc22b6113f482a1cb672c4b897e4dc6d32 --- M debian/changelog M debian/rules M debian/varnish.postrm 3 files changed, 10 insertions(+), 3 deletions(-) Approvals: BBlack: Looks good to me, approved jenkins-bot: Verified diff --git a/debian/changelog b/debian/changelog index 0ef9b3e..6605c85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +varnish (3.0.6plus-wm6) jessie-wikimedia; urgency=low + + * debian/rules update to not start varnishd on pkg install + * postrm compatibility with /var/lib/varnish as a mountpoint + + -- Brandon Black <[email protected]> Thu, 26 Feb 2015 20:34:00 +0000 + varnish (3.0.6plus-wm5) jessie-wikimedia; urgency=low * Added two new local patches: diff --git a/debian/rules b/debian/rules index a0edb2a..c6c1871 100755 --- a/debian/rules +++ b/debian/rules @@ -64,7 +64,7 @@ # Override to add several init scripts override_dh_installinit: - dh_installinit -a + dh_installinit -a --no-start dh_installinit --name=varnishlog dh_installinit --name=varnishncsa diff --git a/debian/varnish.postrm b/debian/varnish.postrm index 026b5c5..4de3444 100644 --- a/debian/varnish.postrm +++ b/debian/varnish.postrm @@ -16,7 +16,7 @@ if test -e /var/lib/varnish; then - rm -r /var/lib/varnish > /dev/null 2>&1 || exit 78 + rm -fr /var/lib/varnish/* > /dev/null 2>&1 || exit 78 fi ;; @@ -31,7 +31,7 @@ if test -e /var/lib/varnish; then - rm -r /var/lib/varnish > /dev/null 2>&1 || exit 78 + rm -fr /var/lib/varnish/* > /dev/null 2>&1 || exit 78 fi rm -f /etc/varnish/secret -- To view, visit https://gerrit.wikimedia.org/r/193263 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie58406dc22b6113f482a1cb672c4b897e4dc6d32 Gerrit-PatchSet: 2 Gerrit-Project: operations/debs/varnish Gerrit-Branch: 3.0.6-plus-wm Gerrit-Owner: BBlack <[email protected]> Gerrit-Reviewer: BBlack <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
