Commit graph

2 commits

Author SHA1 Message Date
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
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