Commit graph

431 commits

Author SHA1 Message Date
Éric Veiras Galisson
c7d5555a21
Merge pull request #139 from myii/chore/standardise-structure
ci(yamllint): add rule `empty-values` & use new `yaml-files` setting
2019-09-11 08:28:44 +02:00
Imran Iqbal
9163726873
ci(yamllint): add rule empty-values & use new yaml-files setting
* Semi-automated using https://github.com/myii/ssf-formula/pull/27
* Fix errors shown below:

```bash
bind-formula$ yamllint -s .
./pillar-with-views.example
  1:1       warning  missing document start "---"  (document-start)
  2:89      error    line too long (93 > 88 characters)  (line-length)
  4:89      error    line too long (98 > 88 characters)  (line-length)
  5:51      warning  comment not indented like content  (comments-indentation)
  5:89      error    line too long (90 > 88 characters)  (line-length)
  6:1       error    trailing spaces  (trailing-spaces)
  8:89      error    line too long (104 > 88 characters)  (line-length)
  10:89     error    line too long (104 > 88 characters)  (line-length)
  11:89     error    line too long (114 > 88 characters)  (line-length)
  12:89     error    line too long (116 > 88 characters)  (line-length)
  14:1      error    trailing spaces  (trailing-spaces)
  16:89     error    line too long (121 > 88 characters)  (line-length)
  18:89     error    line too long (108 > 88 characters)  (line-length)
  20:89     error    line too long (97 > 88 characters)  (line-length)
  22:89     error    line too long (106 > 88 characters)  (line-length)
  23:22     warning  truthy value should be one of [false, true]  (truthy)
  23:89     error    line too long (97 > 88 characters)  (line-length)
  24:51     warning  comment not indented like content  (comments-indentation)
  24:89     error    line too long (110 > 88 characters)  (line-length)
  24:110    error    trailing spaces  (trailing-spaces)
  25:89     error    line too long (122 > 88 characters)  (line-length)
  26:19     warning  truthy value should be one of [false, true]  (truthy)
  27:19     warning  truthy value should be one of [false, true]  (truthy)
  29:89     error    line too long (113 > 88 characters)  (line-length)
  31:89     error    line too long (98 > 88 characters)  (line-length)
  33:89     error    line too long (104 > 88 characters)  (line-length)
  35:89     error    line too long (101 > 88 characters)  (line-length)
  36:51     warning  comment not indented like content  (comments-indentation)
  36:89     error    line too long (112 > 88 characters)  (line-length)
  36:112    error    trailing spaces  (trailing-spaces)
  37:89     error    line too long (122 > 88 characters)  (line-length)
  38:22     warning  truthy value should be one of [false, true]  (truthy)
  39:19     warning  truthy value should be one of [false, true]  (truthy)
  40:19     warning  truthy value should be one of [false, true]  (truthy)
  43:89     error    line too long (96 > 88 characters)  (line-length)
  44:89     error    line too long (119 > 88 characters)  (line-length)
  45:51     warning  comment not indented like content  (comments-indentation)
  46:1      error    trailing spaces  (trailing-spaces)
  50:89     error    line too long (99 > 88 characters)  (line-length)
  57:89     error    line too long (89 > 88 characters)  (line-length)
  70:1      error    trailing spaces  (trailing-spaces)
  71:89     error    line too long (96 > 88 characters)  (line-length)
  72:89     error    line too long (119 > 88 characters)  (line-length)
  73:51     warning  comment not indented like content  (comments-indentation)
  74:1      error    trailing spaces  (trailing-spaces)
  78:89     error    line too long (99 > 88 characters)  (line-length)
  85:89     error    line too long (89 > 88 characters)  (line-length)
  87:89     error    line too long (110 > 88 characters)  (line-length)
```
2019-09-10 23:59:23 +01:00
Niels Abspoel
d498d1985e
Merge pull request #138 from myii/chore/standardise-structure
ci: use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround
2019-09-08 21:46:54 +02:00
Imran Iqbal
90abafaa90
ci: use dist: bionic & apply opensuse-leap-15 SCP error workaround
* Automated using https://github.com/myii/ssf-formula/pull/22
2019-09-07 03:19:02 +01:00
semantic-release-bot
44e1521280 chore(release): 0.18.2 [skip ci]
## [0.18.2](https://github.com/saltstack-formulas/bind-formula/compare/v0.18.1...v0.18.2) (2019-09-05)

### Continuous Integration

* **kitchen+travis:** replace EOL pre-salted images ([3a4d4e8](https://github.com/saltstack-formulas/bind-formula/commit/3a4d4e8))

### Tests

* **inspec:** improve to work on `amazon` as well ([59684c6](https://github.com/saltstack-formulas/bind-formula/commit/59684c6))
2019-09-05 20:42:56 +00:00
Imran Iqbal
aaaa7904b2
Merge pull request #137 from myii/chore/standardise-structure
ci(kitchen+travis): replace EOL pre-salted images
2019-09-05 21:20:54 +01:00
Imran Iqbal
3a4d4e8d04 ci(kitchen+travis): replace EOL pre-salted images
* Automated using https://github.com/myii/ssf-formula/pull/16
2019-08-28 07:15:08 +01:00
Imran Iqbal
59684c6f8a test(inspec): improve to work on amazon as well 2019-08-28 07:14:51 +01:00
semantic-release-bot
1b0d03243b chore(release): 0.18.1 [skip ci]
## [0.18.1](https://github.com/saltstack-formulas/bind-formula/compare/v0.18.0...v0.18.1) (2019-08-18)

### Bug Fixes

* **tests:** move to controls sub-directory ([74bbc5b](https://github.com/saltstack-formulas/bind-formula/commit/74bbc5b))

### Continuous Integration

* **travis:** re-enable `fedora` ([4a6ac4e](https://github.com/saltstack-formulas/bind-formula/commit/4a6ac4e))
2019-08-18 23:10:49 +00:00
Imran Iqbal
c00b054ff1
Merge pull request #136 from myii/bug/fix-tests-not-running
fix(tests): move to controls sub-directory
2019-08-19 00:00:45 +01:00
Imran Iqbal
4a6ac4ebe1
ci(travis): re-enable fedora
* Automated using `ssf-formula` (v0.7.0)
2019-08-18 23:51:20 +01:00
Imran Iqbal
74bbc5b8de
fix(tests): move to controls sub-directory 2019-08-18 23:51:11 +01:00
semantic-release-bot
879ad8e3a8 chore(release): 0.18.0 [skip ci]
# [0.18.0](https://github.com/saltstack-formulas/bind-formula/compare/v0.17.0...v0.18.0) (2019-08-17)

### Continuous Integration

* **kitchen+travis:** modify matrix to include `develop` platform ([641e641](https://github.com/saltstack-formulas/bind-formula/commit/641e641)), closes [#129](https://github.com/saltstack-formulas/bind-formula/issues/129)

### Features

* **yamllint:** include for this repo and apply rules throughout ([a81c9ff](https://github.com/saltstack-formulas/bind-formula/commit/a81c9ff))
2019-08-17 08:42:54 +00:00
Niels Abspoel
d23c01f737
Merge pull request #135 from myii/chore/standardise-structure
feat(yamllint): include for this repo and apply rules throughout
2019-08-17 09:50:03 +02:00
Imran Iqbal
a81c9ffd3a
feat(yamllint): include for this repo and apply rules throughout
* Semi-automated using `ssf-formula` (v0.5.0)
* Fix (or ignore) errors shown below:

```bash
bind-formula$ $(grep "\- yamllint" .travis.yml | sed -e "s:^\s\+-\s\(.*\):\1:")
pillar.example
  1:1       warning  comment not indented like content  (comments-indentation)
  1:89      error    line too long (95 > 88 characters)  (line-length)
  2:1       warning  missing document start "---"  (document-start)
  2:10      error    wrong indentation: expected 0 but found 9  (indentation)
  2:89      error    line too long (103 > 88 characters)  (line-length)
  8:1       error    syntax error: expected '<document start>', but found '<block mapping start>'
  14:89     error    line too long (94 > 88 characters)  (line-length)
  15:51     warning  comment not indented like content  (comments-indentation)
  19:1      error    duplication of key "bind" in mapping  (key-duplicates)
  21:89     error    line too long (93 > 88 characters)  (line-length)
  23:89     error    line too long (102 > 88 characters)  (line-length)
  27:89     error    line too long (96 > 88 characters)  (line-length)
  32:89     error    line too long (143 > 88 characters)  (line-length)
  33:89     error    line too long (134 > 88 characters)  (line-length)
  35:24     error    trailing spaces  (trailing-spaces)
  36:89     error    line too long (91 > 88 characters)  (line-length)
  37:89     error    line too long (93 > 88 characters)  (line-length)
  38:23     warning  truthy value should be one of [false, true]  (truthy)
  39:27     warning  truthy value should be one of [false, true]  (truthy)
  40:27     warning  truthy value should be one of [false, true]  (truthy)
  44:23     warning  truthy value should be one of [false, true]  (truthy)
  45:27     warning  truthy value should be one of [false, true]  (truthy)
  46:27     warning  truthy value should be one of [false, true]  (truthy)
  50:23     warning  truthy value should be one of [false, true]  (truthy)
  51:27     warning  truthy value should be one of [false, true]  (truthy)
  52:27     warning  truthy value should be one of [false, true]  (truthy)
  55:23     warning  truthy value should be one of [false, true]  (truthy)
  56:27     warning  truthy value should be one of [false, true]  (truthy)
  57:27     warning  truthy value should be one of [false, true]  (truthy)
  62:23     warning  truthy value should be one of [false, true]  (truthy)
  63:27     warning  truthy value should be one of [false, true]  (truthy)
  64:27     warning  truthy value should be one of [false, true]  (truthy)
  89:89     error    line too long (91 > 88 characters)  (line-length)
  90:1      warning  comment not indented like content  (comments-indentation)
  97:1      warning  comment not indented like content  (comments-indentation)
  98:89     error    line too long (92 > 88 characters)  (line-length)
  99:51     warning  comment not indented like content  (comments-indentation)
  99:89     error    line too long (96 > 88 characters)  (line-length)
  102:1     warning  comment not indented like content  (comments-indentation)
  102:35    error    trailing spaces  (trailing-spaces)
  103:20    warning  truthy value should be one of [false, true]  (truthy)
  103:89    error    line too long (99 > 88 characters)  (line-length)
  104:51    warning  comment not indented like content  (comments-indentation)
  106:89    error    line too long (99 > 88 characters)  (line-length)
  109:40    error    trailing spaces  (trailing-spaces)
  110:1     error    duplication of key "bind" in mapping  (key-duplicates)
  113:89    error    line too long (115 > 88 characters)  (line-length)
  115:89    error    line too long (110 > 88 characters)  (line-length)
  116:13    error    trailing spaces  (trailing-spaces)
  129:89    error    line too long (120 > 88 characters)  (line-length)
  130:11    error    trailing spaces  (trailing-spaces)
  150:81    error    trailing spaces  (trailing-spaces)
  167:89    error    line too long (118 > 88 characters)  (line-length)
  168:89    error    line too long (101 > 88 characters)  (line-length)
  169:89    error    line too long (103 > 88 characters)  (line-length)
  169:103   error    trailing spaces  (trailing-spaces)
  170:89    error    line too long (107 > 88 characters)  (line-length)
  170:107   error    trailing spaces  (trailing-spaces)
  171:54    warning  comment not indented like content  (comments-indentation)
  171:89    error    line too long (120 > 88 characters)  (line-length)
  172:15    warning  truthy value should be one of [false, true]  (truthy)
  172:89    error    line too long (104 > 88 characters)  (line-length)
  174:21    error    trailing spaces  (trailing-spaces)
  177:15    warning  truthy value should be one of [false, true]  (truthy)
  178:19    error    trailing spaces  (trailing-spaces)
  180:22    error    trailing spaces  (trailing-spaces)
  186:24    warning  truthy value should be one of [false, true]  (truthy)
  186:89    error    line too long (124 > 88 characters)  (line-length)
  191:15    warning  truthy value should be one of [false, true]  (truthy)
  193:89    error    line too long (93 > 88 characters)  (line-length)
  193:93    error    trailing spaces  (trailing-spaces)
  195:89    error    line too long (101 > 88 characters)  (line-length)
  196:89    error    line too long (104 > 88 characters)  (line-length)
  196:104   error    trailing spaces  (trailing-spaces)
  197:15    warning  truthy value should be one of [false, true]  (truthy)
  200:76    error    trailing spaces  (trailing-spaces)
  206:89    error    line too long (94 > 88 characters)  (line-length)
  208:89    error    line too long (94 > 88 characters)  (line-length)
  209:89    error    line too long (98 > 88 characters)  (line-length)
  213:36    error    trailing spaces  (trailing-spaces)
  216:1     error    duplication of key "bind" in mapping  (key-duplicates)
  218:25    warning  truthy value should be one of [false, true]  (truthy)
  221:1     error    too many blank lines (3 > 2)  (empty-lines)
  223:1     error    duplication of key "bind" in mapping  (key-duplicates)
  231:15    warning  truthy value should be one of [false, true]  (truthy)
  231:89    error    line too long (98 > 88 characters)  (line-length)
  232:89    error    line too long (94 > 88 characters)  (line-length)
  234:89    error    line too long (98 > 88 characters)  (line-length)
  235:51    warning  comment not indented like content  (comments-indentation)
  235:89    error    line too long (107 > 88 characters)  (line-length)
  240:15    warning  truthy value should be one of [false, true]  (truthy)
  240:89    error    line too long (98 > 88 characters)  (line-length)
  241:15    warning  truthy value should be one of [false, true]  (truthy)
  241:89    error    line too long (101 > 88 characters)  (line-length)
  242:51    warning  comment not indented like content  (comments-indentation)
  242:89    error    line too long (97 > 88 characters)  (line-length)
  247:15    warning  truthy value should be one of [false, true]  (truthy)
  247:89    error    line too long (98 > 88 characters)  (line-length)
  248:89    error    line too long (99 > 88 characters)  (line-length)
  249:51    warning  comment not indented like content  (comments-indentation)
  249:89    error    line too long (98 > 88 characters)  (line-length)
  253:15    warning  truthy value should be one of [false, true]  (truthy)
  260:89    error    line too long (99 > 88 characters)  (line-length)
  261:15    warning  truthy value should be one of [false, true]  (truthy)
  271:89    error    line too long (96 > 88 characters)  (line-length)
  284:89    error    line too long (109 > 88 characters)  (line-length)
  285:51    warning  comment not indented like content  (comments-indentation)
  285:89    error    line too long (128 > 88 characters)  (line-length)
  286:89    error    line too long (114 > 88 characters)  (line-length)
  287:89    error    line too long (127 > 88 characters)  (line-length)
  289:89    error    line too long (122 > 88 characters)  (line-length)
  290:89    error    line too long (89 > 88 characters)  (line-length)
  291:89    error    line too long (120 > 88 characters)  (line-length)
  292:89    error    line too long (93 > 88 characters)  (line-length)
  293:19    warning  truthy value should be one of [false, true]  (truthy)
  293:24    error    trailing spaces  (trailing-spaces)
  300:89    error    line too long (119 > 88 characters)  (line-length)
  301:51    warning  comment not indented like content  (comments-indentation)
  301:89    error    line too long (122 > 88 characters)  (line-length)
  302:89    error    line too long (93 > 88 characters)  (line-length)
  305:1     error    duplication of key "bind" in mapping  (key-duplicates)
  313:1     warning  comment not indented like content  (comments-indentation)
  313:89    error    line too long (99 > 88 characters)  (line-length)
  320:89    error    line too long (89 > 88 characters)  (line-length)
  337:89    error    line too long (95 > 88 characters)  (line-length)
  341:89    error    line too long (120 > 88 characters)  (line-length)
  345:1     error    too many blank lines (4 > 2)  (empty-lines)
  358:89    error    line too long (89 > 88 characters)  (line-length)
  362:89    error    line too long (117 > 88 characters)  (line-length)
  363:89    error    line too long (89 > 88 characters)  (line-length)
  365:89    error    line too long (102 > 88 characters)  (line-length)
  371:1     error    duplication of key "bind" in mapping  (key-duplicates)

test/salt/pillar/default.sls
  1:1       warning  missing document start "---"  (document-start)
  11:15     warning  truthy value should be one of [false, true]  (truthy)
  16:15     warning  truthy value should be one of [false, true]  (truthy)
  19:15     warning  truthy value should be one of [false, true]  (truthy)
  28:15     warning  truthy value should be one of [false, true]  (truthy)
  114:1     error    too many blank lines (1 > 0)  (empty-lines)
```
2019-08-07 18:34:18 +01:00
Imran Iqbal
d5d11a48b6
Merge pull request #134 from myii/chore/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-07-30 09:07:49 +01:00
Imran Iqbal
23d8218fb2 chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.1.0-rc.3)
2019-07-30 09:04:52 +01:00
Éric Veiras Galisson
a705d31da1
Merge pull request #133 from myii/ci/standardise-structure
chore: use `semantic-release` cross-formula standard structure
2019-07-22 14:07:18 +02:00
Imran Iqbal
89b54c6ee8 chore: use semantic-release cross-formula standard structure
* Automated using `ssf-formula` (v0.1.0-rc.1)
2019-07-18 23:11:20 +01:00
Imran Iqbal
e6656f823b
Merge pull request #132 from myii/ci/use-develop-image-in-matrix
ci(kitchen+travis): modify matrix to include `develop` platform
2019-06-28 06:00:46 +01:00
Imran Iqbal
641e641dcf
ci(kitchen+travis): modify matrix to include develop platform
* Use balanced matrix based on `template-formula` guidelines
* Initial ref: https://github.com/saltstack-formulas/template-formula/issues/118
* Fedora still disabled (ref: #129)
* Remove temporary `train` Gem
2019-06-28 05:53:19 +01:00
semantic-release-bot
18e98c4836 chore(release): 0.17.0 [skip ci]
# [0.17.0](https://github.com/saltstack-formulas/bind-formula/compare/v0.16.0...v0.17.0) (2019-05-24)

### Continuous Integration

* reduce platforms tested ([374b777](https://github.com/saltstack-formulas/bind-formula/commit/374b777))

### Features

* implement an automated changelog ([61bb936](https://github.com/saltstack-formulas/bind-formula/commit/61bb936))

### Tests

* **inspec:** fix suse/opensuse tests ([64872f6](https://github.com/saltstack-formulas/bind-formula/commit/64872f6))
2019-05-24 20:00:19 +00:00
Imran Iqbal
70e9ed0eb7
Merge pull request #129 from daks/semantic-release
feat: implement an automated changelog
2019-05-23 13:48:45 +01:00
Eric Veiras Galisson
374b777572 ci: reduce platforms tested 2019-05-23 13:14:50 +02:00
Eric Veiras Galisson
64872f6ff6 test(inspec): fix suse/opensuse tests 2019-05-23 13:00:29 +02:00
Eric Veiras Galisson
61bb936721 feat: implement an automated changelog 2019-05-20 11:09:27 +02:00
Imran Iqbal
580f9ba5d7
Merge pull request #131 from saltstack-formulas/myii-patch-1
chore(`Gemfile`): update from `template-formula`
2019-05-19 20:07:15 +01:00
Imran Iqbal
bcd2c8bdc1
chore(Gemfile): update from template-formula 2019-05-19 20:06:53 +01:00
Imran Iqbal
6b3b6c65ad
Merge pull request #130 from saltstack-formulas/myii-patch-1
chore(`.gitignore`): update from `template-formula`
2019-05-19 20:05:01 +01:00
Imran Iqbal
429207f7ca
chore(.gitignore): update from template-formula 2019-05-19 20:04:42 +01:00
Javier Bértoli
d7e5d82ab9
Merge pull request #127 from daks/context-fix
fix: corrected indentation on context in file.managed states
2019-04-11 10:41:39 -03:00
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