Merge remote branch 'ftpmaster/master'

diff --git a/config/debian/common b/config/debian/common
index f5ec8ae630ae8a42696c7e5d158c5db2c2607ac0..61559515c04620b0b1c45f09ee6ba22a422ca0b3 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -36,6 +36,8 @@ function make_buildd_dir () {
     dak manage-build-queues -a
 
     for dist in $(ls -1 ${incoming}/dists/); do
+        # Skip project trace directory
+        if [ "${dist}x" = "projectx" ]; then continue; fi
         cd ${incoming}/dists/${dist}
         mkdir -p tree/${STAMP}
         cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/

diff --git a/setup/README b/setup/README
index 4c8a9ebfded3eeb32613294196d50a1a862bb649..c193e9a3cd480c9be8b512ba6f18ae306a36ec95 100644 (file)
--- a/setup/README
+++ b/setup/README
@@ -16,9 +16,8 @@ The following roles are assumed to exist:
 For the purposes of this document, we'll be working in /srv/dak
 
 Set up the dak user on both the system and in postgres:
-# sudo adduser dak
-# sudo addgroup ftpmaster
-# sudo addgroup dak ftpmaster
+# sudo addgroup --system ftpmaster
+# sudo adduser --system dak --ingroup ftpmaster --shell /bin/bash
 # sudo -u postgres createuser -s dak
 
 Set up the dak directory: