fix(sysrc-svc): workaround *BSD minion indefinitely hanging on start

Check https://github.com/saltstack/salt/issues/44848 for further details
This commit is contained in:
sam
2019-04-29 12:20:00 +11:00
committed by sticky-note
parent 29cd2d8a7c
commit 0aa8b4a048
6 changed files with 41 additions and 15 deletions

View File

@@ -30,11 +30,17 @@ FreeBSD:
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 +60,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 +139,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 +183,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: