summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix default timezone in debian busterupstream/masterJohannes Kampmeyer2019-11-261-1/+1
| | | | | | bcfg2-web will fail without setting a valid time zone in newer django versions. This fix initializes the time zone as utc instead of None, to fix most setups without directly breaking functionality. [reporting] TIME_ZONE = <valid_tz>
* Merge branch 'fix-pip-indexurl' of https://github.com/AlexanderS/bcfg2Sol Jerome2019-10-141-1/+1
|\
| * testsuite: Fix pip index-url for ancient pythonAlexander Sulfrian2019-08-021-1/+1
| |
* | Merge branch 'fix/recent-interactions' of https://github.com/AlexanderS/bcfg2Sol Jerome2019-10-141-1/+2
|\ \
| * | Reporting: Fix add_url_filter fallbackAlexander Sulfrian2019-06-171-1/+2
| |/ | | | | | | | | | | django-1.8 deprecated referencing views as strings in the url(), so we need to import the fallback view and referencing the view function directly.
* / Do not encode py3 strings to utf-8 again. Compat.unicode matches strings and ↵xschlef2019-07-181-1/+2
|/ | | | unicode in py3.
* Lint: Import lint plugins with package nameAlexander Sulfrian2019-05-101-1/+4
| | | | | When importing packages we should not pollute the global modules namespace and always import new modules with their package name.
* testsuite: boto requires google_compute_engineAlexander Sulfrian2019-05-081-1/+2
| | | | | | | | | | | | | | | At least with pythn2.6 boto requires google_compute_engine: > Traceback (most recent call last): > File ".../site-packages/boto/__init__.py", line 1216, in <module> > boto.plugin.load_plugins(config) > File ".../site-packages/boto/plugin.py", line 93, in load_plugins > _import_module(file) > File ".../site-packages/boto/plugin.py", line 75, in _import_module > return imp.load_module(name, file, filename, data) > File ".../dist-packages/google_compute_engine/boto/compute_auth.py", line 19, in <module> > from google_compute_engine import logger > ImportError: No module named google_compute_engine
* testsuite: PyYAML-5.1 removed support for Python 2.6Alexander Sulfrian2019-05-071-4/+4
|
* docs: Remove intersphinx mapping for python-mockAlexander Sulfrian2019-05-071-4/+0
| | | | | | python-mock is now part of the Python standard library (available as unittest.mock in Python 3.3 onwards) and all documentation on voidspace.org.uk is removed.
* testsuite: lxml-4.3.0 removed support for Python 2.6Alexander Sulfrian2019-05-071-1/+1
|
* testsuite: Fix build for python2.6Alexander Sulfrian2018-10-121-3/+3
| | | | pycparser-2.19 requires python2.7.
* Fix server shutdownAlexander Sulfrian2018-10-121-0/+4
|
* Merge branch 'debian_fixes' of https://github.com/xschlef/bcfg2Sol Jerome2018-06-032-1/+2
|\
| * south is no longer available in newer debian versionsxschlef2018-04-271-1/+1
| |
| * Bcfg2.Server.migrations is also required for correct database initilizationxschlef2018-04-271-0/+1
| |
* | POSIX: Don't follow symlinks when changing ownerHolger Weiß2018-05-182-17/+17
|/ | | | | Don't let the client follow symbolic links when changing the owner of a path.
* Remove superfluous space to make sphinx happyAlexander Sulfrian2018-03-221-1/+1
|
* doc: Remove support for docutils-0.4Alexander Sulfrian2018-03-221-2/+1
| | | | | | | The compat class from sphinx for "Directive" was deprecated and removed in the current sphinx version. So we should use the class from docutils directly. You will need at least docutils-0.5 (from 2008) to build the documentation.
* Merge pull request #396 from solj/add-missing-reporting-entriesAlexander Sulfrian2018-03-221-2/+6
|\ | | | | Reporting: Add SELinux entries
| * Reporting: Add SELinux entriesSol Jerome2017-11-301-2/+6
| | | | | | | | Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
* | Reporting: Fix syntax of "cycle" templatetagAlexander Sulfrian2018-03-219-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | The backwords compatible syntax was removed in 1.10. The "new" syntax is available since 11 years [1] and was already available in django 1.0 [2]. > Support for the syntax of {% cycle %} that uses comma-separated > arguments is removed. [3] [1]: https://code.djangoproject.com/ticket/208 [2]: https://github.com/django/django/commit/09145d2e5f [3]: https://docs.djangoproject.com/en/2.0/releases/1.10/#features-removed-in-1-10
* | Reporting: Fix template settings for django 1.10Alexander Sulfrian2018-03-211-9/+29
| | | | | | | | | | | | | | | | Django 1.8 deprecated the multiple TEMPLATE_* settings and introduced a single TEMPLATES config option. Django 1.10 stopped creating a backwards-compatible TEMPLATES based on the TEMPLATE_* settings. (See: https://docs.djangoproject.com/en/1.10/ref/templates/upgrading/#the-templates-settings)
* | Reporting: Use django.shortcuts.renderAlexander Sulfrian2018-03-211-40/+32
| | | | | | | | | | | | | | Replace django.shortcuts.render_to_response with django.shortcuts.render because the context_instance argument was deprecated in django 1.8 and removed in django 1.10. The render shortcut is available since django 1.3, so we can use it without a version check.
* | Reporting: Fix compat for "patterns" in django1.10Alexander Sulfrian2018-03-211-2/+2
|/
* travis-ci: Fix pip failure for older python versionsAlexander Sulfrian2017-11-031-1/+1
| | | | | | | The older python versions only ship with an old version of pip. Since some days SSL is required for downloading from pypi. We have to specify this explicitly because the older pip version only try http by default. (https://github.com/pypa/pip/issues/4817)
* Merge branch 'feature/ldap-enhancements' of https://github.com/AlexanderS/bcfg2Sol Jerome2017-08-316-100/+235
|\
| * Server/Plugins/Ldap: Fix module nameAlexander Sulfrian2017-03-211-1/+2
| | | | | | | | | | | | | | | | | | If the module name contains slashes, python will issue an warning: > Ldap/config.py:1: RuntimeWarning: Parent module '__Ldap_/root/repo/Ldap/config' not found while handling absolute import > from Bcfg2.Server.Plugins.Ldap import LdapConnection, LdapQuery So we simply use the basename without the file extension for the module name.
| * Server/Plugins/Ldap: Support arbitrary ldap optionsAlexander Sulfrian2017-03-212-2/+18
| | | | | | | | | | | | You can now set arbitrary ldap option for the connection by specifying a dict with the key and the value. You should use the constants from python-ldap.
| * Server/Plugins/Ldap: Support specifying the ldap uriAlexander Sulfrian2017-03-212-15/+22
| | | | | | | | | | | | | | You can now specify the server to connect by either host (and optionally port) or by specifying the full ldap uri. If you specify host and port the connection will use the plain (unencrypted) ldap protocol by default. Only if you specify the port "636", it will use ldaps now.
| * Server/Plugins/Ldap: Cache the results of the Ldap queriesAlexander Sulfrian2017-03-213-23/+75
| | | | | | | | | | | | | | Using the OnDemandDict removes the results of Ldap queries from the client_metadata cache. We add a new cache per hostname cache for the single ldap queries and add a new configuration option to enable caching until the cache is expired manually via XML-RPC.
| * Server/Plugins/Ldap: Add missing argumentAlexander Sulfrian2017-03-211-1/+2
| |
| * Server/Cache: Return the number of expired itemsAlexander Sulfrian2017-03-211-4/+13
| |
| * Server/Plugins/Ldap: Use CallableDictAlexander Sulfrian2017-03-211-14/+28
| | | | | | | | | | With the CallableDict the LdapQueries will only be executed, if the values are used.
| * Server/Plugin: CallableDict is an OnDemandDict without cachingAlexander Sulfrian2017-03-211-16/+46
| | | | | | | | | | | | Add a CallableDict (like OnDemandDict, but without caching the results) to have a dict-like class, that can be cached with the client metadata without caching the dynamic values.
| * Server/Plugin: Support functions and values for OnDemandDictAlexander Sulfrian2017-03-211-4/+9
| | | | | | | | Now you can also specify simple values for the OnDemandDict.
| * Server/Plugin: Move OnDemandDict to helpersAlexander Sulfrian2017-03-212-50/+50
| | | | | | | | The OnDemandDict could be used by different plugins.
* | Merge branch 'feature/travis-container' of https://github.com/AlexanderS/bcfg2Sol Jerome2017-08-1831-88/+543
|\ \
| * | travis-ci: Fix "with_system_site_packages"Alexander Sulfrian2017-08-172-2/+12
| | | | | | | | | | | | | | | | | | | | | The "with_system_site_packages" virtualenv seems to be missing the pymodules directory containing python modules installed with the python-support debian helper. So we use the default environment and manually add the references to the system-wide python packages.
| * | testsuite: Bump sphinx versionAlexander Sulfrian2017-08-171-1/+1
| | | | | | | | | | | | https://github.com/sphinx-doc/sphinx/issues/3234 should be fixed now.
| * | testsuite: Bump pylint version for Python3Alexander Sulfrian2017-08-173-2/+12
| | |
| * | testsuite: Fix syntaxAlexander Sulfrian2017-08-171-1/+1
| | |
| * | testsuite: Fix building of m2crypto with Python2.6Alexander Sulfrian2017-08-171-5/+10
| | |
| * | testsuite: Use cheetah3 if possibleAlexander Sulfrian2017-08-171-3/+3
| | | | | | | | | | | | cheetah3 is a fork of cheetah for Python2.7 and Python3.
| * | testsuite: guppy does not support Python3Alexander Sulfrian2017-08-171-2/+2
| | |
| * | travis-ci: Use the new default distAlexander Sulfrian2017-08-171-0/+1
| | | | | | | | | | | | | | | | | | | | | Since 2017-07-18 the default dist is changing to trusty[1]. Just using the new default before the switch. 1: https://blog.travis-ci.com/2017-07-11-trusty-as-default-linux-is-coming
| * | testsuite: Requirements for Python3Alexander Sulfrian2017-08-173-6/+17
| | |
| * | travis-ci: Simplified test scriptAlexander Sulfrian2017-08-172-4/+10
| | |
| * | travis-ci: Enable Python3 tests, but allow it to failAlexander Sulfrian2017-08-171-0/+12
| | |
| * | testsuite: Use older mercurial for python2.6Alexander Sulfrian2017-08-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | > Mercurial 4.2.2 is the last release to support Python 2.6. > Use this if you need to run Mercurial on old platforms and > you cannot update your Python installation. See also: https://www.mercurial-scm.org/wiki/SupportedPythonVersions