File tree 9 files changed +49
-17
lines changed
9 files changed +49
-17
lines changed Original file line number Diff line number Diff line change @@ -5,13 +5,13 @@ fixtures:
5
5
ref : " 3.0.1"
6
6
stdlib :
7
7
repo : " puppetlabs/stdlib"
8
- ref : " 5.2 .0"
8
+ ref : " 9.3 .0"
9
9
mysql :
10
10
repo : " puppetlabs/mysql"
11
- ref : " 10.9 .0"
11
+ ref : " 15.0 .0"
12
12
postgresql :
13
13
repo : " puppetlabs/postgresql"
14
- ref : " 6.4 .0"
14
+ ref : " 9.1 .0"
15
15
concat :
16
16
repo : " puppetlabs/concat"
17
17
ref : " 5.3.0"
@@ -26,5 +26,7 @@ fixtures:
26
26
repo : " puppetlabs/augeas_core"
27
27
puppet_version : " >= 6.0.0"
28
28
ref : " 1.0.4"
29
+ repositories :
30
+ systemd : ' https://github.com/voxpupuli/puppet-systemd'
29
31
symlinks :
30
32
powerdns : " #{source_dir}"
Original file line number Diff line number Diff line change @@ -375,6 +375,14 @@ We believe it also on other operating systems such as:
375
375
* Scientific Linux
376
376
* Arch Linux
377
377
378
+ The packages on EL are a bit stupid. The schemas have the exact PowerDNS version
379
+ hardcoded in the paths. The main class has three parameters where you can adjust
380
+ it:
381
+
382
+ * ` mysql_schema_file `
383
+ * ` pgsql_schema_file `
384
+ * ` sqlite_schema_file `
385
+
378
386
## Development
379
387
380
388
We strongly believe in the power of open source. This module is our way
Original file line number Diff line number Diff line change 8
8
ensure => $package_ensure ,
9
9
}
10
10
11
- ensure_packages($install_packages )
11
+ stdlib:: ensure_packages($install_packages )
12
12
13
13
# install the right backend
14
14
case $::powerdns::backend {
Original file line number Diff line number Diff line change 81
81
}
82
82
83
83
if $::powerdns::backend_create_tables {
84
+ $password_hash = $db_password ? {
85
+ Undef => undef ,
86
+ default => postgresql_password($::powerdns::db_username , $_db_password),
87
+ }
84
88
postgresql::server::db { $::powerdns::db_name :
85
89
user => $::powerdns::db_username ,
86
- password => postgresql_password( $::powerdns::db_username , $_db_password) ,
90
+ password => $password_hash ,
87
91
require => Package[$::powerdns::params::pgsql_backend_package_name ],
88
92
}
89
93
Original file line number Diff line number Diff line change 5
5
6
6
case $facts [' os' ][' family' ] {
7
7
' RedHat' : {
8
+ case $facts [' os' ][' release' ][' major' ] {
9
+ ' 7' : {
10
+ $mysql_schema_file = ' /usr/share/doc/pdns-backend-mysql-4.1.14/schema.mysql.sql'
11
+ $pgsql_schema_file = ' /usr/share/doc/pdns-backend-postgresql-4.1.14/schema.pgsql.sql'
12
+ $sqlite_schema_file = ' /usr/share/doc/pdns-backend-sqlite-4.1.14/schema.sqlite.sql'
13
+ }
14
+ default: {
15
+ $mysql_schema_file = ' /usr/share/doc/pdns-backend-mysql-4.8.1/schema.mysql.sql'
16
+ $pgsql_schema_file = ' /usr/share/doc/pdns-backend-postgresql-4.8.1/schema.pgsql.sql'
17
+ $sqlite_schema_file = ' /usr/share/doc/pdns-backend-sqlite-4.8.1/schema.sqlite.sql'
18
+ }
19
+ }
8
20
$authoritative_package = ' pdns'
9
21
$authoritative_service = ' pdns'
10
22
$authoritative_config = ' /etc/pdns/pdns.conf'
14
26
$ldap_backend_package_name = ' pdns-backend-ldap'
15
27
$pgsql_backend_package_name = ' pdns-backend-postgresql'
16
28
$sqlite_backend_package_name = ' pdns-backend-sqlite'
17
- $mysql_schema_file = ' /usr/share/doc/pdns-backend-mysql-4.*.*/schema.mysql.sql'
18
- $pgsql_schema_file = ' /usr/share/doc/pdns-backend-postgresql-4.*.*/schema.pgsql.sql'
19
- $sqlite_schema_file = ' /usr/share/doc/pdns-backend-sqlite-4.*.*/schema.sqlite.sql'
20
29
$sqlite_package_name = ' sqlite'
21
30
$authoritative_configdir = ' /etc/pdns'
22
31
$recursor_package = ' pdns-recursor'
Original file line number Diff line number Diff line change 15
15
Yumrepo[' powerdns-recursor' ] -> Package <| title == $::powerdns::params::recursor_package |>
16
16
17
17
if versioncmp($::operatingsystemmajrelease , ' 7' ) <= 0 {
18
- ensure_packages(' yum-plugin-priorities' )
18
+ stdlib:: ensure_packages(' yum-plugin-priorities' )
19
19
20
20
Package[' yum-plugin-priorities' ]
21
21
-> Yumrepo[' powerdns' ]
Original file line number Diff line number Diff line change 10
10
"dependencies" : [
11
11
{
12
12
"name" : " puppetlabs/stdlib" ,
13
- "version_requirement" : " >=4.3.2 < 9 .0.0"
13
+ "version_requirement" : " >= 9.0.0 < 10 .0.0"
14
14
},
15
15
{
16
16
"name" : " puppetlabs/mysql" ,
17
- "version_requirement" : " >=3.4 .0 < 15 .0.0"
17
+ "version_requirement" : " >= 15.0 .0 < 16 .0.0"
18
18
},
19
19
{
20
20
"name" : " puppetlabs/postgresql" ,
21
- "version_requirement" : " >=6.4 .0 < 10.0.0"
21
+ "version_requirement" : " >= 9.1 .0 < 10.0.0"
22
22
},
23
23
{
24
24
"name" : " puppetlabs/apt" ,
Original file line number Diff line number Diff line change
1
+ ---
2
+ ignore : []
Original file line number Diff line number Diff line change 1
1
override_facts = {
2
- root_home : '/root'
2
+ root_home : '/root' ,
3
+ service_provider : 'systemd'
3
4
}
4
5
5
6
require 'spec_helper'
11
12
facts . merge ( override_facts )
12
13
end
13
14
14
- case facts [ :osfamily ]
15
+ case facts [ :os ] [ 'family' ]
15
16
when 'RedHat'
16
17
authoritative_package_name = 'pdns'
17
18
authoritative_service_name = 'pdns'
18
19
authoritative_config = '/etc/pdns/pdns.conf'
19
- mysql_schema_file = '/usr/share/doc/pdns-backend-mysql-4.*.*/schema.mysql.sql'
20
+ if facts [ :os ] [ 'release' ] [ 'major' ] . to_i == 7
21
+ mysql_schema_file = '/usr/share/doc/pdns-backend-mysql-4.1.14/schema.mysql.sql'
22
+ pgsql_schema_file = '/usr/share/doc/pdns-backend-postgresql-4.1.14/schema.pgsql.sql'
23
+ sqlite_schema_file = '/usr/share/doc/pdns-backend-sqlite-4.1.14/schema.sqlite.sql'
24
+ else
25
+ mysql_schema_file = '/usr/share/doc/pdns-backend-mysql-4.8.1/schema.mysql.sql'
26
+ pgsql_schema_file = '/usr/share/doc/pdns-backend-postgresql-4.8.1/schema.pgsql.sql'
27
+ sqlite_schema_file = '/usr/share/doc/pdns-backend-sqlite-4.8.1/schema.sqlite.sql'
28
+ end
20
29
pgsql_backend_package_name = 'pdns-backend-postgresql'
21
- pgsql_schema_file = '/usr/share/doc/pdns-backend-postgresql-4.*.*/schema.pgsql.sql'
22
30
sqlite_backend_package_name = 'pdns-backend-sqlite'
23
31
sqlite_binary_package_name = 'sqlite'
24
- sqlite_schema_file = '/usr/share/doc/pdns-backend-sqlite-4.*.*/schema.sqlite.sql'
25
32
recursor_package_name = 'pdns-recursor'
26
33
recursor_service_name = 'pdns-recursor'
27
34
when 'Debian'
You can’t perform that action at this time.
0 commit comments