diff options
| author | Michael Scherer <misc@mageia.org> | 2011-01-13 18:12:25 +0000 |
|---|---|---|
| committer | Michael Scherer <misc@mageia.org> | 2011-01-13 18:12:25 +0000 |
| commit | 3d55b77f3fe835b39af1b628ca78260903dc5cef (patch) | |
| tree | a401739152ab3ca28ec4f8a7f7d29adaf470bd25 /manifests | |
| parent | 960966289de4dcf7110468cf5b7ee6f7275c7161 (diff) | |
| download | puppet-3d55b77f3fe835b39af1b628ca78260903dc5cef.tar puppet-3d55b77f3fe835b39af1b628ca78260903dc5cef.tar.gz puppet-3d55b77f3fe835b39af1b628ca78260903dc5cef.tar.bz2 puppet-3d55b77f3fe835b39af1b628ca78260903dc5cef.tar.xz puppet-3d55b77f3fe835b39af1b628ca78260903dc5cef.zip | |
move dns zone to a module in deployment
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/common.pp | 7 | ||||
| -rw-r--r-- | manifests/nodes.pp | 4 |
2 files changed, 3 insertions, 8 deletions
diff --git a/manifests/common.pp b/manifests/common.pp index a4c6c796..50c0f219 100644 --- a/manifests/common.pp +++ b/manifests/common.pp @@ -109,9 +109,4 @@ class default_mageia_server inherits default_mageia_server_no_smtp { # include ssmtp } -class dns_server { - include bind::bind_master - bind::zone_master { "mageia.org": } - bind::zone_master { "mageia.fr": } - bind::zone_reverse { "7.0.0.0.2.0.0.0.8.7.1.2.2.0.a.2.ip6.arpa": } -} + diff --git a/manifests/nodes.pp b/manifests/nodes.pp index 9e2388e4..1850081e 100644 --- a/manifests/nodes.pp +++ b/manifests/nodes.pp @@ -49,7 +49,6 @@ node alamut { # include default_mageia_server_no_smtp include postgresql::server - include dns_server timezone::timezone { "Europe/Paris": } include catdap @@ -62,6 +61,7 @@ node alamut { include postfix::primary_smtp include lists + include dns::server } # buildnode @@ -108,7 +108,7 @@ node krampouezh { #include default_mageia_server_no_smtp #include postfix::secondary_smtp - include dns_server + include dns::server timezone::timezone { "Europe/Paris": } # Other services running on this server : # - meetbot |