mirror of
https://github.com/saltstack-formulas/bind-formula.git
synced 2025-04-16 01:30:22 +00:00
chore(issues): remove issues templates to use org-level templates [skip ci]
* Automated using https://github.com/myii/ssf-formula/pull/61
This commit is contained in:
Imran Iqbal
commit
792b5ab0de
15 changed files with 167 additions and 186 deletions
68
.github/ISSUE_TEMPLATE/bug_report.md
vendored
68
.github/ISSUE_TEMPLATE/bug_report.md
vendored
|
|
@ -1,68 +0,0 @@
|
|||
---
|
||||
name: Bug report
|
||||
about: Create a report to help us improve
|
||||
title: '[BUG] '
|
||||
labels: 'bug'
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
<!--
|
||||
Notes:
|
||||
1. Only post _bug reports_ here.
|
||||
2. Use the appropriate template for _feature requests_.
|
||||
3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
|
||||
-->
|
||||
|
||||
## Your setup
|
||||
### Formula commit hash / release tag
|
||||
<!-- Please specify the formula's commit hash and/or release tag that you are using. -->
|
||||
|
||||
|
||||
|
||||
### Versions reports (master & minion)
|
||||
<!-- Provided by running `salt --versions-report`. Please also mention any differences in master/minion versions. -->
|
||||
|
||||
|
||||
|
||||
### Pillar / config used
|
||||
<!-- Provide links to the SLS files and/or relevant configs (be sure to remove sensitive info). -->
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Bug details
|
||||
### Describe the bug
|
||||
<!-- A clear and concise description of what the bug is. -->
|
||||
|
||||
|
||||
|
||||
### Steps to reproduce the bug
|
||||
<!-- Include debug logs if possible and relevant, e.g. using `salt-minion -l debug`. -->
|
||||
<!-- Alternatively, linking to Kitchen debug logs is useful, e.g. via. Travis CI. -->
|
||||
<!-- Most useful is providing a failing InSpec test, which can be used to verify any proposed fix. -->
|
||||
|
||||
|
||||
|
||||
### Expected behaviour
|
||||
<!-- A clear and concise description of what you expected to happen. -->
|
||||
|
||||
|
||||
|
||||
### Attempts to fix the bug
|
||||
<!-- Please mention any attempts you have made to fix the bug and what the results were. -->
|
||||
|
||||
|
||||
|
||||
### Additional context
|
||||
<!-- Add any other context about the problem here. -->
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
### Meta: How can this template be improved?
|
||||
<!-- Feel free to suggest how this template can be improved. -->
|
||||
|
||||
|
||||
42
.github/ISSUE_TEMPLATE/feature_request.md
vendored
42
.github/ISSUE_TEMPLATE/feature_request.md
vendored
|
|
@ -1,42 +0,0 @@
|
|||
---
|
||||
name: Feature request
|
||||
about: Suggest an idea for this project
|
||||
title: '[FEATURE] '
|
||||
labels: 'enhancement'
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
<!--
|
||||
Notes:
|
||||
1. Only post _feature requests_ here.
|
||||
2. Use the appropriate template for _bug reports_.
|
||||
3. Please direct questions to the [`#formulas` channel on Slack](https://saltstackcommunity.slack.com/messages/C7LG8SV54/), which is bridged to `#saltstack-formulas` on Freenode.
|
||||
-->
|
||||
|
||||
### Is your feature request related to a problem?
|
||||
<!-- A clear and concise description of what the problem is. -->
|
||||
|
||||
|
||||
|
||||
### Describe the solution you'd like
|
||||
<!-- A clear and concise description of what you want to happen. -->
|
||||
|
||||
|
||||
|
||||
### Describe alternatives you've considered
|
||||
<!-- Describe any alternative solutions or features you've considered. -->
|
||||
|
||||
|
||||
|
||||
### Additional context
|
||||
<!-- Add any other context about the feature request here. -->
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
### Meta: How can this template be improved?
|
||||
<!-- Feel free to suggest how this template can be improved. -->
|
||||
|
||||
|
||||
10
.rubocop.yml
Normal file
10
.rubocop.yml
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
# General overrides used across formulas in the org
|
||||
Metrics/LineLength:
|
||||
# Increase from default of `80`
|
||||
# Based on https://github.com/PyCQA/flake8-bugbear#opinionated-warnings (`B950`)
|
||||
Max: 88
|
||||
|
||||
# Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
|
||||
13
.salt-lint
Normal file
13
.salt-lint
Normal file
|
|
@ -0,0 +1,13 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
exclude_paths: []
|
||||
skip_list:
|
||||
# Using `salt-lint` for linting other files as well, such as Jinja macros/templates
|
||||
- 205 # Use ".sls" as a Salt State file extension
|
||||
# Skipping `207` and `208` because `210` is sufficient, at least for the time-being
|
||||
# I.e. Allows 3-digit unquoted codes to still be used, such as `644` and `755`
|
||||
- 207 # File modes should always be encapsulated in quotation marks
|
||||
- 208 # File modes should always contain a leading zero
|
||||
tags: []
|
||||
verbosity: 1
|
||||
117
.travis.yml
117
.travis.yml
|
|
@ -1,64 +1,43 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
## Machine config
|
||||
dist: bionic
|
||||
stages:
|
||||
- test
|
||||
- lint
|
||||
- name: release
|
||||
if: branch = master AND type != pull_request
|
||||
|
||||
sudo: required
|
||||
cache: bundler
|
||||
language: ruby
|
||||
|
||||
services:
|
||||
- docker
|
||||
|
||||
# Make sure the instances listed below match up with
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
env:
|
||||
matrix:
|
||||
- INSTANCE: default-debian-10-develop-py3
|
||||
# - INSTANCE: default-ubuntu-1804-develop-py3
|
||||
# - INSTANCE: default-centos-7-develop-py3
|
||||
# - INSTANCE: default-fedora-30-develop-py3
|
||||
# - INSTANCE: default-opensuse-leap-15-develop-py3
|
||||
# - INSTANCE: default-amazonlinux-2-develop-py2
|
||||
# - INSTANCE: default-arch-base-latest-develop-py2
|
||||
# - INSTANCE: default-debian-9-2019-2-py3
|
||||
- INSTANCE: default-ubuntu-1804-2019-2-py3
|
||||
# - INSTANCE: default-centos-7-2019-2-py3
|
||||
# - INSTANCE: default-fedora-30-2019-2-py3
|
||||
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
|
||||
- INSTANCE: default-amazonlinux-2-2019-2-py2
|
||||
# - INSTANCE: default-arch-base-latest-2019-2-py2
|
||||
# - INSTANCE: default-debian-9-2018-3-py2
|
||||
# - INSTANCE: default-ubuntu-1604-2018-3-py2
|
||||
# - INSTANCE: default-centos-7-2018-3-py2
|
||||
- INSTANCE: default-fedora-29-2018-3-py2
|
||||
- INSTANCE: default-opensuse-leap-15-2018-3-py2
|
||||
# - INSTANCE: default-amazonlinux-2-2018-3-py2
|
||||
# - INSTANCE: default-arch-base-latest-2018-3-py2
|
||||
# - INSTANCE: default-debian-8-2017-7-py2
|
||||
# - INSTANCE: default-ubuntu-1604-2017-7-py2
|
||||
- INSTANCE: default-centos-6-2017-7-py2
|
||||
# - INSTANCE: default-fedora-29-2017-7-py2
|
||||
# - INSTANCE: default-opensuse-leap-15-2017-7-py2
|
||||
# - INSTANCE: default-amazonlinux-2-2017-7-py2
|
||||
# - INSTANCE: default-arch-base-latest-2017-7-py2
|
||||
## Language and cache config
|
||||
language: ruby
|
||||
cache: bundler
|
||||
|
||||
## Script to run for the test stage
|
||||
script:
|
||||
- bin/kitchen verify ${INSTANCE}
|
||||
- bin/kitchen verify "${INSTANCE}"
|
||||
|
||||
## Stages and jobs matrix
|
||||
stages:
|
||||
- test
|
||||
- name: release
|
||||
if: branch = master AND type != pull_request
|
||||
jobs:
|
||||
allow_failures:
|
||||
- env: Lint_rubocop
|
||||
fast_finish: true
|
||||
include:
|
||||
# Define the `lint` stage (runs `yamllint` and `commitlint`)
|
||||
- stage: lint
|
||||
language: node_js
|
||||
## Define the test stage that runs the linters (and testing matrix, if applicable)
|
||||
|
||||
# Run all of the linters in a single job (except `rubocop`)
|
||||
- language: node_js
|
||||
node_js: lts/*
|
||||
env: Lint
|
||||
name: 'Lint: salt-lint, yamllint & commitlint'
|
||||
before_install: skip
|
||||
script:
|
||||
# Install and run `salt-lint`
|
||||
- pip install --user salt-lint
|
||||
- git ls-files | grep '\.sls$\|\.jinja$\|\.j2$\|\.tmpl$'
|
||||
| xargs -I {} salt-lint {}
|
||||
# Install and run `yamllint`
|
||||
# Need at least `v1.17.0` for the `yaml-files` setting
|
||||
- pip install --user yamllint>=1.17.0
|
||||
|
|
@ -67,10 +46,56 @@ jobs:
|
|||
- npm install @commitlint/config-conventional -D
|
||||
- npm install @commitlint/travis-cli -D
|
||||
- commitlint-travis
|
||||
# Define the release stage that runs `semantic-release`
|
||||
# Run the `rubocop` linter in a separate job that is allowed to fail
|
||||
# Once these lint errors are fixed, this can be merged into a single job
|
||||
- language: node_js
|
||||
node_js: lts/*
|
||||
env: Lint_rubocop
|
||||
name: 'Lint: rubocop'
|
||||
before_install: skip
|
||||
script:
|
||||
# Install and run `rubocop`
|
||||
- gem install rubocop
|
||||
- rubocop -d
|
||||
|
||||
## Define the rest of the matrix based on Kitchen testing
|
||||
# Make sure the instances listed below match up with
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
- env: INSTANCE=default-debian-10-develop-py3
|
||||
# - env: INSTANCE=default-ubuntu-1804-develop-py3
|
||||
# - env: INSTANCE=default-centos-7-develop-py3
|
||||
# - env: INSTANCE=default-fedora-30-develop-py3
|
||||
# - env: INSTANCE=default-opensuse-leap-15-develop-py3
|
||||
# - env: INSTANCE=default-amazonlinux-2-develop-py2
|
||||
# - env: INSTANCE=default-arch-base-latest-develop-py2
|
||||
# - env: INSTANCE=default-debian-9-2019-2-py3
|
||||
- env: INSTANCE=default-ubuntu-1804-2019-2-py3
|
||||
# - env: INSTANCE=default-centos-7-2019-2-py3
|
||||
# - env: INSTANCE=default-fedora-30-2019-2-py3
|
||||
# - env: INSTANCE=default-opensuse-leap-15-2019-2-py3
|
||||
- env: INSTANCE=default-amazonlinux-2-2019-2-py2
|
||||
# - env: INSTANCE=default-arch-base-latest-2019-2-py2
|
||||
# - env: INSTANCE=default-debian-9-2018-3-py2
|
||||
# - env: INSTANCE=default-ubuntu-1604-2018-3-py2
|
||||
# - env: INSTANCE=default-centos-7-2018-3-py2
|
||||
- env: INSTANCE=default-fedora-29-2018-3-py2
|
||||
- env: INSTANCE=default-opensuse-leap-15-2018-3-py2
|
||||
# - env: INSTANCE=default-amazonlinux-2-2018-3-py2
|
||||
# - env: INSTANCE=default-arch-base-latest-2018-3-py2
|
||||
# - env: INSTANCE=default-debian-8-2017-7-py2
|
||||
# - env: INSTANCE=default-ubuntu-1604-2017-7-py2
|
||||
- env: INSTANCE=default-centos-6-2017-7-py2
|
||||
# - env: INSTANCE=default-fedora-29-2017-7-py2
|
||||
# - env: INSTANCE=default-opensuse-leap-15-2017-7-py2
|
||||
# - env: INSTANCE=default-amazonlinux-2-2017-7-py2
|
||||
# - env: INSTANCE=default-arch-base-latest-2017-7-py2
|
||||
|
||||
## Define the release stage that runs `semantic-release`
|
||||
- stage: release
|
||||
language: node_js
|
||||
node_js: lts/*
|
||||
env: Release
|
||||
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA'
|
||||
before_install: skip
|
||||
script:
|
||||
# Update `AUTHORS.md`
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@ This list is sorted by the number of commits per contributor in _descending_ ord
|
|||
|
||||
Avatar|Contributor|Contributions
|
||||
:-:|---|:-:
|
||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|34
|
||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>|[@javierbertoli](https://github.com/javierbertoli)|32
|
||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|29
|
||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>|[@gravyboat](https://github.com/gravyboat)|21
|
||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/18069703?v=4' width='36' height='36' alt='@crux-capacitor'>|[@crux-capacitor](https://github.com/crux-capacitor)|14
|
||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|11
|
||||
|
|
@ -55,4 +55,4 @@ Avatar|Contributor|Contributions
|
|||
|
||||
---
|
||||
|
||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-07.
|
||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10.
|
||||
|
|
|
|||
14
CHANGELOG.md
14
CHANGELOG.md
|
|
@ -1,5 +1,19 @@
|
|||
# Changelog
|
||||
|
||||
## [0.18.4](https://github.com/saltstack-formulas/bind-formula/compare/v0.18.3...v0.18.4) (2019-10-10)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **config.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/bind-formula/commit/920615a))
|
||||
* **named.conf.local.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/bind-formula/commit/67736a2))
|
||||
* **named.conf.logging.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/bind-formula/commit/f220886))
|
||||
|
||||
|
||||
### Continuous Integration
|
||||
|
||||
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/bind-formula/commit/5883c09))
|
||||
|
||||
## [0.18.3](https://github.com/saltstack-formulas/bind-formula/compare/v0.18.2...v0.18.3) (2019-10-07)
|
||||
|
||||
|
||||
|
|
|
|||
2
FORMULA
2
FORMULA
|
|
@ -1,7 +1,7 @@
|
|||
name: bind
|
||||
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE
|
||||
os_family: Debian, RedHat, Suse
|
||||
version: 0.18.3
|
||||
version: 0.18.4
|
||||
release: 1
|
||||
minimum_version: 2016.11
|
||||
summary: Bind formula
|
||||
|
|
|
|||
7
Gemfile
7
Gemfile
|
|
@ -1,6 +1,7 @@
|
|||
source "https://rubygems.org"
|
||||
# frozen_string_literal: true
|
||||
|
||||
source 'https://rubygems.org'
|
||||
|
||||
gem 'kitchen-docker', '>= 2.9'
|
||||
gem 'kitchen-salt', '>= 0.6.0'
|
||||
gem 'kitchen-inspec', '>= 1.1'
|
||||
|
||||
gem 'kitchen-salt', '>= 0.6.0'
|
||||
|
|
|
|||
21
bin/kitchen
21
bin/kitchen
|
|
@ -8,22 +8,25 @@
|
|||
# this file is here to facilitate running it.
|
||||
#
|
||||
|
||||
require "pathname"
|
||||
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
|
||||
Pathname.new(__FILE__).realpath)
|
||||
require 'pathname'
|
||||
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile',
|
||||
Pathname.new(__FILE__).realpath)
|
||||
|
||||
bundle_binstub = File.expand_path("../bundle", __FILE__)
|
||||
bundle_binstub = File.expand_path('bundle', __dir__)
|
||||
|
||||
if File.file?(bundle_binstub)
|
||||
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
|
||||
load(bundle_binstub)
|
||||
else
|
||||
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
|
||||
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
|
||||
abort(
|
||||
'Your `bin/bundle` was not generated by Bundler, '\
|
||||
'so this binstub cannot run. Replace `bin/bundle` by running '\
|
||||
'`bundle binstubs bundler --force`, then run this command again.'
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
require "rubygems"
|
||||
require "bundler/setup"
|
||||
require 'rubygems'
|
||||
require 'bundler/setup'
|
||||
|
||||
load Gem.bin_path("test-kitchen", "kitchen")
|
||||
load Gem.bin_path('test-kitchen', 'kitchen')
|
||||
|
|
|
|||
|
|
@ -214,7 +214,12 @@ bind_rndc_client_config:
|
|||
{%- endif %}
|
||||
{%- set zone_records = salt['pillar.get']('bind:available_zones:' + zone + ':records', {}) %}
|
||||
{%- if salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse') %}
|
||||
{%- do generate_reverse(zone_records, salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:net'), salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:for_zones'), salt['pillar.get']('bind:available_zones', {})) %}
|
||||
{%- do generate_reverse(
|
||||
zone_records,
|
||||
salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:net'),
|
||||
salt['pillar.get']('bind:available_zones:' + zone + ':generate_reverse:for_zones'),
|
||||
salt['pillar.get']('bind:available_zones', {})
|
||||
) %}
|
||||
{%- endif %}
|
||||
{# If we define RRs in pillar, we use the internal template to generate the zone file
|
||||
otherwise, we fallback to the old behaviour and use the declared file
|
||||
|
|
@ -222,9 +227,9 @@ bind_rndc_client_config:
|
|||
{%- set zone_source = 'salt://bind/files/zone.jinja' if zone_records != {} else 'salt://' ~ map.zones_source_dir ~ '/' ~ file %}
|
||||
{%- set serial_auto = salt['pillar.get']('bind:available_zones:' + zone + ':soa:serial', '') == 'auto' %}
|
||||
{% if file and zone_data['type'] == 'master' -%}
|
||||
zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else ''}}:
|
||||
zones{{ dash_view }}-{{ zone }}{{ '.include' if serial_auto else '' }}:
|
||||
file.managed:
|
||||
- name: {{ zones_directory }}/{{ file }}{{ '.include' if serial_auto else ''}}
|
||||
- name: {{ zones_directory }}/{{ file }}{{ '.include' if serial_auto else '' }}
|
||||
- source: {{ zone_source }}
|
||||
- template: jinja
|
||||
{% if zone_records != {} %}
|
||||
|
|
@ -292,7 +297,7 @@ zsk-{{ zone }}:
|
|||
- cwd: {{ key_directory }}
|
||||
- name: dnssec-keygen -a {{ key_algorithm }} -b {{ key_size }} -n ZONE {{ zone }}
|
||||
- runas: {{ map.user }}
|
||||
- unless: "grep {{ key_flags.zsk }} {{ key_directory }}/K{{zone}}.+{{ key_algorithm_field }}+*.key"
|
||||
- unless: "grep {{ key_flags.zsk }} {{ key_directory }}/K{{ zone }}.+{{ key_algorithm_field }}+*.key"
|
||||
- require:
|
||||
- file: bind_key_directory
|
||||
|
||||
|
|
@ -301,7 +306,7 @@ ksk-{{ zone }}:
|
|||
- cwd: {{ key_directory }}
|
||||
- name: dnssec-keygen -f KSK -a {{ key_algorithm }} -b {{ key_size }} -n ZONE {{ zone }}
|
||||
- runas: {{ map.user }}
|
||||
- unless: "grep {{ key_flags.ksk }} {{ key_directory }}/K{{zone}}.+{{ key_algorithm_field }}+*.key"
|
||||
- unless: "grep {{ key_flags.ksk }} {{ key_directory }}/K{{ zone }}.+{{ key_algorithm_field }}+*.key"
|
||||
- require:
|
||||
- file: bind_key_directory
|
||||
{% endif %}
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ zone "{{ key }}" {
|
|||
inline-signing yes;
|
||||
{%- endif %}
|
||||
{%- if args['allow-update'] is defined %}
|
||||
allow-update { {{args['allow-update']}}; };
|
||||
allow-update { {{ args['allow-update'] }}; };
|
||||
{%- endif %}
|
||||
{%- if args.update_policy is defined %}
|
||||
update-policy {
|
||||
|
|
|
|||
|
|
@ -3,9 +3,12 @@
|
|||
logging {
|
||||
|
||||
{% for channel in salt['pillar.get']('bind:config:use_extensive_logging:channel') %}
|
||||
channel {{channel}} {
|
||||
channel {{ channel }} {
|
||||
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file', False) %}
|
||||
file "{{ map.log_dir }}/{{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file')}}" versions {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3')}} size {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m')}};
|
||||
{%- set channel_file = salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':file') %}
|
||||
{%- set channel_versions = salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':versions', '3') %}
|
||||
{%- set channel_size = salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':size', '20m') %}
|
||||
file "{{ map.log_dir }}/{{ channel_file }}" versions {{ channel_versions }} size {{ channel_size }};
|
||||
{%- endif %}
|
||||
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':print-time') %}
|
||||
print-time yes;
|
||||
|
|
@ -17,16 +20,16 @@ logging {
|
|||
print-severity yes;
|
||||
{%- endif %}
|
||||
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity') %}
|
||||
severity {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity')}};
|
||||
severity {{ salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':severity') }};
|
||||
{%- endif %}
|
||||
{%- if salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog') %}
|
||||
syslog {{salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog')}};
|
||||
syslog {{ salt['pillar.get']('bind:config:use_extensive_logging:channel:'+channel+':syslog') }};
|
||||
{%- endif %}
|
||||
};
|
||||
{% endfor %}
|
||||
|
||||
{%- for category in salt['pillar.get']('bind:config:use_extensive_logging:category') %}
|
||||
category {{category}} { {{ salt['pillar.get']('bind:config:use_extensive_logging:category:'+category, []) | join('; ') }}; };
|
||||
category {{ category }} { {{ salt['pillar.get']('bind:config:use_extensive_logging:category:'+category, []) | join('; ') }}; };
|
||||
|
||||
{%- endfor %}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||
* - Avatar
|
||||
- Contributor
|
||||
- Contributions
|
||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
|
||||
- `@myii <https://github.com/myii>`_
|
||||
- 34
|
||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/242396?v=4' width='36' height='36' alt='@javierbertoli'>`
|
||||
- `@javierbertoli <https://github.com/javierbertoli>`_
|
||||
- 32
|
||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
|
||||
- `@myii <https://github.com/myii>`_
|
||||
- 29
|
||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>`
|
||||
- `@gravyboat <https://github.com/gravyboat>`_
|
||||
- 21
|
||||
|
|
@ -161,4 +161,4 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||
|
||||
----
|
||||
|
||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-07.
|
||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-10.
|
||||
|
|
|
|||
|
|
@ -2,6 +2,23 @@
|
|||
Changelog
|
||||
=========
|
||||
|
||||
`0.18.4 <https://github.com/saltstack-formulas/bind-formula/compare/v0.18.3...v0.18.4>`_ (2019-10-10)
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
|
||||
Bug Fixes
|
||||
^^^^^^^^^
|
||||
|
||||
|
||||
* **config.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/bind-formula/commit/920615a>`_\ )
|
||||
* **named.conf.local.jinja:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/bind-formula/commit/67736a2>`_\ )
|
||||
* **named.conf.logging.jinja:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/bind-formula/commit/f220886>`_\ )
|
||||
|
||||
Continuous Integration
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/bind-formula/commit/5883c09>`_\ )
|
||||
|
||||
`0.18.3 <https://github.com/saltstack-formulas/bind-formula/compare/v0.18.2...v0.18.3>`_ (2019-10-07)
|
||||
---------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue