[Ansible] JFrog Platform 7.24.3 (#153)

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

@@ -1,33 +1,36 @@
----
-- name: install acl, python3-psycopg2
+- name: Install prerequisite packages
   become: yes
   apt:
-    name:
-      - acl
-      - python3-psycopg2
+    name: ['acl', 'apt-transport-https', 'locales', 'python3-psycopg2']
     state: present
     update_cache: yes
-  ignore_errors: yes
 
-- name: add postgres apt key
+- name: Ensure UTF-8 locale exists
+  become: yes
+  locale_gen:
+    name: en_US.UTF-8
+    state: present
+
+- name: Import PostgreSQL repository key
   become: yes
   apt_key:
     url: "{{ postgres_apt_key_url }}"
     id: "{{ postgres_apt_key_id }}"
-    validate_certs: no
     state: present
 
-- name: register APT repository
+- name: Register PostgreSQL repository
   become: yes
   apt_repository:
     repo: "{{ postgres_apt_repository_repo }}"
     state: present
     filename: pgdg
 
-- name: install postgres packages
+- name: Install postgres packages
   become: yes
   apt:
     name:
       - postgresql-{{ postgres_version }}
       - postgresql-contrib-{{ postgres_version }}
     state: present
+    update_cache: yes
+    cache_valid_time: 3600

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

@@ -1,14 +1,23 @@
----
-
-- name: install EPEL repository
+- name: Import EPEL GPG public key
   become: yes
-  yum: name=epel-release state=present
-  when: >  # not for Fedora
-    ansible_distribution == 'CentOS' or
-    ansible_distribution == 'Red Hat Enterprise Linux'
+  rpm_key:
+    key: https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-{{ version }}
+    state: present
+  vars:
+    version: "{{ ansible_distribution_major_version }}"
 
-- name: install acl
+- name: Install EPEL repository
   become: yes
+  yum:
+    name: https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ version }}.noarch.rpm
+    state: present
+  vars:
+    version: "{{ ansible_distribution_major_version }}"
+  when: ansible_distribution in ['CentOS', 'RedHat']
+
+- name: Install prerequisite packages
+  become: yes
+  ignore_errors: yes
   yum:
     name:
       - acl
@@ -16,66 +25,46 @@
       - wget
       - perl
     state: present
-  ignore_errors: yes
 
-- name: install python3-psycopg2
+- name: Install python3-psycopg2
   become: yes
   yum:
-    name:
-      - python3-psycopg2
+    name: python3-psycopg2
     state: present
   when: ansible_distribution_major_version == '8'
 
-- name: install python2-psycopg2
+- name: Install python2-psycopg2
   become: yes
   yum:
-    name:
-      - python-psycopg2
+    name: python-psycopg2
     state: present
   when: ansible_distribution_major_version == '7'
 
-- name: fixup some locale issues
+- name: Fixup some locale issues
   become: yes
   lineinfile:
-    dest: /etc/default/locale
-    line: 'LANGUAGE="{{ item }}"'
+    dest: /etc/locale.conf
+    line: "{{ item }}"
     state: present
     create: yes
   loop:
-    - 'en_US:en'
-    - 'en_us.UTF-8'
+    - LANG=en_us.UTF-8
+    - LANGUAGE=en_us.UTF-8
 
-- name: get latest version
-  vars:
-    base: http://download.postgresql.org/pub/repos/yum
-    ver: "{{ ansible_distribution_major_version }}"
-  shell: |
-    set -eo pipefail
-    wget -O - {{ base }}/reporpms/EL-{{ ver }}-x86_64/ 2>/dev/null | \
-    grep 'pgdg-redhat-repo-latest' | \
-    perl -pe 's/^.*rpm">//g' | \
-    perl -pe 's/<\/a>.*//g' | \
-    tail -n 1
-  args:
-    executable: /bin/bash
-  changed_when: false
-  check_mode: false
-  register: latest_version
-  tags: [skip_ansible_lint]
-
-- name: config postgres repository
+- name: Install postgres repository
   become: yes
-  vars:
-    base: http://download.postgresql.org/pub/repos/yum
-    ver: "{{ ansible_distribution_major_version }}"
   yum:
-    name: "{{ base }}/reporpms/EL-{{ ver }}-x86_64/{{ latest_version.stdout }}"
+    name: "{{ base }}/reporpms/EL-{{ version }}-x86_64/{{ repo_file_name }}"
     state: present
+  vars:
+    base: https://download.postgresql.org/pub/repos/yum
+    version: "{{ ansible_distribution_major_version }}"
+    repo_file_name: pgdg-redhat-repo-latest.noarch.rpm
 
-- name: install postgres packages
+- name: Install postgres packages
   become: yes
   yum:
     name:
       - postgresql{{ postgres_server_pkg_version }}-server
       - postgresql{{ postgres_server_pkg_version }}-contrib
-    state: present
+    state: present

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

@@ -1,11 +1,10 @@
----
-- name: define OS-specific variables
+- name: Define OS-specific variables
   include_vars: "{{ ansible_os_family }}.yml"
 
-- name: perform installation
+- name: Install prerequisite packages
   include_tasks: "{{ ansible_os_family }}.yml"
 
-- name: Set PostgreSQL environment variables.
+- name: Set PostgreSQL environment variables
   become: yes
   template:
     src: postgres.sh.j2
@@ -13,7 +12,7 @@
     mode: 0644
   notify: restart postgresql
 
-- name: Ensure PostgreSQL data directory exists.
+- name: Ensure PostgreSQL data directory exists
   become: yes
   become_user: postgres
   file:
@@ -40,7 +39,7 @@
     dest: "{{ postgresql_config_path }}/{{ item }}"
     owner: postgres
     group: postgres
-    mode: u=rw,go=r
+    mode: 0644
   loop:
     - pg_hba.conf
     - postgresql.conf
@@ -56,6 +55,8 @@
 - name: Hold until Postgresql is up and running
   wait_for:
     port: "{{ postgres_port }}"
+    timeout: 120
+    sleep: 10
 
 - name: Create users
   become: yes
@@ -64,7 +65,7 @@
     name: "{{ item.db_user }}"
     password: "{{ item.db_password }}"
     conn_limit: "-1"
-  loop: "{{ db_users|default([]) }}"
+  loop: "{{ db_users | default([]) }}"
   no_log: true  # secret passwords
 
 - name: Create a database
@@ -77,7 +78,7 @@
     lc_collate: "{{ postgres_locale }}"
     lc_ctype: "{{ postgres_locale }}"
     template: template0
-  loop: "{{ dbs|default([]) }}"
+  loop: "{{ dbs | default([]) }}"
 
 - name: Check if MC schemas already exists
   become: yes
@@ -85,15 +86,17 @@
   command: psql -d {{ mc_db_name }} -t -c "\dn"
   register: mc_schemas_loaded
   when: mc_enabled
+  changed_when: false
 
 - name: Create schemas for mission-control
   become: yes
   become_user: postgres
   command: psql -d {{ mc_db_name }} -c 'CREATE SCHEMA {{ item }} authorization {{ mc_db_user }}'
-  loop: "{{  mc_schemas|default([]) }}"
-  when: 
+  loop: "{{  mc_schemas | default([]) }}"
+  when:
     - mc_enabled
-    - "mc_schemas_loaded.stdout is defined and '{{ item }}' not in mc_schemas_loaded.stdout"
+    - mc_schemas_loaded.stdout is defined
+    - item not in mc_schemas_loaded.stdout
 
 - name: Grant all privileges to mc user on its schema
   become: yes
@@ -104,7 +107,7 @@
     type: schema
     roles: "{{ mc_db_user }}"
     objs: "{{ item }}"
-  loop: "{{ mc_schemas|default([]) }}"
+  loop: "{{ mc_schemas | default([]) }}"
   when: mc_enabled
 
 - name: Grant privs on db
@@ -116,7 +119,7 @@
     state: present
     privs: ALL
     type: database
-  loop: "{{ dbs|default([]) }}"
+  loop: "{{ dbs | default([]) }}"
 
 - debug:
     msg: "Restarted postgres systemd {{ postgresql_daemon }}"