Skip to content

feat(archlinux): add support, fixing rendering errors #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2019
Merged

feat(archlinux): add support, fixing rendering errors #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion postgres/upstream.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@ postgresql-repo:
postgresql-repo:
test.show_notification:
- text: |
PostgreSQL does not provide package repository for {{ grains['osfinger'] }}
PostgreSQL does not provide package repository for {{ salt['grains.get']('osfinger', grains.os) }}

{%- endif %}
8 changes: 4 additions & 4 deletions test/salt/pillar/postgres.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Port to use for the cluster -- can be used to provide a non-standard port
# NOTE: If already set in the minion config, that value takes priority

{%- if not (grains.os_family == 'Debian' or grains.osfinger == 'Leap-15') %}
{%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'Leap-15' %}
postgres.port: '5432'
{%- else %}
postgres.port: '5433'
Expand All @@ -10,7 +10,7 @@ postgres.port: '5433'
postgres:
# UPSTREAM REPO
# Set True to configure upstream postgresql.org repository for YUM/APT/ZYPP
{%- if not (grains.os_family == 'Debian' or grains.osfinger == 'CentOS-6') %}
{%- if grains.os_family != 'Debian' and salt['grains.get']('osfinger') != 'CentOS-6' %}
use_upstream_repo: False
{%- else %}
use_upstream_repo: True
Expand Down Expand Up @@ -181,7 +181,7 @@ postgres:
public:
owner: localUser
# enable per-db extension
{%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
{%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
extensions:
uuid-ossp:
schema: 'public'
Expand All @@ -194,7 +194,7 @@ postgres:
owner: localUser

# optional extensions to install in schema
{%- if grains.os_family == 'Debian' and grains.osfinger != 'Debian-8' %}
{%- if grains.os_family == 'Debian' and salt['grains.get']('osfinger') != 'Debian-8' %}
extensions:
uuid-ossp:
schema: uuid-ossp
Expand Down