* Automated using https://github.com/myii/ssf-formula/pull/61tags/v2.3.2
--- | |||||
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. --> | |||||
--- | |||||
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. --> | |||||
# -*- 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` |
# -*- 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 |
# -*- coding: utf-8 -*- | # -*- coding: utf-8 -*- | ||||
# vim: ft=yaml | # vim: ft=yaml | ||||
--- | --- | ||||
## Machine config | |||||
dist: bionic | dist: bionic | ||||
stages: | |||||
- test | |||||
- lint | |||||
- name: release | |||||
if: branch = master AND type != pull_request | |||||
sudo: required | sudo: required | ||||
cache: bundler | |||||
language: ruby | |||||
services: | services: | ||||
- docker | - 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: | 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: | jobs: | ||||
allow_failures: | |||||
- env: Lint_rubocop | |||||
fast_finish: true | |||||
include: | 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/* | node_js: lts/* | ||||
env: Lint | |||||
name: 'Lint: salt-lint, yamllint & commitlint' | |||||
before_install: skip | before_install: skip | ||||
script: | 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` | # Install and run `yamllint` | ||||
# Need at least `v1.17.0` for the `yaml-files` setting | # Need at least `v1.17.0` for the `yaml-files` setting | ||||
- pip install --user yamllint>=1.17.0 | - pip install --user yamllint>=1.17.0 | ||||
- npm install @commitlint/config-conventional -D | - npm install @commitlint/config-conventional -D | ||||
- npm install @commitlint/travis-cli -D | - npm install @commitlint/travis-cli -D | ||||
- commitlint-travis | - 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 | - stage: release | ||||
language: node_js | language: node_js | ||||
node_js: lts/* | node_js: lts/* | ||||
env: Release | |||||
name: 'Run semantic-release inc. file updates to AUTHORS, CHANGELOG & FORMULA' | |||||
before_install: skip | before_install: skip | ||||
script: | script: | ||||
# Update `AUTHORS.md` | # Update `AUTHORS.md` |
Avatar|Contributor|Contributions | Avatar|Contributor|Contributions | ||||
:-:|---|:-: | :-:|---|:-: | ||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|41 | |||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>|[@aboe76](https://github.com/aboe76)|45 | |||||
<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)|33 | |||||
<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)|27 | <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)|27 | ||||
<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)|24 | <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)|24 | ||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 | <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>|[@noelmcloughlin](https://github.com/noelmcloughlin)|18 | ||||
<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)|18 | |||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|17 | <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>|[@whiteinge](https://github.com/whiteinge)|17 | ||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>|[@ross-p](https://github.com/ross-p)|13 | <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/4956475?v=4' width='36' height='36' alt='@ross-p'>|[@ross-p](https://github.com/ross-p)|13 | ||||
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|10 | <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/52996?v=4' width='36' height='36' alt='@daks'>|[@daks](https://github.com/daks)|10 | ||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11417?v=4' width='36' height='36' alt='@malept'>|[@malept](https://github.com/malept)|2 | <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11417?v=4' width='36' height='36' alt='@malept'>|[@malept](https://github.com/malept)|2 | ||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3279679?v=4' width='36' height='36' alt='@meganlkm'>|[@meganlkm](https://github.com/meganlkm)|2 | <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3279679?v=4' width='36' height='36' alt='@meganlkm'>|[@meganlkm](https://github.com/meganlkm)|2 | ||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>|[@garrettw](https://github.com/garrettw)|2 | <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>|[@garrettw](https://github.com/garrettw)|2 | ||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/101513?v=4' width='36' height='36' alt='@ErisDS'>|[@ErisDS](https://github.com/ErisDS)|2 | |||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/879922?v=4' width='36' height='36' alt='@myoung34'>|[@myoung34](https://github.com/myoung34)|2 | <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/879922?v=4' width='36' height='36' alt='@myoung34'>|[@myoung34](https://github.com/myoung34)|2 | ||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1922124?v=4' width='36' height='36' alt='@bebosudo'>|[@bebosudo](https://github.com/bebosudo)|1 | <img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/1922124?v=4' width='36' height='36' alt='@bebosudo'>|[@bebosudo](https://github.com/bebosudo)|1 | ||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/8395913?v=4' width='36' height='36' alt='@aanriot'>|[@aanriot](https://github.com/aanriot)|1 | <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/8395913?v=4' width='36' height='36' alt='@aanriot'>|[@aanriot](https://github.com/aanriot)|1 | ||||
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/72727?v=4' width='36' height='36' alt='@czarneckid'>|[@czarneckid](https://github.com/czarneckid)|1 | <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/72727?v=4' width='36' height='36' alt='@czarneckid'>|[@czarneckid](https://github.com/czarneckid)|1 | ||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/983?v=4' width='36' height='36' alt='@statik'>|[@statik](https://github.com/statik)|1 | <img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/983?v=4' width='36' height='36' alt='@statik'>|[@statik](https://github.com/statik)|1 | ||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/48329?v=4' width='36' height='36' alt='@ekristen'>|[@ekristen](https://github.com/ekristen)|1 | <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/48329?v=4' width='36' height='36' alt='@ekristen'>|[@ekristen](https://github.com/ekristen)|1 | ||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/101513?v=4' width='36' height='36' alt='@ErisDS'>|[@ErisDS](https://github.com/ErisDS)|1 | |||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/75496?v=4' width='36' height='36' alt='@jeduardo'>|[@jeduardo](https://github.com/jeduardo)|1 | <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/75496?v=4' width='36' height='36' alt='@jeduardo'>|[@jeduardo](https://github.com/jeduardo)|1 | ||||
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/668449?v=4' width='36' height='36' alt='@stromnet'>|[@stromnet](https://github.com/stromnet)|1 | <img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/668449?v=4' width='36' height='36' alt='@stromnet'>|[@stromnet](https://github.com/stromnet)|1 | ||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/744549?v=4' width='36' height='36' alt='@bsdlp'>|[@bsdlp](https://github.com/bsdlp)|1 | <img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/744549?v=4' width='36' height='36' alt='@bsdlp'>|[@bsdlp](https://github.com/bsdlp)|1 | ||||
--- | --- | ||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-09-01. | |||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-10. |
# Changelog | # Changelog | ||||
## [2.3.1](https://github.com/saltstack-formulas/nginx-formula/compare/v2.3.0...v2.3.1) (2019-10-10) | |||||
### Bug Fixes | |||||
* **certificates.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/nginx-formula/commit/bedc1b6)) | |||||
* **map.jinja:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/nginx-formula/commit/0772d8a)) | |||||
* **pkg.sls:** fix `salt-lint` errors ([](https://github.com/saltstack-formulas/nginx-formula/commit/06d055e)) | |||||
### Continuous Integration | |||||
* **kitchen:** change `log_level` to `debug` instead of `info` ([](https://github.com/saltstack-formulas/nginx-formula/commit/671a4ce)) | |||||
* **kitchen:** install required packages to bootstrapped `opensuse` [skip ci] ([](https://github.com/saltstack-formulas/nginx-formula/commit/17291a0)) | |||||
* **kitchen:** use bootstrapped `opensuse` images until `2019.2.2` [skip ci] ([](https://github.com/saltstack-formulas/nginx-formula/commit/a39e124)) | |||||
* **platform:** add `arch-base-latest` ([](https://github.com/saltstack-formulas/nginx-formula/commit/c921086)) | |||||
* **yamllint:** add rule `empty-values` & use new `yaml-files` setting ([](https://github.com/saltstack-formulas/nginx-formula/commit/3d48b1b)) | |||||
* merge travis matrix, add `salt-lint` & `rubocop` to `lint` job ([](https://github.com/saltstack-formulas/nginx-formula/commit/08ce3ed)) | |||||
* use `dist: bionic` & apply `opensuse-leap-15` SCP error workaround ([](https://github.com/saltstack-formulas/nginx-formula/commit/8ddb921)) | |||||
### Documentation | |||||
* **pillar.example:** fix TOFS comment to explain the default path [skip ci] ([](https://github.com/saltstack-formulas/nginx-formula/commit/714f547)), closes [/github.com/saltstack-formulas/libvirt-formula/pull/60#issuecomment-537965254](https://github.com//github.com/saltstack-formulas/libvirt-formula/pull/60/issues/issuecomment-537965254) [/github.com/saltstack-formulas/libvirt-formula/pull/60#issuecomment-537988138](https://github.com//github.com/saltstack-formulas/libvirt-formula/pull/60/issues/issuecomment-537988138) | |||||
# [2.3.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.2.1...v2.3.0) (2019-09-01) | # [2.3.0](https://github.com/saltstack-formulas/nginx-formula/compare/v2.2.1...v2.3.0) (2019-09-01) | ||||
name: nginx | name: nginx | ||||
os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE | os: Debian, Ubuntu, RedHat, Fedora, CentOS, Suse, openSUSE | ||||
os_family: Debian, RedHat, Suse | os_family: Debian, RedHat, Suse | ||||
version: 2.3.0 | |||||
version: 2.3.1 | |||||
release: 1 | release: 1 | ||||
minimum_version: 2017.3 | minimum_version: 2017.3 | ||||
summary: nginx formula | summary: nginx formula |
source "https://rubygems.org" | |||||
# frozen_string_literal: true | |||||
source 'https://rubygems.org' | |||||
gem 'kitchen-docker', '>= 2.9' | gem 'kitchen-docker', '>= 2.9' | ||||
gem 'kitchen-salt', '>= 0.6.0' | |||||
gem 'kitchen-inspec', '>= 1.1' | gem 'kitchen-inspec', '>= 1.1' | ||||
gem 'kitchen-salt', '>= 0.6.0' |
# this file is here to facilitate running it. | # 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.file?(bundle_binstub) | ||||
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ | if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/ | ||||
load(bundle_binstub) | load(bundle_binstub) | ||||
else | 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 | ||||
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') |
- Contributions | - Contributions | ||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1800660?v=4' width='36' height='36' alt='@aboe76'>` | ||||
- `@aboe76 <https://github.com/aboe76>`_ | - `@aboe76 <https://github.com/aboe76>`_ | ||||
- 41 | |||||
- 45 | |||||
* - :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>`_ | |||||
- 33 | |||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1396878?v=4' width='36' height='36' alt='@gravyboat'>` | * - :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>`_ | - `@gravyboat <https://github.com/gravyboat>`_ | ||||
- 27 | - 27 | ||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13322818?v=4' width='36' height='36' alt='@noelmcloughlin'>` | ||||
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_ | - `@noelmcloughlin <https://github.com/noelmcloughlin>`_ | ||||
- 18 | - 18 | ||||
* - :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>`_ | |||||
- 18 | |||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/91293?v=4' width='36' height='36' alt='@whiteinge'>` | ||||
- `@whiteinge <https://github.com/whiteinge>`_ | - `@whiteinge <https://github.com/whiteinge>`_ | ||||
- 17 | - 17 | ||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/84885?v=4' width='36' height='36' alt='@garrettw'>` | ||||
- `@garrettw <https://github.com/garrettw>`_ | - `@garrettw <https://github.com/garrettw>`_ | ||||
- 2 | - 2 | ||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/101513?v=4' width='36' height='36' alt='@ErisDS'>` | |||||
- `@ErisDS <https://github.com/ErisDS>`_ | |||||
- 2 | |||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/879922?v=4' width='36' height='36' alt='@myoung34'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/879922?v=4' width='36' height='36' alt='@myoung34'>` | ||||
- `@myoung34 <https://github.com/myoung34>`_ | - `@myoung34 <https://github.com/myoung34>`_ | ||||
- 2 | - 2 | ||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/48329?v=4' width='36' height='36' alt='@ekristen'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/48329?v=4' width='36' height='36' alt='@ekristen'>` | ||||
- `@ekristen <https://github.com/ekristen>`_ | - `@ekristen <https://github.com/ekristen>`_ | ||||
- 1 | - 1 | ||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/101513?v=4' width='36' height='36' alt='@ErisDS'>` | |||||
- `@ErisDS <https://github.com/ErisDS>`_ | |||||
- 1 | |||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/75496?v=4' width='36' height='36' alt='@jeduardo'>` | * - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/75496?v=4' width='36' height='36' alt='@jeduardo'>` | ||||
- `@jeduardo <https://github.com/jeduardo>`_ | - `@jeduardo <https://github.com/jeduardo>`_ | ||||
- 1 | - 1 | ||||
---- | ---- | ||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-09-01. | |||||
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-10-10. |
Changelog | Changelog | ||||
========= | ========= | ||||
`2.3.1 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.3.0...v2.3.1>`_ (2019-10-10) | |||||
------------------------------------------------------------------------------------------------------- | |||||
Bug Fixes | |||||
^^^^^^^^^ | |||||
* **certificates.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/bedc1b6>`_\ ) | |||||
* **map.jinja:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/0772d8a>`_\ ) | |||||
* **pkg.sls:** fix ``salt-lint`` errors (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/06d055e>`_\ ) | |||||
Continuous Integration | |||||
^^^^^^^^^^^^^^^^^^^^^^ | |||||
* **kitchen:** change ``log_level`` to ``debug`` instead of ``info`` (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/671a4ce>`_\ ) | |||||
* **kitchen:** install required packages to bootstrapped ``opensuse`` [skip ci] (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/17291a0>`_\ ) | |||||
* **kitchen:** use bootstrapped ``opensuse`` images until ``2019.2.2`` [skip ci] (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/a39e124>`_\ ) | |||||
* **platform:** add ``arch-base-latest`` (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/c921086>`_\ ) | |||||
* **yamllint:** add rule ``empty-values`` & use new ``yaml-files`` setting (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/3d48b1b>`_\ ) | |||||
* merge travis matrix, add ``salt-lint`` & ``rubocop`` to ``lint`` job (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/08ce3ed>`_\ ) | |||||
* use ``dist: bionic`` & apply ``opensuse-leap-15`` SCP error workaround (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/8ddb921>`_\ ) | |||||
Documentation | |||||
^^^^^^^^^^^^^ | |||||
* **pillar.example:** fix TOFS comment to explain the default path [skip ci] (\ ` <https://github.com/saltstack-formulas/nginx-formula/commit/714f547>`_\ ), closes `/github.com/saltstack-formulas/libvirt-formula/pull/60#issuecomment-537965254 <https://github.com//github.com/saltstack-formulas/libvirt-formula/pull/60/issues/issuecomment-537965254>`_ `/github.com/saltstack-formulas/libvirt-formula/pull/60#issuecomment-537988138 <https://github.com//github.com/saltstack-formulas/libvirt-formula/pull/60/issues/issuecomment-537988138>`_ | |||||
`2.3.0 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.2.1...v2.3.0>`_ (2019-09-01) | `2.3.0 <https://github.com/saltstack-formulas/nginx-formula/compare/v2.2.1...v2.3.0>`_ (2019-09-01) | ||||
------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- | ||||
- name: {{ certificates_path }}/{{ domain }}.crt | - name: {{ certificates_path }}/{{ domain }}.crt | ||||
- makedirs: True | - makedirs: True | ||||
{% if salt['pillar.get']("nginx:certificates:{}:public_cert_pillar".format(domain)) %} | {% if salt['pillar.get']("nginx:certificates:{}:public_cert_pillar".format(domain)) %} | ||||
- contents_pillar: {{salt['pillar.get']('nginx:certificates:{}:public_cert_pillar'.format(domain))}} | |||||
- contents_pillar: {{ salt['pillar.get']('nginx:certificates:{}:public_cert_pillar'.format(domain)) }} | |||||
{% else %} | {% else %} | ||||
- contents_pillar: nginx:certificates:{{ domain }}:public_cert | - contents_pillar: nginx:certificates:{{ domain }}:public_cert | ||||
{% endif %} | {% endif %} | ||||
- watch_in: | - watch_in: | ||||
- service: nginx_service | - service: nginx_service | ||||
{% if salt['pillar.get']("nginx:certificates:{}:private_key".format(domain)) or salt['pillar.get']("nginx:certificates:{}:private_key_pillar".format(domain))%} | |||||
{% if salt['pillar.get']("nginx:certificates:{}:private_key".format(domain)) or salt['pillar.get']("nginx:certificates:{}:private_key_pillar".format(domain)) %} | |||||
nginx_{{ domain }}_ssl_key: | nginx_{{ domain }}_ssl_key: | ||||
file.managed: | file.managed: | ||||
- name: {{ certificates_path }}/{{ domain }}.key | - name: {{ certificates_path }}/{{ domain }}.key | ||||
- mode: 600 | - mode: 600 | ||||
- makedirs: True | - makedirs: True | ||||
{% if salt['pillar.get']("nginx:certificates:{}:private_key_pillar".format(domain)) %} | {% if salt['pillar.get']("nginx:certificates:{}:private_key_pillar".format(domain)) %} | ||||
- contents_pillar: {{salt['pillar.get']('nginx:certificates:{}:private_key_pillar'.format(domain))}} | |||||
- contents_pillar: {{ salt['pillar.get']('nginx:certificates:{}:private_key_pillar'.format(domain)) }} | |||||
{% else %} | {% else %} | ||||
- contents_pillar: nginx:certificates:{{ domain }}:private_key | - contents_pillar: nginx:certificates:{{ domain }}:private_key | ||||
{% endif %} | {% endif %} |
{% if 'user' not in nginx.server.config %} | {% if 'user' not in nginx.server.config %} | ||||
{% do nginx.server.config.update({ | {% do nginx.server.config.update({ | ||||
'user': nginx.lookup.webuser, | 'user': nginx.lookup.webuser, | ||||
})%} | |||||
}) %} | |||||
{% endif %} | {% endif %} | ||||
{% if 'pid' not in nginx.server.config and 'pid_file' in nginx.lookup %} | {% if 'pid' not in nginx.server.config and 'pid_file' in nginx.lookup %} | ||||
{% do nginx.server.config.update({ | {% do nginx.server.config.update({ | ||||
'pid': nginx.lookup.pid_file, | 'pid': nginx.lookup.pid_file, | ||||
})%} | |||||
}) %} | |||||
{% endif %} | {% endif %} | ||||
{% if salt['grains.get']('os_family') == 'RedHat' %} | {% if salt['grains.get']('os_family') == 'RedHat' %} | ||||
{% do nginx.passenger.update({ | {% do nginx.passenger.update({ | ||||
'passenger_root': '/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini', | 'passenger_root': '/usr/share/ruby/vendor_ruby/phusion_passenger/locations.ini', | ||||
'passenger_instance_registry_dir': '/var/run/passenger-instreg', | 'passenger_instance_registry_dir': '/var/run/passenger-instreg', | ||||
})%} | |||||
}) %} | |||||
{% if 'osfinger' in grains and salt['grains.get']('osfinger') == 'CentOS-6' %} | {% if 'osfinger' in grains and salt['grains.get']('osfinger') == 'CentOS-6' %} | ||||
{% do nginx.server.config.update({ | {% do nginx.server.config.update({ | ||||
'pid': '/var/run/nginx.pid', | 'pid': '/var/run/nginx.pid', | ||||
})%} | |||||
}) %} | |||||
{% do nginx.passenger.update({ | {% do nginx.passenger.update({ | ||||
'passenger_root': '/usr/lib/ruby/1.8/phusion_passenger/locations.ini', | 'passenger_root': '/usr/lib/ruby/1.8/phusion_passenger/locations.ini', | ||||
})%} | |||||
}) %} | |||||
{% endif %} | {% endif %} | ||||
{% endif %} | {% endif %} |
- humanname: nginx phusionpassenger repo | - humanname: nginx phusionpassenger repo | ||||
- baseurl: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' | - baseurl: 'https://oss-binaries.phusionpassenger.com/yum/passenger/el/$releasever/$basearch' | ||||
- repo_gpgcheck: 1 | - repo_gpgcheck: 1 | ||||
- gpgcheck: 0 | |||||
- gpgcheck: 0 | |||||
- gpgkey: 'https://packagecloud.io/gpg.key' | - gpgkey: 'https://packagecloud.io/gpg.key' | ||||
- enabled: True | - enabled: True | ||||
- sslverify: 1 | - sslverify: 1 |