diff options
author | Tim Laszlo <tim.laszlo@gmail.com> | 2012-08-07 13:47:54 -0500 |
---|---|---|
committer | Tim Laszlo <tim.laszlo@gmail.com> | 2012-08-07 13:47:54 -0500 |
commit | 4c0f2815882d60b3990147ca0d68c4c0b4a5b766 (patch) | |
tree | 4f42c2f6ce1207c3eac1c469c31a86a33c49c484 | |
parent | 5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e (diff) | |
download | bcfg2-4c0f2815882d60b3990147ca0d68c4c0b4a5b766.tar.gz bcfg2-4c0f2815882d60b3990147ca0d68c4c0b4a5b766.tar.bz2 bcfg2-4c0f2815882d60b3990147ca0d68c4c0b4a5b766.zip |
Update web config documents
-rw-r--r-- | doc/appendix/guides/fedora.txt | 14 | ||||
-rw-r--r-- | doc/appendix/guides/ubuntu.txt | 14 | ||||
-rw-r--r-- | doc/appendix/guides/web-reports-install.txt | 16 | ||||
-rw-r--r-- | doc/reports/dynamic.txt | 18 |
4 files changed, 33 insertions, 29 deletions
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt index f8dea2192..1e49084ef 100644 --- a/doc/appendix/guides/fedora.txt +++ b/doc/appendix/guides/fedora.txt @@ -143,18 +143,20 @@ The ``bcfg2.conf`` file contains only standard plugins so far. [statistics] sendmailpath = /usr/lib/sendmail - database_engine = sqlite3 + + [database] + engine = sqlite3 # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'. - database_name = + name = # Or path to database file if using sqlite3. #<repository>/etc/brpt.sqlite is default path if left empty - database_user = + user = # Not used with sqlite3. - database_password = + password = # Not used with sqlite3. - database_host = + host = # Not used with sqlite3. - database_port = + port = [communication] protocol = xmlrpc/ssl diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt index f72247220..5a67d0a37 100644 --- a/doc/appendix/guides/ubuntu.txt +++ b/doc/appendix/guides/ubuntu.txt @@ -121,18 +121,20 @@ Replace Pkgmgr with Packages in the plugins line of ``bcfg2.conf``:: [statistics] sendmailpath = /usr/lib/sendmail - database_engine = sqlite3 + + [database] + engine = sqlite3 # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'. - database_name = + name = # Or path to database file if using sqlite3. #<repository>/etc/brpt.sqlite is default path if left empty - database_user = + user = # Not used with sqlite3. - database_password = + password = # Not used with sqlite3. - database_host = + host = # Not used with sqlite3. - database_port = + port = [communication] protocol = xmlrpc/ssl diff --git a/doc/appendix/guides/web-reports-install.txt b/doc/appendix/guides/web-reports-install.txt index c03682974..489a7673d 100644 --- a/doc/appendix/guides/web-reports-install.txt +++ b/doc/appendix/guides/web-reports-install.txt @@ -52,18 +52,18 @@ then have something like this:: [statistics] sendmailpath = /usr/lib/sendmail - database_engine = sqlite3 + + [database] + engine = sqlite3 # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'. - database_name = - # Or path to database file if using sqlite3. - #<repository>/etc/brpt.sqlite is default path if left empty - database_user = + name = + user = # Not used with sqlite3. - database_password = + password = # Not used with sqlite3. - database_host = + host = # Not used with sqlite3. - database_port = + port = Restart apache and point a browser to your Bcfg2 server. diff --git a/doc/reports/dynamic.txt b/doc/reports/dynamic.txt index 8267bffe3..99cce43a2 100644 --- a/doc/reports/dynamic.txt +++ b/doc/reports/dynamic.txt @@ -120,19 +120,19 @@ Notes on Alternative Databases ------------------------------ If you choose to use a different database, you'll need to edit -``/etc/bcfg2.conf``. These fields should be updated in the [statistics] +``/etc/bcfg2.conf``. These fields should be updated in the [database] section: -* database_engine +* engine - * ex: database_engine = mysql - * ex: database_engine = postgresql_psycopg2 + * ex: engine = mysql + * ex: engine = postgresql_psycopg2 -* database_name -* database_user -* database_password -* database_host -* database_port (optional) +* name +* user +* password +* host +* port (optional) Summary and Features ==================== |