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
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<HTML>
<HEAD>
<TITLE> [Mageia-sysadm] [774] - allow to override the templates used for zone
</TITLE>
<LINK REL="Index" HREF="index.html" >
<LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B774%5D%20-%20allow%20to%20override%20the%20templates%20used%20for%0A%09zone&In-Reply-To=%3C20110113181224.77D5D42376%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="002047.html">
<LINK REL="Next" HREF="002050.html">
</HEAD>
<BODY BGCOLOR="#ffffff">
<H1>[Mageia-sysadm] [774] - allow to override the templates used for zone</H1>
<B>root at mageia.org</B>
<A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B774%5D%20-%20allow%20to%20override%20the%20templates%20used%20for%0A%09zone&In-Reply-To=%3C20110113181224.77D5D42376%40valstar.mageia.org%3E"
TITLE="[Mageia-sysadm] [774] - allow to override the templates used for zone">root at mageia.org
</A><BR>
<I>Thu Jan 13 19:12:24 CET 2011</I>
<P><UL>
<LI>Previous message: <A HREF="002047.html">[Mageia-sysadm] [773] add various comment on what should be improved later
</A></li>
<LI>Next message: <A HREF="002050.html">[Mageia-sysadm] [775] move dns zone to a module in deployment
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2048">[ date ]</a>
<a href="thread.html#2048">[ thread ]</a>
<a href="subject.html#2048">[ subject ]</a>
<a href="author.html#2048">[ author ]</a>
</LI>
</UL>
<HR>
<!--beginarticle-->
<PRE>Revision: 774
Author: misc
Date: 2011-01-13 19:12:24 +0100 (Thu, 13 Jan 2011)
Log Message:
-----------
- allow to override the templates used for zone
Modified Paths:
--------------
puppet/modules/bind/manifests/init.pp
Modified: puppet/modules/bind/manifests/init.pp
===================================================================
--- puppet/modules/bind/manifests/init.pp 2011-01-13 18:12:22 UTC (rev 773)
+++ puppet/modules/bind/manifests/init.pp 2011-01-13 18:12:24 UTC (rev 774)
@@ -30,31 +30,38 @@
notify => [Service['named']]
}
- define zone_master {
- file { "/var/lib/named/var/named/master/$name.zone":
+ define zone_base($content = false) {
+ if ! $content {
+ $zone_content = template("bind/zones/$name.zone")
+ } else {
+ $zone_content = $content
+ }
+ file { "/var/lib/named/var/named/$zone_subdir/$name.zone":
ensure => present,
owner => root,
group => root,
mode => 644,
- content => template("bind/zones/$name.zone"),
+ content => $zone_content,
require => Package[bind],
notify => Service[named]
}
}
- define zone_reverse {
- file { "/var/lib/named/var/named/reverse/$name.zone":
- ensure => present,
- owner => root,
- group => root,
- mode => 644,
- content => template("bind/zones/$name.zone"),
- require => Package[bind],
- notify => Service[named]
+ define zone_master(content = false) {
+ $zone_subdir = "master"
+ zone_base { $name :
+ content => $content
}
}
+ define zone_reverse(content = false) {
+ $zone_subdir = "reverse"
+ zone_base { $name :
+ content => $content
+ }
+ }
+
class bind_master inherits bind_base {
file { '/var/lib/named/etc/named.conf':
content => template("bind/named_base.conf", "bind/named_master.conf"),
-------------- next part --------------
An HTML attachment was scrubbed...
URL: </pipermail/mageia-sysadm/attachments/20110113/4a9c611d/attachment.html>
</PRE>
<!--endarticle-->
<HR>
<P><UL>
<!--threads-->
<LI>Previous message: <A HREF="002047.html">[Mageia-sysadm] [773] add various comment on what should be improved later
</A></li>
<LI>Next message: <A HREF="002050.html">[Mageia-sysadm] [775] move dns zone to a module in deployment
</A></li>
<LI> <B>Messages sorted by:</B>
<a href="date.html#2048">[ date ]</a>
<a href="thread.html#2048">[ thread ]</a>
<a href="subject.html#2048">[ subject ]</a>
<a href="author.html#2048">[ 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>
|
