r2141 - in branches/1.1: . debian

[des at projects.linpro.no]

Author: des
Date: 2007-10-19 13:32:49 +0200 (Fri, 19 Oct 2007)
New Revision: 2141

Modified:
   branches/1.1/
   branches/1.1/debian/varnish.postinst
Log:
Merged revisions 2078 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r2078 | ssm | 2007-10-05 11:15:09 +0200 (Fri, 05 Oct 2007) | 1 line
  
  Fix ticket #166, debian package issues
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2133
   + /trunk/varnish-cache:1-1722,1727-1729,1733,1738,1743-1777,1779-1798,1800-1815,1817,1819,1823,1830-1838,1846,1853-1855,1857-1859,1862,1865-1868,1871-1880,1883-1884,1886,1888,1896,1898,1902-1905,1907,1909,1912-1916,1920-1928,1935-1939,1941-1949,1955,1957-1958,1967-1968,1970-1974,1976-1977,1984,1986-1989,1991-1998,2026,2031-2033,2078,2133

Modified: branches/1.1/debian/varnish.postinst
===================================================================
--- branches/1.1/debian/varnish.postinst	2007-10-19 11:29:31 UTC (rev 2140)
+++ branches/1.1/debian/varnish.postinst	2007-10-19 11:32:49 UTC (rev 2141)
@@ -5,8 +5,12 @@
                 adduser --system --no-create-home --group varnish 2>&1 > /dev/null || exit 78
         fi
 }
+varnish_create_storagedir() {
+	install -o varnish -g varnish -d /var/lib/varnish/$(uname -n) || exit 78
+}
 
 varnish_setup_user
+varnish_create_storagedir
 
 #DEBHELPER#
 # Automatically added by dh_installinit
@@ -19,13 +23,3 @@
 	fi
 fi
 # End automatically added section
-# Automatically added by dh_installinit
-if [ -x "/etc/init.d/varnishlog" ]; then
-	update-rc.d varnishlog defaults >/dev/null
-	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
-		invoke-rc.d varnishlog start || exit $?
-	else
-		/etc/init.d/varnishlog start || exit $?
-	fi
-fi
-# End automatically added section