Merge branch 'master' of gitosis@git.auf:auf_rh_dae

diff --git a/devel.cfg b/devel.cfg
index dfece77..2f26547 100644 (file)
--- a/devel.cfg
+++ b/devel.cfg
@@ -1,9 +1,9 @@
 [buildout]
-extends=buildout.cfg
+extends = buildout.cfg
 
 [django]
-wsgi=false
-settings=development
+wsgi = false
+settings = development
 eggs = ${buildout:eggs}
     django-debug-toolbar
 

diff --git a/project/conf.py.edit b/project/conf.py.edit
new file mode 100644 (file)
index 0000000..a420b4c
--- /dev/null
+++ b/project/conf.py.edit
@@ -0,0 +1,14 @@
+# -*- encoding: utf-8 -*-
+
+DATABASE_ENGINE = ''    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+DATABASE_NAME = ''
+DATABASE_USER = ''             # Not used with sqlite3.
+DATABASE_PASSWORD = ''         # Not used with sqlite3.
+DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
+DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
+
+EMAIL_FROM = ''
+ROA_API_KEY = ''
+
+AUTH_PASSWORD_REQUIRED = True
+