From 4898e2b994d42589887a195b2857316aa9ea45e0 Mon Sep 17 00:00:00 2001 From: Stefan Jakobs Date: Wed, 27 Nov 2019 11:42:05 +0100 Subject: [PATCH 1/3] add CentOS-8/RedHat-8 support --- molecule/default/converge.yml | 6 +++--- vars/RedHat-8.yml | 11 +++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 vars/RedHat-8.yml diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml index a437c51..40348b7 100644 --- a/molecule/default/converge.yml +++ b/molecule/default/converge.yml @@ -11,15 +11,15 @@ pre_tasks: # The Fedora 30+ container images have only C.UTF-8 installed - - name: Set database locale if using Fedora 30+ + - name: Set database locale if using Fedora 30+ or RedHat 8+ set_fact: postgresql_databases: - name: example lc_collate: 'C.UTF-8' lc_ctype: 'C.UTF-8' when: - - ansible_distribution == 'Fedora' - - ansible_distribution_major_version >= '30' + - ( ansible_distribution == 'Fedora' and ansible_distribution_major_version >= '30') or + ( ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8') - name: Update apt cache. apt: update_cache=true cache_valid_time=600 diff --git a/vars/RedHat-8.yml b/vars/RedHat-8.yml new file mode 100644 index 0000000..bfd5df7 --- /dev/null +++ b/vars/RedHat-8.yml @@ -0,0 +1,11 @@ +--- +__postgresql_version: "10" +__postgresql_data_dir: "/var/lib/pgsql/data" +__postgresql_bin_path: "/usr/bin" +__postgresql_config_path: "/var/lib/pgsql/data" +__postgresql_daemon: postgresql +__postgresql_packages: + - postgresql + - postgresql-server + - postgresql-contrib +postgresql_python_library: python3-psycopg2 From a4a51a6613c23f06ef8bb41ae82eabc75e503ca1 Mon Sep 17 00:00:00 2001 From: Stefan Jakobs Date: Wed, 4 Mar 2020 17:37:56 +0100 Subject: [PATCH 2/3] Add centos8 to tested distros in .travis.yml and meta --- .travis.yml | 1 + meta/main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index e0fb59b..61d923b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ env: - ROLE_NAME: postgresql matrix: - MOLECULE_DISTRO: centos7 + - MOLECULE_DISTRO: centos8 - MOLECULE_DISTRO: fedora31 - MOLECULE_DISTRO: ubuntu1804 - MOLECULE_DISTRO: debian10 diff --git a/meta/main.yml b/meta/main.yml index 4e81708..5d3ae1f 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -12,6 +12,7 @@ galaxy_info: versions: - 6 - 7 + - 8 - name: Fedora versions: - 29 From 3d9e02f6900071288f6465a6fe0fd325e2d3e60a Mon Sep 17 00:00:00 2001 From: Stefan Jakobs Date: Thu, 5 Mar 2020 09:20:48 +0100 Subject: [PATCH 3/3] Set socket mode to 0755 --- vars/RedHat-8.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/RedHat-8.yml b/vars/RedHat-8.yml index bfd5df7..e519ea9 100644 --- a/vars/RedHat-8.yml +++ b/vars/RedHat-8.yml @@ -8,4 +8,5 @@ __postgresql_packages: - postgresql - postgresql-server - postgresql-contrib +__postgresql_unix_socket_directories_mode: '0755' postgresql_python_library: python3-psycopg2