Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5df8f79dc1 | ||
|
|
0046482adf | ||
|
|
904ba271ca | ||
|
|
e5700f48c5 | ||
|
|
aa492c3ba9 | ||
|
|
72ff82ce75 | ||
|
|
5e631bf7d8 | ||
|
|
d999597a91 | ||
|
|
45a921dc4e | ||
|
|
3f81439991 |
14
.gitignore
vendored
14
.gitignore
vendored
@@ -48,6 +48,7 @@ coverage.xml
|
|||||||
.kitchen
|
.kitchen
|
||||||
.kitchen.local.yml
|
.kitchen.local.yml
|
||||||
kitchen.local.yml
|
kitchen.local.yml
|
||||||
|
junit-*.xml
|
||||||
|
|
||||||
# Translations
|
# Translations
|
||||||
*.mo
|
*.mo
|
||||||
@@ -103,8 +104,19 @@ ENV/
|
|||||||
# mypy
|
# mypy
|
||||||
.mypy_cache/
|
.mypy_cache/
|
||||||
|
|
||||||
|
# Bundler
|
||||||
|
Gemfile.lock
|
||||||
|
|
||||||
# copied `.md` files used for conversion to `.rst` using `m2r`
|
# copied `.md` files used for conversion to `.rst` using `m2r`
|
||||||
docs/*.md
|
docs/*.md
|
||||||
|
|
||||||
# Vim
|
# Vim
|
||||||
*.sw[nop]
|
*.sw?
|
||||||
|
|
||||||
|
## Collected when centralising formulas (check and sort)
|
||||||
|
# `collectd-formula`
|
||||||
|
.pytest_cache/
|
||||||
|
/.idea/
|
||||||
|
Dockerfile.*_*
|
||||||
|
ignore/
|
||||||
|
tmp/
|
||||||
|
|||||||
29
.travis.yml
29
.travis.yml
@@ -1,3 +1,6 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# vim: ft=yaml
|
||||||
|
---
|
||||||
stages:
|
stages:
|
||||||
- test
|
- test
|
||||||
- commitlint
|
- commitlint
|
||||||
@@ -7,31 +10,32 @@ stages:
|
|||||||
sudo: required
|
sudo: required
|
||||||
cache: bundler
|
cache: bundler
|
||||||
language: ruby
|
language: ruby
|
||||||
|
dist: xenial
|
||||||
|
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
|
||||||
before_install:
|
|
||||||
- bundle install
|
|
||||||
|
|
||||||
# Make sure the instances listed below match up with
|
# Make sure the instances listed below match up with
|
||||||
# the `platforms` defined in `kitchen.yml`
|
# the `platforms` defined in `kitchen.yml`
|
||||||
env:
|
env:
|
||||||
matrix:
|
matrix:
|
||||||
- INSTANCE: default-debian-9-2019-2-py3
|
- INSTANCE: default-debian-9-develop-py3
|
||||||
|
# TODO: Re-enable this once the `systemd` service can be restarted reliably
|
||||||
|
# - INSTANCE: default-ubuntu-1804-develop-py3
|
||||||
|
# - INSTANCE: default-centos-7-develop-py3
|
||||||
|
# - INSTANCE: default-fedora-29-develop-py3
|
||||||
|
# - INSTANCE: default-opensuse-leap-15-develop-py3
|
||||||
|
# - INSTANCE: default-debian-9-2019-2-py3
|
||||||
# TODO: Re-enable this once the `systemd` service can be restarted reliably
|
# TODO: Re-enable this once the `systemd` service can be restarted reliably
|
||||||
# - INSTANCE: default-ubuntu-1804-2019-2-py3
|
# - INSTANCE: default-ubuntu-1804-2019-2-py3
|
||||||
- INSTANCE: default-centos-7-2019-2-py3
|
- INSTANCE: default-centos-7-2019-2-py3
|
||||||
# - INSTANCE: default-fedora-29-2019-2-py3
|
- INSTANCE: default-fedora-29-2019-2-py3
|
||||||
- INSTANCE: default-opensuse-leap-15-2019-2-py3
|
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
|
||||||
# - INSTANCE: default-debian-9-2018-3-py2
|
# - INSTANCE: default-debian-9-2018-3-py2
|
||||||
- INSTANCE: default-ubuntu-1604-2018-3-py2
|
- INSTANCE: default-ubuntu-1604-2018-3-py2
|
||||||
# - INSTANCE: default-centos-7-2018-3-py2
|
# - INSTANCE: default-centos-7-2018-3-py2
|
||||||
- INSTANCE: default-fedora-29-2018-3-py2
|
# - INSTANCE: default-fedora-29-2018-3-py2
|
||||||
# TODO: Use this when fixed instead of `opensuse-423`
|
- INSTANCE: default-opensuse-leap-42-2018-3-py2
|
||||||
# NOTE: Having to temporarily disable `opensuse-423` due to slow mirror
|
|
||||||
# - INSTANCE: default-opensuse-leap-15-2018-3-py2
|
|
||||||
# - INSTANCE: default-opensuse-423-2018-3-py2
|
|
||||||
# - INSTANCE: default-debian-8-2017-7-py2
|
# - INSTANCE: default-debian-8-2017-7-py2
|
||||||
# - INSTANCE: default-ubuntu-1604-2017-7-py2
|
# - INSTANCE: default-ubuntu-1604-2017-7-py2
|
||||||
- INSTANCE: default-centos-6-2017-7-py2
|
- INSTANCE: default-centos-6-2017-7-py2
|
||||||
@@ -39,7 +43,7 @@ env:
|
|||||||
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
|
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- bundle exec kitchen verify ${INSTANCE}
|
- bin/kitchen verify ${INSTANCE}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
include:
|
include:
|
||||||
@@ -73,4 +77,3 @@ jobs:
|
|||||||
script:
|
script:
|
||||||
# Run `semantic-release`
|
# Run `semantic-release`
|
||||||
- npx semantic-release@15
|
- npx semantic-release@15
|
||||||
|
|
||||||
|
|||||||
10
AUTHORS.md
10
AUTHORS.md
@@ -4,9 +4,9 @@ This list is sorted by the number of commits per contributor in _descending_ ord
|
|||||||
|
|
||||||
Avatar|Contributor|Contributions
|
Avatar|Contributor|Contributions
|
||||||
:-:|---|:-:
|
:-:|---|:-:
|
||||||
<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)|57
|
<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)|58
|
||||||
<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)|47
|
<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)|50
|
||||||
<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)|45
|
<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)|48
|
||||||
<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)|41
|
<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)|41
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/16338056?v=4' width='36' height='36' alt='@vutny'>|[@vutny](https://github.com/vutny)|31
|
||||||
<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)|19
|
<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)|19
|
||||||
@@ -14,13 +14,13 @@ Avatar|Contributor|Contributions
|
|||||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|11
|
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/528061?v=4' width='36' height='36' alt='@puneetk'>|[@puneetk](https://github.com/puneetk)|11
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|9
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/745513?v=4' width='36' height='36' alt='@EvaSDK'>|[@EvaSDK](https://github.com/EvaSDK)|9
|
||||||
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>|[@dferrantelli](https://github.com/dferrantelli)|8
|
<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>|[@dferrantelli](https://github.com/dferrantelli)|8
|
||||||
|
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|8
|
||||||
<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)|8
|
<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)|8
|
||||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|8
|
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/117961?v=4' width='36' height='36' alt='@babilen5'>|[@babilen5](https://github.com/babilen5)|8
|
||||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|7
|
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/20441?v=4' width='36' height='36' alt='@iggy'>|[@iggy](https://github.com/iggy)|7
|
||||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13106485?v=4' width='36' height='36' alt='@dynjnelson'>|[@dynjnelson](https://github.com/dynjnelson)|7
|
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/13106485?v=4' width='36' height='36' alt='@dynjnelson'>|[@dynjnelson](https://github.com/dynjnelson)|7
|
||||||
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3449635?v=4' width='36' height='36' alt='@rominf'>|[@rominf](https://github.com/rominf)|7
|
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/3449635?v=4' width='36' height='36' alt='@rominf'>|[@rominf](https://github.com/rominf)|7
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>|[@alfredopalhares](https://github.com/alfredopalhares)|6
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>|[@alfredopalhares](https://github.com/alfredopalhares)|6
|
||||||
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>|[@johnkeates](https://github.com/johnkeates)|6
|
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|5
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>|[@alxwr](https://github.com/alxwr)|5
|
||||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyr'>|[@audreyr](https://github.com/audreyr)|5
|
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/74739?v=4' width='36' height='36' alt='@audreyr'>|[@audreyr](https://github.com/audreyr)|5
|
||||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>|[@blast-hardcheese](https://github.com/blast-hardcheese)|5
|
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/278900?v=4' width='36' height='36' alt='@blast-hardcheese'>|[@blast-hardcheese](https://github.com/blast-hardcheese)|5
|
||||||
@@ -70,4 +70,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-05-31.
|
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-24.
|
||||||
|
|||||||
13
CHANGELOG.md
13
CHANGELOG.md
@@ -1,5 +1,18 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
# [0.38.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.4...v0.38.0) (2019-07-24)
|
||||||
|
|
||||||
|
|
||||||
|
### Continuous Integration
|
||||||
|
|
||||||
|
* **kitchen:** remove `python*-pip` installation ([d999597](https://github.com/saltstack-formulas/postgres-formula/commit/d999597))
|
||||||
|
* **kitchen+travis:** modify matrix to include `develop` platform ([3f81439](https://github.com/saltstack-formulas/postgres-formula/commit/3f81439))
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* **debian:** add buster support ([904ba27](https://github.com/saltstack-formulas/postgres-formula/commit/904ba27))
|
||||||
|
|
||||||
## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31)
|
## [0.37.4](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4) (2019-05-31)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
FORMULA
2
FORMULA
@@ -1,7 +1,7 @@
|
|||||||
name: postgres
|
name: postgres
|
||||||
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
|
os: Debian, Ubuntu, Raspbian, RedHat, Fedora, CentOS, Suse, openSUSE, Gentoo, Funtoo, Arch, Manjaro, Alpine, FreeBSD, OpenBSD, Solaris, SmartOS, Windows, MacOS
|
||||||
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
|
os_family: Debian, RedHat, Suse, Gentoo, Arch, Alpine, FreeBSD, OpenBSD, Solaris, Windows, MacOS
|
||||||
version: 0.37.4
|
version: 0.38.0
|
||||||
release: 1
|
release: 1
|
||||||
minimum_version: 2016.11
|
minimum_version: 2016.11
|
||||||
summary: Postgres formula
|
summary: Postgres formula
|
||||||
|
|||||||
1
Gemfile
1
Gemfile
@@ -3,3 +3,4 @@ source "https://rubygems.org"
|
|||||||
gem 'kitchen-docker', '>= 2.9'
|
gem 'kitchen-docker', '>= 2.9'
|
||||||
gem 'kitchen-salt', '>= 0.6.0'
|
gem 'kitchen-salt', '>= 0.6.0'
|
||||||
gem 'kitchen-inspec', '>= 1.1'
|
gem 'kitchen-inspec', '>= 1.1'
|
||||||
|
|
||||||
|
|||||||
26
Gemfile.lock
26
Gemfile.lock
@@ -1,26 +0,0 @@
|
|||||||
GEM
|
|
||||||
remote: https://rubygems.org/
|
|
||||||
specs:
|
|
||||||
kitchen-salt (0.0.19)
|
|
||||||
kitchen-vagrant (0.15.0)
|
|
||||||
test-kitchen (~> 1.0)
|
|
||||||
mixlib-shellout (2.0.1)
|
|
||||||
net-scp (1.2.1)
|
|
||||||
net-ssh (>= 2.6.5)
|
|
||||||
net-ssh (2.9.2)
|
|
||||||
safe_yaml (1.0.4)
|
|
||||||
test-kitchen (1.3.1)
|
|
||||||
mixlib-shellout (>= 1.2, < 3.0)
|
|
||||||
net-scp (~> 1.1)
|
|
||||||
net-ssh (~> 2.7)
|
|
||||||
safe_yaml (~> 1.0)
|
|
||||||
thor (~> 0.18)
|
|
||||||
thor (0.19.1)
|
|
||||||
|
|
||||||
PLATFORMS
|
|
||||||
ruby
|
|
||||||
|
|
||||||
DEPENDENCIES
|
|
||||||
kitchen-salt
|
|
||||||
kitchen-vagrant
|
|
||||||
test-kitchen (> 1.2.0)
|
|
||||||
29
bin/kitchen
Executable file
29
bin/kitchen
Executable file
@@ -0,0 +1,29 @@
|
|||||||
|
#!/usr/bin/env ruby
|
||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
#
|
||||||
|
# This file was generated by Bundler.
|
||||||
|
#
|
||||||
|
# The application 'kitchen' is installed as part of a gem, and
|
||||||
|
# this file is here to facilitate running it.
|
||||||
|
#
|
||||||
|
|
||||||
|
require "pathname"
|
||||||
|
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
|
||||||
|
Pathname.new(__FILE__).realpath)
|
||||||
|
|
||||||
|
bundle_binstub = File.expand_path("../bundle", __FILE__)
|
||||||
|
|
||||||
|
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.")
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
require "rubygems"
|
||||||
|
require "bundler/setup"
|
||||||
|
|
||||||
|
load Gem.bin_path("test-kitchen", "kitchen")
|
||||||
@@ -15,13 +15,13 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||||||
- Contributions
|
- Contributions
|
||||||
* - :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>`_
|
||||||
- 57
|
- 58
|
||||||
* - :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>`_
|
|
||||||
- 47
|
|
||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/10231489?v=4' width='36' height='36' alt='@myii'>`
|
* - :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>`_
|
- `@myii <https://github.com/myii>`_
|
||||||
- 45
|
- 50
|
||||||
|
* - :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>`_
|
||||||
|
- 48
|
||||||
* - :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>`_
|
||||||
- 41
|
- 41
|
||||||
@@ -43,6 +43,9 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>`
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/1713422?v=4' width='36' height='36' alt='@dferrantelli'>`
|
||||||
- `@dferrantelli <https://github.com/dferrantelli>`_
|
- `@dferrantelli <https://github.com/dferrantelli>`_
|
||||||
- 8
|
- 8
|
||||||
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
|
||||||
|
- `@johnkeates <https://github.com/johnkeates>`_
|
||||||
|
- 8
|
||||||
* - :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>`_
|
||||||
- 8
|
- 8
|
||||||
@@ -61,9 +64,6 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
|||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>`
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/223763?v=4' width='36' height='36' alt='@alfredopalhares'>`
|
||||||
- `@alfredopalhares <https://github.com/alfredopalhares>`_
|
- `@alfredopalhares <https://github.com/alfredopalhares>`_
|
||||||
- 6
|
- 6
|
||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/5306980?v=4' width='36' height='36' alt='@johnkeates'>`
|
|
||||||
- `@johnkeates <https://github.com/johnkeates>`_
|
|
||||||
- 6
|
|
||||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
|
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/1920805?v=4' width='36' height='36' alt='@alxwr'>`
|
||||||
- `@alxwr <https://github.com/alxwr>`_
|
- `@alxwr <https://github.com/alxwr>`_
|
||||||
- 5
|
- 5
|
||||||
@@ -206,4 +206,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-05-31.
|
Auto-generated by a `forked version <https://github.com/myii/maintainer>`_ of `gaocegege/maintainer <https://github.com/gaocegege/maintainer>`_ on 2019-07-24.
|
||||||
|
|||||||
@@ -2,6 +2,22 @@
|
|||||||
Changelog
|
Changelog
|
||||||
=========
|
=========
|
||||||
|
|
||||||
|
`0.38.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.4...v0.38.0>`_ (2019-07-24)
|
||||||
|
-------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Continuous Integration
|
||||||
|
^^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
|
||||||
|
* **kitchen:** remove ``python*-pip`` installation (\ `d999597 <https://github.com/saltstack-formulas/postgres-formula/commit/d999597>`_\ )
|
||||||
|
* **kitchen+travis:** modify matrix to include ``develop`` platform (\ `3f81439 <https://github.com/saltstack-formulas/postgres-formula/commit/3f81439>`_\ )
|
||||||
|
|
||||||
|
Features
|
||||||
|
^^^^^^^^
|
||||||
|
|
||||||
|
|
||||||
|
* **debian:** add buster support (\ `904ba27 <https://github.com/saltstack-formulas/postgres-formula/commit/904ba27>`_\ )
|
||||||
|
|
||||||
`0.37.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4>`_ (2019-05-31)
|
`0.37.4 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.3...v0.37.4>`_ (2019-05-31)
|
||||||
-------------------------------------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|||||||
@@ -156,3 +156,4 @@ An example of that:
|
|||||||
BREAKING CHANGE: With the removal of all of the `.sls` files under
|
BREAKING CHANGE: With the removal of all of the `.sls` files under
|
||||||
`template package`, this formula no longer supports the installation of
|
`template package`, this formula no longer supports the installation of
|
||||||
packages.
|
packages.
|
||||||
|
|
||||||
|
|||||||
80
kitchen.yml
80
kitchen.yml
@@ -11,7 +11,40 @@ driver:
|
|||||||
# Make sure the platforms listed below match up with
|
# Make sure the platforms listed below match up with
|
||||||
# the `env.matrix` instances defined in `.travis.yml`
|
# the `env.matrix` instances defined in `.travis.yml`
|
||||||
platforms:
|
platforms:
|
||||||
## SALT 2019.2
|
## SALT `develop`
|
||||||
|
- name: debian-9-develop-py3
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-develop-py3:debian-9
|
||||||
|
provision_command:
|
||||||
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
|
- name: ubuntu-1804-develop-py3
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-develop-py3:ubuntu-18.04
|
||||||
|
provision_command:
|
||||||
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
|
- name: centos-7-develop-py3
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-develop-py3:centos-7
|
||||||
|
provision_command:
|
||||||
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
|
- name: fedora-29-develop-py3
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-develop-py3:fedora-29
|
||||||
|
provision_command:
|
||||||
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
|
- name: opensuse-leap-15-develop-py3
|
||||||
|
driver:
|
||||||
|
image: netmanagers/salt-develop-py3:opensuse-leap-15
|
||||||
|
provision_command:
|
||||||
|
- curl -o bootstrap-salt.sh -L https://bootstrap.saltstack.com
|
||||||
|
- sh bootstrap-salt.sh -XdPbfrq -x python3 git develop
|
||||||
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
|
## SALT `2019.2`
|
||||||
- name: debian-9-2019-2-py3
|
- name: debian-9-2019-2-py3
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2019.2-py3:debian-9
|
image: netmanagers/salt-2019.2-py3:debian-9
|
||||||
@@ -29,7 +62,7 @@ platforms:
|
|||||||
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
## SALT 2018.3
|
## SALT `2018.3`
|
||||||
- name: debian-9-2018-3-py2
|
- name: debian-9-2018-3-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:debian-9
|
image: netmanagers/salt-2018.3-py2:debian-9
|
||||||
@@ -42,19 +75,12 @@ platforms:
|
|||||||
- name: fedora-29-2018-3-py2
|
- name: fedora-29-2018-3-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:fedora-29
|
image: netmanagers/salt-2018.3-py2:fedora-29
|
||||||
# TODO: Use this when fixed instead of `opensuse-423`
|
- name: opensuse-leap-42-2018-3-py2
|
||||||
- name: opensuse-leap-15-2018-3-py2
|
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
|
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
|
||||||
run_command: /usr/lib/systemd/systemd
|
|
||||||
- name: opensuse-423-2018-3-py2
|
|
||||||
driver:
|
|
||||||
image: netmanagers/salt-2018.3-py2:opensuse-423
|
|
||||||
provision_command:
|
|
||||||
- zypper refresh && zypper install -y net-tools
|
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
## SALT 2017.7
|
## SALT `2017.7`
|
||||||
- name: debian-8-2017-7-py2
|
- name: debian-8-2017-7-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2017.7-py2:debian-8
|
image: netmanagers/salt-2017.7-py2:debian-8
|
||||||
@@ -71,8 +97,6 @@ platforms:
|
|||||||
- name: opensuse-leap-42-2017-7-py2
|
- name: opensuse-leap-42-2017-7-py2
|
||||||
driver:
|
driver:
|
||||||
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
|
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
|
||||||
provision_command:
|
|
||||||
- zypper refresh && zypper install -y python-pip
|
|
||||||
run_command: /usr/lib/systemd/systemd
|
run_command: /usr/lib/systemd/systemd
|
||||||
|
|
||||||
provisioner:
|
provisioner:
|
||||||
@@ -84,17 +108,6 @@ provisioner:
|
|||||||
salt_copy_filter:
|
salt_copy_filter:
|
||||||
- .kitchen
|
- .kitchen
|
||||||
- .git
|
- .git
|
||||||
state_top:
|
|
||||||
base:
|
|
||||||
'*':
|
|
||||||
- postgres
|
|
||||||
pillars:
|
|
||||||
top.sls:
|
|
||||||
base:
|
|
||||||
'*':
|
|
||||||
- postgres
|
|
||||||
pillars_from_files:
|
|
||||||
postgres.sls: test/salt/pillar/postgres.sls
|
|
||||||
|
|
||||||
verifier:
|
verifier:
|
||||||
# https://www.inspec.io/
|
# https://www.inspec.io/
|
||||||
@@ -103,8 +116,21 @@ verifier:
|
|||||||
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
||||||
reporter:
|
reporter:
|
||||||
- cli
|
- cli
|
||||||
inspec_tests:
|
|
||||||
- path: test/integration/default
|
|
||||||
|
|
||||||
suites:
|
suites:
|
||||||
- name: default
|
- name: default
|
||||||
|
provisioner:
|
||||||
|
state_top:
|
||||||
|
base:
|
||||||
|
'*':
|
||||||
|
- postgres
|
||||||
|
pillars:
|
||||||
|
top.sls:
|
||||||
|
base:
|
||||||
|
'*':
|
||||||
|
- postgres
|
||||||
|
pillars_from_files:
|
||||||
|
postgres.sls: test/salt/pillar/postgres.sls
|
||||||
|
verifier:
|
||||||
|
inspec_tests:
|
||||||
|
- path: test/integration/default
|
||||||
|
|||||||
@@ -50,16 +50,18 @@
|
|||||||
|
|
||||||
{% endmacro %}
|
{% endmacro %}
|
||||||
|
|
||||||
## Debian GNU/Linux
|
## Debian GNU/Linux (the second parameter refers to the postgresql package version, not the distro)
|
||||||
{{ debian_codename('wheezy', '9.1') }}
|
{{ debian_codename('wheezy', '9.1') }}
|
||||||
{{ debian_codename('jessie', '9.4') }}
|
{{ debian_codename('jessie', '9.4') }}
|
||||||
{{ debian_codename('stretch', '9.6') }}
|
{{ debian_codename('stretch', '9.6') }}
|
||||||
|
{{ debian_codename('buster', '11') }}
|
||||||
|
|
||||||
# `oscodename` grain has long distro name
|
# `oscodename` grain has long distro name
|
||||||
# if `lsb-release` package not installed
|
# if `lsb-release` package not installed
|
||||||
{{ debian_codename('wheezy', '9.1', 'Debian GNU/Linux 7 (wheezy)') }}
|
{{ debian_codename('wheezy', '9.1', 'Debian GNU/Linux 7 (wheezy)') }}
|
||||||
{{ debian_codename('jessie', '9.4', 'Debian GNU/Linux 8 (jessie)') }}
|
{{ debian_codename('jessie', '9.4', 'Debian GNU/Linux 8 (jessie)') }}
|
||||||
{{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
|
{{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
|
||||||
|
{{ debian_codename('buster', '11', 'Debian GNU/Linux 10 (buster)') }}
|
||||||
|
|
||||||
## Ubuntu
|
## Ubuntu
|
||||||
{{ debian_codename('trusty', '9.3') }}
|
{{ debian_codename('trusty', '9.3') }}
|
||||||
|
|||||||
@@ -87,12 +87,13 @@
|
|||||||
{%- else %}
|
{%- else %}
|
||||||
{%- set fs_dir = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
|
{%- set fs_dir = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{%- set url = '- salt://' ~ '/'.join([
|
{%- set url = [
|
||||||
path_prefix_inc_ext,
|
'- salt:/',
|
||||||
files_dir,
|
path_prefix_inc_ext.strip('/'),
|
||||||
fs_dir,
|
files_dir.strip('/'),
|
||||||
src_file.lstrip('/')
|
fs_dir.strip('/'),
|
||||||
]) %}
|
src_file.strip('/'),
|
||||||
|
] | select | join('/') %}
|
||||||
{{ url | indent(indent_width, true) }}
|
{{ url | indent(indent_width, true) }}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
{%- endfor %}
|
{%- endfor %}
|
||||||
|
|||||||
50
test/integration/default/README.md
Normal file
50
test/integration/default/README.md
Normal file
@@ -0,0 +1,50 @@
|
|||||||
|
# InSpec Profile: `default`
|
||||||
|
|
||||||
|
This shows the implementation of the `default` InSpec [profile](https://github.com/inspec/inspec/blob/master/docs/profiles.md).
|
||||||
|
|
||||||
|
## Verify a profile
|
||||||
|
|
||||||
|
InSpec ships with built-in features to verify a profile structure.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ inspec check default
|
||||||
|
Summary
|
||||||
|
-------
|
||||||
|
Location: default
|
||||||
|
Profile: profile
|
||||||
|
Controls: 4
|
||||||
|
Timestamp: 2019-06-24T23:09:01+00:00
|
||||||
|
Valid: true
|
||||||
|
|
||||||
|
Errors
|
||||||
|
------
|
||||||
|
|
||||||
|
Warnings
|
||||||
|
--------
|
||||||
|
```
|
||||||
|
|
||||||
|
## Execute a profile
|
||||||
|
|
||||||
|
To run all **supported** controls on a local machine use `inspec exec /path/to/profile`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ inspec exec default
|
||||||
|
..
|
||||||
|
|
||||||
|
Finished in 0.0025 seconds (files took 0.12449 seconds to load)
|
||||||
|
8 examples, 0 failures
|
||||||
|
```
|
||||||
|
|
||||||
|
## Execute a specific control from a profile
|
||||||
|
|
||||||
|
To run one control from the profile use `inspec exec /path/to/profile --controls name`.
|
||||||
|
|
||||||
|
```bash
|
||||||
|
$ inspec exec default --controls package
|
||||||
|
.
|
||||||
|
|
||||||
|
Finished in 0.0025 seconds (files took 0.12449 seconds to load)
|
||||||
|
1 examples, 0 failures
|
||||||
|
```
|
||||||
|
|
||||||
|
See an [example control here](https://github.com/inspec/inspec/blob/master/examples/profile/controls/example.rb).
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
name: postgres
|
name: default
|
||||||
title: Postgres Formula
|
title: postgres formula
|
||||||
maintainer: Your Name
|
maintainer: SaltStack Formulas
|
||||||
license: Apache-2.0
|
license: Apache-2.0
|
||||||
summary: Verify that the postgres formula is setup and configured correctly
|
summary: Verify that the postgres formula is setup and configured correctly
|
||||||
supports:
|
supports:
|
||||||
- os-name: debian
|
- platform-name: debian
|
||||||
- os-name: ubuntu
|
- platform-name: ubuntu
|
||||||
- os-name: centos
|
- platform-name: centos
|
||||||
- os-name: fedora
|
- platform-name: fedora
|
||||||
- os-name: opensuse
|
- platform-name: opensuse
|
||||||
- os-name: suse
|
- platform-name: suse
|
||||||
|
- platform-name: freebsd
|
||||||
|
- platform-name: amazon
|
||||||
|
|||||||
Reference in New Issue
Block a user