r1887 - in branches/1.1: . debian

[bahner at projects.linpro.no]

Author: bahner
Date: 2007-08-20 13:02:27 +0200 (Mon, 20 Aug 2007)
New Revision: 1887

Added:
   branches/1.1/debian/varnish.manpages
   branches/1.1/debian/varnish.postinst
Modified:
   branches/1.1/
   branches/1.1/debian/README.Debian
   branches/1.1/debian/changelog
   branches/1.1/debian/varnish.default
Log:
Merged revisions 1865,1867-1868,1871,1873-1880 via svnmerge from 
svn+ssh://projects.linpro.no/svn/varnish/trunk/varnish-cache

........
  r1865 | bahner | 2007-08-20 10:38:29 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Added -u and -g to default setup. Bumped release.
........
  r1867 | bahner | 2007-08-20 10:55:34 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Added creation of varnish user and group to postinst
........
  r1868 | bahner | 2007-08-20 10:56:40 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Comment on postinst user-creation
........
  r1873 | bahner | 2007-08-20 11:33:50 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Add file to install man pages; call varnish_setup_user from postinst
........
  r1874 | bahner | 2007-08-20 11:37:59 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Added forgotten shebang to postinst
........
  r1875 | bahner | 2007-08-20 11:40:54 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Fixed silly race
........
  r1877 | bahner | 2007-08-20 11:42:56 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Added group 
........
  r1880 | bahner | 2007-08-20 12:13:16 +0200 (Mon, 20 Aug 2007) | 2 lines
  
  Clarified change
........



Property changes on: branches/1.1
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862
   + /trunk/varnish-cache:1-1722,1727-1729,1738,1743-1777,1779-1795,1797-1798,1800-1808,1810-1815,1817,1819,1823,1831-1838,1846,1853-1855,1857-1859,1862,1865,1867-1868,1871,1873-1880

Modified: branches/1.1/debian/README.Debian
===================================================================
--- branches/1.1/debian/README.Debian	2007-08-20 10:52:59 UTC (rev 1886)
+++ branches/1.1/debian/README.Debian	2007-08-20 11:02:27 UTC (rev 1887)
@@ -1,3 +1,10 @@
+Important change for 1.1.1
+==========================
+
+Varnish now features use of ``-u'' and ``-g'' in the default
+configuration. If you have customized the defaults you may wish to
+make these changes yourself.
+
 GCC
 ===
 Varnish requires a GCC-compiler compatible with the compiler used to

Modified: branches/1.1/debian/changelog
===================================================================
--- branches/1.1/debian/changelog	2007-08-20 10:52:59 UTC (rev 1886)
+++ branches/1.1/debian/changelog	2007-08-20 11:02:27 UTC (rev 1887)
@@ -1,3 +1,12 @@
+varnish (1.1.1) unstable; urgency=low
+
+  * New upstream release
+  * User and Group id added to default DAEMON_OPTS
+  * Added user and group creation to postinst
+  * Added missing man pages
+
+ -- Lars Bahner <bahner at debian.org>  Mon, 20 Aug 2007 11:29:33 +0200
+
 varnish (1.1) unstable; urgency=low
 
   * New upstream release

Modified: branches/1.1/debian/varnish.default
===================================================================
--- branches/1.1/debian/varnish.default	2007-08-20 10:52:59 UTC (rev 1886)
+++ branches/1.1/debian/varnish.default	2007-08-20 11:02:27 UTC (rev 1887)
@@ -17,6 +17,7 @@
 DAEMON_OPTS="-a :6081 \
              -T localhost:6082 \
 	     -b localhost:8080 \
+	     -u varnish -g varnish \
 	     -n /var/lib/varnish \
 	     -s file,/var/lib/varnish/varnish_storage.bin,1G"
 

Copied: branches/1.1/debian/varnish.manpages (from rev 1880, trunk/varnish-cache/debian/varnish.manpages)
===================================================================
--- branches/1.1/debian/varnish.manpages	                        (rev 0)
+++ branches/1.1/debian/varnish.manpages	2007-08-20 11:02:27 UTC (rev 1887)
@@ -0,0 +1,9 @@
+bin/varnishncsa/varnishncsa.1
+bin/varnishhist/varnishhist.1
+bin/varnishstat/varnishstat.1
+bin/varnishreplay/varnishreplay.1
+bin/varnishadm/varnishadm.1
+bin/varnishlog/varnishlog.1
+bin/varnishtop/varnishtop.1
+bin/varnishd/varnishd.1
+man/vcl.7

Copied: branches/1.1/debian/varnish.postinst (from rev 1868, trunk/varnish-cache/debian/varnish.postinst)
===================================================================
--- branches/1.1/debian/varnish.postinst	                        (rev 0)
+++ branches/1.1/debian/varnish.postinst	2007-08-20 11:02:27 UTC (rev 1887)
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+varnish_setup_user() {
+        if ! id varnish > /dev/null 2>&1 ; then
+                adduser --system --no-create-home --group varnish 2>&1 > /dev/null || exit 78
+        fi
+}
+
+varnish_setup_user
+
+# Automatically added by dh_installinit
+if [ -x "/etc/init.d/varnish" ]; then
+	update-rc.d varnish defaults >/dev/null
+	if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+		invoke-rc.d varnish start || exit $?
+	else
+		/etc/init.d/varnish start || exit $?
+	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