From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1CB7113800E for ; Sun, 5 Aug 2012 13:52:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 50882E04EC; Sun, 5 Aug 2012 13:52:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1CE3CE04EC for ; Sun, 5 Aug 2012 13:52:42 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EC4E1B4019 for ; Sun, 5 Aug 2012 13:52:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 53811E5439 for ; Sun, 5 Aug 2012 13:52:39 +0000 (UTC) From: "Theo Chatzimichos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Theo Chatzimichos" Message-ID: <1344174722.a7434e44230f4f74390d4a7fab70fc0364b942c9.tampakrap@gentoo> Subject: [gentoo-commits] proj/planet-gentoo:master commit in: scripts/ X-VCS-Repository: proj/planet-gentoo X-VCS-Files: scripts/update-venus X-VCS-Directories: scripts/ X-VCS-Committer: tampakrap X-VCS-Committer-Name: Theo Chatzimichos X-VCS-Revision: a7434e44230f4f74390d4a7fab70fc0364b942c9 X-VCS-Branch: master Date: Sun, 5 Aug 2012 13:52:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d3b67e4f-7f26-4533-88cb-e124907b539f X-Archives-Hash: aa2f317fb400dac91e439d72e0863a33 commit: a7434e44230f4f74390d4a7fab70fc0364b942c9 Author: Theo Chatzimichos gentoo org> AuthorDate: Sun Aug 5 13:52:02 2012 +0000 Commit: Theo Chatzimichos gentoo org> CommitDate: Sun Aug 5 13:52:02 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=a7434e44 Move the logs to /var/log/planet.gentoo.org/{planet,universe} --- scripts/update-venus | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/update-venus b/scripts/update-venus index fc78835..352d3a9 100755 --- a/scripts/update-venus +++ b/scripts/update-venus @@ -4,14 +4,13 @@ LOG_DATE=$(date +%F-%R) BASE_DIR="/var/www/planet.gentoo.org" # created by cfengine REPO="${BASE_DIR}/planet-gentoo" VENUS_DIR="/usr/lib/python2.7/site-packages/venus" +LOG_DIR="/var/log/planet.gentoo.org" BANNED_USERS=( tampakrap ) # Create folders and symlinks (for initial setup) [[ -d ${BASE_DIR}/htdocs ]] || mkdir ${BASE_DIR}/htdocs -[[ -d ${BASE_DIR}/logs/planet ]] || mkdir -p ${BASE_DIR}/logs/planet -[[ -d ${BASE_DIR}/logs/universe ]] || mkdir -p ${BASE_DIR}/logs/universe [[ -d ${BASE_DIR}/generated_configs ]] || mkdir ${BASE_DIR}/generated_configs [[ -L ${BASE_DIR}/htdocs/images ]] || ln -s ${BASE_DIR}/planet-gentoo/media/* ${BASE_DIR}/htdocs [[ -d ${BASE_DIR}/htdocs/archives ]] || mkdir ${BASE_DIR}/htdocs/archives @@ -34,7 +33,7 @@ for instance in planet universe; do # Generate the combined ini file from the split config files cat ${REPO}/configs/base/venus.${instance} ${REPO}/configs/${instance}/* > ${BASE_DIR}/generated_configs/venus.${instance}.ini # Run venus - python ${VENUS_DIR}/planet.py ${BASE_DIR}/generated_configs/venus.${instance}.ini > ${BASE_DIR}/logs/${instance}/${LOG_DATE}.log + python ${VENUS_DIR}/planet.py ${BASE_DIR}/generated_configs/venus.${instance}.ini > ${LOG_DIR}/${instance}/${LOG_DATE}.log 2>&1 done # Delete old logs