Page MenuHomeDevCentral
Files F35025773

D4117.id10806.diff
No OneTemporary
Actions

D4117.id10806.diff
View Options

diff --git a/pillar/dbserver/cluster-A.sls b/pillar/dbserver/cluster-A.sls
--- a/pillar/dbserver/cluster-A.sls
+++ b/pillar/dbserver/cluster-A.sls
@@ -2,6 +2,7 @@
server:
cluster: A
+ version: 15
# Fantoir database needs the pg_trgm extension
with_contrib: True
diff --git a/pillar/dbserver/windriver.sls b/pillar/dbserver/windriver.sls
--- a/pillar/dbserver/windriver.sls
+++ b/pillar/dbserver/windriver.sls
@@ -48,6 +48,7 @@
server:
cluster: windriver
+ version: 18
# Fantoir database needs the pg_trgm extension
with_contrib: True
diff --git a/roles/dbserver-pgsql/server/content.sls b/roles/dbserver-pgsql/server/content.sls
--- a/roles/dbserver-pgsql/server/content.sls
+++ b/roles/dbserver-pgsql/server/content.sls
@@ -10,6 +10,37 @@
{% set users = salt["pillar.get"]("dbserver_postgresql:users", {}) %}
{% set databases = salt["pillar.get"]("dbserver_postgresql:databases", {}) %}
+# -------------------------------------------------------------
+# Data directory
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
+{% set zfs_tank = salt["node.get"]("zfs:pool") %}
+{% set version = salt["pillar.get"]("dbserver_postgresql:server:version") %}
+{% set data_dir = "data" ~ version %}
+
+postgresql_data_zfs_dataset:
+ zfs.filesystem_present:
+ - name: {{ zfs_tank }}/postgresql/{{ data_dir }}
+ - properties:
+ mountpoint: /var/db/postgres/{{ data_dir }}
+ compression: lz4
+ atime: off
+ recordsize: "8K"
+
+postgresql_data_permissions:
+ file.directory:
+ - name: /var/db/postgres/{{ data_dir }}
+ - user: postgres
+ - group: postgres
+ - mode: 700
+ - require:
+ - zfs: postgresql_data_zfs_dataset
+
+/var/db/postgres/data:
+ file.symlink:
+ - target: {{ data_dir }}
+ - group: postgres
+
# -------------------------------------------------------------
# Users
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

File Metadata

Mime Type
text/plain
Expires
Tue, Jul 7, 01:59 (2 h, 35 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3898932
Default Alt Text
D4117.id10806.diff (1 KB)

Event Timeline

Nasqueron DevCentral · If it had been much bigger the moon would have had a core of ice. · Powered by Phabricator