[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     73cc1442c9f71602840e2e76bfc4fa63dc08b33a
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 10:56:12 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 10:56:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=73cc1442

Temporarily ban me from planet to debug something

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index fadd6bd..4eb07cd 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -2,7 +2,7 @@
 DATE=$(date +%F)
 LOG_DATE=$(date +%F-%R)
 BASE_DIR="/var/www/planet.gentoo.org/" # created by cfengine
-RESTRICT=""
+RESTRICT="tampakrap"
 VENUS_DIR="/usr/lib/python2.7/site-packages/venus/"
 
 # Create folders and symlinks (for initial setup)

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     31c73dd97e33c5603cd01a1dabe779f6fb5c6542
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  9 14:42:51 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Thu Aug  9 14:42:51 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=31c73dd9

Grep errors in the logs of a week, the script will run weekly after that

---
 scripts/error-report |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/error-report b/scripts/error-report
index 983c68d..9a28f37 100755
--- a/scripts/error-report
+++ b/scripts/error-report
@@ -5,5 +5,5 @@
 
 for instance in planet universe; do
     echo "ERRORS in ${instance}"
-    find /var/log/planet.gentoo.org/${instance} -type f -name "$(date +%Y-%m-%d)*" -exec grep "ERROR" {} \; | sort | uniq -c
+    find /var/log/planet.gentoo.org/${instance} -type f -atime -7 -exec grep "ERROR" {} \; | grep -v "Errno" | sort | uniq -c
 done

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     9e7eda5fce60c8eeb0d18d106222141db661ac7b
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  7 06:40:44 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Tue Aug  7 06:40:44 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=9e7eda5f

Make it executable, and print a message on the instance running

---
 scripts/error-report |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/scripts/error-report b/scripts/error-report
old mode 100644
new mode 100755
index ccb42eb..983c68d
--- a/scripts/error-report
+++ b/scripts/error-report
@@ -4,5 +4,6 @@
 # and email the planet admins with the result
 
 for instance in planet universe; do
+    echo "ERRORS in ${instance}"
     find /var/log/planet.gentoo.org/${instance} -type f -name "$(date +%Y-%m-%d)*" -exec grep "ERROR" {} \; | sort | uniq -c
 done

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     99924d317d7d3a4041b1c5b4fd0d284fe50ee3d1
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 17:24:04 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 17:24:04 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=99924d31

Even more silent

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 51834a6..04fca6f 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -24,7 +24,7 @@ BANNED_USERS=(
 # Get latest Git changes
 cd ${BASE_DIR}/planet-gentoo
 git reset --hard origin/master > /dev/null 2>&1
-git pull --force >/dev/null
+git pull --force >/dev/null 2>&1
 
 for instance in planet universe; do
     # Remove configs of banned users

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     b305df60d4d5dbc79a56d762c1983f7342be657a
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 16:14:33 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 16:14:33 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=b305df60

Unban me, testing is over

---
 scripts/update-venus |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 2a78085..51834a6 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -6,7 +6,6 @@ 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)

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     a3b7238206feff00183646d0cc7806e44a63e0ba
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 16:12:53 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 16:12:53 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=a3b72382

make the update script a bit more silent

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index f115074..2a78085 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -24,7 +24,7 @@ BANNED_USERS=(
 
 # Get latest Git changes
 cd ${BASE_DIR}/planet-gentoo
-git reset --hard origin/master > /dev/null
+git reset --hard origin/master > /dev/null 2>&1
 git pull --force >/dev/null
 
 for instance in planet universe; do

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     2a74045cbcaf1fad086f68de96718f2b461cfb1d
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 15:51:22 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 15:51:22 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=2a74045c

hard reset the repo before doing anything, in order to make sure that
the banned users' configs will be back

---
 scripts/update-venus |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 7b01cfc..f115074 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -23,7 +23,9 @@ BANNED_USERS=(
     ln -s ${BASE_DIR}/planet-gentoo/archives/universe/index.php ${BASE_DIR}/htdocs/universe/archives/index.php
 
 # Get latest Git changes
-cd ${BASE_DIR}/planet-gentoo; git pull --force >/dev/null
+cd ${BASE_DIR}/planet-gentoo
+git reset --hard origin/master > /dev/null
+git pull --force >/dev/null
 
 for instance in planet universe; do
     # Remove configs of banned users

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     7f0d0bac4f735003b8e9f6df23f339b03adf9ae1
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 14:48:17 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 14:48:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=7f0d0bac

New script that notifies planet admins for bad URLs

---
 scripts/error-report |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/scripts/error-report b/scripts/error-report
new file mode 100644
index 0000000..ccb42eb
--- /dev/null
+++ b/scripts/error-report
@@ -0,0 +1,8 @@
+#!/bin/bash
+# At the end of the day, scan the logs of planet/universe,
+# grep for errors, sort them, count the duplicate URLs
+# and email the planet admins with the result
+
+for instance in planet universe; do
+    find /var/log/planet.gentoo.org/${instance} -type f -name "$(date +%Y-%m-%d)*" -exec grep "ERROR" {} \; | sort | uniq -c
+done

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     afd07644b2fdc8d4d3ac55f2718846870f36ec4e
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 13:59:43 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 13:59:43 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=afd07644

Also update the log dir for the cleanup log command

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 352d3a9..7b01cfc 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -37,7 +37,7 @@ for instance in planet universe; do
 done
 
 # Delete old logs
-find ${BASE_DIR}/logs -type f -mtime +30 -delete
+find ${LOG_DIR} -type f -mtime +30 -delete
 
 # Check for year directory, if not there create both needed
 [[ -d ${BASE_DIR}/htdocs/archives/$(date +%G) ]] || \

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     a7434e44230f4f74390d4a7fab70fc0364b942c9
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 13:52:02 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> 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

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     567f9cd6ee929d3005ad2d51384f0a58a50f8826
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 12:06:03 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 12:06:03 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=567f9cd6

Small fix in for loop
Also stop ignoring errors

---
 scripts/update-venus |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 9aadb9d..fc78835 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -24,12 +24,13 @@ BANNED_USERS=(
     ln -s ${BASE_DIR}/planet-gentoo/archives/universe/index.php ${BASE_DIR}/htdocs/universe/archives/index.php
 
 # Get latest Git changes
-cd ${BASE_DIR}/planet-gentoo; git pull --force >/dev/null 2>&1
+cd ${BASE_DIR}/planet-gentoo; git pull --force >/dev/null
 
 for instance in planet universe; do
     # Remove configs of banned users
     for banned_user in ${BANNED_USERS[@]}; do
         rm -f ${REPO}/configs/${instance}/${banned_user}
+    done
     # 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

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     8f6080a84a168cbbf683b606643502b3703ed77c
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 12:01:16 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 12:01:16 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=8f6080a8

RESTRICT->BANNED_USERS

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index d7aba0c..9aadb9d 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -4,7 +4,7 @@ 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"
-RESTRICT=(
+BANNED_USERS=(
     tampakrap
 )
 

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     838aad706cbcf289e9e2ea8101c982b732d7ae99
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 11:59:08 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 11:59:08 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=838aad70

missing slash

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 8985f20..d7aba0c 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -24,7 +24,7 @@ RESTRICT=(
     ln -s ${BASE_DIR}/planet-gentoo/archives/universe/index.php ${BASE_DIR}/htdocs/universe/archives/index.php
 
 # Get latest Git changes
-cd ${BASE_DIR}planet-gentoo; git pull --force >/dev/null 2>&1
+cd ${BASE_DIR}/planet-gentoo; git pull --force >/dev/null 2>&1
 
 for instance in planet universe; do
     # Remove configs of banned users

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     d6eb312c7df3d1a7747429555a05c16981164da7
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  5 11:45:45 2012 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Sun Aug  5 11:45:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=d6eb312c

Update the cronjob. fix identation, add trailing slashes in the vars,
use array for banned_users

---
 scripts/update-venus |   67 +++++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index 4eb07cd..8985f20 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -1,48 +1,49 @@
 #!/bin/bash
 DATE=$(date +%F)
 LOG_DATE=$(date +%F-%R)
-BASE_DIR="/var/www/planet.gentoo.org/" # created by cfengine
-RESTRICT="tampakrap"
-VENUS_DIR="/usr/lib/python2.7/site-packages/venus/"
+BASE_DIR="/var/www/planet.gentoo.org" # created by cfengine
+REPO="${BASE_DIR}/planet-gentoo"
+VENUS_DIR="/usr/lib/python2.7/site-packages/venus"
+RESTRICT=(
+    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
-[[ -d ${BASE_DIR}themes_common ]] 		|| mkdir -p ${BASE_DIR}themes_common; \
-	cp -r /usr/share/webapps/venus/$(ls /usr/share/webapps/venus/ | grep "^20" | sort -r | head -n 1)/themes/common/* ${BASE_DIR}/themes_common/
-[[ -d ${BASE_DIR}htdocs/universe/archives ]]	|| \
-	mkdir -p ${BASE_DIR}htdocs/universe/archives
-[[ -L ${BASE_DIR}htdocs/archives/index.php ]]	|| \
-	ln -s ${BASE_DIR}planet-gentoo/archives/planet/index.php ${BASE_DIR}htdocs/archives/index.php
-[[ -L ${BASE_DIR}htdocs/universe/archives/index.php ]]	|| \
-	ln -s ${BASE_DIR}planet-gentoo/archives/universe/index.php ${BASE_DIR}htdocs/universe/archives/index.php
+[[ -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
+[[ -d ${BASE_DIR}/themes_common ]] || mkdir ${BASE_DIR}/themes_common; \
+    cp -r /usr/share/webapps/venus/$(ls /usr/share/webapps/venus/ | grep "^20" | sort -r | head -n 1)/themes/common/* ${BASE_DIR}/themes_common/
+[[ -d ${BASE_DIR}/htdocs/universe/archives ]] || mkdir -p ${BASE_DIR}/htdocs/universe/archives
+[[ -L ${BASE_DIR}/htdocs/archives/index.php ]] || \
+    ln -s ${BASE_DIR}/planet-gentoo/archives/planet/index.php ${BASE_DIR}/htdocs/archives/index.php
+[[ -L ${BASE_DIR}/htdocs/universe/archives/index.php ]] || \
+    ln -s ${BASE_DIR}/planet-gentoo/archives/universe/index.php ${BASE_DIR}/htdocs/universe/archives/index.php
 
 # Get latest Git changes
 cd ${BASE_DIR}planet-gentoo; git pull --force >/dev/null 2>&1
 
-# Run Venus
-for x in planet universe; do
-        if [[ ! -z $RESTRICT ]]; then
-                for y in $RESTRICT; do
-                        rm -f ${BASE_DIR}planet-gentoo/configs/${x}/${y}
-                done
-        fi
-        cat ${BASE_DIR}planet-gentoo/configs/base/venus.${x} ${BASE_DIR}planet-gentoo/configs/${x}/* > ${BASE_DIR}generated_configs/venus.${x}.ini
-        python ${VENUS_DIR}planet.py ${BASE_DIR}generated_configs/venus.${x}.ini > ${BASE_DIR}logs/${x}/${LOG_DATE}.log 2>&1
+for instance in planet universe; do
+    # Remove configs of banned users
+    for banned_user in ${BANNED_USERS[@]}; do
+        rm -f ${REPO}/configs/${instance}/${banned_user}
+    # 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
 done
 
 # Delete old logs
-find ${BASE_DIR}logs -type f -mtime +30 -delete
+find ${BASE_DIR}/logs -type f -mtime +30 -delete
 
 # Check for year directory, if not there create both needed
-[[ -d ${BASE_DIR}htdocs/archives/$(date +%G) ]]  || \
-      mkdir ${BASE_DIR}htdocs/{,universe/}archives/$(date +%G)
+[[ -d ${BASE_DIR}/htdocs/archives/$(date +%G) ]] || \
+    mkdir ${BASE_DIR}/htdocs/{,universe/}archives/$(date +%G)
 # Archive posts, use -a to retain readable permissions
-cp -a ${BASE_DIR}htdocs/index.html \
-        ${BASE_DIR}htdocs/archives/$(date +%G)/${DATE}.html
-cp -a ${BASE_DIR}htdocs/universe/index.html \
-        ${BASE_DIR}htdocs/universe/archives/$(date +%G)/${DATE}.html
+cp -a ${BASE_DIR}/htdocs/index.html \
+    ${BASE_DIR}/htdocs/archives/$(date +%G)/${DATE}.html
+cp -a ${BASE_DIR}/htdocs/universe/index.html \
+    ${BASE_DIR}/htdocs/universe/archives/$(date +%G)/${DATE}.html

[gentoo-commits] proj/planet-gentoo:master commit in: scripts/

[Theo Chatzimichos]

commit:     bbcbb838eb0e3fc4ebb05a1b69c196b3a3e7b7d9
Author:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 14 15:21:27 2011 +0000
Commit:     Theo Chatzimichos <tampakrap <AT> gentoo <DOT> org>
CommitDate: Mon Nov 14 15:21:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/planet-gentoo.git;a=commit;h=bbcbb838

Update python version to 2.7

---
 scripts/update-venus |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/update-venus b/scripts/update-venus
index e65c80e..fadd6bd 100755
--- a/scripts/update-venus
+++ b/scripts/update-venus
@@ -3,7 +3,7 @@ DATE=$(date +%F)
 LOG_DATE=$(date +%F-%R)
 BASE_DIR="/var/www/planet.gentoo.org/" # created by cfengine
 RESTRICT=""
-VENUS_DIR="/usr/lib/python2.6/site-packages/venus/"
+VENUS_DIR="/usr/lib/python2.7/site-packages/venus/"
 
 # Create folders and symlinks (for initial setup)
 [[ -d ${BASE_DIR}htdocs ]]				|| mkdir ${BASE_DIR}htdocs