Merge branch 'master' into distorted

* master:
  etc/ftpsync-debian.conf: Fetch from the German mirror.
  bin/run-mirrors: Use id(1) to find current user name.
  etc/logrotate.conf: Somehow went missing.

diff --git a/bin/run-mirrors b/bin/run-mirrors
index ec43009..c69b903 100755 (executable)
--- a/bin/run-mirrors
+++ b/bin/run-mirrors
@@ -3,7 +3,7 @@
 set -e
 
 ## Make sure we're running as the right user.
-case "$USER" in
+case $(id -un) in
   mirror) ;;
   *) exec userv -fstdin=/dev/null mirror run ;;
 esac

diff --git a/etc/ftpsync-debian.conf b/etc/ftpsync-debian.conf
index 391e6b7..15d5c83 100644 (file)
--- a/etc/ftpsync-debian.conf
+++ b/etc/ftpsync-debian.conf
@@ -15,7 +15,7 @@ TO="/mnt/ftp/pub/mirrors/debian/"
 RSYNC_PATH="debian"
 
 ## The host we mirror from
-RSYNC_HOST=ftp.uk.debian.org
+RSYNC_HOST=ftp.de.debian.org
 
 ## In case we need a user to access the rsync share at our upstream host
 #RSYNC_USER=

diff --git a/etc/logrotate.conf b/etc/logrotate.conf
new file mode 100644 (file)
index 0000000..44f00d4
--- /dev/null
+++ b/etc/logrotate.conf
@@ -0,0 +1,11 @@
+### -*-conf-*-
+###
+### Log rotation configuration for mirrors.
+
+compress
+rotate 31
+minsize 4194304
+daily
+
+/mnt/ftp/mirror-admin/log/*.log {
+}