diff options
author | Michael Scherer <misc@mageia.org> | 2010-11-20 11:15:06 +0000 |
---|---|---|
committer | Michael Scherer <misc@mageia.org> | 2010-11-20 11:15:06 +0000 |
commit | c173069efea53f72fc7c6a758f8eebe772464a6f (patch) | |
tree | d57f55460f6691cbc8f4a508efc77b126d9a9601 | |
parent | 5c7a0f8bb6a5c4baf2644bd7cd965c92c5d7d7ae (diff) | |
download | puppet-c173069efea53f72fc7c6a758f8eebe772464a6f.tar puppet-c173069efea53f72fc7c6a758f8eebe772464a6f.tar.gz puppet-c173069efea53f72fc7c6a758f8eebe772464a6f.tar.bz2 puppet-c173069efea53f72fc7c6a758f8eebe772464a6f.tar.xz puppet-c173069efea53f72fc7c6a758f8eebe772464a6f.zip |
- add 2 new facter macro, lib_dir ( %lib_dir from rpm) and dc_suffix ( dc=mageia,dc=org ), as we cut and paste them in every template
-rw-r--r-- | modules/facter/lib/facter/dc_suffix.rb | 10 | ||||
-rw-r--r-- | modules/facter/lib/facter/libdir.rb | 10 |
2 files changed, 20 insertions, 0 deletions
diff --git a/modules/facter/lib/facter/dc_suffix.rb b/modules/facter/lib/facter/dc_suffix.rb new file mode 100644 index 00000000..a8526978 --- /dev/null +++ b/modules/facter/lib/facter/dc_suffix.rb @@ -0,0 +1,10 @@ +Facter.add("dc_suffix") do + setcode do + begin + Facter.domain + rescue + Facter.loadfacts() + end + dc_suffix = 'dc=' + Facter.value('domain').gsub('.',',dc=') + end +end diff --git a/modules/facter/lib/facter/libdir.rb b/modules/facter/lib/facter/libdir.rb new file mode 100644 index 00000000..9cd30ea0 --- /dev/null +++ b/modules/facter/lib/facter/libdir.rb @@ -0,0 +1,10 @@ +Facter.add("libdir") do + setcode do + begin + Facter.architecture + rescue + Facter.loadfacts() + end + '/usr/lib' + ( Facter.value('architecture') == "x86_64" ? '64' : '') + '/' + end +end |