Page MenuHomeDevCentral
Files F13055940

D3882.diff
No OneTemporary
Actions

D3882.diff
View Options

diff --git a/roles/dbserver-pgsql/server/build.sls b/roles/dbserver-pgsql/server/build.sls
deleted file mode 100644
--- a/roles/dbserver-pgsql/server/build.sls
+++ /dev/null
@@ -1,47 +0,0 @@
-# -------------------------------------------------------------
-# Salt — PostgreSQL
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# Project: Nasqueron
-# License: Trivial work, not eligible to copyright
-# -------------------------------------------------------------
-
-{% if grains['os'] == 'FreeBSD' %}
-
-# -------------------------------------------------------------
-# Port options
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-/var/db/ports/databases_postgresql15-server/options:
- file.managed:
- - source: salt://roles/devserver/userland-software/files/port_options
- - template: jinja
- - mode: 644
- - context:
- args:
- category: databases
- name: postgresql15-server
- options:
- set:
- - XML
-
-# -------------------------------------------------------------
-# Build and install package
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-postgresql_build_dependencies:
- pkg.installed:
- - pkgs:
- - dialog4ports
- - gmake
- - pkgconf
- - gettext
-
-postgresql_build_port:
- cmd.run:
- - name: |
- make build package deinstall reinstall
- pkg lock --yes postgresql15-server
- - cwd: /usr/ports/databases/postgresql15-server
- - creates: /usr/local/bin/postgres
-
-{% endif %}
diff --git a/roles/dbserver-pgsql/server/init.sls b/roles/dbserver-pgsql/server/init.sls
--- a/roles/dbserver-pgsql/server/init.sls
+++ b/roles/dbserver-pgsql/server/init.sls
@@ -6,7 +6,6 @@
# -------------------------------------------------------------
include:
- - .build
- .software
- .config
- .service
diff --git a/roles/dbserver-pgsql/server/software.sls b/roles/dbserver-pgsql/server/software.sls
--- a/roles/dbserver-pgsql/server/software.sls
+++ b/roles/dbserver-pgsql/server/software.sls
@@ -1,5 +1,3 @@
-#!py
-
# -------------------------------------------------------------
# Salt — Database server — PostgreSQL
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -7,39 +5,17 @@
# License: Trivial work, not eligible to copyright
# -------------------------------------------------------------
+{% from "map.jinja" import packages with context %}
+
# -------------------------------------------------------------
# PostgreSQL server
-#
-# Packages to install:
-# - PostgreSQL, excepted on FreeBSD: already done in .build
-# - PostgreSQL contrib, if so configured in pillar
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+postgresql_server_software:
+ pkg.installed:
+ - pkgs:
+ - {{ packages.postgresql }}
-def get_packages():
- packages = []
- map_packages = __salt__["jinja.load_map"]("map.jinja", "packages")
-
- if __grains__["os"] != "FreeBSD":
- packages.append(map_packages["postgresql"])
-
- if __salt__["pillar.get"]("dbserver_postgresql:server:with_contrib"):
- packages.append(map_packages["postgresql-contrib"])
-
- return packages
-
-
-def run():
- packages = get_packages()
-
- if not packages:
- # FreeBSD server without contrib: no more package to install
- return {}
-
- return {
- "postgresql_server_software": {
- "pkg.installed": [
- {"pkgs": get_packages()},
- ]
- }
- }
+ {% if pillar["dbserver_postgresql"]["server"]["with_contrib"] | default(False) %}
+ - {{ packages["postgresql-contrib"] }}
+ {% endif %}

File Metadata

Mime Type
text/plain
Expires
Wed, Nov 19, 11:37 (26 m, 2 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3185134
Default Alt Text
D3882.diff (3 KB)

Event Timeline

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