[jfrog-platform] 7.25.7 release (#159)

Ansible/ansible_collections/jfrog/platform/roles/postgres/defaults/main.yml

@@ -1,4 +1,3 @@
----
 # Default version of Postgres server to install.
 postgres_version: 13
 
@@ -93,3 +92,14 @@ postgres_allowed_hosts:
       address: "0.0.0.0/0",
       method: "trust",
     }
+
+# PostgreSQL misc settings
+postgresql_bin_path: "{{ default_postgresql_bin_path }}"
+postgresql_config_path: "{{ default_postgresql_config_path }}"
+postgresql_data_dir: "{{ default_postgresql_data_dir }}"
+postgresql_daemon: "{{ default_postgresql_daemon }}"
+postgresql_external_pid_file: "{{ default_postgresql_external_pid_file }}"
+
+postgres_apt_key_id: "{{ default_postgres_apt_key_id }}"
+postgres_apt_key_url: "{{ default_postgres_apt_key_url }}"
+postgres_apt_repository_repo: "{{ default_postgres_apt_repository_repo }}"

Ansible/ansible_collections/jfrog/platform/roles/postgres/meta/main.yml

@@ -1,16 +1,27 @@
+---
+dependencies: []
+
 galaxy_info:
   author: "JFrog Maintainers Team <installers@jfrog.com>"
   description: "The postgres role will install Postgresql software and configure a database and user to support an Artifactory or Xray server."
   company: JFrog
-
   issue_tracker_url: "https://github.com/jfrog/JFrog-Cloud-Installers/issues"
-
   license: license (Apache-2.0)
-
   min_ansible_version: 2.9
-
+  platforms:
+    - name: EL
+      versions:
+        - 7
+        - 8
+    - name: Ubuntu
+      versions:
+        - xenial
+        - bionic
+        - focal
+    - name: Debian
+      versions:
+        - stretch
+        - buster
   galaxy_tags:
     - postgres
-    - jfrog
-
-dependencies: []
+    - jfrog

Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/RedHat.yml

@@ -47,6 +47,7 @@
     line: "{{ item }}"
     state: present
     create: yes
+    mode: 0644
   loop:
     - LANG=en_us.UTF-8
     - LANGUAGE=en_us.UTF-8

Ansible/ansible_collections/jfrog/platform/roles/postgres/tasks/install.yml

@@ -120,6 +120,3 @@
     privs: ALL
     type: database
   loop: "{{ dbs | default([]) }}"
-
-- debug:
-    msg: "Restarted postgres systemd {{ postgresql_daemon }}"

Ansible/ansible_collections/jfrog/platform/roles/postgres/templates/pg_hba.conf.j2

@@ -9,10 +9,10 @@
 local   all             all                                     peer
 host    all             all             127.0.0.1/32            md5
 host    all             all             ::1/128                 md5
-## remote connections IPv4
-{% if postgres_allowed_hosts and postgres_allowed_hosts is iterable %}
-    {% for host in postgres_allowed_hosts %}
-        {{ host.type | default('host') }}         {{ host.database | default('all') }}        {{ host.user | default('all') }}             {{ host.address | default('0.0.0.0/0') }}            {{ item.auth | default('trust') }}
-    {% endfor %}
-{% endif %}
 
+## remote connections IPv4
+{% if postgres_allowed_hosts and postgres_allowed_hosts is iterable -%}
+{%- for host in postgres_allowed_hosts %}
+{{ host.type | default('host') }}         {{ host.database | default('all') }}        {{ host.user | default('all') }}             {{ host.address | default('0.0.0.0/0') }}            {{ item.auth | default('trust') }}
+{% endfor %}
+{% endif %}

Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/Debian.yml

@@ -1,8 +1,9 @@
-postgresql_data_dir: "/var/lib/postgresql/{{ postgres_version }}/main"
-postgresql_bin_path: "/usr/lib/postgresql/{{ postgres_version }}/bin"
-postgresql_config_path: "/etc/postgresql/{{ postgres_version }}/main"
-postgresql_daemon: postgresql@{{ postgres_version }}-main
-postgresql_external_pid_file: "/var/run/postgresql/{{ postgres_version }}-main.pid"
-postgres_apt_key_url: "https://www.postgresql.org/media/keys/ACCC4CF8.asc"
-postgres_apt_key_id: "0x7FCC7D46ACCC4CF8"
-postgres_apt_repository_repo: "deb https://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main"
+default_postgresql_bin_path: /usr/lib/postgresql/{{ postgres_version }}/bin
+default_postgresql_config_path: /etc/postgresql/{{ postgres_version }}/main
+default_postgresql_data_dir: /var/lib/postgresql/{{ postgres_version }}/main
+default_postgresql_daemon: postgresql@{{ postgres_version }}-main
+default_postgresql_external_pid_file: /var/run/postgresql/{{ postgres_version }}-main.pid
+
+default_postgres_apt_key_id: '0x7FCC7D46ACCC4CF8'
+default_postgres_apt_key_url: https://www.postgresql.org/media/keys/ACCC4CF8.asc
+default_postgres_apt_repository_repo: deb https://apt.postgresql.org/pub/repos/apt/ {{ ansible_distribution_release }}-pgdg main

Ansible/ansible_collections/jfrog/platform/roles/postgres/vars/RedHat.yml

@@ -1,5 +1,5 @@
-postgresql_bin_path: "/usr/pgsql-{{ postgres_version }}/bin"
-postgresql_data_dir: "/var/lib/pgsql/{{ postgres_version }}/data"
-postgresql_config_path: "/var/lib/pgsql/{{ postgres_version }}/data"
-postgresql_daemon: postgresql-{{ postgres_version }}.service
-postgresql_external_pid_file: "/var/run/postgresql/{{ postgres_version }}-main.pid"
+default_postgresql_bin_path: /usr/pgsql-{{ postgres_version }}/bin
+default_postgresql_config_path: /var/lib/pgsql/{{ postgres_version }}/data
+default_postgresql_data_dir: /var/lib/pgsql/{{ postgres_version }}/data
+default_postgresql_daemon: postgresql-{{ postgres_version }}.service
+default_postgresql_external_pid_file: /var/run/postgresql/{{ postgres_version }}-main.pid