summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2018-09-25 15:05:42 -0400
committerLuke Shumaker <lukeshu@parabola.nu>2018-09-25 15:11:22 -0400
commit840c13924da569fc38f45181b5ac2a059b6b143e (patch)
treefa57762681245f6312fd221a6084eb1a0b47397d
parentff0971c9160f85ca506ac4e913fbe67f39fbb1ea (diff)
Revert "Teach db-cleanup to clean old torrents, rather than having make_repo_torrents do it"
Since make_repo_torrents will now only place symlinks in TORRENTPOOL, the dead symlink removal will now handle it automatically, and db-cleanup needs no special knowledge of TORRENTPOOL. This reverts commit 3540ddbf4c2dc25903f3d4f23a86dd795ae620e2.
-rwxr-xr-xcron-jobs/db-cleanup2
-rw-r--r--db-cleanup.conf9
2 files changed, 3 insertions, 8 deletions
diff --git a/cron-jobs/db-cleanup b/cron-jobs/db-cleanup
index fc7fd25..de92e21 100755
--- a/cron-jobs/db-cleanup
+++ b/cron-jobs/db-cleanup
@@ -40,7 +40,7 @@ done | cut -d'/' -f1 | sort -u | sed "s|$|*|" > "$filter"
msg "Removing old files:"
-for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}" "${TORRENTPOOLS[@]}"; do
+for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}"; do
msg2 '%s' "${POOL}"
rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
diff --git a/db-cleanup.conf b/db-cleanup.conf
index 9944438..12d65f9 100644
--- a/db-cleanup.conf
+++ b/db-cleanup.conf
@@ -1,6 +1,6 @@
#!/hint/bash
-# All `*POOLS` variables are relative to `config:FTP_BASE`.
+# Both PKGPOOLS and SRCPOOLS are relative to `config:FTP_BASE`.
# Directories where packages are shared between repos
PKGPOOLS=(
@@ -11,7 +11,7 @@ PKGPOOLS=(
pool/community # Arch Linux (community)
)
-# Directories where source-packages are stored
+# Directories where sources are stored
SRCPOOLS=(
sources/parabola # Parabola GNU/Linux-libre
sources/alarm # Arch Linux ARM
@@ -19,8 +19,3 @@ SRCPOOLS=(
sources/packages # Arch Linux (project)
sources/community # Arch Linux (community)
)
-
-# Directories where torrents are stored
-TORRENTPOOLS=(
- torrents
-)