Skip to content

Commit 43ff459

Browse files
1 parent 631c19c commit 43ff459

File tree

1 file changed

+21
-25
lines changed

1 file changed

+21
-25
lines changed

modules/dns/manifests/init.pp

+21-25
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,42 @@
11
# dns
22
class dns {
3-
include prometheus::exporter::gdnsd
3+
# include prometheus::exporter::gdnsd
44

5-
package { 'gdnsd':
5+
package { 'bind9':
6+
ensure => installed,
7+
}
8+
package { 'bind9-utils':
69
ensure => installed,
710
}
811

912
git::clone { 'dns':
1013
ensure => latest,
11-
directory => '/etc/gdnsd',
14+
directory => '/etc/bind',
1215
origin => 'https://github.com/miraheze/dns',
1316
owner => 'root',
1417
group => 'root',
15-
before => Package['gdnsd'],
16-
notify => Exec['gdnsd-syntax'],
17-
}
18-
19-
file { '/usr/share/GeoIP/GeoLite2-Country.mmdb':
20-
ensure => present,
21-
source => 'puppet:///private/geoip/GeoLite2-Country.mmdb',
22-
mode => '0444',
23-
notify => Exec['gdnsd-syntax'],
18+
before => Package['bind9'],
19+
notify => Exec['bind-syntax'],
2420
}
2521

26-
exec { 'gdnsd-syntax':
27-
command => '/usr/sbin/gdnsd checkconf',
28-
notify => Service['gdnsd'],
22+
exec { 'bind-syntax':
23+
command => '/usr/bin/named-checkzone',
24+
notify => Service['named'],
2925
refreshonly => true,
3026
}
3127

32-
service { 'gdnsd':
28+
service { 'named':
3329
ensure => running,
3430
hasrestart => true,
3531
hasstatus => true,
36-
require => [ Package['gdnsd'], Exec['gdnsd-syntax'] ],
32+
require => [ Package['bind9'], Exec['bind-syntax'] ],
3733
}
3834

39-
file { '/usr/lib/nagios/plugins/check_gdnsd_datacenters':
40-
ensure => present,
41-
source => 'puppet:///modules/dns/check_gdnsd_datacenters.py',
42-
mode => '0755',
43-
}
35+
#file { '/usr/lib/nagios/plugins/check_gdnsd_datacenters':
36+
#ensure => present,
37+
#source => 'puppet:///modules/dns/check_gdnsd_datacenters.py',
38+
#mode => '0755',
39+
#}
4440

4541
if ( $facts['networking']['interfaces']['ens19'] and $facts['networking']['interfaces']['ens18'] ) {
4642
$address = $facts['networking']['interfaces']['ens19']['ip']
@@ -58,7 +54,7 @@
5854
},
5955
}
6056

61-
monitoring::nrpe { 'GDNSD Datacenters':
62-
command => '/usr/bin/sudo /usr/lib/nagios/plugins/check_gdnsd_datacenters'
63-
}
57+
#monitoring::nrpe { 'GDNSD Datacenters':
58+
#command => '/usr/bin/sudo /usr/lib/nagios/plugins/check_gdnsd_datacenters'
59+
#}
6460
}

0 commit comments

Comments
 (0)