diff options
Diffstat (limited to 'doc/appendix')
| -rw-r--r-- | doc/appendix/files/ntp.txt | 93 | ||||
| -rw-r--r-- | doc/appendix/guides/authentication.txt | 2 | ||||
| -rw-r--r-- | doc/appendix/guides/fedora.txt | 14 | ||||
| -rw-r--r-- | doc/appendix/guides/nat_howto.txt | 6 | ||||
| -rw-r--r-- | doc/appendix/guides/ubuntu.txt | 14 | ||||
| -rw-r--r-- | doc/appendix/guides/web-reports-install.txt | 16 |
6 files changed, 73 insertions, 72 deletions
diff --git a/doc/appendix/files/ntp.txt b/doc/appendix/files/ntp.txt index ec1fa3094..e14816f6e 100644 --- a/doc/appendix/files/ntp.txt +++ b/doc/appendix/files/ntp.txt @@ -19,95 +19,92 @@ Package only ------------ Our example starts with the bare minimum configuration setup. We have -a client, a profile group, a list of packages, and a base configuration. +a client, a profile group, a list of packages, and an NTP bundle. ``Metadata/clients.xml``: .. code-block:: xml - <Clients version='3.0'> - <Client profile='fedora' pingable='N' pingtime='0' name='foo.bar.com'/> + <Clients> + <Client profile='server' name='foo.bar.com'/> </Clients> ``Metadata/groups.xml``: .. code-block:: xml - <Groups version='3.0'> - <Group profile='true' name='fedora' toolset='rh'/> + <Groups> + <Group profile='true' name='server'> + <Bundle name="ntp"/> + </Group> </Groups> -``Base/base.xml``: +``Bundler/ntp.xml``: .. code-block:: xml - <Base> - <Group name='fedora'> - <Package name='ntp'/> - </Group> - </Base> + <Bundle name="ntp"> + <Package name='ntp'/> + </Bundle> ``Pkgmgr/packages.xml``: .. code-block:: xml <PackageList type='rpm' priority='0'> - <Package name='ntp' version='4.2.0.a.20050816-11.FC5'/> + <Package name='ntp' version='4.2.0.a.20050816-11.FC5'/> </PackageList> +(This can also be performed more elegantly with the +:ref:`server-plugins-generators-packages` plugin.) + Add service ----------- -Configure the service, and add it to the base. +Configure the service, and add it to Rules. -``Svcmgr/services.xml``: +``Rules/services.xml``: .. code-block:: xml <Services priority='0'> - <Service name='ntpd' status='on'/> + <Service name='ntpd' status='on'/> </Services> -``Base/base.xml``: +``Bundler/ntp.xml``: .. code-block:: xml - <Base> - <Group name='fedora'> - <Package name='ntp'/> - <Service name='ntpd'/> - </Group> - </Base> + <Bundle name="ntp"> + <Package name='ntp'/> + <Service name='ntpd'/> + </Bundle> Add config file --------------- -Setup an ``etc/`` directory structure, and add it to the base.:: +Setup an ``etc/`` directory structure, and add it to the base:: # cat Cfg/etc/ntp.conf/ntp.conf server ntp1.utexas.edu ``Base/base.xml``: +``Bundler/ntp.xml``: + .. code-block:: xml - <Base> - <Group name='fedora'> - <Package name='ntp'/> - <Service name='ntpd'/> - <Path name='/etc/ntp.conf'/> - </Group> - </Base> + <Bundle name="ntp"> + <Package name='ntp'/> + <Service name='ntpd'/> + <Path name='/etc/ntp.conf'/> + </Bundle> Create a bundle --------------- -The above configuration layout works fine for a single service, but -that method of organization would quickly become a nightmare as you -approach the number of packages, services, and config files required -to represent a fully configured host. Bundles allow the grouping of -related configuration entries that are used to provide a single -service. This is done for several reasons: +Bundles allow the grouping of related configuration entries that are +used to provide a single service. This is done for several reasons: * Grouping related things in one place makes it easier to add those entries for multiple groups of clients @@ -128,10 +125,10 @@ logically grouped together. We use a bundle to accomplish this. .. code-block:: xml - <Bundle name='ntp' version='2.0'> - <Package name='ntp'/> - <Service name='ntpd'/> - <Path name='/etc/ntp.conf'/> + <Bundle name='ntp'> + <Package name='ntp'/> + <Service name='ntpd'/> + <Path name='/etc/ntp.conf'/> </Bundle> After this bundle is created, it must be associated with a group @@ -143,15 +140,15 @@ install this bundle. .. code-block:: xml <Groups> - ... - <Group name='fedora'> - <Bundle name='ntp'/> - </Group> - ... + ... + <Group profile='true' name='server'> + <Bundle name="ntp"/> + </Group> + ... </Groups> -Once this bundle is created, a client reconfigure will install -these entries. If any are modified, then the *ntpd* service will -be restarted. If you only want ntp configurations to be updated (and +Once this bundle is created, a client reconfigure will install these +entries. If any are modified, then the *ntpd* service will be +restarted. If you only want ntp configurations to be updated (and nothing else), the bcfg2 client can be run with a ``-b <bundle name>`` option that will only update entries in the specified bundle. diff --git a/doc/appendix/guides/authentication.txt b/doc/appendix/guides/authentication.txt index dab122f80..68a232f6f 100644 --- a/doc/appendix/guides/authentication.txt +++ b/doc/appendix/guides/authentication.txt @@ -62,7 +62,7 @@ How Authentication Works #. Next, the ip address is verified against the client record. If the address doesn't match, then the client must be set to - location=floating + floating='true' #. Finally, the password is verified. If the client is set to secure mode, the only its per-client password is accepted. If it is not set 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/nat_howto.txt b/doc/appendix/guides/nat_howto.txt index 818d3e644..b3492e871 100644 --- a/doc/appendix/guides/nat_howto.txt +++ b/doc/appendix/guides/nat_howto.txt @@ -43,14 +43,14 @@ the Client entry in clients.xml will look something like this: .. code-block:: xml - <Client profile="desktop" name="test1" pingable="N" - uuid='9001ec29-1531-4b16-8198-a71bea093d0a' location='floating'/> + <Client profile="desktop" name="test1" + uuid='9001ec29-1531-4b16-8198-a71bea093d0a' floating='true'/> Alternatively, the Client entry can be setup like this: .. code-block:: xml - <Client profile="desktop" name="test1" pingable="N" + <Client profile="desktop" name="test1" uuid='9001ec29-1531-4b16-8198-a71bea093d0a' address='ip-address-of-NAT'/> The difference between these definitions is explained in detail in the 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. |