From 0335adedb88db01c9be4d9293860bfd386ded9a1 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Sun, 11 Aug 2013 12:03:28 -0700 Subject: [PATCH] git-daemon-sysvinit: advertise GIT_DAEMON_BASE_PATH in /etc/default/git-daemon When changing GIT_DAEMON_DIRECTORY in the /etc/default/git-daemon coming with the package to e.g. /srv/repos/git the git-daemon is still called with --base-path=/var/cache because GIT_DAEMON_BASE_PATH has the default value from /etc/init.d/git-daemon but is not included in /etc/default/git-daemon which leads to a path not found error. Add GIT_DAEMON_BASE_PATH to the default /etc/default/git-daemon so people customizing know to change it. Reported-by: Alexander Dahl Signed-off-by: Jonathan Nieder Acked-by: Daniel Baumann --- debian/changelog | 8 ++++++++ debian/git-daemon.default | 1 + 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 9f736138f0..3811c56874 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +git (1:1.8.4.4-1.1) unstable; urgency=low + + * git-daemon-sysvinit: advertise GIT_DAEMON_BASE_PATH in + /etc/default/git-daemon (thx Alexander Dahl and Antonio + Ospite; closes: #704985). + + -- Jonathan Nieder Fri, 22 Nov 2013 12:28:19 -0800 + git (1:1.8.4.4-1) unstable; urgency=low * new upstream point release. diff --git a/debian/git-daemon.default b/debian/git-daemon.default index fd62168cbc..356bb3d26d 100644 --- a/debian/git-daemon.default +++ b/debian/git-daemon.default @@ -8,6 +8,7 @@ GIT_DAEMON_ENABLE=false GIT_DAEMON_USER=gitdaemon +GIT_DAEMON_BASE_PATH=/var/lib GIT_DAEMON_DIRECTORY=/var/lib/git # Additional options that are passed to the Daemon. -- 2.11.4.GIT