diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-23 14:50:09 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-04-23 14:50:09 -0400 |
commit | 46a47b4120b3d892b8149a5e181e4d976ad87f99 (patch) | |
tree | f2697f233fc7f5ad5022864222a5ca87715a651b /examples | |
parent | e1f99d1d5045e0511db42debb30aa97da2018796 (diff) | |
parent | 3d06f311274d6b942ee89d8cdb13b2ecc99af1b0 (diff) | |
download | bcfg2-46a47b4120b3d892b8149a5e181e4d976ad87f99.tar.gz bcfg2-46a47b4120b3d892b8149a5e181e4d976ad87f99.tar.bz2 bcfg2-46a47b4120b3d892b8149a5e181e4d976ad87f99.zip |
Merge branch '1.4.x'
Conflicts:
debian/bcfg2-server.install
doc/server/plugins/grouping/metadata.txt
src/lib/Bcfg2/Client/Client.py
src/lib/Bcfg2/Client/Tools/Portage.py
src/lib/Bcfg2/Client/Tools/RcUpdate.py
src/lib/Bcfg2/Client/Tools/YUM24.py
src/lib/Bcfg2/Client/Tools/__init__.py
src/lib/Bcfg2/Client/Tools/launchd.py
src/lib/Bcfg2/Options.py
src/lib/Bcfg2/Server/Core.py
src/lib/Bcfg2/Server/Plugin/helpers.py
src/lib/Bcfg2/Server/Plugins/Metadata.py
src/lib/Bcfg2/Server/models.py
src/lib/Bcfg2/Utils.py
src/sbin/bcfg2-info
src/sbin/bcfg2-test
testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
testsuite/Testsrc/test_code_checks.py
Diffstat (limited to 'examples')
-rw-r--r-- | examples/Bundler/dirvish.xml | 20 | ||||
-rw-r--r-- | examples/Bundler/sgenshi-dirvish.genshi | 23 | ||||
-rw-r--r-- | examples/Cfg/etc/dirvish/master.conf/master.conf.genshi (renamed from examples/TGenshi/etc/dirvish/master.conf/template.newtxt) | 0 | ||||
-rw-r--r-- | examples/TGenshi/etc/motd/template.newtxt | 31 | ||||
-rw-r--r-- | examples/TGenshi/tmp/bar/template.txt | 19 | ||||
-rw-r--r-- | examples/TGenshi/tmp/foo/template.xml | 46 | ||||
-rw-r--r-- | examples/bcfg2.confHostbase | 33 |
7 files changed, 20 insertions, 152 deletions
diff --git a/examples/Bundler/dirvish.xml b/examples/Bundler/dirvish.xml new file mode 100644 index 000000000..47bf8cf54 --- /dev/null +++ b/examples/Bundler/dirvish.xml @@ -0,0 +1,20 @@ +<Bundle xmlns:py="http://genshi.edgewall.org/"> + <py:for each="user in metadata.Properties['dirvish.xml'].xdata.find('users')"> + <!-- Generate configs for all users in dirvish.xml --> + <BoundPath + name='/backup/homes/${user.tag}/dirvish/default.conf' + owner='root' + group='root' + perms='0644'>client: nfs-host +tree: /export/homes/${user.text} +exclude: + *~ + .nfs* + </BoundPath> + </py:for> + + <Package name='dirvish'/> + <Path name='/etc/cron.d/dirvish'/> + <Path name='/etc/dirvish/dirvish-cronjob'/> + <Path name='/etc/dirvish/master.conf'/> +</Bundle> diff --git a/examples/Bundler/sgenshi-dirvish.genshi b/examples/Bundler/sgenshi-dirvish.genshi deleted file mode 100644 index b4ea08f2c..000000000 --- a/examples/Bundler/sgenshi-dirvish.genshi +++ /dev/null @@ -1,23 +0,0 @@ -<!-- -vim: ft=xml ---> -<Bundle name='sgenshi-dirvish' xmlns:py="http://genshi.edgewall.org/"> -<py:for each="user in metadata.Properties['dirvish.xml'].xdata.find('users')"> -<!-- Generate configs for all users in dirvish.xml --> -<BoundPath - name='/backup/homes/${user.tag}/dirvish/default.conf' - owner='root' - group='root' - perms='0644'>client: nfs-host -tree: /export/homes/${user.text} -exclude: - *~ - .nfs* -</BoundPath> -</py:for> - -<Package name='dirvish'/> -<Path name='/etc/cron.d/dirvish'/> -<Path name='/etc/dirvish/dirvish-cronjob'/> -<Path name='/etc/dirvish/master.conf'/> -</Bundle> diff --git a/examples/TGenshi/etc/dirvish/master.conf/template.newtxt b/examples/Cfg/etc/dirvish/master.conf/master.conf.genshi index 6c9750f9d..6c9750f9d 100644 --- a/examples/TGenshi/etc/dirvish/master.conf/template.newtxt +++ b/examples/Cfg/etc/dirvish/master.conf/master.conf.genshi diff --git a/examples/TGenshi/etc/motd/template.newtxt b/examples/TGenshi/etc/motd/template.newtxt deleted file mode 100644 index ca3cc5f18..000000000 --- a/examples/TGenshi/etc/motd/template.newtxt +++ /dev/null @@ -1,31 +0,0 @@ -------------------------------------------------------------------------
- GOALS FOR SERVER MANAGED BY BCFG2
-------------------------------------------------------------------------
-Hostname is ${metadata.hostname}
-
-Groups:
-{% for group in metadata.groups %}\
- * ${group}
-{% end %}\
-
-{% if metadata.categories %}\
-Categories:
-{% for category in metadata.categories %}\
- * ${category}
-{% end %}\
-{% end %}\
-
-
-{% if metadata.Probes %}\
-Probes:
-{% for probe, value in metadata.Probes.iteritems() %}\
- * ${probe} \
- ${value}
-{% end %}\
-{% end %}\
-
-------------------------------------------------------------------------
- ITOPS MOTD
-------------------------------------------------------------------------
-Please create a Ticket for any system level changes you need from IT.
-
diff --git a/examples/TGenshi/tmp/bar/template.txt b/examples/TGenshi/tmp/bar/template.txt deleted file mode 100644 index dbf482c22..000000000 --- a/examples/TGenshi/tmp/bar/template.txt +++ /dev/null @@ -1,19 +0,0 @@ -[communication] -protocol = xmlrpc/ssl -#if metadata.uuid != None -user = $metadata.uuid -#end -#choose -#when metadata.password is not None -password = $metadata.password -#end -#when metadata.password is None -password = GlobalPassword -#end -#end - -[client] -drivers = Action,Chkconfig,POSIX,YUMng - -[components] -bcfg2 = https://config.example.com:6789 diff --git a/examples/TGenshi/tmp/foo/template.xml b/examples/TGenshi/tmp/foo/template.xml deleted file mode 100644 index 522c6e7fe..000000000 --- a/examples/TGenshi/tmp/foo/template.xml +++ /dev/null @@ -1,46 +0,0 @@ -<html xmlns:py="http://genshi.edgewall.org/"> - <head> - <title>${name}</title> - </head> - <body> - <table> - <tr><th>Name:</th><td>${name}</td></tr> - <tr><th>Hostname:</th><td>${metadata.hostname}</td></tr> - <tr><th>Toolset:</th><td>${metadata.hostname}</td></tr> - <tr><th>UUID:</th><td>${metadata.uuid}</td></tr> - <tr><th>Password:</th><td>${metadata.password}</td></tr> - <tr> - <th>Bundles:</th> - <td> - <table> - <tr py:for="bundle in metadata.bundles"><td>${bundle}</td></tr> - </table> - </td> - </tr> - <tr> - <th>Groups:</th> - <td> - <table> - <tr py:for="group in metadata.groups"><td>${group}</td></tr> - </table> - </td> - </tr> - <tr> - <th>Categories:</th> - <td> - <table> - <tr py:for="category in metadata.categories"><td>${category}</td></tr> - </table> - </td> - </tr> - <tr> - <th>Probes:</th> - <td> - <table> - <tr py:for="probe in metadata.probes"><td>${probe}</td><td>${metadata.probes[probe]}</td></tr> - </table> - </td> - </tr> - </table> - </body> -</html> diff --git a/examples/bcfg2.confHostbase b/examples/bcfg2.confHostbase deleted file mode 100644 index c9420e34a..000000000 --- a/examples/bcfg2.confHostbase +++ /dev/null @@ -1,33 +0,0 @@ -[server] -repository = /var/lib/bcfg2 -plugins = Bundler,Rules,Metadata,SSHbase,Cfg - -[statistics] -sendmailpath = /usr/sbin/sendmail - -[communication] -protocol = xmlrpc/ssl -password = foobat -key = /etc/bcfg2.key - -[components] -bcfg2 = https://localhost:6789 - -[hostbase] -# postgresql, mysql, sqlite3 or ado_mssql -database_engine = mysql -# Or path to database file if using sqlite3. -database_name = -# Not used with sqlite3. -database_user = -# Not used with sqlite3. -database_password = -# Set to empty string for localhost. Not used with sqlite3. -database_host = -# Set to empty string for default. Not used with sqlite3. -database_port = 3306 -# enter an NIS group name you'd like to give access to edit hostbase records -##authorized_group = support -# default mx record for new hosts added to the database -default_mx = mailserver.yourdomain.net -priority = 30 |