diff options
author | 2010-09-12 23:31:06 +0300 | |
---|---|---|
committer | 2010-09-12 23:31:06 +0300 | |
commit | 16715e6aa82f036820ac762739adc79c292fb7b4 (patch) | |
tree | c59dbb20b7bd48a0ed8ab0f09c6238ec4dda911f | |
parent | svnignore->gitignore (diff) | |
download | planet-16715e6aa82f036820ac762739adc79c292fb7b4.tar.gz planet-16715e6aa82f036820ac762739adc79c292fb7b4.tar.bz2 planet-16715e6aa82f036820ac762739adc79c292fb7b4.zip |
Small fixes to cron and base configs
-rw-r--r-- | configs/base/venus.planet | 2 | ||||
-rw-r--r-- | configs/base/venus.universe | 2 | ||||
-rw-r--r-- | scripts/update-venus | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/configs/base/venus.planet b/configs/base/venus.planet index be46e439..107f2fef 100644 --- a/configs/base/venus.planet +++ b/configs/base/venus.planet @@ -10,7 +10,7 @@ description = Welcome to <b>Planet Gentoo</b>, an aggregation of Gentoo-related # planet cache_directory = /var/www/planet.gentoo.org/cache/planet log_level = DEBUG -output_theme = /var/www/planet.gentoo.org/venus/themes/planet_gentoo +output_theme = /var/www/planet.gentoo.org/planet-gentoo/templates output_dir = /var/www/planet.gentoo.org/htdocs items_per_page = 50 days_per_page = 0 diff --git a/configs/base/venus.universe b/configs/base/venus.universe index 71ba8301..87a64609 100644 --- a/configs/base/venus.universe +++ b/configs/base/venus.universe @@ -10,7 +10,7 @@ description = Welcome to <b>Gentoo Universe</b>, an aggregation of weblog articl # planet cache_directory = /var/www/planet.gentoo.org/cache/universe log_level = DEBUG -output_theme = /var/www/planet.gentoo.org/venus/themes/planet_gentoo +output_theme = /var/www/planet.gentoo.org/planet-gentoo/universe output_dir = /var/www/planet.gentoo.org/htdocs/universe items_per_page = 50 days_per_page = 0 diff --git a/scripts/update-venus b/scripts/update-venus index 7c0c02e9..a58d6eef 100644 --- a/scripts/update-venus +++ b/scripts/update-venus @@ -8,14 +8,15 @@ VENUS_DIR="/usr/lib/python2.6/site-packages/venus/" cd ${BASE_DIR} # Get latest SVN changes -git pull ${BASE_DIR}/planet-gentoo/configs/ >/dev/null 2>&1 -git pull ${BASE_DIR}/planet-gentoo/templates/ >/dev/null 2>&1 +#git pull ${BASE_DIR}/planet-gentoo/configs/ >/dev/null 2>&1 +#git pull ${BASE_DIR}/planet-gentoo/templates/ >/dev/null 2>&1 +git pull ${BASE_DIR}planet-gentoo/ >/dev/null 2>&1 # Run Venus for x in planet universe; do if [[ ! -z $RESTRICT ]]; then for y in $RESTRICT; do - rm ${BASE_DIR}configs/${x}/${y} + rm ${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 |