Merge lp:~canonical-isd-hackers/canonical-identity-provider/config-tweaks-update into lp:canonical-identity-provider/release

[Ricardo Kirkner]

Updated configs with changes from config branch

Updated configs

[David Owen (dsowen)]

Looks good.

review: Approve

=== modified file 'django_project/config_dev/config/devel.cfg'
--- django_project/config_dev/config/devel.cfg	2011-10-06 21:32:16 +0000
+++ django_project/config_dev/config/devel.cfg	2011-12-07 18:57:27 +0000
@@ -1,11 +1,9 @@
 [__noschema__]
+basedir = .
+debug = true
+environment = devel
 hostname = localhost:8000
-db_engine = identityprovider.backend
-db_name = identityprovider
-db_host = localhost
-db_user = postgres
-db_password =
-db_port =
+locale_basedir = %(basedir)s/identityprovider
 
 #
 # django settings override
@@ -26,15 +24,26 @@
     oauth_backend
     preflight
     gargoyle
+    saml2idp
     devserver
-    saml2idp
+middleware_classes =
+    identityprovider.middleware.dbfailover.DBFailoverMiddleware
+    django.middleware.common.CommonMiddleware
+    django.contrib.sessions.middleware.SessionMiddleware
+    django.middleware.csrf.CsrfViewMiddleware
+    django.contrib.auth.middleware.AuthenticationMiddleware
+    identityprovider.middleware.useraccount.UserAccountConversionMiddleware
+    django.middleware.locale.LocaleMiddleware
+    identityprovider.middleware.exception.LogExceptionMiddleware
+# Uncomment this to enable profiling middleware
+#    identityprovider.middleware.profile.ProfileMiddleware
 # allow cookies to be stored when accessing via http
 session_cookie_secure = false
 test_runner = identityprovider.tests.utils.run_tests
 
 [__main__]
 db_connections = db_master
-db_statement_timeout_millis = 60000
+oops_dir = /tmp
 # serve media from branch
 serve_static_media = True
 # Make sure to include only those fields that are not empty as having
@@ -48,30 +57,21 @@
 test_dsn = dbname=test_%(db_name)s user=%(db_user)s
 
 [captcha]
+captcha_use_proxy = false
 disable_captcha_verification = true
 
-[debug]
-testing = true
-
 [openid]
 openid_preauthorization_acl = http://%(hostname)s/, http://%(hostname)s/
 
 [readonly]
 app_servers = as_localhost
+dbfailover_flag_dir = /tmp
 
 [sso]
+embedded_trust_root = http://%(hostname)s/consumer/
 sso_media_root = %(basedir)s/identityprovider/media/
 sso_provider_url = http://%(hostname)s/+openid
 sso_root_url = http://%(hostname)s/
-embedded_trust_root = http://%(hostname)s/consumer/
-
-
-[saml2]
-saml2idp_autosubmit = true
-saml2idp_issuer = http://%(hostname)s
-saml2idp_certificate_file = %(basedir)s/path/to/certificate.pem
-saml2idp_private_key_file = %(basedir)s/path/to/private-key.pem
-saml2idp_signing = true
 
 #
 # helper sections
@@ -82,14 +82,6 @@
 host = localhost
 port = 8000
 
-[db_default]
-engine = %(db_engine)s
-name = %(db_name)s
-host = %(db_host)s
-user = %(db_user)s
-password = %(db_password)s
-port = %(db_port)s
-
 [db_master]
 database_id = master
 database_host = %(db_host)s
@@ -110,8 +102,3 @@
 #    devserver.modules.cache.CacheSummaryModule
 #    devserver.modules.profile.MemoryUseModule
 #    devserver.modules.profile.LineProfilerModule
-
-[django_databases]
-default = db_default
-
-[django_logging]

=== modified file 'django_project/config_dev/config/main.cfg'
--- django_project/config_dev/config/main.cfg	2011-11-21 19:38:32 +0000
+++ django_project/config_dev/config/main.cfg	2011-12-07 18:57:27 +0000
@@ -1,13 +1,16 @@
 [__noschema__]
-basedir = /usr/share
+basedir = /srv/%(hostname)s/%(environment)s/canonical-identity-provider
 db_engine = identityprovider.backend
 db_host = localhost
 db_name = identityprovider
 db_password =
 db_port =
 db_user = postgres
-hostname = localhost:8000
-locale_basedir = /usr/share
+debug = false
+domain = ubuntu.com
+environment = default
+hostname = login.%(domain)s
+locale_basedir = /srv/%(hostname)s/%(environment)s/canonical-identity-provider/branches/translations
 
 #
 # django settings
@@ -46,13 +49,13 @@
     gargoyle
     saml2idp
 language_code = en
-locale_paths = %(locale_basedir)s/identityprovider/locale
+locale_paths = %(locale_basedir)s/locale
 logging = django_logging
 login_redirect_url = /
 login_url = /+login
 managers = %(admins)s
 middleware_classes =
-    identityprovider.middleware.dbfailover.DBFailoverMiddleware
+#    identityprovider.middleware.dbfailover.DBFailoverMiddleware
     django.middleware.common.CommonMiddleware
     django.contrib.sessions.middleware.SessionMiddleware
     django.middleware.csrf.CsrfViewMiddleware
@@ -63,7 +66,7 @@
 # Uncomment this to enable profiling middleware
 #    identityprovider.middleware.profile.ProfileMiddleware
 secret_key =
-server_email = noreply@localhost
+server_email = noreply@%(domain)s
 session_cookie_secure = true
 session_engine = django.contrib.sessions.backends.db
 static_root = media
@@ -95,14 +98,14 @@
 db_statement_timeout_millis = 5000
 extra_pythonpath = %(basedir)s
 includes =
-oops_dir = /tmp
-pgconnect_timeout = 10
+oops_dir = /srv/%(hostname)s/%(environment)s-logs/www-oops
+pgconnect_timeout = 5
 serve_static_media = False
 support_form_url = https://forms.canonical.com/sso-support/
 google_analytics_id = UA-1018242-24
 
 [api]
-api_enabled = false
+api_enabled = true
 api_host = %(hostname)s
 oauth_data_store = identityprovider.store.SSODataStore
 
@@ -118,18 +121,18 @@
 captcha_proxies = captcha_proxies
 captcha_public_key = captcha-public-key
 # direct internet connection
-captcha_use_proxy = false
+captcha_use_proxy = true
 captcha_verify_url = http://api-verify.recaptcha.net/verify
 disable_captcha_verification = False
 
 [debug]
-openid_debug = false
-testing = false
+openid_debug = %(debug)s
+testing = %(debug)s
 
 [email]
-enable_token_debug = true
-feedback_to_address = feedback@localhost
-noreply_from_address = noreply@localhost
+enable_token_debug = %(debug)s
+feedback_to_address = feedback@%(domain)s
+noreply_from_address = noreply@%(domain)s
 
 [i18n]
 language_names = language_names
@@ -159,7 +162,7 @@
 [readonly]
 app_servers =
 dbfailover_attempts = 3
-dbfailover_flag_dir = /tmp
+dbfailover_flag_dir = /srv/%(hostname)s/tmp
 dbrecover_attempts = 10
 dbrecover_interval = 15
 dbrecover_multiplier = 2
@@ -167,7 +170,7 @@
 
 [sso]
 embedded_trust_root =
-logging_config_file = config/logging.conf
+logging_config_file = config/logging_%(environment)s.conf
 sso_account_update_url = None
 sso_media_root = media
 sso_provider_url = https://%(hostname)s/+openid
@@ -175,7 +178,6 @@
 sso_root_url = https://%(hostname)s/
 sso_versions_teams =
 
-
 [saml2]
 saml2idp_autosubmit = true
 saml2idp_issuer = http://%(hostname)s