kup-server: more sane default pathnames

Use pathnames that someone might actually want to deploy.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/README b/README
index cf32476..0fd3524 100644
--- a/README
+++ b/README
@@ -9,30 +9,30 @@ for specific tree access control.
 
 
 The following pathnames in kup-server need to be customized
-appropriately.  The predefined paths are dummy paths for testing only.
+appropriately.
 
 All of these paths should be disjoint!
 
 
-my $data_path = '/home/kuptest/kernel.org/test/pub';
+my $data_path = '/var/lib/kup/pub';
 
 This is the path under which files are uploaded.
 
 
-my $git_path  = '/home/kuptest/kernel.org/test/git';
+my $git_path  = '/var/lib/git';
 
 This is the path where git trees (for the TAR and DIFF options) are
 available.  Those should be readonly for the uploaders.
 
 
-my $lock_file = '/home/kuptest/kernel.org/test/lock';
+my $lock_file = '/var/run/kup/lock';
 
 A common lock file for $data_path.  No program should modify the
 content in $data_path without holding an flock on this file.  Should
 be readonly for the uploaders.
 
 
-my $tmp_path  = '/home/kuptest/kernel.org/test/tmp/';
+my $tmp_path  = '/var/lib/kup/tmp/';
 
 This can be either:
 
@@ -48,7 +48,7 @@ $data_path, since the script expects to create files in this directory
 and rename() them into $data_path.
 
 
-my $pgp_path  = '/home/kuptest/kernel.org/test/pgp';
+my $pgp_path  = '/var/lib/kup/pgp';
 
 A directory containing a GnuPG public keyring for each user, named
 <user>.gpg and readable (but not writable) by that user.
diff --git a/kup-server b/kup-server
index cc96f07..a7e4e2e 100755
--- a/kup-server
+++ b/kup-server
@@ -62,12 +62,12 @@ use Sys::Syslog qw(:standard :macros);
 use Git;
 
 # All paths starting with /home/kuptest are dummy paths for testing
-my $data_path = '/home/kuptest/kernel.org/test/pub';
-my $git_path  = '/home/kuptest/kernel.org/test/git';
-my $lock_file = '/home/kuptest/kernel.org/test/lock';
+my $data_path = '/var/lib/kup/pub';
+my $git_path  = '/var/lib/git';
+my $lock_file = '/var/run/kup/lock';
 # If $tmp_path ends in /, a full set of per-user temp directories are expected
-my $tmp_path  = '/home/kuptest/kernel.org/test/tmp/';
-my $pgp_path  = '/home/kuptest/kernel.org/test/pgp';
+my $tmp_path  = '/var/lib/kup/tmp/';
+my $pgp_path  = '/var/lib/kup/pgp';
 my $max_data  = 8*1024*1024*1024;
 my $bufsiz    = 256*1024;