aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2011-06-23 01:15:08 +0300
committerTheo Chatzimichos <tampakrap@gentoo.org>2011-06-23 01:15:08 +0300
commite83ce3eb802a1ce9aa200005dc1c976117d8d02d (patch)
treed2ebb1e3542ee11e7ddce0eb7f5e57026b025dbb /settings
parentCreate the accounts view, which will list the user profile data and let (diff)
downloadidentity.gentoo.org-e83ce3eb802a1ce9aa200005dc1c976117d8d02d.tar.gz
identity.gentoo.org-e83ce3eb802a1ce9aa200005dc1c976117d8d02d.tar.bz2
identity.gentoo.org-e83ce3eb802a1ce9aa200005dc1c976117d8d02d.zip
Change again the settings modular schema, no settings.py is needed
Diffstat (limited to 'settings')
-rw-r--r--settings/10-base.py (renamed from settings/10-base.conf)0
-rw-r--r--settings/90-development.sample3
-rw-r--r--settings/90-production.sample3
-rw-r--r--settings/__init__.py0
4 files changed, 4 insertions, 2 deletions
diff --git a/settings/10-base.conf b/settings/10-base.py
index 5e07fdc..5e07fdc 100644
--- a/settings/10-base.conf
+++ b/settings/10-base.py
diff --git a/settings/90-development.sample b/settings/90-development.sample
index 03c19e8..11c1b5c 100644
--- a/settings/90-development.sample
+++ b/settings/90-development.sample
@@ -1,6 +1,7 @@
# Django development settings for okupy project.
import ldap
+from settings.base import *
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@@ -148,4 +149,4 @@ LDAP_ACL_GROUPS = {
LDAP_NEW_USER_OBJECTCLASS = ['person', 'top', 'posixAccount']
# Base DN for new user
-LDAP_NEW_USER_BASE_DN = 'ou=users,dc=example,dc=gr' \ No newline at end of file
+LDAP_NEW_USER_BASE_DN = 'ou=users,dc=example,dc=gr'
diff --git a/settings/90-production.sample b/settings/90-production.sample
index ce94b3e..20844c1 100644
--- a/settings/90-production.sample
+++ b/settings/90-production.sample
@@ -1,6 +1,7 @@
# Django production settings for okupy project.
import ldap
+from settings.base import *
DEBUG = False
TEMPLATE_DEBUG = DEBUG
@@ -148,4 +149,4 @@ LDAP_ACL_GROUPS = {
LDAP_NEW_USER_OBJECTCLASS = ['person', 'top', 'posixAccount']
# Base DN for new user
-LDAP_NEW_USER_BASE_DN = 'ou=users,dc=example,dc=gr' \ No newline at end of file
+LDAP_NEW_USER_BASE_DN = 'ou=users,dc=example,dc=gr'
diff --git a/settings/__init__.py b/settings/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/settings/__init__.py