Merge branch '18378-add-debian-11-platform'

[arvados-formula.git] / test / salt / pillar / examples / postgresql.sls

diff --git a/test/salt/pillar/examples/postgresql.sls b/test/salt/pillar/examples/postgresql.sls
index aec4f1340a0c0ca290a3951a0a27c8049032a8a1..a60b41f2f7e70b4e9df30a1e8ff4483d7f566315 100644 (file)
--- a/test/salt/pillar/examples/postgresql.sls
+++ b/test/salt/pillar/examples/postgresql.sls
@@ -1,14 +1,36 @@
 ---
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 ### POSTGRESQL
 postgres:
+  # Centos-7 and Ubuntu-18.04's postgres packages are too old, so we need to force using upstream's
+  # This is not required in Debian's family as they already ship with PG +11
+  {%- if salt['grains.get']('osfinger') in ['Ubuntu-18.04', 'CentOS Linux-7'] %}
+  use_upstream_repo: true
+  version: '12'
+
+    {%- if salt['grains.get']('osfinger') == 'CentOS Linux-7' %}
+  pkgs_deps:
+    - libicu
+    - libxslt
+    - systemd-sysv
+  pkgs_extra:
+    - postgresql12-contrib
+
+    {%- endif %}
+
+  {%- else %}
   use_upstream_repo: false
   pkgs_extra:
     - postgresql-contrib
+  {%- endif %}
   postgresconf: |-
     listen_addresses = '*'  # listen on all interfaces
     #ssl = on
-    #ssl_cert_file = '/etc/ssl/certs/ssl-cert-snakeoil.pem'
-    #ssl_key_file = '/etc/ssl/private/ssl-cert-snakeoil.key'
+    #ssl_cert_file = '/etc/ssl/certs/arvados-snakeoil-cert.pem'
+    #ssl_key_file = '/etc/ssl/private/arvados-snakeoil-cert.key'
   acls:
     - ['local', 'all', 'postgres', 'peer']
     - ['local', 'all', 'all', 'peer']