Refresh docs.

Refs #1590

diff --git a/README b/README
index bf9e296..4193cc8 100644 (file)
--- a/README
+++ b/README
@@ -16,8 +16,6 @@ On a typical debian-based Linux system run:
     apt-get install python-django python-django-south python-setuptools python-sphinx python-httplib2
     apt-get install python-sqlalchemy python-mysqldb python-psycopg2
 
-Enter the pithos dir, copy settings.py.dist to settings.py.
-
 Then run:
     python setup.py build_sphinx
 
@@ -35,8 +33,6 @@ Make sure you have all required packages installed:
     apt-get install python-django python-setuptools python-sphinx python-httplib2
     apt-get install python-sqlalchemy python-mysqldb python-psycopg2
 
-Enter the pithos dir, copy settings.py.dist to settings.py.
-
 Then run:
     python manage.py syncdb
     python manage.py schemamigration im --initial

diff --git a/docs/source/adminguide.rst b/docs/source/adminguide.rst
index 9148def..aa3facd 100644 (file)
--- a/docs/source/adminguide.rst
+++ b/docs/source/adminguide.rst
@@ -17,15 +17,16 @@ Get the source::
   cd /
   git clone https://code.grnet.gr/git/pithos
 
-Setup the files (choose where to store data in ``settings.py`` and change ``SECRET_KEY``)::
+Setup the files::
 
   cd /pithos/pithos
-  cp settings.py.dist settings.py
   python manage.py syncdb
   python manage.py schemamigration im --initial
   cd /pithos
   python setup.py build_sphinx
 
+It is advised that you create a ``settings.local`` file to place any configuration overrides (at least change ``SECRET_KEY``).
+
 Edit ``/etc/apache2/sites-available/pithos`` (change the ``ServerName`` directive)::
 
   <VirtualHost *:80>
@@ -115,7 +116,7 @@ Configure and run apache::
 
 Useful alias to add in ``~/.bashrc``::
 
-  alias pithos-sync='cd /pithos && git pull && python setup.py build_sphinx && /etc/init.d/apache2 restart'
+  alias pithos-sync='cd /pithos && git pull && python setup.py build_sphinx && cd pithos && python manage.py migrate im && /etc/init.d/apache2 restart'
 
 Gunicorn Setup
 --------------
@@ -160,7 +161,7 @@ Replace the ``WSGI*`` directives in ``/etc/apache2/sites-available/pithos`` and
   ProxyPass        /api http://localhost:8080 retry=0
   ProxyPassReverse /api http://localhost:8080
 
-Make sure that in ``settings.py``::
+Make sure that in ``settings.local``::
 
   USE_X_FORWARDED_HOST = True
 

diff --git a/pithos/settings.py b/pithos/settings.py
index 420fb2b..13c91de 100644 (file)
--- a/pithos/settings.py
+++ b/pithos/settings.py
@@ -42,3 +42,4 @@ conffiles = glob(join(PROJECT_PATH, 'settings.d', '*.conf'))
 
 for conf in sorted(conffiles):
     execfile(conf)
+execfile(join(PROJECT_PATH, 'settings.local'))