summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorParabola <dev@list.parabolagnulinux.org>2011-11-14 05:14:04 -0800
committerParabola <dev@list.parabolagnulinux.org>2011-11-14 05:14:04 -0800
commit801ea2c927ace5ee892209dd8e3c1044e1b3842e (patch)
tree0239fd4e5cbfb65d4b4c185599d37b8309743618
parent27b75785fe18e1e8a2d45f53daf8652ebe579ace (diff)
Fixes while testing it
-rw-r--r--config10
-rwxr-xr-xdb-sync2
2 files changed, 6 insertions, 6 deletions
diff --git a/config b/config
index a0849a9..23b7bbb 100644
--- a/config
+++ b/config
@@ -1,10 +1,10 @@
#!/bin/bash
-FTP_BASE="/tmp/repo"
-ARCH_BASE="/tmp/repo"
+FTP_BASE="/srv/http/repo/public/temprepo"
+ARCH_BASE="/srv/http/repo/public/temprepo"
SVNREPO="/var/abs"
# Repos from Arch
-ARCHREPOS=('core') #'extra' 'community' 'testing' 'multilib')
+ARCHREPOS=('core' 'testing') #'extra' 'community' 'testing' 'multilib')
# Official Parabola repos
OURREPOS=('libre' 'libre-testing')
# User repos
@@ -32,7 +32,7 @@ LOCK_TIMEOUT=300
STAGING="$FTP_BASE/staging"
TMPDIR="/tmp"
-ARCHARCHES=(i686) # x86_64)
+ARCHARCHES=(i686 x86_64)
ARCHES=(${ARCHARCHES[@]} mips64el)
DBEXT=".db.tar.gz"
FILESEXT=".files.tar.gz"
@@ -40,4 +40,4 @@ PKGEXT=".pkg.tar.?z"
SRCEXT=".src.tar.gz"
MAKEPKGCONF="/etc/makepkg.conf"
-BLACKLIST_FILE="$FTP_BASE/blacklist.txt"
+BLACKLIST_FILE="$HOME/blacklist/blacklist.txt"
diff --git a/db-sync b/db-sync
index 0bb79b7..1a9e02f 100755
--- a/db-sync
+++ b/db-sync
@@ -89,7 +89,7 @@ init() {
# We delete here for cleanup
rsync -vrtlH \
--delete-after \
- --safe-links \
+ --delete-excluded \
--delay-updates \
--max-delete=1000 \
--include-from=/tmp/${_repo}-${_arch}.whitelist \