blob: 6d8695bdfedbde03cd4a06bd3c5505564a032aaf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [339] Merge remote branch 'vm_valstar/master'
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B339%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C20101120111506.A8F913FBCB%40valstar.mageia.org%3E">
<META NAME="robots" CONTENT="index,nofollow">
<META http-equiv="Content-Type" content="text/html; charset=us-ascii">
<LINK REL="Previous" HREF="000681.html">
<LINK REL="Next" HREF="000683.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [339] Merge remote branch 'vm_valstar/master'</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B339%5D%20Merge%20remote%20branch%20%27vm_valstar/master%27&In-Reply-To=%3C20101120111506.A8F913FBCB%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [339] Merge remote branch 'vm_valstar/master'">root at mageia.org
</A><BR>
<I>Sat Nov 20 12:15:06 CET 2010</I>
<P><UL>
<LI>Previous message: <A HREF="000681.html">[Mageia-sysadm] Http server problem
</A></li>
<LI>Next message: <A HREF="000683.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#682">[ date ]</a>
<a href="thread.html#682">[ thread ]</a>
<a href="subject.html#682">[ subject ]</a>
<a href="author.html#682">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 339
Author: misc
Date: 2010-11-20 12:15:06 +0100 (Sat, 20 Nov 2010)
Log Message:
-----------
Merge remote branch 'vm_valstar/master'
Added Paths:
-----------
puppet/modules/facter/
puppet/modules/facter/lib/
puppet/modules/facter/lib/facter/
puppet/modules/facter/lib/facter/dc_suffix.rb
puppet/modules/facter/lib/facter/libdir.rb
Added: puppet/modules/facter/lib/facter/dc_suffix.rb
===================================================================
--- puppet/modules/facter/lib/facter/dc_suffix.rb (rev 0)
+++ puppet/modules/facter/lib/facter/dc_suffix.rb 2010-11-20 11:15:06 UTC (rev 339)
@@ -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
Added: puppet/modules/facter/lib/facter/libdir.rb
===================================================================
--- puppet/modules/facter/lib/facter/libdir.rb (rev 0)
+++ puppet/modules/facter/lib/facter/libdir.rb 2010-11-20 11:15:06 UTC (rev 339)
@@ -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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20101120/5fbc9d72/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="000681.html">[Mageia-sysadm] Http server problem
</A></li>
<LI>Next message: <A HREF="000683.html">[Mageia-sysadm] [340] Merge remote branch 'vm_valstar/master'
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#682">[ date ]</a>
<a href="thread.html#682">[ thread ]</a>
<a href="subject.html#682">[ subject ]</a>
<a href="author.html#682">[ author ]</a>
</LI>
</UL>
<hr>
<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm
mailing list</a><br>
</body></html>
|
