You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2012/12/14 16:03:30 UTC
[38/50] git commit: [#5403] remove huge unused mako config section
[#5403] remove huge unused mako config section
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/3670b2f1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/3670b2f1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/3670b2f1
Branch: refs/heads/ph/4655
Commit: 3670b2f1bc3fb6097847ead57234b8851c6f8c27
Parents: 9fbad0b
Author: Dave Brondsema <db...@geek.net>
Authored: Fri Dec 7 22:52:29 2012 +0000
Committer: Cory Johns <jo...@geek.net>
Committed: Wed Dec 12 15:02:53 2012 +0000
----------------------------------------------------------------------
Allura/allura/config/app_cfg.py | 2 +-
Allura/development.ini | 23 -----------------------
Allura/setup.py | 1 -
3 files changed, 1 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3670b2f1/Allura/allura/config/app_cfg.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index 428c339..9c185c2 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -36,7 +36,7 @@ class ForgeConfig(AppConfig):
AppConfig.__init__(self)
self.root_controller = root_controller
self.package = allura
- self.renderers = [ 'json', 'genshi', 'mako', 'jinja' ]
+ self.renderers = [ 'json', 'genshi', 'jinja' ]
self.default_renderer = 'genshi'
self.use_sqlalchemy = False
self.use_toscawidgets = True
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3670b2f1/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 19000a6..e5e3021 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -205,28 +205,6 @@ sqlalchemy.echo = false
sqlalchemy.echo_pool = false
sqlalchemy.pool_recycle = 3600
-# if you are using Mako and want to be able to reload
-# the mako template from disk during the development phase
-# you should say 'true' here
-# This option is only used for mako templating engine
-# WARNING: if you want to deploy your application using a zipped egg
-# (ie: if your application's setup.py defines zip-safe=True, then you
-# MUST put "false" for the production environment because there will
-# be no disk and real files to compare time with.
-# On the contrary if your application defines zip-safe=False and is
-# deployed in an unzipped manner, then you can leave this option to true
-templating.mako.reloadfromdisk = true
-
-# the compiled template dir is a directory that must be readable by your
-# webserver. It will be used to store the resulting templates once compiled
-# by the TemplateLookup system.
-# During development you generally don't need this option since paste's HTTP
-# server will have access to you development directories, but in production
-# you'll most certainly want to have apache or nginx to write in a directory
-# that does not contain any source code in any form for obvious security reasons.
-#
-#templating.mako.compiled_templates_dir = /some/dir/where/webserver/has/access
-
# WARNING: *THE LINE BELOW MUST BE UNCOMMENTED ON A PRODUCTION ENVIRONMENT*
# Debug mode will enable the interactive debugging tool, allowing ANYONE to
# execute malicious code after an exception is raised.
@@ -251,7 +229,6 @@ sqlalchemy.url = sqlite:///%(here)s/devdata.db
sqlalchemy.echo = false
sqlalchemy.echo_pool = false
sqlalchemy.pool_recycle = 3600
-templating.mako.reloadfromdisk = true
# Forgemail server
forgemail.host = 0.0.0.0
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/3670b2f1/Allura/setup.py
----------------------------------------------------------------------
diff --git a/Allura/setup.py b/Allura/setup.py
index 916dc57..cdc6a06 100644
--- a/Allura/setup.py
+++ b/Allura/setup.py
@@ -72,7 +72,6 @@ setup(
]},
message_extractors={'allura': [
('**.py', 'python', None),
- ('templates/**.mako', 'mako', None),
('templates/**.html', 'genshi', None),
('public/**', 'ignore', None)]},