Skip to content

Commit

Permalink
Merge pull request #21 from myii/fix/ensure-map-data-directly-under-v…
Browse files Browse the repository at this point in the history 
…alues

fix(_mapdata): ensure map data is directly under `values`
  • Loading branch information
@myii
myii authored Jan 14, 2021
2 parents b1110aa + bf57752 commit 3859034
Show file tree
Hide file tree
Showing 14 changed files with 428 additions and 443 deletions.
4 changes: 1 addition & 3 deletions powerdns/_mapdata/init.sls
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
{%- from tplroot ~ "/map.jinja" import powerdns with context %}
{%- set _mapdata = {
"values": {
"powerdns": powerdns,
}
"values": powerdns,
} %}
{%- do salt["log.debug"]("### MAP.JINJA DUMP ###\n" ~ _mapdata | yaml(False)) %}
Expand Down
71 changes: 35 additions & 36 deletions test/integration/default/files/_mapdata/amazonlinux-1.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,38 @@
# Amazon Linux AMI-2018
---
values:
powerdns:
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
71 changes: 35 additions & 36 deletions test/integration/default/files/_mapdata/amazonlinux-2.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,38 @@
# Amazon Linux-2
---
values:
powerdns:
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
33 changes: 16 additions & 17 deletions test/integration/default/files/_mapdata/arch-base-latest.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,19 @@
# Arch
---
values:
powerdns:
arch: amd64
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
launch: gsqlite3
webserver: 'yes'
webserver-port: 8081
group: pdns
repo:
keyid: FF389421CBC8B383
release: master
sqlite3_pkg: sqlite3
user: pdns
arch: amd64
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
launch: gsqlite3
webserver: 'yes'
webserver-port: 8081
group: pdns
repo:
keyid: FF389421CBC8B383
release: master
sqlite3_pkg: sqlite3
user: pdns
71 changes: 35 additions & 36 deletions test/integration/default/files/_mapdata/centos-7.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,38 @@
# CentOS Linux-7
---
values:
powerdns:
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
71 changes: 35 additions & 36 deletions test/integration/default/files/_mapdata/centos-8.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,38 @@
# CentOS Linux-8
---
values:
powerdns:
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
arch: amd64
backend_geoip_pkg: pdns-backend-geoip
backend_ldap_pkg: pdns-backend-ldap
backend_lua_pkg: pdns-backend-lua
backend_mydns_pkg: pdns-backend-mydns
backend_mysql_pkg: pdns-backend-mysql
backend_odbc_pkg: pdns-backend-odbc
backend_opendbx_pkg: pdns-backend-opendbx
backend_pgsql_pkg: pdns-backend-pgsql
backend_pipe_pkg: pdns-backend-pipe
backend_remote_pkg: pdns-backend-remote
backend_sqlite3_pkg: pdns-backend-sqlite
backend_sqlite3_pkg_sql: /usr/share/doc/packages/pdns/schema.sqlite3.sql
config:
allow-axfr-ips: 127.0.0.0/8,::1
api: 'yes'
api-key: d34db33f
daemon: 'no'
gsqlite3-database: /var/lib/powerdns/pdns.sqlite3
gsqlite3-dnssec: 'yes'
guardian: 'no'
launch: gsqlite3
setgid: pdns
setuid: pdns
webserver: 'yes'
webserver-port: 8081
config_file: /etc/pdns/pdns.conf
group: pdns
pkg: pdns
repo:
keyid: FF389421CBC8B383
release: master
service: pdns
sqlite3_pkg: sqlite
user: pdns
Loading

0 comments on commit 3859034

Please sign in to comment.