Skip to content

Commit 457b065

Browse files
ju5tju5t
authored
Merge pull request #151 from bastelfreak/fixtures
.fixtures.yml: Migrate to git
2 parents 0623f38 + 341ff74 commit 457b065

15 files changed

+139
-162
lines changed

‎.fixtures.yml

+10-30
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,12 @@
1+
---
12
fixtures:
2-
forge_modules:
3-
epel:
4-
repo: "puppet/epel"
5-
ref: "3.0.1"
6-
stdlib:
7-
repo: "puppetlabs/stdlib"
8-
ref: "9.3.0"
9-
mysql:
10-
repo: "puppetlabs/mysql"
11-
ref: "15.0.0"
12-
postgresql:
13-
repo: "puppetlabs/postgresql"
14-
ref: "9.1.0"
15-
concat:
16-
repo: "puppetlabs/concat"
17-
ref: "5.3.0"
18-
apt:
19-
repo: "puppetlabs/apt"
20-
ref: "6.3.0"
21-
yumrepo:
22-
repo: "puppetlabs/yumrepo_core"
23-
puppet_version: ">= 6.0.0"
24-
ref: "1.0.3"
25-
augeas:
26-
repo: "puppetlabs/augeas_core"
27-
puppet_version: ">= 6.0.0"
28-
ref: "1.0.4"
293
repositories:
30-
systemd: 'https://github.com/voxpupuli/puppet-systemd'
31-
symlinks:
32-
powerdns: "#{source_dir}"
4+
concat: https://github.com/puppetlabs/puppetlabs-concat.git
5+
stdlib: https://github.com/puppetlabs/puppetlabs-stdlib.git
6+
epel: https://github.com/voxpupuli/puppet-epel.git
7+
mysql: https://github.com/puppetlabs/puppetlabs-mysql.git
8+
postgresql: https://github.com/puppetlabs/puppetlabs-postgresql.git
9+
apt: https://github.com/puppetlabs/puppetlabs-apt.git
10+
systemd: https://github.com/voxpupuli/puppet-systemd
11+
yumrepo_core: https://github.com/puppetlabs/puppetlabs-yumrepo_core.git
12+
augeas_core: https://github.com/puppetlabs/puppetlabs-augeas_core.git

‎manifests/authoritative.pp

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
class powerdns::authoritative (
33
$package_ensure = $powerdns::params::default_package_ensure,
44
Optional[Array[String]] $install_packages = $powerdns::install_packages,
5-
) inherits powerdns {
5+
) inherits powerdns {
66
# install the powerdns package
7-
package { $::powerdns::params::authoritative_package:
7+
package { $powerdns::params::authoritative_package:
88
ensure => $package_ensure,
99
}
1010

1111
stdlib::ensure_packages($install_packages)
1212

1313
# install the right backend
14-
case $::powerdns::backend {
14+
case $powerdns::backend {
1515
'mysql': {
1616
include powerdns::backends::mysql
1717
}
@@ -28,14 +28,14 @@
2828
include powerdns::backends::sqlite
2929
}
3030
default: {
31-
fail("${::powerdns::backend} is not supported. We only support 'mysql', 'bind', 'postgresql', 'ldap' and 'sqlite' at the moment.")
31+
fail("${powerdns::backend} is not supported. We only support 'mysql', 'bind', 'postgresql', 'ldap' and 'sqlite' at the moment.")
3232
}
3333
}
3434

3535
service { 'pdns':
36-
ensure => running,
37-
name => $::powerdns::params::authoritative_service,
38-
enable => true,
39-
require => Package[$::powerdns::params::authoritative_package],
36+
ensure => running,
37+
name => $powerdns::params::authoritative_service,
38+
enable => true,
39+
require => Package[$powerdns::params::authoritative_package],
4040
}
4141
}

‎manifests/backends/bind.pp

+11-11
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# Remove the default simplebind configuration as we prefer to manage PowerDNS
44
# consistently across all operating systems. This file is added to Debian
55
# based systems due to Debian's policies.
6-
file { "${::powerdns::params::authoritative_configdir}/pdns.d/pdns.simplebind.conf":
6+
file { "${powerdns::params::authoritative_configdir}/pdns.d/pdns.simplebind.conf":
77
ensure => absent,
8-
require => Package[$::powerdns::params::authoritative_package],
8+
require => Package[$powerdns::params::authoritative_package],
99
}
1010

1111
# set the configuration variables
@@ -19,33 +19,33 @@
1919
powerdns::config { 'bind-config':
2020
ensure => present,
2121
setting => 'bind-config',
22-
value => "${::powerdns::params::authoritative_configdir}/named.conf",
22+
value => "${powerdns::params::authoritative_configdir}/named.conf",
2323
type => 'authoritative',
24-
require => Package[$::powerdns::params::authoritative_package],
24+
require => Package[$powerdns::params::authoritative_package],
2525
}
2626

27-
file { "${::powerdns::params::authoritative_configdir}/named.conf":
27+
file { "${powerdns::params::authoritative_configdir}/named.conf":
2828
ensure => file,
2929
mode => '0644',
3030
owner => 'root',
3131
group => 'root',
32-
require => Package[$::powerdns::params::authoritative_package],
32+
require => Package[$powerdns::params::authoritative_package],
3333
}
3434

3535
file_line { 'powerdns-bind-baseconfig':
3636
ensure => present,
37-
path => "${::powerdns::params::authoritative_configdir}/named.conf",
38-
line => "options { directory \"${::powerdns::params::authoritative_configdir}/named\"; };",
37+
path => "${powerdns::params::authoritative_configdir}/named.conf",
38+
line => "options { directory \"${powerdns::params::authoritative_configdir}/named\"; };",
3939
match => 'options',
4040
notify => Service['pdns'],
41-
require => File["${::powerdns::params::authoritative_configdir}/named.conf"],
41+
require => File["${powerdns::params::authoritative_configdir}/named.conf"],
4242
}
4343

44-
file { "${::powerdns::params::authoritative_configdir}/named":
44+
file { "${powerdns::params::authoritative_configdir}/named":
4545
ensure => directory,
4646
mode => '0755',
4747
owner => 'root',
4848
group => 'root',
49-
require => Package[$::powerdns::params::authoritative_package],
49+
require => Package[$powerdns::params::authoritative_package],
5050
}
5151
}

‎manifests/backends/ldap.pp

+13-13
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# backend package which we do not want when using another backend such as ldap.
66
package { 'pdns-backend-bind':
77
ensure => purged,
8-
require => Package[$::powerdns::params::authoritative_package],
8+
require => Package[$powerdns::params::authoritative_package],
99
}
1010
}
1111

@@ -20,20 +20,20 @@
2020
powerdns::config { 'ldap-host':
2121
ensure => present,
2222
setting => 'ldap-host',
23-
value => $::powerdns::ldap_host,
23+
value => $powerdns::ldap_host,
2424
type => 'authoritative',
2525
}
2626

2727
powerdns::config { 'ldap-binddn':
2828
ensure => present,
2929
setting => 'ldap-binddn',
30-
value => $::powerdns::ldap_binddn,
30+
value => $powerdns::ldap_binddn,
3131
type => 'authoritative',
3232
}
3333

34-
$_ldap_secret = $::powerdns::ldap_secret =~ Sensitive ? {
35-
true => $::powerdns::ldap_secret.unwrap,
36-
false => $::powerdns::ldap_secret
34+
$_ldap_secret = $powerdns::ldap_secret =~ Sensitive ? {
35+
true => $powerdns::ldap_secret.unwrap,
36+
false => $powerdns::ldap_secret
3737
}
3838

3939
powerdns::config { 'ldap-secret':
@@ -46,31 +46,31 @@
4646
powerdns::config { 'ldap-basedn':
4747
ensure => present,
4848
setting => 'ldap-basedn',
49-
value => $::powerdns::ldap_basedn,
49+
value => $powerdns::ldap_basedn,
5050
type => 'authoritative',
5151
}
5252

5353
powerdns::config { 'ldap-method':
5454
ensure => present,
5555
setting => 'ldap-method',
56-
value => $::powerdns::ldap_method,
56+
value => $powerdns::ldap_method,
5757
type => 'authoritative',
5858
}
5959

60-
if $::powerdns::params::ldap_backend_package_name {
60+
if $powerdns::params::ldap_backend_package_name {
6161
# set up the powerdns backend
62-
package { $::powerdns::params::ldap_backend_package_name:
62+
package { $powerdns::params::ldap_backend_package_name:
6363
ensure => $package_ensure,
6464
before => Service['pdns'],
65-
require => Package[$::powerdns::params::authoritative_package],
65+
require => Package[$powerdns::params::authoritative_package],
6666
}
6767
}
6868

69-
if $::powerdns::backend_install {
69+
if $powerdns::backend_install {
7070
fail('backend_install is not supported with ldap')
7171
}
7272

73-
if $::powerdns::backend_create_tables {
73+
if $powerdns::backend_create_tables {
7474
fail('backend_create_tables is not supported with ldap')
7575
}
7676
}

‎manifests/backends/mysql.pp

+19-19
Original file line numberDiff line numberDiff line change
@@ -11,21 +11,21 @@
1111
powerdns::config { 'gmysql-host':
1212
ensure => present,
1313
setting => 'gmysql-host',
14-
value => $::powerdns::db_host,
14+
value => $powerdns::db_host,
1515
type => 'authoritative',
1616
}
1717

1818
powerdns::config { 'gmysql-port':
1919
ensure => present,
2020
setting => 'gmysql-port',
21-
value => $::powerdns::db_port,
21+
value => $powerdns::db_port,
2222
type => 'authoritative',
2323
}
2424

2525
powerdns::config { 'gmysql-user':
2626
ensure => present,
2727
setting => 'gmysql-user',
28-
value => $::powerdns::db_username,
28+
value => $powerdns::db_username,
2929
type => 'authoritative',
3030
}
3131

@@ -46,46 +46,46 @@
4646
powerdns::config { 'gmysql-dbname':
4747
ensure => present,
4848
setting => 'gmysql-dbname',
49-
value => $::powerdns::db_name,
49+
value => $powerdns::db_name,
5050
type => 'authoritative',
5151
}
5252

53-
if $::powerdns::params::mysql_backend_package_name {
53+
if $powerdns::params::mysql_backend_package_name {
5454
# set up the powerdns backend
55-
package { $::powerdns::params::mysql_backend_package_name:
55+
package { $powerdns::params::mysql_backend_package_name:
5656
ensure => $package_ensure,
5757
before => Service['pdns'],
58-
require => Package[$::powerdns::params::authoritative_package],
58+
require => Package[$powerdns::params::authoritative_package],
5959
}
6060
}
61-
if $::powerdns::backend_install {
61+
if $powerdns::backend_install {
6262
# mysql database
63-
if ! defined(Class['::mysql::server']) {
63+
if ! defined(Class['mysql::server']) {
6464
$_db_root_password = $powerdns::db_root_password =~ Sensitive ? {
6565
true => $powerdns::db_root_password.unwrap,
6666
false => $powerdns::db_root_password
6767
}
6868

69-
class { '::mysql::server':
69+
class { 'mysql::server':
7070
root_password => $_db_root_password,
7171
create_root_my_cnf => true,
7272
}
7373
}
7474

75-
if ! defined(Class['::mysql::server::account_security']) {
76-
class { '::mysql::server::account_security': }
75+
if ! defined(Class['mysql::server::account_security']) {
76+
class { 'mysql::server::account_security': }
7777
}
7878
}
7979

80-
if $::powerdns::backend_create_tables and $_db_password {
80+
if $powerdns::backend_create_tables and $_db_password {
8181
# make sure the database exists
82-
mysql::db { $::powerdns::db_name:
83-
user => $::powerdns::db_username,
82+
mysql::db { $powerdns::db_name:
83+
user => $powerdns::db_username,
8484
password => $_db_password,
85-
host => $::powerdns::db_host,
86-
grant => [ 'ALL' ],
87-
sql => [ $::powerdns::mysql_schema_file ],
88-
require => Package[$::powerdns::params::mysql_backend_package_name],
85+
host => $powerdns::db_host,
86+
grant => ['ALL'],
87+
sql => [$powerdns::mysql_schema_file],
88+
require => Package[$powerdns::params::mysql_backend_package_name],
8989
}
9090
}
9191
}

0 commit comments

Comments
 (0)