Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5df8f79dc1 | ||
|
|
0046482adf | ||
|
|
904ba271ca | ||
|
|
e5700f48c5 | ||
|
|
aa492c3ba9 | ||
|
|
72ff82ce75 | ||
|
|
5e631bf7d8 | ||
|
|
d999597a91 | ||
|
|
45a921dc4e | ||
|
|
3f81439991 | ||
|
|
44b8fb1bc2 | ||
|
|
cb4e405098 | ||
|
|
2ff919f1bf | ||
|
|
81165fc405 | ||
|
|
a054cea962 | ||
|
|
77960641dd | ||
|
|
cb8de937a5 | ||
|
|
5763d220e5 | ||
|
|
8745365d71 | ||
|
|
10126fb740 | ||
|
|
65519cb06f | ||
|
|
0aa8b4a048 | ||
|
|
425049ceec | ||
|
|
07d491e2cb | ||
|
|
850ca6ae88 |
14
.gitignore
vendored
14
.gitignore
vendored
@@ -48,6 +48,7 @@ coverage.xml
|
||||
.kitchen
|
||||
.kitchen.local.yml
|
||||
kitchen.local.yml
|
||||
junit-*.xml
|
||||
|
||||
# Translations
|
||||
*.mo
|
||||
@@ -103,8 +104,19 @@ ENV/
|
||||
# mypy
|
||||
.mypy_cache/
|
||||
|
||||
# Bundler
|
||||
Gemfile.lock
|
||||
|
||||
# copied `.md` files used for conversion to `.rst` using `m2r`
|
||||
docs/*.md
|
||||
|
||||
# Vim
|
||||
*.sw[nop]
|
||||
*.sw?
|
||||
|
||||
## Collected when centralising formulas (check and sort)
|
||||
# `collectd-formula`
|
||||
.pytest_cache/
|
||||
/.idea/
|
||||
Dockerfile.*_*
|
||||
ignore/
|
||||
tmp/
|
||||
|
||||
39
.travis.yml
39
.travis.yml
@@ -1,3 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: ft=yaml
|
||||
---
|
||||
stages:
|
||||
- test
|
||||
- commitlint
|
||||
@@ -7,39 +10,40 @@ stages:
|
||||
sudo: required
|
||||
cache: bundler
|
||||
language: ruby
|
||||
dist: xenial
|
||||
|
||||
services:
|
||||
- docker
|
||||
|
||||
before_install:
|
||||
- bundle install
|
||||
|
||||
# Make sure the instances listed below match up with
|
||||
# the `platforms` defined in `kitchen.yml`
|
||||
env:
|
||||
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
|
||||
# - INSTANCE: default-ubuntu-1804-2019-2-py3
|
||||
- INSTANCE: default-centos-7-2019-2-py3
|
||||
- INSTANCE: default-fedora-29-2019-2-py3
|
||||
- INSTANCE: default-opensuse-leap-15-2019-2-py3
|
||||
- INSTANCE: default-debian-9-2018-3-py2
|
||||
# - INSTANCE: default-opensuse-leap-15-2019-2-py3
|
||||
# - 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
|
||||
# TODO: Use this when fixed instead of `opensuse-423`
|
||||
# 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-ubuntu-1604-2017-7-py2
|
||||
# - INSTANCE: default-centos-7-2018-3-py2
|
||||
# - INSTANCE: default-fedora-29-2018-3-py2
|
||||
- INSTANCE: default-opensuse-leap-42-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-28-2017-7-py2
|
||||
- INSTANCE: default-opensuse-leap-42-2017-7-py2
|
||||
# - INSTANCE: default-fedora-28-2017-7-py2
|
||||
# - INSTANCE: default-opensuse-leap-42-2017-7-py2
|
||||
|
||||
script:
|
||||
- bundle exec kitchen verify ${INSTANCE}
|
||||
- bin/kitchen verify ${INSTANCE}
|
||||
|
||||
jobs:
|
||||
include:
|
||||
@@ -73,4 +77,3 @@ jobs:
|
||||
script:
|
||||
# Run `semantic-release`
|
||||
- npx semantic-release@15
|
||||
|
||||
|
||||
15
AUTHORS.md
15
AUTHORS.md
@@ -4,23 +4,23 @@ 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://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://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://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://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://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/10231489?v=4' width='36' height='36' alt='@myii'>|[@myii](https://github.com/myii)|38
|
||||
<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)|30
|
||||
<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://avatars0.githubusercontent.com/u/3374962?v=4' width='36' height='36' alt='@nmadhok'>|[@nmadhok](https://github.com/nmadhok)|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)|18
|
||||
<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://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://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/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://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/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
|
||||
@@ -65,8 +65,9 @@ Avatar|Contributor|Contributions
|
||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/2097647?v=4' width='36' height='36' alt='@XRasher'>|[@XRasher](https://github.com/XRasher)|1
|
||||
<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/8005290?v=4' width='36' height='36' alt='@YetAnotherMinion'>|[@YetAnotherMinion](https://github.com/YetAnotherMinion)|1
|
||||
<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>|[@ek9](https://github.com/ek9)|1
|
||||
<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11394644?v=4' width='36' height='36' alt='@Strade288'>|[@Strade288](https://github.com/Strade288)|1
|
||||
<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)|1
|
||||
|
||||
---
|
||||
|
||||
Auto generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-05-06.
|
||||
Auto-generated by a [forked version](https://github.com/myii/maintainer) of [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-07-24.
|
||||
|
||||
48
CHANGELOG.md
48
CHANGELOG.md
@@ -1,5 +1,53 @@
|
||||
# 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)
|
||||
|
||||
|
||||
### Continuous Integration
|
||||
|
||||
* **travis:** reduce matrix down to 6 instances ([2ff919f](https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f))
|
||||
|
||||
|
||||
### Tests
|
||||
|
||||
* **`services_spec`:** remove temporary `suse` conditional ([81165fc](https://github.com/saltstack-formulas/postgres-formula/commit/81165fc))
|
||||
* **command_spec:** use cleaner `match` string using `%r` ([a054cea](https://github.com/saltstack-formulas/postgres-formula/commit/a054cea))
|
||||
* **locale:** improve test using locale `en_US.UTF-8` ([7796064](https://github.com/saltstack-formulas/postgres-formula/commit/7796064))
|
||||
|
||||
## [0.37.3](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3) (2019-05-16)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **freebsd-user:** fix FreeBSD daemon's user for PostgreSQL >= 9.6 ([8745365](https://github.com/saltstack-formulas/postgres-formula/commit/8745365)), closes [#263](https://github.com/saltstack-formulas/postgres-formula/issues/263)
|
||||
|
||||
## [0.37.2](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.1...v0.37.2) (2019-05-12)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **sysrc-svc:** workaround *BSD minion indefinitely hanging on start ([0aa8b4a](https://github.com/saltstack-formulas/postgres-formula/commit/0aa8b4a))
|
||||
|
||||
## [0.37.1](https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.0...v0.37.1) (2019-05-06)
|
||||
|
||||
|
||||
### Documentation
|
||||
|
||||
* **readme:** fix link for Travis badge ([850ca6a](https://github.com/saltstack-formulas/postgres-formula/commit/850ca6a))
|
||||
|
||||
# [0.37.0](https://github.com/saltstack-formulas/postgres-formula/compare/v0.36.0...v0.37.0) (2019-05-06)
|
||||
|
||||
|
||||
|
||||
2
FORMULA
2
FORMULA
@@ -1,7 +1,7 @@
|
||||
name: postgres
|
||||
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
|
||||
version: 0.37.0
|
||||
version: 0.38.0
|
||||
release: 1
|
||||
minimum_version: 2016.11
|
||||
summary: Postgres formula
|
||||
|
||||
1
Gemfile
1
Gemfile
@@ -3,3 +3,4 @@ source "https://rubygems.org"
|
||||
gem 'kitchen-docker', '>= 2.9'
|
||||
gem 'kitchen-salt', '>= 0.6.0'
|
||||
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,25 +15,25 @@ This list is sorted by the number of commits per contributor in *descending* ord
|
||||
- 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'>`
|
||||
- `@noelmcloughlin <https://github.com/noelmcloughlin>`_
|
||||
- 57
|
||||
- 58
|
||||
* - :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>`_
|
||||
- 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>`_
|
||||
- 47
|
||||
- 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'>`
|
||||
- `@gravyboat <https://github.com/gravyboat>`_
|
||||
- 41
|
||||
* - :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>`_
|
||||
- 38
|
||||
* - :raw-html-m2r:`<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>`_
|
||||
- 30
|
||||
- 31
|
||||
* - :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>`_
|
||||
- 19
|
||||
* - :raw-html-m2r:`<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>`_
|
||||
- 19
|
||||
* - :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>`_
|
||||
- 18
|
||||
* - :raw-html-m2r:`<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
|
||||
@@ -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'>`
|
||||
- `@dferrantelli <https://github.com/dferrantelli>`_
|
||||
- 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'>`
|
||||
- `@whiteinge <https://github.com/whiteinge>`_
|
||||
- 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'>`
|
||||
- `@alfredopalhares <https://github.com/alfredopalhares>`_
|
||||
- 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'>`
|
||||
- `@alxwr <https://github.com/alxwr>`_
|
||||
- 5
|
||||
@@ -196,6 +196,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://avatars0.githubusercontent.com/u/17393048?v=4' width='36' height='36' alt='@ek9'>`
|
||||
- `@ek9 <https://github.com/ek9>`_
|
||||
- 1
|
||||
* - :raw-html-m2r:`<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/11394644?v=4' width='36' height='36' alt='@Strade288'>`
|
||||
- `@Strade288 <https://github.com/Strade288>`_
|
||||
- 1
|
||||
* - :raw-html-m2r:`<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>`_
|
||||
- 1
|
||||
@@ -203,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-06.
|
||||
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,66 @@
|
||||
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)
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Continuous Integration
|
||||
^^^^^^^^^^^^^^^^^^^^^^
|
||||
|
||||
|
||||
* **travis:** reduce matrix down to 6 instances (\ `2ff919f <https://github.com/saltstack-formulas/postgres-formula/commit/2ff919f>`_\ )
|
||||
|
||||
Tests
|
||||
^^^^^
|
||||
|
||||
|
||||
* **\ ``services_spec``\ :** remove temporary ``suse`` conditional (\ `81165fc <https://github.com/saltstack-formulas/postgres-formula/commit/81165fc>`_\ )
|
||||
* **command_spec:** use cleaner ``match`` string using ``%r`` (\ `a054cea <https://github.com/saltstack-formulas/postgres-formula/commit/a054cea>`_\ )
|
||||
* **locale:** improve test using locale ``en_US.UTF-8`` (\ `7796064 <https://github.com/saltstack-formulas/postgres-formula/commit/7796064>`_\ )
|
||||
|
||||
`0.37.3 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.2...v0.37.3>`_ (2019-05-16)
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Bug Fixes
|
||||
^^^^^^^^^
|
||||
|
||||
|
||||
* **freebsd-user:** fix FreeBSD daemon's user for PostgreSQL >= 9.6 (\ `8745365 <https://github.com/saltstack-formulas/postgres-formula/commit/8745365>`_\ ), closes `#263 <https://github.com/saltstack-formulas/postgres-formula/issues/263>`_
|
||||
|
||||
`0.37.2 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.1...v0.37.2>`_ (2019-05-12)
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Bug Fixes
|
||||
^^^^^^^^^
|
||||
|
||||
|
||||
* **sysrc-svc:** workaround *BSD minion indefinitely hanging on start (\ `0aa8b4a <https://github.com/saltstack-formulas/postgres-formula/commit/0aa8b4a>`_\ )
|
||||
|
||||
`0.37.1 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.37.0...v0.37.1>`_ (2019-05-06)
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
Documentation
|
||||
^^^^^^^^^^^^^
|
||||
|
||||
|
||||
* **readme:** fix link for Travis badge (\ `850ca6a <https://github.com/saltstack-formulas/postgres-formula/commit/850ca6a>`_\ )
|
||||
|
||||
`0.37.0 <https://github.com/saltstack-formulas/postgres-formula/compare/v0.36.0...v0.37.0>`_ (2019-05-06)
|
||||
-------------------------------------------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -156,3 +156,4 @@ An example of that:
|
||||
BREAKING CHANGE: With the removal of all of the `.sls` files under
|
||||
`template package`, this formula no longer supports the installation of
|
||||
packages.
|
||||
|
||||
|
||||
@@ -5,10 +5,10 @@ postgres-formula
|
||||
|
||||
|img_travis| |img_sr|
|
||||
|
||||
.. |img_travis| image:: https://travis-ci.com/saltstack-formulas/template-formula.svg?branch=master
|
||||
.. |img_travis| image:: https://travis-ci.com/saltstack-formulas/postgres-formula.svg?branch=master
|
||||
:alt: Travis CI Build Status
|
||||
:scale: 100%
|
||||
:target: https://travis-ci.com/saltstack-formulas/template-formula
|
||||
:target: https://travis-ci.com/saltstack-formulas/postgres-formula
|
||||
.. |img_sr| image:: https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg
|
||||
:alt: Semantic Release
|
||||
:scale: 100%
|
||||
|
||||
76
kitchen.yml
76
kitchen.yml
@@ -11,7 +11,40 @@ driver:
|
||||
# Make sure the platforms listed below match up with
|
||||
# the `env.matrix` instances defined in `.travis.yml`
|
||||
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
|
||||
driver:
|
||||
image: netmanagers/salt-2019.2-py3:debian-9
|
||||
@@ -29,7 +62,7 @@ platforms:
|
||||
image: netmanagers/salt-2019.2-py3:opensuse-leap-15
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT 2018.3
|
||||
## SALT `2018.3`
|
||||
- name: debian-9-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:debian-9
|
||||
@@ -42,19 +75,12 @@ platforms:
|
||||
- name: fedora-29-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:fedora-29
|
||||
# TODO: Use this when fixed instead of `opensuse-423`
|
||||
- name: opensuse-leap-15-2018-3-py2
|
||||
- name: opensuse-leap-42-2018-3-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2018.3-py2:opensuse-leap-15
|
||||
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
|
||||
image: netmanagers/salt-2018.3-py2:opensuse-leap-42
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
## SALT 2017.7
|
||||
## SALT `2017.7`
|
||||
- name: debian-8-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:debian-8
|
||||
@@ -71,8 +97,6 @@ platforms:
|
||||
- name: opensuse-leap-42-2017-7-py2
|
||||
driver:
|
||||
image: netmanagers/salt-2017.7-py2:opensuse-leap-42
|
||||
provision_command:
|
||||
- zypper refresh && zypper install -y python-pip
|
||||
run_command: /usr/lib/systemd/systemd
|
||||
|
||||
provisioner:
|
||||
@@ -84,6 +108,18 @@ provisioner:
|
||||
salt_copy_filter:
|
||||
- .kitchen
|
||||
- .git
|
||||
|
||||
verifier:
|
||||
# https://www.inspec.io/
|
||||
name: inspec
|
||||
sudo: true
|
||||
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
||||
reporter:
|
||||
- cli
|
||||
|
||||
suites:
|
||||
- name: default
|
||||
provisioner:
|
||||
state_top:
|
||||
base:
|
||||
'*':
|
||||
@@ -95,16 +131,6 @@ provisioner:
|
||||
- postgres
|
||||
pillars_from_files:
|
||||
postgres.sls: test/salt/pillar/postgres.sls
|
||||
|
||||
verifier:
|
||||
# https://www.inspec.io/
|
||||
name: inspec
|
||||
sudo: true
|
||||
# cli, documentation, html, progress, json, json-min, json-rspec, junit
|
||||
reporter:
|
||||
- cli
|
||||
verifier:
|
||||
inspec_tests:
|
||||
- path: test/integration/default
|
||||
|
||||
suites:
|
||||
- name: default
|
||||
|
||||
@@ -24,7 +24,10 @@ postgres:
|
||||
# These pillars are typically never required.
|
||||
# pkg: 'postgresql'
|
||||
# pkg_client: 'postgresql-client'
|
||||
# service: postgresql
|
||||
# service:
|
||||
# name: 'postgresql'
|
||||
# flags: -w -s -m fast
|
||||
# sysrc: True
|
||||
pkgs_extra:
|
||||
- postgresql-contrib
|
||||
- postgresql-plpython
|
||||
@@ -33,7 +36,7 @@ postgres:
|
||||
# The default `encoding` is derived from the `locale` so not recommended
|
||||
# to provide a value for it unless necessary
|
||||
cluster:
|
||||
locale: en_GB.UTF-8
|
||||
locale: en_US.UTF-8
|
||||
# encoding: UTF8
|
||||
|
||||
#'Alternatives system' priority incremental. 0 disables feature.
|
||||
|
||||
@@ -50,16 +50,18 @@
|
||||
|
||||
{% 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('jessie', '9.4') }}
|
||||
{{ debian_codename('stretch', '9.6') }}
|
||||
{{ debian_codename('buster', '11') }}
|
||||
|
||||
# `oscodename` grain has long distro name
|
||||
# if `lsb-release` package not installed
|
||||
{{ debian_codename('wheezy', '9.1', 'Debian GNU/Linux 7 (wheezy)') }}
|
||||
{{ debian_codename('jessie', '9.4', 'Debian GNU/Linux 8 (jessie)') }}
|
||||
{{ debian_codename('stretch', '9.6', 'Debian GNU/Linux 9 (stretch)') }}
|
||||
{{ debian_codename('buster', '11', 'Debian GNU/Linux 10 (buster)') }}
|
||||
|
||||
## Ubuntu
|
||||
{{ debian_codename('trusty', '9.3') }}
|
||||
|
||||
@@ -67,7 +67,9 @@ postgres:
|
||||
|
||||
config_backup: '.bak'
|
||||
|
||||
service: postgresql
|
||||
service:
|
||||
name: postgresql
|
||||
sysrc: False
|
||||
|
||||
bake_image: False
|
||||
|
||||
|
||||
@@ -87,12 +87,13 @@
|
||||
{%- else %}
|
||||
{%- set fs_dir = salt['config.get'](tplroot ~ ':tofs:dirs:default', 'default') %}
|
||||
{%- endif %}
|
||||
{%- set url = '- salt://' ~ '/'.join([
|
||||
path_prefix_inc_ext,
|
||||
files_dir,
|
||||
fs_dir,
|
||||
src_file.lstrip('/')
|
||||
]) %}
|
||||
{%- set url = [
|
||||
'- salt:/',
|
||||
path_prefix_inc_ext.strip('/'),
|
||||
files_dir.strip('/'),
|
||||
fs_dir.strip('/'),
|
||||
src_file.strip('/'),
|
||||
] | select | join('/') %}
|
||||
{{ url | indent(indent_width, true) }}
|
||||
{%- endfor %}
|
||||
{%- endfor %}
|
||||
|
||||
@@ -21,20 +21,33 @@ Debian:
|
||||
{% endif %}
|
||||
|
||||
FreeBSD:
|
||||
conf_dir: /usr/local/pgsql/data
|
||||
data_dir: /usr/local/pgsql/data
|
||||
{% if repo.version|float >= 9.6 %}
|
||||
user: &freebsd-user postgres
|
||||
group: &freebsd-group postgres
|
||||
conf_dir: {{ '/var/db/postgres/data' ~ release }}
|
||||
data_dir: {{ '/var/db/postgres/data' ~ release }}
|
||||
{% else %}
|
||||
user: &freebsd-user pgsql
|
||||
group: &freebsd-group pgsql
|
||||
conf_dir: /usr/local/pgsql/data
|
||||
data_dir: /usr/local/pgsql/data
|
||||
{% endif %}
|
||||
pkg_client: postgresql{{ release }}-client
|
||||
pkg: postgresql{{ release }}-server
|
||||
prepare_cluster:
|
||||
user: *freebsd-user
|
||||
group: *freebsd-group
|
||||
service:
|
||||
flags: -w -s -m fast
|
||||
sysrc: True
|
||||
|
||||
OpenBSD:
|
||||
conf_dir: /var/postgresql/data
|
||||
data_dir: /var/postgresql/data
|
||||
user: _postgresql
|
||||
service:
|
||||
flags: -w -s -m fast
|
||||
sysrc: True
|
||||
|
||||
RedHat:
|
||||
pkg_repo:
|
||||
@@ -54,7 +67,8 @@ RedHat:
|
||||
pkg_dev: postgresql{{ release }}-devel
|
||||
conf_dir: {{ data_dir }}
|
||||
data_dir: {{ data_dir }}
|
||||
service: postgresql-{{ repo.version }}
|
||||
service:
|
||||
name: postgresql-{{ repo.version }}
|
||||
|
||||
# Alternatives system
|
||||
linux:
|
||||
@@ -132,7 +146,8 @@ Suse:
|
||||
pkg_libs: postgresql{{ release }}-libs
|
||||
conf_dir: {{ data_dir }}
|
||||
data_dir: {{ data_dir }}
|
||||
service: postgresql-{{ repo.version }}
|
||||
service:
|
||||
name: postgresql-{{ repo.version }}
|
||||
|
||||
# Alternatives system
|
||||
linux:
|
||||
@@ -175,9 +190,11 @@ Suse:
|
||||
## jinja check avoids rendering noise/failure on Linux
|
||||
MacOS:
|
||||
{%- if repo.use_upstream_repo == 'homebrew' %}
|
||||
service: homebrew.mxcl.postgresql
|
||||
service:
|
||||
name: homebrew.mxcl.postgresql
|
||||
{%- elif repo.use_upstream_repo == 'postgresapp' %}
|
||||
service: com.postgresapp.Postgres2
|
||||
service:
|
||||
name: com.postgresapp.Postgres2
|
||||
{%- endif %}
|
||||
pkg: postgresql
|
||||
pkg_client:
|
||||
|
||||
@@ -24,11 +24,11 @@ postgresql-start:
|
||||
postgresql-enable:
|
||||
cmd.run:
|
||||
{%- if salt['file.file_exists']('/bin/systemctl') %}
|
||||
- name: systemctl enable {{ postgres.service }}
|
||||
- name: systemctl enable {{ postgres.service.name }}
|
||||
{%- elif salt['cmd.which']('chkconfig') %}
|
||||
- name: chkconfig {{ postgres.service }} on
|
||||
- name: chkconfig {{ postgres.service.name }} on
|
||||
{%- elif salt['file.file_exists']('/usr/sbin/update-rc.d') %}
|
||||
- name: update-rc.d {{ service }} defaults
|
||||
- name: update-rc.d {{ postgres.service.name }} defaults
|
||||
{%- else %}
|
||||
# Nothing to do
|
||||
- name: 'true'
|
||||
|
||||
@@ -31,8 +31,8 @@ postgresql-server:
|
||||
- require_in:
|
||||
- file: postgresql-server
|
||||
file.managed:
|
||||
- name: /Library/LaunchAgents/{{ postgres.service }}.plist
|
||||
- source: /usr/local/opt/postgres/{{ postgres.service }}.plist
|
||||
- name: /Library/LaunchAgents/{{ postgres.service.name }}.plist
|
||||
- source: /usr/local/opt/postgres/{{ postgres.service.name }}.plist
|
||||
- group: wheel
|
||||
- require_in:
|
||||
- service: postgresql-running
|
||||
@@ -261,12 +261,23 @@ postgresql-tablespace-dir-{{ name }}-fcontext:
|
||||
|
||||
{%- if not postgres.bake_image %}
|
||||
|
||||
# Workaround for FreeBSD minion undefinitely hanging on service start
|
||||
# cf. https://github.com/saltstack/salt/issues/44848
|
||||
{% if postgres.service.sysrc %}
|
||||
posgresql-rc-flags:
|
||||
sysrc.managed:
|
||||
- name: {{ postgres.service.name }}_flags
|
||||
- value: "{{ postgres.service.flags }} > /dev/null 2>&1"
|
||||
- watch_in:
|
||||
- service: postgresql-running
|
||||
{% endif %}
|
||||
|
||||
# Start PostgreSQL server using OS init
|
||||
# Note: This is also the target for numerous `watch_in` requisites above, used
|
||||
# for the necessary service restart after changing the relevant configuration files
|
||||
postgresql-running:
|
||||
service.running:
|
||||
- name: {{ postgres.service }}
|
||||
- name: {{ postgres.service.name }}
|
||||
- enable: True
|
||||
|
||||
# Reload the service for changes made to `pg_ident.conf`, except for `MacOS`
|
||||
@@ -275,7 +286,7 @@ postgresql-running:
|
||||
postgresql-service-reload:
|
||||
module.wait:
|
||||
- name: service.reload
|
||||
- m_name: {{ postgres.service }}
|
||||
- m_name: {{ postgres.service.name }}
|
||||
- require:
|
||||
- service: postgresql-running
|
||||
{%- endif %}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
postgresql-dead:
|
||||
service.dead:
|
||||
- name: {{ postgres.service }}
|
||||
- name: {{ postgres.service.name }}
|
||||
- enable: False
|
||||
|
||||
postgresql-repo-removed:
|
||||
|
||||
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).
|
||||
@@ -9,7 +9,6 @@ control 'Postgres command' do
|
||||
|
||||
# Can't use `%Q` here due to the `\`
|
||||
describe command(%q{su - postgres -c 'psql -p} + pg_port + %q{ -qtc "\l+ db2"'}) do
|
||||
its(:stdout) { should match(/.*db2.*my_space/) }
|
||||
# its(:stdout) { should match(/db2.*remoteUser.*UTF8.*en_US\.UTF-8.*en_US\.UTF-8.*my_space/) }
|
||||
its(:stdout) { should match(%r{db2.*remoteUser.*UTF8.*en_US.UTF-8.*en_US.UTF-8.*my_space}) }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -7,11 +7,6 @@ elsif os[:family] == 'debian' or os[:name] == 'suse'
|
||||
pg_port = 5433
|
||||
end
|
||||
|
||||
# Temporary `if` due to `opensuse-leap-15` bug re: `service`
|
||||
if os[:name] == 'suse'
|
||||
puts "[Skip `service`-based tests due to `opensuse-leap-15` detection bug (see https://github.com/inspec/train/issues/377)]"
|
||||
puts "[Skip `service`-based tests due to `opensuse-leap-15` bug]"
|
||||
else
|
||||
control 'Postgres service' do
|
||||
impact 0.5
|
||||
title 'should be running and enabled'
|
||||
@@ -25,4 +20,3 @@ control 'Postgres service' do
|
||||
it { should be_listening }
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
name: postgres
|
||||
title: Postgres Formula
|
||||
maintainer: Your Name
|
||||
name: default
|
||||
title: postgres formula
|
||||
maintainer: SaltStack Formulas
|
||||
license: Apache-2.0
|
||||
summary: Verify that the postgres formula is setup and configured correctly
|
||||
supports:
|
||||
- os-name: debian
|
||||
- os-name: ubuntu
|
||||
- os-name: centos
|
||||
- os-name: fedora
|
||||
- os-name: opensuse
|
||||
- os-name: suse
|
||||
- platform-name: debian
|
||||
- platform-name: ubuntu
|
||||
- platform-name: centos
|
||||
- platform-name: fedora
|
||||
- platform-name: opensuse
|
||||
- platform-name: suse
|
||||
- platform-name: freebsd
|
||||
- platform-name: amazon
|
||||
|
||||
@@ -42,13 +42,13 @@ postgres:
|
||||
# - postgresql-contrib
|
||||
# - postgresql-plpython
|
||||
|
||||
# # CLUSTER
|
||||
# # The default `encoding` is derived from the `locale` so not recommended
|
||||
# # to provide a value for it unless necessary
|
||||
# cluster:
|
||||
# locale: en_GB.UTF-8
|
||||
# # encoding: UTF8
|
||||
#
|
||||
# CLUSTER
|
||||
# The default `encoding` is derived from the `locale` so not recommended
|
||||
# to provide a value for it unless necessary
|
||||
cluster:
|
||||
locale: en_US.UTF-8
|
||||
# encoding: UTF8
|
||||
|
||||
# #'Alternatives system' priority incremental. 0 disables feature.
|
||||
# linux:
|
||||
# altpriority: 30
|
||||
@@ -166,20 +166,20 @@ postgres:
|
||||
# databases to be created
|
||||
databases:
|
||||
db1:
|
||||
owner: 'localUser'
|
||||
# template: 'template0'
|
||||
# lc_ctype: 'en_US.UTF-8'
|
||||
# lc_collate: 'en_US.UTF-8'
|
||||
owner: localUser
|
||||
template: template0
|
||||
lc_ctype: en_US.UTF-8
|
||||
lc_collate: en_US.UTF-8
|
||||
db2:
|
||||
owner: 'remoteUser'
|
||||
# template: 'template0'
|
||||
# lc_ctype: 'en_US.UTF-8'
|
||||
# lc_collate: 'en_US.UTF-8'
|
||||
tablespace: 'my_space'
|
||||
owner: remoteUser
|
||||
template: template0
|
||||
lc_ctype: en_US.UTF-8
|
||||
lc_collate: en_US.UTF-8
|
||||
tablespace: my_space
|
||||
# set custom schema
|
||||
schemas:
|
||||
public:
|
||||
owner: 'localUser'
|
||||
owner: localUser
|
||||
# enable per-db extension
|
||||
{%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
|
||||
extensions:
|
||||
|
||||
Reference in New Issue
Block a user