Skip to content

Repo setup update #335

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

Open
Riventrop wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Repo setup update #335

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
5 changes: 3 additions & 2 deletions postgres/osfamilymap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Debian:
pkg_repo:
humanname: PostgreSQL Official Repository
file: /etc/apt/sources.list.d/pgdg.list
pkg_repo_keyring: 'https://download.postgresql.org/pub/repos/apt/pool/main/p/pgdg-keyring/pgdg-keyring_2018.2_all.deb'
key_url: https://download.postgresql.org/pub/repos/apt/ACCC4CF8.asc
name: deb https://apt.postgresql.org/pub/repos/apt {{ grains.get('oscodename') }}-pgdg main
pkg_repo_keyid: ACCC4CF8
{% if repo.use_upstream_repo == true %}
pkg_dev: ''
Expand Down Expand Up @@ -60,7 +61,7 @@ RedHat:
name: pgdg{{ release }}
humanname: PostgreSQL {{ repo.version }} $releasever - $basearch
gpgcheck: 1
gpgkey: 'https://download.postgresql.org/pub/repos/yum/RPM-GPG-KEY-PGDG-{{ release }}'
gpgkey: 'https://download.postgresql.org/pub/repos/yum/keys/PGDG-RPM-GPG-KEY-RHEL'
baseurl: 'https://download.postgresql.org/pub/repos/yum/{{ repo.version }}/redhat/rhel-$releasever-$basearch'

pkgs_deps:
Expand Down
21 changes: 1 addition & 20 deletions postgres/upstream.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ postgresql-profile:
- name: /etc/profile.d/postgres.sh
- user: root
- group: root
- mode: 644
- mode: '0644'
- template: jinja
- source: salt://postgres/templates/postgres.sh.j2
- defaults:
Expand All @@ -24,22 +24,9 @@ postgresql-pkg-deps:
- pkgs: {{ postgres.pkgs_deps | json }}

# Add upstream repository for your distro
{% if grains.os_family == 'Debian' %}
{% if salt['pkg.version_cmp'](pg_common_version, '246') <= 0 %}
postgresql-repo-keyring:
pkg.installed:
- sources:
- pgdg-keyring: {{ postgres.pkg_repo_keyring }}
- require_in:
- pkgrepo: postgresql-repo
{%- endif %}
{%- endif %}

postgresql-repo:
pkgrepo.managed:
{{- format_kwargs(postgres.pkg_repo) }}
- require:
- pkg: postgresql-pkg-deps

{%- else -%}

Expand All @@ -51,12 +38,6 @@ postgresql-repo:
- keyid: {{ postgres.pkg_repo_keyid }}
{%- endif %}

{% if grains.os_family == 'Debian' %}
postgresql-repo-keyring:
pkg.removed:
- name: pgdg-keyring
{%- endif -%}

{%- endif -%}

{%- elif grains.os not in ('Windows', 'MacOS',) %}
Expand Down