From 1b52d03f22f9ce224ee8355fe4489c326d19820c Mon Sep 17 00:00:00 2001 From: Evgeny Fadeev Date: Mon, 1 Mar 2010 20:23:04 -0500 Subject: fixed the cron job files and added README for cron directory --- cron/README | 5 +++++ cron/multi_award_badges | 11 +++-------- cron/multi_award_badges_virtualenv | 10 ++++++++++ cron/once_award_badges | 11 +++-------- cron/once_award_badges_virtualenv | 10 ++++++++++ cron/send_email_alerts | 7 ++++--- 6 files changed, 35 insertions(+), 19 deletions(-) create mode 100644 cron/README create mode 100755 cron/multi_award_badges_virtualenv create mode 100755 cron/once_award_badges_virtualenv diff --git a/cron/README b/cron/README new file mode 100644 index 00000000..d5573150 --- /dev/null +++ b/cron/README @@ -0,0 +1,5 @@ +this directory contains sample commands to be executed +by cron + +files with names ending "virtuanenv" should work under Python virtualenv system +other files - with standard unix setup diff --git a/cron/multi_award_badges b/cron/multi_award_badges index df58155a..b34abd09 100755 --- a/cron/multi_award_badges +++ b/cron/multi_award_badges @@ -1,10 +1,5 @@ #!/bin/sh - -WORKON_HOME=~/envs/osqa -PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ - -# activate virtual environment -. $WORKON_HOME/bin/activate - -cd $PROJECT_ROOT +PYTHONPATH=/path/to/dir_above_osqa_site +export PYTHONPATH +PROJECT_ROOT=$PYTHONPATH/osqa_site python manage.py multi_award_badges >> $PROJECT_ROOT/log/cron_badges.log 2>&1 diff --git a/cron/multi_award_badges_virtualenv b/cron/multi_award_badges_virtualenv new file mode 100755 index 00000000..df58155a --- /dev/null +++ b/cron/multi_award_badges_virtualenv @@ -0,0 +1,10 @@ +#!/bin/sh + +WORKON_HOME=~/envs/osqa +PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ + +# activate virtual environment +. $WORKON_HOME/bin/activate + +cd $PROJECT_ROOT +python manage.py multi_award_badges >> $PROJECT_ROOT/log/cron_badges.log 2>&1 diff --git a/cron/once_award_badges b/cron/once_award_badges index 12414969..79d02f61 100755 --- a/cron/once_award_badges +++ b/cron/once_award_badges @@ -1,10 +1,5 @@ #!/bin/sh - -WORKON_HOME=~/envs/osqa -PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ - -# activate virtual environment -. $WORKON_HOME/bin/activate - -cd $PROJECT_ROOT +PYTHONPATH=/path/to/dir_above_osqa_site +export PYTHONPATH +PROJECT_ROOT=$PYTHONPATH/osqa_site python manage.py once_award_badges >> $PROJECT_ROOT/log/cron_badges.log 2>&1 diff --git a/cron/once_award_badges_virtualenv b/cron/once_award_badges_virtualenv new file mode 100755 index 00000000..12414969 --- /dev/null +++ b/cron/once_award_badges_virtualenv @@ -0,0 +1,10 @@ +#!/bin/sh + +WORKON_HOME=~/envs/osqa +PROJECT_ROOT=~/webapps/osqa_server/projects/osqa/ + +# activate virtual environment +. $WORKON_HOME/bin/activate + +cd $PROJECT_ROOT +python manage.py once_award_badges >> $PROJECT_ROOT/log/cron_badges.log 2>&1 diff --git a/cron/send_email_alerts b/cron/send_email_alerts index 6358b599..cae09606 100644 --- a/cron/send_email_alerts +++ b/cron/send_email_alerts @@ -1,4 +1,5 @@ -PYTHONPATH=/path/to/dir/above/forum +#!/bin/sh +PYTHONPATH=/path/to/dir_above_osqa_site export PYTHONPATH -APP_ROOT=$PYTHONPATH/nmr-forum2 -/path/to/python $APP_ROOT/manage.py send_email_alerts +PROJECT_ROOT=$PYTHONPATH/osqa_site +/path/to/python $PROJECT_ROOT/manage.py send_email_alerts -- cgit v1.2.3-1-g7c22 From 1d35d25b8ce9f3004eebd10d88757c5921dd686c Mon Sep 17 00:00:00 2001 From: hrcerqueira Date: Tue, 2 Mar 2010 19:24:19 +0000 Subject: Fixed the new question bug, removed some old stuff from settings files, and fixed the errors introduced by the "staticmethod" decorator removal. --- .idea/misc.xml | 192 +++++++++- .idea/workspace.xml | 617 +++++++++++++++++++++++++-------- context.py | 2 - forum/models/answer.py | 4 +- forum/models/base.py | 3 - forum/models/question.py | 4 +- forum/views/auth.py | 26 +- forum_modules/sphinxfulltext/models.py | 1 + osqa.iml | 9 - settings.py | 21 -- settings_local.py.dist | 18 - 11 files changed, 688 insertions(+), 209 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 5253b461..26b17735 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -9,6 +9,59 @@