You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2015/04/15 16:55:07 UTC
[8/8] allura git commit: [#7870] remove DEFAULT section altogether,
unnecessary entry points
[#7870] remove DEFAULT section altogether, unnecessary entry points
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a04d77fe
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a04d77fe
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a04d77fe
Branch: refs/heads/db/7870
Commit: a04d77fed09f5b2218726f1a7484a4572246bf0f
Parents: ec96915
Author: Dave Brondsema <da...@brondsema.net>
Authored: Tue Apr 14 17:32:34 2015 -0400
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Wed Apr 15 10:54:32 2015 -0400
----------------------------------------------------------------------
Allura/allura/config/middleware.py | 4 +--
Allura/development.ini | 47 ++++++++++++++++-----------------
Allura/setup.py | 9 -------
3 files changed, 25 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a04d77fe/Allura/allura/config/middleware.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/middleware.py b/Allura/allura/config/middleware.py
index 840a39c..a8720e4 100644
--- a/Allura/allura/config/middleware.py
+++ b/Allura/allura/config/middleware.py
@@ -155,7 +155,7 @@ def _make_core_app(root, global_conf, full_stack=True, **app_conf):
# Setup resource manager, widget context SOP
app = ew.WidgetMiddleware(
app,
- compress=not asbool(global_conf['debug']),
+ compress=not asbool(app_conf['debug']),
# compress=True,
script_name=app_conf.get('ew.script_name', '/_ew_resources/'),
url_base=app_conf.get('ew.url_base', '/_ew_resources/'),
@@ -175,7 +175,7 @@ def _make_core_app(root, global_conf, full_stack=True, **app_conf):
# don't use TG footer with extra CSS & images that take time to load
tg.error.footer_html = '<!-- %s %s -->'
app = tg.error.ErrorHandler(
- app, global_conf, **config['pylons.errorware'])
+ app, app_conf, **config['pylons.errorware'])
# Redirect some status codes to /error/document
if asbool(config['debug']):
http://git-wip-us.apache.org/repos/asf/allura/blob/a04d77fe/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 69718d9..0821bce 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -33,29 +33,6 @@
; use = config:development.ini#main
; Then just use the new file name instead of development.ini for any paster commands you run.
-[DEFAULT]
-; WARNING: *THE LINE BELOW MUST BE CHANGED ON A PRODUCTION ENVIRONMENT*
-; Debug mode will enable the interactive debugging tool, allowing ANYONE to
-; execute malicious code after an exception is raised.
-debug = true
-
-; If you want to receive an email for every unhandled HTTP 500 error, set your email address here:
-;email_to = you@yourdomain.com
-error_email_from = paste@localhost
-
-; TODO:
-; move these configs out of [DEFAULT] so they can be overriden ??
-
-; SMTP settings for outgoing mail
-smtp_tls = false
-smtp_ssl = false
-;smtp_user = some_user
-;smtp_password = some_password
-smtp_timeout = 10
-smtp_server = localhost
-smtp_port = 8826
-; Reply-To and From address often used in email notifications:
-forgemail.return_path = noreply@localhost
;
; Settings for `paster serve` command
@@ -65,11 +42,18 @@ use = egg:Paste#http
host = 0.0.0.0
port = 8080
-
+;
+; The main allura settings
+;
[app:main]
use = egg:Allura
full_stack = true
+; WARNING: *THE LINE BELOW MUST BE CHANGED ON A PRODUCTION ENVIRONMENT*
+; Debug mode will enable the interactive debugging tool, allowing ANYONE to
+; execute malicious code after an exception is raised.
+debug = false
+
; Change this to your website's name
site_name = Allura
; Change these to your website's domain
@@ -81,6 +65,21 @@ forgemail.url = http://localhost:8080
; This should be updated each time you deploy (or make significant changes, like new tools, new css)
build_key=1276635823
+; If you want to receive an email for every unhandled HTTP 500 error, set your email address here:
+;email_to = you@yourdomain.com
+error_email_from = paste@localhost
+
+; SMTP settings for outgoing mail
+smtp_tls = false
+smtp_ssl = false
+;smtp_user = some_user
+;smtp_password = some_password
+smtp_timeout = 10
+smtp_server = localhost
+smtp_port = 8826
+; Reply-To and From address often used in email notifications:
+forgemail.return_path = noreply@localhost
+
; Used by Turbogears / Pylons in some cases. Not particularly relevant for Allura.
cache_dir = %(here)s/data
http://git-wip-us.apache.org/repos/asf/allura/blob/a04d77fe/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index 99fb419..f2213b3 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -94,15 +94,6 @@ setup(
# Other packages (the Forge* directories) or 3rd-party can add more too.
# development.ini is used for many cases to specify which to actually use.
entry_points="""
- [paste.app_factory]
- main = allura.config.middleware:make_app
- task = allura.config.middleware:make_task_app
- tool_test = allura.config.middleware:make_tool_test_app
-
- [paste.app_install]
- main = pylons.util:PylonsInstaller
- tool_test = pylons.util:PylonsInstaller
-
[allura]
profile = allura.ext.user_profile:UserProfileApp
admin = allura.ext.admin:AdminApp