diff options
| -rw-r--r-- | doc/development/index.txt | 4 | ||||
| -rw-r--r-- | doc/server/plugins/generators/tgenshi/ganglia.txt | 4 | ||||
| -rw-r--r-- | doc/server/plugins/generators/tgenshi/motd.txt | 4 | ||||
| -rw-r--r-- | doc/server/plugins/generators/tgenshi/test.txt | 4 | ||||
| -rw-r--r-- | doc/unsorted/converging_rhel5.txt | 4 | ||||
| -rw-r--r-- | doc/unsorted/developing_for_bcfg2.txt | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/doc/development/index.txt b/doc/development/index.txt index bcfa2b56c..0cfe4ec42 100644 --- a/doc/development/index.txt +++ b/doc/development/index.txt @@ -188,7 +188,7 @@ Example Plugin def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) - self.Entries = {'ConfigFile':{'/etc/foo.conf': self.buildFoo}} + self.Entries = {'Path':{'/etc/foo.conf': self.buildFoo}} def myfunction(self): '''function for xmlrpc rmi call''' @@ -197,7 +197,7 @@ Example Plugin def buildFoo(self, entry, metadata): '''Bind per-client information into entry based on metadata''' - entry.attrib.update({'owner':'root', 'group':'root', 'perms':'644'}) + entry.attrib.update({'type':'file', 'owner':'root', 'group':'root', 'perms':'644'}) entry.text = '''contents of foo.conf''' Example Connector diff --git a/doc/server/plugins/generators/tgenshi/ganglia.txt b/doc/server/plugins/generators/tgenshi/ganglia.txt index 1ad737900..3b844afda 100644 --- a/doc/server/plugins/generators/tgenshi/ganglia.txt +++ b/doc/server/plugins/generators/tgenshi/ganglia.txt @@ -37,7 +37,7 @@ Bundler/ganglia.xml <Bundle name='ganglia' version='2.0' revision='$Revision$' origin='$HeadURL$' > <Package name='ganglia-gmond' /> <Package name='ganglia-gmond-modules-python' /> - <ConfigFile name='/etc/ganglia/gmond.conf' /> + <Path name='/etc/ganglia/gmond.conf' /> <Service name='gmond' /> <Action name='gmond-reload' /> @@ -45,7 +45,7 @@ Bundler/ganglia.xml <Package name='ganglia-gmetad'/> <Package name='ganglia-web'/> <Package name='rrdtool'/> - <ConfigFile name='/etc/ganglia/gmetad.conf' /> + <Path name='/etc/ganglia/gmetad.conf' /> <Service name='gmetad' /> </Group> </Bundle> diff --git a/doc/server/plugins/generators/tgenshi/motd.txt b/doc/server/plugins/generators/tgenshi/motd.txt index 89cf77dc5..1e2f3e4b9 100644 --- a/doc/server/plugins/generators/tgenshi/motd.txt +++ b/doc/server/plugins/generators/tgenshi/motd.txt @@ -148,7 +148,7 @@ it-may-be-depreciated, style of Genshi (pre-0.5).:: This template results in:: > buildfile /bar.conf ubik3 - <ConfigFile name="/bar.conf" owner="root" perms="0644" group="root">Hostname is ubik3 + <Path name="/bar.conf" type="file" owner="root" perms="0644" group="root">Hostname is ubik3 Groups: * desktop @@ -166,4 +166,4 @@ This template results in:: * noyp * mysql - </ConfigFile> + </Path> diff --git a/doc/server/plugins/generators/tgenshi/test.txt b/doc/server/plugins/generators/tgenshi/test.txt index a4f33bb14..1348a0603 100644 --- a/doc/server/plugins/generators/tgenshi/test.txt +++ b/doc/server/plugins/generators/tgenshi/test.txt @@ -94,7 +94,7 @@ this (below reformatted a little bit to fit in 80 columns):: Processed 12 gamin events in 0.105 seconds. 0 collapsed Processed 0 gamin events in 0.100 seconds. 0 collapsed <?xml version='1.0' encoding='UTF-8'?> - <ConfigFile name="/test" owner="root" perms="644" encoding="ascii" group="root" paranoid="false"> + <Path type="file" name="/test" owner="root" perms="644" encoding="ascii" group="root" paranoid="false"> Hostname is test.hostname.org Groups: @@ -156,4 +156,4 @@ this (below reformatted a little bit to fit in 80 columns):: getchildren getiterator getnext getparent getprevious getroottree index insert items iterancestors iterchildren iterdescendants itersiblings keys makeelement nsmap prefix remove replace set sourceline tag tail text values xpath - </ConfigFile> + </Path> diff --git a/doc/unsorted/converging_rhel5.txt b/doc/unsorted/converging_rhel5.txt index e41c46f8e..9d508e5e4 100644 --- a/doc/unsorted/converging_rhel5.txt +++ b/doc/unsorted/converging_rhel5.txt @@ -51,7 +51,7 @@ For a "Package" * For example, {{{/etc/motd}}} to {{{/var/lib/bcfg2/Cfg/etc/motd/motd}}}. Yes, there is an extra directory level named after the file. - #. Specify configuration files as {{{<ConfigFile name='PATH' />}}} in the Base or Bundler configuration. + #. Specify configuration files as {{{<Path name='PATH' />}}} in the Base or Bundler configuration. #. Add directories to {{{/var/lib/bcfg2/Rules/directories.xml}}}. For example: .. code-block:: xml @@ -84,7 +84,7 @@ For a "Package" #. Add {{{pkg_checks="false"}}} to the {{{<Package />}}} tag. -For a "ConfigFile" +For a "Path" ------------------- * Unclear verification problem (no details from BCFG2) diff --git a/doc/unsorted/developing_for_bcfg2.txt b/doc/unsorted/developing_for_bcfg2.txt index 39582b520..9d3e77bd7 100644 --- a/doc/unsorted/developing_for_bcfg2.txt +++ b/doc/unsorted/developing_for_bcfg2.txt @@ -70,7 +70,7 @@ Example Plugin def __init__(self, core, datastore): Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore) - self.Entries = {'ConfigFile':{'/etc/foo.conf': self.buildFoo}} + self.Entries = {'Path':{'/etc/foo.conf': self.buildFoo}} def myfunction(self): '''function for xmlrpc rmi call''' @@ -79,7 +79,7 @@ Example Plugin def buildFoo(self, entry, metadata): '''Bind per-client information into entry based on metadata''' - entry.attrib.update({'owner':'root', 'group':'root', 'perms':'644'}) + entry.attrib.update({'type':'file', 'owner':'root', 'group':'root', 'perms':'644'}) entry.text = '''contents of foo.conf''' Example Connector |