Commit graph

300 commits

Author SHA1 Message Date
Eric Veiras Galisson
120c2d1370 fix: corrected indentation on context in file.managed states 2019-04-11 14:57:51 +02:00
Imran Iqbal
02a066939b
Merge pull request #126 from alxwr/master
Fix bind/config.sls; use json()
2019-03-09 00:43:40 +00:00
Alexander Weidinger
7fbe60c949 Fix bind/config.sls; use json() 2019-03-08 16:01:34 +01:00
Niels Abspoel
e100bdab2b
Merge pull request #119 from alxwr/master
FreeBSD: support extensive logging
2018-11-30 21:50:10 +01:00
Alexander Weidinger
56dc5da024 FreeBSD: support extensive logging 2018-11-30 02:11:05 +01:00
Niels Abspoel
df046903ce
Merge pull request #118 from crux-capacitor/master
Add support for multiple views serving the same zone but different record sets.
2018-11-16 23:09:22 +01:00
evan.gramens
8eec38cecc Merge branch 'master' of https://github.com/crux-capacitor/bind-formula 2018-11-16 16:29:20 -05:00
crux-capacitor
7e47c7658f Squash commits
Update named.conf.local.jinja

Some reorganization of the format.

In the for-loop that handles configured_views:
  - Add if-block on lines 124-128 to allow specifying a file for your view, rather than defaulting to the name of the specified zone. This allows multiple views to serve the same zone, but use a different file.

Update pillar.example

Add documentation and an example on specifying the file to be used for a view, as well as documented that you should not define the top-level 'configured_zones' key when using views.

Small comment update.

Add comment about using ACLs and views.

Create pillar-with-views.example

An example of the bind pillar that defines multiple views for internal and external record sets.

This doesn't include the other portion of the pillar the defines the bind config - this is zones, views and ACLs only. The config portion is not affected by this.

Add more comment clarification.

Add comment explaining file name requirements.

The filename must match the corresponding zone name (without the .txt extension) because the config.sls jinja logic uses the filename to match to the zone when setting zone_records. It also is hardcoded to replace ".txt" with "" in order to make this match work, and so .txt extension is required for the logic to work.

Update config.sls

Add logic to detect a file specified in a view, and match it to a zone under available_zones to enable creating that zone file.

Revert back

Made a bad commit.

Update with the required logic.

Added an if-block to test for the file argument in the zone_data, and if found, use that view and update the zone variable to match the zone defined under available_zones.

Fix variable set.

Set zone based on file with the .txt extension removed.

Update README.rst

Add paragraph about using views.

Update pillar-with-views.example

Add some more comments for explanation.
2018-11-16 16:28:41 -05:00
crux-capacitor
bc48510abc
Update pillar-with-views.example
Add some more comments for explanation.
2018-11-16 11:09:02 -05:00
crux-capacitor
3151899e06
Update README.rst
Add paragraph about using views.
2018-11-16 11:04:01 -05:00
crux-capacitor
e6636fe915
Fix variable set.
Set zone based on file with the .txt extension removed.
2018-11-16 08:48:51 -05:00
crux-capacitor
342c0d7d08
Update with the required logic.
Added an if-block to test for the file argument in the zone_data, and if found, use that view and update the zone variable to match the zone defined under available_zones.
2018-11-15 16:07:19 -05:00
crux-capacitor
33c34d928d
Revert back
Made a bad commit.
2018-11-15 16:00:22 -05:00
crux-capacitor
f0bdf1da4e
Update config.sls
Add logic to detect a file specified in a view, and match it to a zone under available_zones to enable creating that zone file.
2018-11-15 15:52:58 -05:00
crux-capacitor
2e5730c82d
Add comment explaining file name requirements.
The filename must match the corresponding zone name (without the .txt extension) because the config.sls jinja logic uses the filename to match to the zone when setting zone_records. It also is hardcoded to replace ".txt" with "" in order to make this match work, and so .txt extension is required for the logic to work.
2018-11-15 13:43:46 -05:00
crux-capacitor
9b2f783612
Add more comment clarification. 2018-11-15 08:43:20 -05:00
crux-capacitor
d67e9f8660
Create pillar-with-views.example
An example of the bind pillar that defines multiple views for internal and external record sets.

This doesn't include the other portion of the pillar the defines the bind config - this is zones, views and ACLs only. The config portion is not affected by this.
2018-11-15 08:39:07 -05:00
crux-capacitor
d8eac23c5d
Add comment about using ACLs and views. 2018-11-14 11:30:13 -05:00
crux-capacitor
a2a363819c
Small comment update. 2018-11-14 11:21:30 -05:00
crux-capacitor
4b88c4d797
Update pillar.example
Add documentation and an example on specifying the file to be used for a view, as well as documented that you should not define the top-level 'configured_zones' key when using views.
2018-11-14 11:17:45 -05:00
crux-capacitor
d387599e77
Update named.conf.local.jinja
Some reorganization of the format.

In the for-loop that handles configured_views:
  - Add if-block on lines 124-128 to allow specifying a file for your view, rather than defaulting to the name of the specified zone. This allows multiple views to serve the same zone, but use a different file.
2018-11-14 11:11:07 -05:00
Javier Bértoli
522b369cab
Merge pull request #117 from tiefpunkt/patch-1
Update link to example in README.rst
2018-10-26 19:34:59 -03:00
Severin Schols
b4e5c0ce5c
Update link to example in README.rst
pillar.example seems to have been moved to the root of the repository. Tried to make it a link but that only seems to work in Markdown, not in RST 🤷‍♂️
2018-10-26 22:24:42 +02:00
Javier Bértoli
a96669c191
Merge pull request #113 from rbjorklin/readme-formatting
fix formatting for yaml blocks
2018-09-26 11:32:05 -03:00
Robin Björklin
652ec42129 change kitchen reporter from k/v to list 2018-09-26 16:23:26 +02:00
Robin Björklin
47fe92ac88 fix formatting for yaml blocks 2018-09-26 12:48:36 +02:00
Alexandre Anriot
ea2f1a2442
Merge pull request #112 from netmanagers/master
Parallelize travis tests
2018-09-10 14:09:04 +02:00
Javier Bértoli
13815d984a Parallelize travis tests 2018-09-10 08:58:42 -03:00
Javier Bértoli
038e6535d3
Merge pull request #111 from aanriot/master
db.root is now outdated
2018-09-10 08:57:07 -03:00
Alexandre Anriot
db0681ef4e db.root is now outdated 2018-09-10 09:10:14 +02:00
Javier Bértoli
703a5e33a7
Merge pull request #110 from bmwiedemann/sort
Two fixes
2018-09-04 18:11:53 -03:00
Bernhard M. Wiedemann
7f500766e0 Use dictsort instead of iteritems
to process entries in deterministic order
2018-09-04 21:10:24 +02:00
Bernhard M. Wiedemann
353a8dfc15 Sort hashes
To process hash entries in deterministic order.

Without this patch, config entries were different for every run
and required a service restart when nothing actually changed.

Doing it similar to
0fe2f7e66b
2018-08-31 15:03:48 +02:00
Bernhard M. Wiedemann
993b7d339d Fix named_directory usage
similar to e573baf26d
was broken by 019e1e4a58
2018-08-31 14:20:13 +02:00
Javier Bértoli
a7041da355
Merge pull request #108 from wanless-systems/master
Redhat/CentOS is broken by SELinux
2018-08-30 09:47:23 -03:00
Brian Sidebotham
1da26c7a2d Move Redhat family logging location to satisfy selinux requirements 2018-08-30 12:25:02 +01:00
Javier Bértoli
3a1e9907fe
Merge pull request #105 from ryanwalder/testing-improvements
Overhaul testing
2018-08-03 14:32:12 -03:00
Ryan Walder
05477570e2 Overhaul testing
* Test package install
* Test service
* Test configs
* Test zonefiles
2018-08-02 16:16:24 +01:00
Javier Bértoli
23dcc6a86a
Merge pull request #103 from joe-bowman/fix-debian-directory-bug
fix named_directory bug in Debian/Ubuntu by using the map value
2018-07-30 09:38:32 -03:00
Joe Bowman
2e585637e1
Merge pull request #4 from ryanwalder/fix-for-the-fix
Make `zones_directory` compatible with all distros
2018-07-27 13:50:25 +01:00
Ryan Walder
819126ed50 Make zones_directory compatible with all distros
As all but Debian based distros seem to put the zonefiles in
`named_directory` itself it's been removed from `map.jinja` for all but
debian.

Within `bind.config` we set `zones_directory` to `named_directory` if
not defined in `map.jinja`/pillar.

All zonefile actions then write using the `zones_directory` variable.
2018-07-27 13:30:14 +01:00
Joe Bowman
c0ce2eb97c
Merge pull request #3 from ryanwalder/fix-debian-directory-bug
Add `zones_directory` variable to map
2018-07-26 23:44:57 +01:00
Ryan Walder
2e8643fef4 Change zonefile include to use absolute path 2018-07-26 13:00:51 +01:00
Ryan Walder
ccbcd2a31c Add zones_directory variable to map
This allows the `named_directory` to be the base bind directory as it should so it can be used as a base variable for other directories. Then use the `zones_directory` for placing the zone files in.
2018-07-26 13:00:51 +01:00
Joe Bowman
d51c30c896 replace hardcoded /var/named with variable from map.jinja throughout redhat/named.conf 2018-07-25 16:58:47 +01:00
Joe Bowman
22b206456a add Gem lockfile to .gitignore 2018-07-25 16:51:53 +01:00
Joe Bowman
e573baf26d fix incorrect variable reference causing all RedHat os_family tests to fail 2018-07-13 11:43:11 +01:00
Joe Bowman
019e1e4a58 fix named_directory bug in Debian/Ubuntu by using the map value instead of hardcoding 2018-07-13 11:40:50 +01:00
Javier Bértoli
72030c9009
Merge pull request #101 from joe-bowman/fix-dnssec-pillar-duplicate
remove superfluous signed-<zone> block
2018-07-12 18:06:39 -03:00
Joe Bowman
a8b703f877 remove superfluous signed-<zone> block, as the per-view block negates the need for this (as default view is still treated as a view); fixes #100 2018-07-09 14:24:15 +01:00