From ad2762cf775a8dde508de47164d6429f3fd724f1 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Sun, 24 May 2015 16:57:33 +0800 Subject: Move to a more recent django project structure This change updates patchwor to the newer project struture: we've moved the actual application out of the apps/ directory, and the patchwork-specific templates to under the patchwork application. This gives us the manage.py script in the top-level now. Signed-off-by: Jeremy Kerr --- docs/HACKING | 4 ++-- docs/INSTALL | 13 ++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'docs') diff --git a/docs/HACKING b/docs/HACKING index cab59eb..c1b478e 100644 --- a/docs/HACKING +++ b/docs/HACKING @@ -43,9 +43,9 @@ It's always a good idea to use virtualenv to develop python software. 5. Now one can run patchwork within that environment - (django-1.7)$ ./apps/manage.py --version + (django-1.7)$ ./manage.py --version 1.7 - (django-1.7)$ ./apps/manage.py runserver + (django-1.7)$ ./manage.py runserver 6. To exit the virtual environment diff --git a/docs/INSTALL b/docs/INSTALL index 16ab2b5..b006178 100644 --- a/docs/INSTALL +++ b/docs/INSTALL @@ -135,8 +135,7 @@ in brackets): Then, get patchwork to create its tables in your configured database: - cd apps/ - PYTHONPATH=../lib/python ./manage.py syncdb + PYTHONPATH=lib/python ./manage.py syncdb And add privileges for your mail and web users. This is only needed if you use the ident-based approach. If you use password-based database @@ -190,7 +189,7 @@ in brackets): Once you have apache set up, you can start the fastcgi server with: - cd /srv/patchwork/apps + cd /srv/patchwork/ ./manage.py runfcgi method=prefork \ socket=/srv/patchwork/var/fcgi.sock \ pidfile=/srv/patchwork/var/fcgi.pid @@ -222,14 +221,14 @@ in brackets): directory. (Note, do not use the parsemail.py script directly). Something like this in /etc/aliases is suitable for postfix: - patchwork: "|/srv/patchwork/apps/patchwork/bin/parsemail.sh" + patchwork: "|/srv/patchwork/patchwork/bin/parsemail.sh" You may need to customise the parsemail.sh script if you haven't installed patchwork in /srv/patchwork. Test that you can deliver a patch to this script: - sudo -u nobody /srv/patchwork/apps/patchwork/bin/parsemail.sh < mail + sudo -u nobody /srv/patchwork/patchwork/bin/parsemail.sh < mail 7. Set up the patchwork cron script @@ -240,9 +239,9 @@ in brackets): Something like this in your crontab should work: # m h dom mon dow command - PYTHONPATH=apps:. + PYTHONPATH=. DJANGO_SETTINGS_MODULE=settings - */10 * * * * cd patchwork; python apps/patchwork/bin/patchwork-cron.py + */10 * * * * cd patchwork; python patchwork/bin/patchwork-cron.py - the frequency should be the same as the NOTIFICATION_DELAY_MINUTES -- cgit v1.2.3