Moved synnefo package in a nested directory

since more than one packages exist in repository root

.gitignore

@@ -17,5 +17,5 @@ selenium-server-standalone-2.0b2.jar
 .settings/
 settings.d/*-local.conf
 *.egg-info
-/dist
+dist
 _build

runtests.sh

@@ -37,8 +37,9 @@
 
 set -e
 
-echo "Running Django tests..." >&2
-python synnefo/manage.py test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
+echo "Running snf-app tests..." >&2
+export PYTHONPATH=$PYTHONPATH:./snf-app
+python snf-app/synnefo/manage.py test aai admin api db helpdesk invitations logic userdata --settings=synnefo.settings.test
 
 echo "Running snf-ganeti-tools tests..." >&2
 PYTHONPATH=snf-ganeti-tools:$PYTHONPATH ./snf-ganeti-tools/test/synnefo.ganeti_unittest.py

docs/src/configuration.rst → snf-app/docs/src/configuration.rst

@@ -3,24 +3,45 @@
 Configuration
 =============
 
+
+.. _settings-guide:
+
 Customizing Synnefo settings
 ----------------------------
 
-Synnefo package bundles a `Django` project with predefined common `settings` 
-and `urls` set. The corresponding `Django` ``manage.py`` for the bundled project is 
-``synnefo-manage`` which after the package installation should be available as a
-command from your system's terminal.
-
 To ease up the configuration of the application Synnefo includes settings
-defined in ``/etc/synnefo/*.conf`` files.
+defined in ``/etc/synnefo/*.conf`` files. The location can be altered by 
+setting an enviromental variable named ``SYNNEFO_SETTINGS_DIR`` to the 
+appropriate path, or by using the ``--settings-dir`` option of the
+``synnefo-manage`` tool.
+
+Synnefo package bundles a `Django` project with predefined common `settings` 
+and `urls` set. The corresponding  ``manage.py`` for the bundled project is 
+``synnefo-manage``. After the package installation the tool should be available 
+as a command from your system's terminal. Due to this nature of `synnefo-manage`
+it is possible to alter settings not only using ``.conf`` files but also by
+providing a custom python module by using ``DJANGO_SETTINGS_MODULE``
+evnironmental variable or ``--settings`` option of the tool.
+
+.. seealso::
+    https://docs.djangoproject.com/en/dev/topics/settings/
+
+If you are using a custom settings module, you are strongly encouraged to
+import the synnefo default settings prior to your customized ones e.g. :
+    
+.. code-block:: python
+    
+    from synnefo.settings import *
 
+    CUSTOM_SETTING1 = "...."
+    CUSTOM_SETTING2 = "...."
 
 .. _database-configuration:
 
 Database configuration
 ----------------------
 
-Add the following to your custom settings.py, depending on your choice
+Add the following to your custom :ref:`settings <settings-guide>`, depending on your choice
 of DB:
 
 SQLite

docs/src/develop.rst → snf-app/docs/src/develop.rst

@@ -9,13 +9,19 @@ It should be read alongside :ref:`installation guide <installation>`.
 It contains development-specific ammendments to the basic installation steps
 outlined in `installation guide <installation>`, and development-specific notes.
 
-Installing the development environment
---------------------------------------
+
+Prerequisites
+-------------
 
 For a basic development environment you need to follow steps
 of `installation guide <installation>`, which should be read in its 
 entirety *before* this document.
 
+
+Setting up development environment
+----------------------------------
+
+Although not necessary it is 
 Development-specific guidelines on each step:
 
 

setup.py → snf-app/setup.py

@@ -3,11 +3,12 @@ distribute_setup.use_setuptools()
 
 import os
 from setuptools import setup, find_packages
+from synnefo import get_version
 
 HERE = os.path.abspath(os.path.normpath(os.path.dirname(__file__)))
 
 # Package info
-VERSION = '0.8rc1'
+VERSION = get_version().replace(" ","")
 README = open(os.path.join(HERE, 'README')).read()
 CHANGES = open(os.path.join(HERE, 'Changelog')).read()
 SHORT_DESCRIPTION = 'Package short description'