Commit graph

447 commits

Author SHA1 Message Date
Imran Iqbal
0d9a5ba239 Append Managed by SaltStack comment to port setting
* Regex modified:
  - Ensure whitespace before comment is maintained
  - Consistent with surrounding lines in the file
* Used YAML pipe `>-` due to the colon-space (`: `) in the comment
2018-06-11 02:42:24 +01:00
N
6840bf3839
Merge pull request #204 from noelmcloughlin/python
use upstream repo for python if configured
2018-06-09 19:16:09 +01:00
Imran Iqbal
06e5944133 Allow port to be configurable
Regex:

- `^`        Line start
- `#*\s*`    Find line even if commented out
- `(port)`   'port' -- capture as backreference `\1`
- `\s*=\s*`  Equals sign, whether or not surrounded by whitespace
- `\d{4,5}`  Existing port value, expected at 4/5 digits
- `(.*)`     Remainder (i.e. comment) -- capture as backreference `\2`
- `$`        Line end
2018-06-09 00:21:40 +01:00
N
800259dffe
Merge pull request #217 from myii/patch-2
Prevent default `fromrepo` being evaluated as string 'None'
2018-06-06 19:45:11 +01:00
Imran Iqbal
cdca9108e0 Add fromrepo to pillar.example 2018-06-06 16:37:56 +01:00
Imran Iqbal
2c6483f235 Use default filter for fromrepo instead of or 2018-06-06 16:37:56 +01:00
Imran Iqbal
6a77bbbecd Prevent remaining defaults from being evaluated as string 'None' 2018-06-06 16:37:54 +01:00
N
84e027c4b8
Merge pull request #215 from myii/patch-1
Update `codenamemap` for Ubuntu
2018-06-06 14:41:59 +01:00
myii
bfb158c0e3
Prevent default fromrepo being evaluated as string 'None'
Bare `fromrepo:` results in `{..., 'fromrepo': 'None', ...}`
2018-06-06 05:40:09 +01:00
myii
008526b9e5
Update codenamemap for Ubuntu
Modified for current supported versions as shown at:

* https://packages.ubuntu.com/search?keywords=postgresql&searchon=names
2018-06-05 16:12:08 +01:00
N
e6be41aa15
Merge branch 'master' into python 2018-05-17 16:27:05 +01:00
noelmcloughlin
be07072e4f use upstream repo for python if configured 2018-05-17 16:25:55 +01:00
Niels Abspoel
d22b66dfd0
Merge pull request #211 from mkotsbak/fix_relative_references
Make formula relative to actual directory by using 'tpldir'
2018-05-11 22:45:34 +02:00
Marius Kotsbak
dd526f1de2 Make formula relative to actual directory by using 'tpldir' 2018-05-11 22:35:50 +02:00
Niels Abspoel
3d8d8486ed
Merge pull request #205 from noelmcloughlin/alts
Unique state ID and alternative for dev package
2018-05-10 11:31:48 +02:00
Niels Abspoel
e08f52aaca
Merge pull request #212 from noelmcloughlin/tidyUpCodenamemap
Tidyup codenamemap.yaml for Fedora
2018-05-10 11:30:03 +02:00
Noel McLoughlin
c476099a5e Tidyup codenamemap.yaml 2018-05-10 09:43:19 +01:00
N
6e21e4914a
Merge pull request #209 from noelmcloughlin/fromrepo
Introduce fromrepo support.
2018-05-09 17:45:32 +01:00
Noel McLoughlin
82ef464e86 Remove 'from_repo' in defaults & pkg_dev in codenamemap (not needed) 2018-05-08 09:40:51 +01:00
N
89fa6e87e1
Merge pull request #210 from mkotsbak/patch-1
Better default data directory permission
2018-05-04 14:38:41 +01:00
Marius B. Kotsbak
b5e3fdd3b0
Better data directory permission
Postgresql won't start without directory permission 0700.
2018-05-03 17:24:59 +02:00
noelmcloughlin
3f5c6b5010 Merge branch 'master' into fromrepo 2018-04-23 15:33:49 -06:00
N
bc72dff950
Merge pull request #203 from noelmcloughlin/upstream
Tidyup upstream.sls
2018-04-23 15:15:13 -06:00
noelmcloughlin
8dfc5a5983 Tidyup if/else in upstream.sls 2018-04-23 11:44:44 -06:00
noelmcloughlin
82c2e6ccb6 Merge branch 'master' of https://github.com/saltstack-formulas/postgres-formula into alts 2018-04-22 01:42:12 -06:00
N
14e360170a
Merge pull request #206 from noelmcloughlin/fixDirMode
Convert hex to decimal in defaults.yaml
2018-04-21 11:45:16 +01:00
Javier Bértoli
a8c1e9da64
Merge pull request #207 from vutny/fix-salt-2018.3-compat
Fix compatibility with Salt 2018.3.0
2018-04-12 07:02:20 -03:00
Denys Havrysh
15f3d5f5b4 Fix compatibility with Salt 2018.3.0 2018-04-12 12:35:24 +03:00
noelmcloughlin
9b289b8402 Convert hex to decimal 2018-04-09 15:50:17 +01:00
noelmcloughlin
a4e184b79c fromrepo support 2018-04-09 14:59:49 +01:00
N
b51b592a99
Merge pull request #199 from noelmcloughlin/clientdir
Add client/ directory
2018-04-09 14:31:19 +01:00
noelmcloughlin
cc30fbb903 Updated alternatives solution 2018-03-31 22:51:52 +01:00
Niels Abspoel
ad5792ddd4
Merge pull request #202 from xbglowx/conf_dir_mode
Allow setting dir mode for conf_dir in pillar
2018-03-31 22:54:55 +02:00
Brian Glogower
feb2b386ce
Allow setting dir mode for conf_dir in pillar
The current mode of 0775 causes start problems:

`FATAL:  data directory "/var/lib/postgresql/9.6/main" has group or world access`
2018-03-31 13:03:16 -07:00
N
43b51148fe
Merge pull request #201 from noelmcloughlin/fedora2
Use osmap for OS handling of fedora repo
2018-03-31 20:15:34 +01:00
noelmcloughlin
70491364bd Add OS grain filter_by. Move Fedora to osmap 2018-03-31 20:13:23 +01:00
Niels Abspoel
2dc3a5dfd1
Merge pull request #198 from noelmcloughlin/fedora1
Update Fedora oscode mappings
2018-03-28 16:07:02 +02:00
noelmcloughlin
0551e3f2ab Update Fedora oscode mappings 2018-03-28 14:54:57 +01:00
John Keates
93d1428fae
Merge pull request #200 from noelmcloughlin/debian1
Avoid corrupted upstream install on Debian's
2018-03-28 13:46:01 +02:00
noelmcloughlin
d93d80bae2 Avoid corrupted upstream install on Debian's 2018-03-28 12:05:37 +01:00
noelmcloughlin
23e312eb3e Add client/ directory 2018-03-28 11:28:46 +01:00
Niels Abspoel
7783058767
Merge pull request #197 from noelmcloughlin/notOSmap
Rename osmap to osfamilymap
2018-03-27 20:17:57 +02:00
noelmcloughlin
44f5b7d158 Merge branch 'master' of https://github.com/saltstack-formulas/postgres-formula into notOSmap 2018-03-27 18:42:53 +01:00
noelmcloughlin
8887f96ed8 rename osmap to osfamilymap 2018-03-27 18:41:48 +01:00
N
9e51505541
Merge pull request #196 from noelmcloughlin/fedoraRepo
Fedora repo
2018-03-26 10:12:48 +01:00
noelmcloughlin
b3be3de843 Merge branch 'master' of https://github.com/saltstack-formulas/postgres-formula into fedoraRepo 2018-03-26 09:44:31 +01:00
noelmcloughlin
37c096e078 Use correct Fedora upstream repo 2018-03-26 09:43:19 +01:00
N
56cd03404e
Merge pull request #193 from noelmcloughlin/pkgs
corrected package defaults/maps
2018-03-20 22:54:26 +00:00
noelmcloughlin
2d9ef7606d Merge branch 'master' of https://github.com/saltstack-formulas/postgres-formula into pkgs 2018-03-20 22:41:05 +00:00
noelmcloughlin
4d629f0b0c corrections for packages 2018-03-20 22:37:42 +00:00