Move non-user-configurable configuration elements to TurboGears app.cfg file.

432908

3 files changed, 58 insertions, 31 deletions

diff --git a/ipa-server/ipa-gui/dev.cfg b/ipa-server/ipa-gui/dev.cfg
index 7e2e29fc..cb8e0f75 100644
--- a/ipa-server/ipa-gui/dev.cfg
+++ b/ipa-server/ipa-gui/dev.cfg
@@ -15,19 +15,6 @@
 # in development
 # sqlobject.dburi="sqlite://%(current_dir_uri)s/devdata.sqlite"
 
-# Our our sqlobject-derived proxy provider
-identity.provider='proxyprovider'
-
-# the first thing checked on any request. We want to short-circuit this
-# as early as possible
-identity.source = 'visit'
-
-# Turn on identity and visit (visit is required for identity)
-identity.on=True
-identity.failure_url="/loginfailed"
-visit.on=True
-visit.manager='proxyvisit'
-
 # if you are using a database or table type without transactions
 # (MySQL default, for example), you should turn off transactions
 # by prepending notrans_ on the uri
@@ -38,7 +25,6 @@ visit.manager='proxyvisit'
 
 # TurboGears sessions. Storing in /tmp for a production system would be
 # insane but should be fine for developers.
-session_filter.on = True
 session_filter.storage_type='File'
 session_filter.storage_path='/tmp'
 
diff --git a/ipa-server/ipa-gui/ipa_webgui.cfg b/ipa-server/ipa-gui/ipa_webgui.cfg
index f7dfb259..101eb825 100644
--- a/ipa-server/ipa-gui/ipa_webgui.cfg
+++ b/ipa-server/ipa-gui/ipa_webgui.cfg
@@ -1,23 +1,13 @@
 [global]
+# This is where all of your settings go for your production environment.
+# Settings that are the same for both development and production
+# (such as template engine, encodings, etc.) all go in 
+# ipagui/config/app.cfg
+
 # DATABASE
 
 # no database for ipa_webgui since everything is stored in LDAP
 
-# IDENTITY
-
-# Our our sqlobject-derived proxy provider
-identity.provider='proxyprovider'
-
-# the first thing checked on any request. We want to short-circuit this
-# as early as possible
-identity.source = 'visit'
-
-# Turn on identity and visit (visit is required for identity)
-identity.on=True
-identity.failure_url="/loginfailed"
-visit.on=True
-visit.manager='proxyvisit'
-
 # SERVER
 
 server.environment="production"
@@ -52,7 +42,6 @@ base_url_filter.on = True
 i18n.run_template_filter = True
 
 # TurboGears sessions. 
-session_filter.on = True
 session_filter.storage_type='File'
 session_filter.storage_path='/var/cache/ipa/sessions'
 
diff --git a/ipa-server/ipa-gui/ipagui/config/app.cfg b/ipa-server/ipa-gui/ipagui/config/app.cfg
index 38d896f2..03170d37 100644
--- a/ipa-server/ipa-gui/ipagui/config/app.cfg
+++ b/ipa-server/ipa-gui/ipagui/config/app.cfg
@@ -34,8 +34,60 @@
 # tg.scheduler = False
 
 # Set session or cookie
-# session_filter.on = True
+session_filter.on = True
 
+# VISIT TRACKING
+# Each visit to your application will be assigned a unique visit ID tracked via
+# a cookie sent to the visitor's browser.
+# --------------
+
+# Enable Visit tracking
+visit.on=True
+
+# Number of minutes a visit may be idle before it expires.
+# visit.timeout=20
+
+# The name of the cookie to transmit to the visitor's browser.
+# visit.cookie.name="tg-visit"
+
+# Domain name to specify when setting the cookie (must begin with . according to
+# RFC 2109). The default (None) should work for most cases and will default to
+# the machine to which the request was made. NOTE: localhost is NEVER a valid
+# value and will NOT WORK.
+# visit.cookie.domain=None
+
+# Specific path for the cookie
+# visit.cookie.path="/"
+
+# The name of the VisitManager plugin to use for visitor tracking.
+visit.manager="proxyvisit"
+
+# IDENTITY
+# General configuration of the TurboGears Identity management module
+# --------
+
+# Switch to turn on or off the Identity management module
+identity.on=True
+
+# [REQUIRED] URL to which CherryPy will internally redirect when an access
+# control check fails. If Identity management is turned on, a value for this
+# option must be specified.
+identity.failure_url="/loginfailed"
+
+identity.provider='proxyprovider'
+
+# The names of the fields on the login form containing the visitor's user ID
+# and password. In addition, the submit button is specified simply so its
+# existence may be stripped out prior to passing the form data to the target
+# controller.
+# identity.form.user_name="user_name"
+# identity.form.password="password"
+# identity.form.submit="login"
+
+# What sources should the identity provider consider when determining the
+# identity associated with a request? Comma separated list of identity sources.
+# Valid sources: form, visit, http_auth
+# identity.source="form,http_auth,visit"
 
 # compress the data sends to the web browser
 # [/]