allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject [4/4] git commit: [#7732] .ini cleanup
Date Fri, 03 Oct 2014 21:12:47 GMT
[#7732] .ini cleanup


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/652b4066
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/652b4066
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/652b4066

Branch: refs/heads/db/7732
Commit: 652b40661ad9d66b93cf5963d36b74ca80f44200
Parents: cbe880b
Author: Dave Brondsema <dbrondsema@slashdotmedia.com>
Authored: Fri Oct 3 03:12:22 2014 +0000
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Oct 3 21:05:53 2014 +0000

----------------------------------------------------------------------
 Allura/allura/lib/app_globals.py |  1 -
 Allura/development.ini           | 39 ++++-------------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/652b4066/Allura/allura/lib/app_globals.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/app_globals.py b/Allura/allura/lib/app_globals.py
index 9c80253..2d5136e 100644
--- a/Allura/allura/lib/app_globals.py
+++ b/Allura/allura/lib/app_globals.py
@@ -160,7 +160,6 @@ class Globals(object):
         else:  # pragma no cover
             log.warning('Solr config not set; using in-memory MockSOLR')
             self.solr = self.solr_short_timeout = MockSOLR()
-        self.use_queue = asbool(config.get('use_queue', False))
 
         # Load login/logout urls; only used for customized logins
         self.login_url = config.get('auth.login_url', '/auth/')

http://git-wip-us.apache.org/repos/asf/allura/blob/652b4066/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 75cded3..03fe01f 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -46,10 +46,9 @@ next=main
 [app:main]
 use = egg:Allura
 full_stack = true
-use_queue = true
 site_name = Allura
 
-domain = forge-allura.apache.org
+domain = localhost
 base_url = http://localhost:8080
 
 #lang = ru
@@ -147,19 +146,11 @@ user_prefs_storage.ldap.fields.display_name = cn
 # Set the locations of some static resources.  ("ew" stands for EasyWidgets library)
 #  script_name is the path that is handled by the application
 #  url_base is the prefix that references to the static resources should have
-no_redirect.pattern = ^/nf/\d+/_(ew|static)_/.*|^/rest/.*
-# Pages that must always be SSL even when logged out, such as ones using the login overlay
-force_ssl.pattern = ^/[a-z0-9-]+/import_project/
-# to make all pages use ssl, even when not logged in:
-# force_ssl.pattern = .
-
+# If you use a CDN, put your CDN prefix in the url_base values
 ew.script_name = /nf/%(build_key)s/_ew_/
 ew.url_base = /nf/%(build_key)s/_ew_/
-# ew.url_base = ://a.fsdn.com/allura/nf/%(build_key)s/_ew_/
 static.script_name = /nf/%(build_key)s/_static_/
 static.url_base = /nf/%(build_key)s/_static_/
-# static.url_base = ://a.fsdn.com/allura/nf/%(build_key)s/_static_/
-# cdn.url_base = //a.fsdn.com/allura
 
 ; Expires header for "static" resources served through allura (e.g. icons, attachments, /nf/tool_icon_css)
 files_expires_header_secs = 1209600 ; 2 weeks
@@ -291,28 +282,6 @@ forgemail.return_path = noreply@sf.net
 # no need to sleep in devel
 ensure_index.sleep = 0
 
-# If you'd like to fine-tune the individual locations of the cache data dirs
-# for the Cache data, or the Session saves, un-comment the desired settings
-# here:
-#beaker.cache.data_dir = %(here)s/data/cache
-#beaker.session.data_dir = %(here)s/data/sessions
-
-# pick the form for your database
-# %(here) may include a ':' character on Windows environments; this can
-# invalidate the URI when specifying a SQLite db via path name
-# sqlalchemy.url=postgres://username:password@hostname:port/databasename
-# sqlalchemy.url=mysql://username:password@hostname:port/databasename
-
-
-# If you have sqlite, here's a simple default to get you started
-# in development
-
-sqlalchemy.url = sqlite:///%(here)s/devdata.db
-#echo shouldn't be used together with the logging module.
-sqlalchemy.echo = false
-sqlalchemy.echo_pool = false
-sqlalchemy.pool_recycle = 3600
-
 # set this to "false" if you are deploying to production and want performance improvements
 auto_reload_templates = true
 
@@ -334,7 +303,7 @@ user_message.max_messages = 20
 
 [app:tool_test]
 use = egg:Allura
-override_root=basetest_project_root
+override_root=basetest_project_root ; TurboGears will use controllers/basetest_project_root.py
as root controller
 full_stack = true
 
 cache_dir = %(here)s/data
@@ -376,7 +345,7 @@ markdown_render_max_length = 999999999
 
 [app:task]
 use = main
-override_root = task
+override_root = task ; TurboGears will use controllers/task.py as root controller
 
 # Logging configuration
 # Add additional loggers, handlers, formatters here


Mime
View raw message