summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config3
-rwxr-xr-xcron-jobs/ftpdir-cleanup2
-rwxr-xr-xdb-update8
3 files changed, 8 insertions, 5 deletions
diff --git a/config b/config
index 57ae64b..3a232f2 100644
--- a/config
+++ b/config
@@ -1,6 +1,9 @@
FTP_BASE="/srv/ftp"
+#This dir MUST be under FTP_BASE
+PKGPOOL_DIR="packages"
+
SVNREPO="file:///srv/svn-packages"
CLEANUP_DESTDIR="/srv/package-cleanup"
diff --git a/cron-jobs/ftpdir-cleanup b/cron-jobs/ftpdir-cleanup
index 977b384..a278341 100755
--- a/cron-jobs/ftpdir-cleanup
+++ b/cron-jobs/ftpdir-cleanup
@@ -36,7 +36,7 @@ done
to_cleanup=""
for _arch in ${ARCHES[@]}; do
- poolpath="$FTP_BASE/packages/os/$_arch/"
+ poolpath="$FTP_BASE/$PKGPOOL_DIR/os/$_arch/"
cd $poolpath
for pkg in *$PKGEXT; do
[ -f "$pkg" ] || continue # in case we get a file named "*.pkg.tar.gz"
diff --git a/db-update b/db-update
index a178996..bcfb882 100755
--- a/db-update
+++ b/db-update
@@ -131,11 +131,11 @@ for current_arch in ${ARCHES[@]}; do
ftppath="$FTP_BASE/$reponame/os/$current_arch"
ftppath_any="$FTP_BASE/$reponame/os/any"
- poolpath="$FTP_BASE/packages/os/$current_arch"
- poolpath_any="$FTP_BASE/packages/os/any"
+ poolpath="$FTP_BASE/$PKGPOOL_DIR/os/$current_arch"
+ poolpath_any="$FTP_BASE/$PKGPOOL_DIR/os/any"
# The following is used to create relative symlinks
- poolrel="../../../packages/os/$current_arch"
- poolrel_any="../../../packages/os/any"
+ poolrel="../../../$PKGPOOL_DIR/os/$current_arch"
+ poolrel_any="../../../$PKGPOOL_DIR/os/any"
if [ ! -d "$ftppath" ]; then
echo "FTP path for this repo ($reponame) is missing"