From 3089342a70e548d4340e0fa89dd76eb3ff5e77d4 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Tue, 2 Dec 2014 15:57:28 +0000 Subject: [PATCH] Fix the bandersnatch element on ubuntu Use the correct path to httpd conf files for ubuntu. Fix cron filename and permissions so its not ignored. Remove use of "&>>" it doesn't work in dash. Change-Id: Ifa77871903d9a89b53e93d0a81eca1600773cff0 --- elements/bandersnatch/install.d/76-bandersnatch | 10 ++++++++-- .../os-refresh-config/post-configure.d/50-bandersnatch | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/elements/bandersnatch/install.d/76-bandersnatch b/elements/bandersnatch/install.d/76-bandersnatch index f4eae10fd..78e4b16f2 100755 --- a/elements/bandersnatch/install.d/76-bandersnatch +++ b/elements/bandersnatch/install.d/76-bandersnatch @@ -13,9 +13,15 @@ register-state-path --leave-symlink /srv/pypi/web /usr/local/bin/bandersnatch mirror || true # Run bandersnatch every hour -echo "0 * * * * root flock -n /var/run/bandersnatch -c \"/usr/local/bin/bandersnatch mirror &>> /var/log/bandersnatch\"" > /etc/cron.d/bandersnatch.cron +echo "0 * * * * root flock -n /var/run/bandersnatch -c \"/usr/local/bin/bandersnatch mirror >> /var/log/bandersnatch 2>&1\"" > /etc/cron.d/bandersnatch +chmod 755 /etc/cron.d/bandersnatch -cat > /etc/httpd/conf.d/bandersnatch.conf<<'EOF' +HTTPDCONFFILE=/etc/httpd/conf.d/bandersnatch.conf +if [ -d /etc/apache2/sites-enabled ]; then + HTTPDCONFFILE=/etc/apache2/sites-enabled/bandersnatch.conf +fi + +cat > $HTTPDCONFFILE<<'EOF' Alias /pypi /srv/pypi/web Options Indexes diff --git a/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch b/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch index 445a81a6c..3e3c273b6 100755 --- a/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch +++ b/elements/bandersnatch/os-refresh-config/post-configure.d/50-bandersnatch @@ -4,4 +4,4 @@ set -o pipefail # Start building mirror in the background, this can take hours and downloads over 100G of data flock -n /var/run/bandersnatch -c \ - "/usr/local/bin/bandersnatch mirror &>> /var/log/bandersnatch" & + "/usr/local/bin/bandersnatch mirror >> /var/log/bandersnatch 2>&1" &