Merge de93576318 into 156d056c8f

.github/workflows/ci.yml

@@ -19,12 +19,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.postgresql'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 
@@ -52,12 +52,12 @@ jobs:
 
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.postgresql'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

.github/workflows/release.yml

@@ -22,12 +22,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase.
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: 'geerlingguy.postgresql'
 
       - name: Set up Python 3.
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: '3.x'
 

README.md

@@ -76,11 +76,11 @@ If overriding, make sure you copy all of the existing entries from `defaults/mai
       - 'en_US.UTF-8'
 
 (Debian/Ubuntu only) Used to generate the locales used by PostgreSQL databases.
-
+    postgresql_default_locale: 'en_US.UTF-8' # Default `lc_collate` and `lc_ctype` value
     postgresql_databases:
       - name: exampledb # required; the rest are optional
-        lc_collate: # defaults to 'en_US.UTF-8'
-        lc_ctype: # defaults to 'en_US.UTF-8'
+        lc_collate: # defaults to {{ postgresql_default_locale }}
+        lc_ctype: # defaults to {{ postgresql_default_locale }}
         encoding: # defaults to 'UTF-8'
         template: # defaults to 'template0'
         login_host: # defaults to 'localhost'

defaults/main.yml

@@ -38,11 +38,12 @@ postgresql_hba_entries:
 postgresql_locales:
   - 'en_US.UTF-8'
 
+postgresql_default_locale: 'en_US.UTF-8'
 # Databases to ensure exist.
 postgresql_databases: []
 # - name: exampledb # required; the rest are optional
-#   lc_collate: # defaults to 'en_US.UTF-8'
-#   lc_ctype: # defaults to 'en_US.UTF-8'
+#   lc_collate: # defaults to 'postgresql_default_locale'
+#   lc_ctype: # defaults to 'postgresql_default_locale'
 #   encoding: # defaults to 'UTF-8'
 #   template: # defaults to 'template0'
 #   login_host: # defaults to 'localhost'

molecule/default/molecule.yml

@@ -2,11 +2,13 @@
 role_name_check: 1
 dependency:
   name: galaxy
+  options:
+    ignore-errors: true
 driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-centos7}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-rockylinux8}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

tasks/databases.yml

@@ -2,8 +2,8 @@
 - name: Ensure PostgreSQL databases are present.
   postgresql_db:
     name: "{{ item.name }}"
-    lc_collate: "{{ item.lc_collate | default('en_US.UTF-8') }}"
-    lc_ctype: "{{ item.lc_ctype | default('en_US.UTF-8') }}"
+    lc_collate: "{{ item.lc_collate | default(postgresql_default_locale) }}"
+    lc_ctype: "{{ item.lc_ctype | default(postgresql_default_locale) }}"
     encoding: "{{ item.encoding | default('UTF-8') }}"
     template: "{{ item.template | default('template0') }}"
     login_host: "{{ item.login_host | default('localhost') }}"

tasks/variables.yml

@@ -63,10 +63,10 @@
 
 - name: Define postgresql_effective_log_dir, if postgresql_log_dir is absolute
   set_fact:
-    postgresql_effective_log_dir: '{{ postgresql_log_dir }}'
+    postgresql_effective_log_dir: "{{ postgresql_log_dir }}"
   when: postgresql_log_dir is match("/")
 
 - name: Define postgresql_effective_log_dir, if postgresql_log_dir is relative
   set_fact:
-    postgresql_effective_log_dir: '{{ postgresql_data_dir }}/{{ postgresql_log_dir }}'
+    postgresql_effective_log_dir: "{{ postgresql_data_dir }}/{{ postgresql_log_dir }}"
   when: postgresql_log_dir is not match("/")