diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-25 07:57:59 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-01-25 07:57:59 -0500 |
| commit | c31d8664f0c1bf78c085f0e6d83db44c81c81372 (patch) | |
| tree | f64222200a7df80aff6a0a3c2a9a5e2fa76446d0 | |
| parent | e2d418287724d25e85d067672049638af022c2c3 (diff) | |
| download | bcfg2-c31d8664f0c1bf78c085f0e6d83db44c81c81372.tar.gz bcfg2-c31d8664f0c1bf78c085f0e6d83db44c81c81372.tar.bz2 bcfg2-c31d8664f0c1bf78c085f0e6d83db44c81c81372.zip | |
turn off web_debug by default, give a warning if it's on
| -rw-r--r-- | doc/appendix/guides/fedora.txt | 2 | ||||
| -rw-r--r-- | doc/appendix/guides/ubuntu.txt | 2 | ||||
| -rw-r--r-- | doc/appendix/guides/web-reports-install.txt | 2 | ||||
| -rw-r--r-- | src/lib/Server/Admin/Init.py | 2 | ||||
| -rw-r--r-- | src/lib/Server/Reports/settings.py | 13 |
5 files changed, 6 insertions, 15 deletions
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt index 9d11414ef..f8dea2192 100644 --- a/doc/appendix/guides/fedora.txt +++ b/doc/appendix/guides/fedora.txt @@ -155,8 +155,6 @@ The ``bcfg2.conf`` file contains only standard plugins so far. database_host = # Not used with sqlite3. database_port = - # Set to empty string for default. Not used with sqlite3. - web_debug = True [communication] protocol = xmlrpc/ssl diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt index fe5564d19..d85c34b02 100644 --- a/doc/appendix/guides/ubuntu.txt +++ b/doc/appendix/guides/ubuntu.txt @@ -133,8 +133,6 @@ Replace Pkgmgr with Packages in the plugins line of ``bcfg2.conf``:: database_host = # Not used with sqlite3. database_port = - # Set to empty string for default. Not used with sqlite3. - web_debug = True [communication] protocol = xmlrpc/ssl diff --git a/doc/appendix/guides/web-reports-install.txt b/doc/appendix/guides/web-reports-install.txt index 7ec7efb4e..f6a588692 100644 --- a/doc/appendix/guides/web-reports-install.txt +++ b/doc/appendix/guides/web-reports-install.txt @@ -176,8 +176,6 @@ then have something like this:: database_host = # Not used with sqlite3. database_port = - # Set to empty string for default. Not used with sqlite3. - web_debug = True Restart apache and point a browser to your Bcfg2 server. diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py index aba6bbd32..b7c71e9df 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Server/Admin/Init.py @@ -30,8 +30,6 @@ database_password = database_host = # Not used with sqlite3. database_port = -# Set to empty string for default. Not used with sqlite3. -web_debug = True [communication] protocol = %s diff --git a/src/lib/Server/Reports/settings.py b/src/lib/Server/Reports/settings.py index 128658ff1..2b35d0d05 100644 --- a/src/lib/Server/Reports/settings.py +++ b/src/lib/Server/Reports/settings.py @@ -11,15 +11,14 @@ if len(c.read(['/etc/bcfg2.conf', '/etc/bcfg2-web.conf'])) == 0: sys.exit(1) try: - dset = c.get('statistics', 'web_debug') + DEBUG = c.getboolean('statistics', 'web_debug') except: - dset = 'false' - -if dset == "True": - DEBUG = True -else: DEBUG = False - + +if DEBUG: + print("Warning: Setting web_debug to True causes extraordinary memory " + "leaks. Only use this setting if you know what you're doing.") + TEMPLATE_DEBUG = DEBUG ADMINS = ( |