Parcourir la source

dns: Finish renameing of dns (public/private crap)

Sebastien Badia il y a 8 ans
Parent
commit
cb3fcc2fd9
3 fichiers modifiés avec 5 ajouts et 16 suppressions
  1. 4 2
      manifests/dns/authoritative.pp
  2. 0 13
      manifests/dns/init.pp
  3. 1 1
      manifests/dns/zone.pp

+ 4 - 2
manifests/dns/authoritative.pp

@@ -9,7 +9,9 @@
 # Class:: public::dns::authoritative inherits dns
 #
 #
-class public::dns::authoritative inherits dns {
+class public::dns::authoritative {
+
+  include 'bind'
 
   package { 'zonecheck':
     ensure => installed,
@@ -28,7 +30,7 @@ class public::dns::authoritative inherits dns {
     zonedir     => '/etc/bind',
     owner       => 'bind',
     group       => 'bind',
-    source_base => 'puppet:///modules/public/authoritative/confs/',
+    source_base => 'puppet:///modules/private/authoritative/confs/',
     # require     => File['/etc/all-knowing-dns.conf'],
   }
 

+ 0 - 13
manifests/dns/init.pp

@@ -1,13 +0,0 @@
-# Module:: public
-# Manifest:: dns.pp
-#
-# Author:: Julien Vaubourg (<julien@vaubourg.com>)
-# Date:: 2013-09-21 13:36:02 +0200
-# Maintainer:: Julien Vaubourg (<julien@vaubourg.com>)
-#
-# Class:: public::dns
-#
-#
-class public::dns {
-  include 'bind'
-}

+ 1 - 1
manifests/dns/zone.pp

@@ -11,7 +11,7 @@ define public::dns::zone {
     zonedir     => '/etc/bind/zones',
     owner       => 'bind',
     group       => 'bind',
-    source_base => 'puppet:///modules/public/authoritative/zones/',
+    source_base => 'puppet:///modules/private/authoritative/zones/',
     require     => File['/etc/bind/zones'],
   }
 }