diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2012-04-19 09:39:32 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2012-04-19 09:39:32 -0500 |
| commit | 232963077d5883d3e7b15ad15a10063bb1986de9 (patch) | |
| tree | 2b7c09dfdce07662dd7028e5a6f76ec06444f603 /doc | |
| parent | fb63e457428f5bb91e5e80be40f5ac166d712d50 (diff) | |
| parent | 3824f10c6edaa7ee1cfff65d1eb17343a5b20b9c (diff) | |
| download | bcfg2-232963077d5883d3e7b15ad15a10063bb1986de9.tar.gz bcfg2-232963077d5883d3e7b15ad15a10063bb1986de9.tar.bz2 bcfg2-232963077d5883d3e7b15ad15a10063bb1986de9.zip | |
Merge branch 'maint'
Conflicts:
src/sbin/bcfg2-info
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/glossary.txt | 2 | ||||
| -rw-r--r-- | doc/reports/dynamic.txt | 9 | ||||
| -rw-r--r-- | doc/server/plugins/generators/tgenshi/index.txt | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/doc/glossary.txt b/doc/glossary.txt index 5455e9ced..06f67dab9 100644 --- a/doc/glossary.txt +++ b/doc/glossary.txt @@ -33,8 +33,6 @@ Glossary profile A special type of group that a client is explicitly assigned to. - structure - repository A collection of folders and files that together define the configurations that Bcfg2 applies to clients. The repository diff --git a/doc/reports/dynamic.txt b/doc/reports/dynamic.txt index 4c75cce32..07763922c 100644 --- a/doc/reports/dynamic.txt +++ b/doc/reports/dynamic.txt @@ -71,6 +71,15 @@ Apache configuration for web-based reports by adding a **web_prefix** setting in the [statistics] section of your ``bcfg2.conf``. +.. warning:: + + When running with SELINUX enabled, you can have potential problems + with the WSGISocketPrefix. One solution that works without too much + trouble is modifying your prefix so that it is located in a standard + location:: + + WSGISocketPrefix /var/run/httpd/wsgi + An example site config is included below:: <IfModule mod_wsgi.c> diff --git a/doc/server/plugins/generators/tgenshi/index.txt b/doc/server/plugins/generators/tgenshi/index.txt index c5392dcc4..21ef8f17f 100644 --- a/doc/server/plugins/generators/tgenshi/index.txt +++ b/doc/server/plugins/generators/tgenshi/index.txt @@ -130,7 +130,7 @@ Then, run:: setup = Bcfg2.Options.OptionParser({'repo': Bcfg2.Options.SERVER_REPOSITORY}) setup.parse('--') - template = TemplateLoader().load(set['repo'] + path, cls=NewTextTemplate) + template = TemplateLoader().load(setup['repo'] + path, cls=NewTextTemplate) print template.generate(metadata=metadata, path=path, name=name).render() This gives you more fine-grained control over how your template is |