Merge pull request #257 from brendon-stephens/patch-1

set the default postgres version to "13" for RHEL9 (fixes #252)

.github/stale.yml

@@ -1,57 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 90
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 30
-
-# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
-onlyLabels: []
-
-# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
-exemptLabels:
-  - bug
-  - pinned
-  - security
-  - planned
-
-# Set to true to ignore issues in a project (defaults to false)
-exemptProjects: false
-
-# Set to true to ignore issues in a milestone (defaults to false)
-exemptMilestones: false
-
-# Set to true to ignore issues with an assignee (defaults to false)
-exemptAssignees: false
-
-# Label to use when marking as stale
-staleLabel: stale
-
-# Limit the number of actions per hour, from 1-30. Default is 30
-limitPerRun: 30
-
-pulls:
-  markComment: |-
-    This pull request has been marked 'stale' due to lack of recent activity. If there is no further activity, the PR will be closed in another 30 days. Thank you for your contribution!
-
-    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark pull requests as stale.
-
-  unmarkComment: >-
-    This pull request is no longer marked for closure.
-
-  closeComment: >-
-    This pull request has been closed due to inactivity. If you feel this is in error, please reopen the pull request or file a new PR with the relevant details.
-
-issues:
-  markComment: |-
-    This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
-
-    Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
-
-  unmarkComment: >-
-    This issue is no longer marked for closure.
-
-  closeComment: >-
-    This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.

.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'
 
@@ -44,28 +44,25 @@ jobs:
         distro:
           - rockylinux8
           - rockylinux9
-          - centos7
-          - fedora36
+          - fedora38
           - ubuntu2204
           - ubuntu2004
-          - ubuntu1804
-          - debian10
           - debian11
-          # - amazonlinux2
+          - debian12
 
     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'
 
       - name: Install test dependencies.
-        run: pip3 install ansible molecule[docker] docker
+        run: pip3 install ansible molecule molecule-plugins[docker] docker
 
       - name: Run Molecule tests.
         run: molecule test

.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'
 

.github/workflows/stale.yml

@@ -0,0 +1,34 @@
+---
+name: Close inactive issues
+'on':
+  schedule:
+    - cron: "55 19 * * 5"  # semi-random time
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v8
+        with:
+          days-before-stale: 120
+          days-before-close: 60
+          exempt-issue-labels: bug,pinned,security,planned
+          exempt-pr-labels: bug,pinned,security,planned
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+          stale-issue-message: |
+            This issue has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+            
+            Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+          close-issue-message: |
+            This issue has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+          stale-pr-message: |
+            This pr has been marked 'stale' due to lack of recent activity. If there is no further activity, the issue will be closed in another 30 days. Thank you for your contribution!
+            
+            Please read [this blog post](https://www.jeffgeerling.com/blog/2020/enabling-stale-issue-bot-on-my-github-repositories) to see the reasons why I mark issues as stale.
+          close-pr-message: |
+            This pr has been closed due to inactivity. If you feel this is in error, please reopen the issue or file a new issue with the relevant details.
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

.yamllint

@@ -7,5 +7,4 @@ rules:
     level: warning
 
 ignore: |
-  .github/stale.yml
-  .travis.yml
+  .github/workflows/stale.yml

README.md

@@ -8,56 +8,72 @@ Installs and configures PostgreSQL server on RHEL/CentOS or Debian/Ubuntu server
 
 No special requirements; note that this role requires root access, so either run it in a playbook with a global `become: yes`, or invoke the role in your playbook like:
 
-    - hosts: database
-      roles:
-        - role: geerlingguy.postgresql
-          become: yes
-
+```yaml
+- hosts: database
+  roles:
+    - role: geerlingguy.postgresql
+      become: yes
+```
 ## Role Variables
 
 Available variables are listed below, along with default values (see `defaults/main.yml`):
 
-    postgresql_enablerepo: ""
-
+```yaml
+postgresql_enablerepo: ""
+```
 (RHEL/CentOS only) You can set a repo to use for the PostgreSQL installation by passing it in here.
 
-    postgresql_restarted_state: "restarted"
+```yaml
+postgresql_restarted_state: "restarted"
+```
 
 Set the state of the service when configuration changes are made. Recommended values are `restarted` or `reloaded`.
 
-    postgresql_python_library: python-psycopg2
+```yaml
+postgresql_python_library: python-psycopg2
+```
 
 Library used by Ansible to communicate with PostgreSQL. If you are using Python 3 (e.g. set via `ansible_python_interpreter`), you should change this to `python3-psycopg2`.
 
-    postgresql_user: postgres
-    postgresql_group: postgres
+```yaml
+postgresql_user: postgres
+postgresql_group: postgres
+```
 
 The user and group under which PostgreSQL will run.
 
-    postgresql_unix_socket_directories:
-      - /var/run/postgresql
+```yaml
+postgresql_unix_socket_directories:
+  - /var/run/postgresql
+```
 
 The directories (usually one, but can be multiple) where PostgreSQL's socket will be created.
 
-    postgresql_service_state: started
-    postgresql_service_enabled: true
+```yaml
+postgresql_service_state: started
+postgresql_service_enabled: true
+```
 
 Control the state of the postgresql service and whether it should start at boot time.
 
-    postgresql_global_config_options:
-      - option: unix_socket_directories
-        value: '{{ postgresql_unix_socket_directories | join(",") }}'
-      - option: log_directory
-        value: 'log'
+```yaml
+postgresql_global_config_options:
+  - option: unix_socket_directories
+    value: '{{ postgresql_unix_socket_directories | join(",") }}'
+  - option: log_directory
+    value: 'log'
+```
 Global configuration options that will be set in `postgresql.conf`.
 For PostgreSQL versions older than 9.3 you need to at least override this variable and set the `option` to `unix_socket_directory`.
-If you override the value of `option: log_directory` with another path, relative or absolute, then this role will create it for you. 
+If you override the value of `option: log_directory` with another path, relative or absolute, then this role will create it for you.
 
-    postgresql_hba_entries:
-      - { type: local, database: all, user: postgres, auth_method: peer }
-      - { type: local, database: all, user: all, auth_method: peer }
-      - { type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5 }
-      - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 }
+```yaml
+postgresql_hba_entries:
+  - { type: local, database: all, user: postgres, auth_method: peer }
+  - { type: local, database: all, user: all, auth_method: peer }
+  - { type: host, database: all, user: all, address: '127.0.0.1/32', auth_method: md5 }
+  - { type: host, database: all, user: all, address: '::1/128', auth_method: md5 }
+```
 
 Configure [host based authentication](https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html) entries to be set in the `pg_hba.conf`. Options for entries include:
 
@@ -72,53 +88,63 @@ Configure [host based authentication](https://www.postgresql.org/docs/current/st
 
 If overriding, make sure you copy all of the existing entries from `defaults/main.yml` if you need to preserve existing entries.
 
-    postgresql_locales:
-      - 'en_US.UTF-8'
+```yaml
+postgresql_locales:
+  - 'en_US.UTF-8'
+```
 
 (Debian/Ubuntu only) Used to generate the locales used by PostgreSQL databases.
 
-    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'
-        encoding: # defaults to 'UTF-8'
-        template: # defaults to 'template0'
-        login_host: # defaults to 'localhost'
-        login_password: # defaults to not set
-        login_user: # defaults to 'postgresql_user'
-        login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
-        port: # defaults to not set
-        owner: # defaults to postgresql_user
-        state: # defaults to 'present'
+```yaml
+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'
+    encoding: # defaults to 'UTF-8'
+    template: # defaults to 'template0'
+    login_host: # defaults to 'localhost'
+    login_password: # defaults to not set
+    login_user: # defaults to 'postgresql_user'
+    login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+    port: # defaults to not set
+    owner: # defaults to postgresql_user
+    state: # defaults to 'present'
+```
 
 A list of databases to ensure exist on the server. Only the `name` is required; all other properties are optional.
 
-    postgresql_users:
-      - name: jdoe #required; the rest are optional
-        password: # defaults to not set
-        encrypted: # defaults to not set
-        priv: # defaults to not set
-        role_attr_flags: # defaults to not set
-        db: # defaults to not set
-        login_host: # defaults to 'localhost'
-        login_password: # defaults to not set
-        login_user: # defaults to '{{ postgresql_user }}'
-        login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
-        port: # defaults to not set
-        state: # defaults to 'present'
+```yaml
+postgresql_users:
+  - name: jdoe #required; the rest are optional
+    password: # defaults to not set
+    encrypted: # defaults to not set
+    priv: # defaults to not set
+    role_attr_flags: # defaults to not set
+    db: # defaults to not set
+    login_host: # defaults to 'localhost'
+    login_password: # defaults to not set
+    login_user: # defaults to '{{ postgresql_user }}'
+    login_unix_socket: # defaults to 1st of postgresql_unix_socket_directories
+    port: # defaults to not set
+    state: # defaults to 'present'
+```
 
 A list of users to ensure exist on the server. Only the `name` is required; all other properties are optional.
 
-    postgres_users_no_log: true
+```yaml
+postgres_users_no_log: true
+```
 
 Whether to output user data (which may contain sensitive information, like passwords) when managing users.
 
-    postgresql_version: [OS-specific]
-    postgresql_data_dir: [OS-specific]
-    postgresql_bin_path: [OS-specific]
-    postgresql_config_path: [OS-specific]
-    postgresql_daemon: [OS-specific]
-    postgresql_packages: [OS-specific]
+```yaml
+postgresql_version: [OS-specific]
+postgresql_data_dir: [OS-specific]
+postgresql_bin_path: [OS-specific]
+postgresql_config_path: [OS-specific]
+postgresql_daemon: [OS-specific]
+postgresql_packages: [OS-specific]
+```
 
 OS-specific variables that are set by include files in this role's `vars` directory. These shouldn't be overridden unless you're using a version of PostgreSQL that wasn't installed using system packages.
 
@@ -128,20 +154,24 @@ None.
 
 ## Example Playbook
 
-    - hosts: database
-      become: yes
-      vars_files:
-        - vars/main.yml
-      roles:
-        - geerlingguy.postgresql
+```yaml
+- hosts: database
+  become: yes
+  vars_files:
+    - vars/main.yml
+  roles:
+    - geerlingguy.postgresql
+```
 
 *Inside `vars/main.yml`*:
 
-    postgresql_databases:
-      - name: example_db
-    postgresql_users:
-      - name: example_user
-        password: supersecure
+```yaml
+postgresql_databases:
+  - name: example_db
+postgresql_users:
+  - name: example_user
+    password: supersecure
+```
 
 ## License
 

meta/main.yml

@@ -7,25 +7,18 @@ galaxy_info:
   description: PostgreSQL server for Linux.
   company: "Midwestern Mac, LLC"
   license: "license (BSD, MIT)"
-  min_ansible_version: 2.8
+  min_ansible_version: 2.10
   platforms:
     - name: ArchLinux
       versions:
         - all
-    - name: EL
-      versions:
-        - 7
-        - 8
-        - 9
     - name: Fedora
       versions:
-        - 30
-        - 31
-        - 32
-        - 33
         - 34
         - 35
         - 36
+        - 37
+        - 38
     - name: Ubuntu
       versions:
         - xenial
@@ -34,11 +27,9 @@ galaxy_info:
         - jammy
     - name: Debian
       versions:
-        - wheezy
-        - jessie
-        - stretch
         - buster
         - bullseye
+        - bookworm
   galaxy_tags:
     - database
     - postgresql

molecule/default/molecule.yml

@@ -2,14 +2,17 @@
 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:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     privileged: true
     pre_build_image: true
 provisioner:

tasks/main.yml

@@ -3,12 +3,15 @@
 - include_tasks: variables.yml
 
 # Setup/install tasks.
-- include_tasks: setup-RedHat.yml
-  when: ansible_os_family == 'RedHat'
+- include_tasks: setup-Archlinux.yml
+  when: ansible_os_family == 'Archlinux'
 
 - include_tasks: setup-Debian.yml
   when: ansible_os_family == 'Debian'
 
+- include_tasks: setup-RedHat.yml
+  when: ansible_os_family == 'RedHat'
+
 - include_tasks: initialize.yml
 - include_tasks: configure.yml
 

tasks/setup-Archlinux.yml

@@ -0,0 +1,21 @@
+---
+- name: Ensure PostgreSQL Python libraries are installed.
+  pacman:
+    name: "{{ postgresql_python_library }}"
+    state: present
+
+- name: Ensure PostgreSQL packages are installed.
+  pacman:
+    name: "{{ postgresql_packages }}"
+    state: present
+
+- name: Ensure all configured locales are present.
+  locale_gen: "name={{ item }} state=present"
+  with_items: "{{ postgresql_locales }}"
+  register: locale_gen_result
+
+- name: Force-restart PostgreSQL after new locales are generated.
+  systemd:
+    name: "{{ postgresql_daemon }}"
+    state: restarted
+  when: locale_gen_result.changed

tasks/variables.yml

@@ -7,9 +7,9 @@
 - name: Include OS-specific variables (RedHat).
   include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_version.split('.')[0] }}.yml"
   when:
-  - ansible_os_family == 'RedHat'
-  - ansible_distribution != 'Fedora'
-  - ansible_distribution != 'Amazon'
+    - ansible_os_family == 'RedHat'
+    - ansible_distribution != 'Fedora'
+    - ansible_distribution != 'Amazon'
 
 - name: Include OS-specific variables (Amazon).
   include_vars: "{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml"

vars/Debian-11.yml

@@ -3,7 +3,7 @@ __postgresql_version: "13"
 __postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
 __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
 __postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: "postgresql@{{ postgresql_version }}-main"
+__postgresql_daemon: "postgresql@{{ __postgresql_version }}-main"
 __postgresql_packages:
   - postgresql
   - postgresql-contrib

vars/Debian-12.yml

@@ -1,5 +1,5 @@
 ---
-__postgresql_version: "9.4"
+__postgresql_version: "15"
 __postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
 __postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
 __postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
@@ -8,3 +8,4 @@ __postgresql_packages:
   - postgresql
   - postgresql-contrib
   - libpq-dev
+postgresql_python_library: python3-psycopg2

vars/Debian-7.yml

@@ -1,10 +0,0 @@
----
-__postgresql_version: "9.1"
-__postgresql_data_dir: "/var/lib/postgresql/{{ __postgresql_version }}/main"
-__postgresql_bin_path: "/usr/lib/postgresql/{{ __postgresql_version }}/bin"
-__postgresql_config_path: "/etc/postgresql/{{ __postgresql_version }}/main"
-__postgresql_daemon: postgresql
-__postgresql_packages:
-  - postgresql
-  - postgresql-contrib
-  - libpq-dev

vars/Fedora-29.yml

@@ -1,12 +0,0 @@
----
-__postgresql_version: "10.5"
-__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-libs
-postgresql_python_library: python2-psycopg2

vars/Fedora-30.yml

@@ -1,13 +0,0 @@
----
-__postgresql_version: "11.2"
-__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-libs
-# Fedora 30 containers only have python3 by default
-postgresql_python_library: python3-psycopg2

vars/Fedora-37.yml

@@ -1,5 +1,5 @@
 ---
-__postgresql_version: "12.2"
+__postgresql_version: "14.3"
 __postgresql_data_dir: "/var/lib/pgsql/data"
 __postgresql_bin_path: "/usr/bin"
 __postgresql_config_path: "/var/lib/pgsql/data"

vars/Fedora-38.yml

@@ -1,5 +1,5 @@
 ---
-__postgresql_version: "11.5"
+__postgresql_version: "15.1"
 __postgresql_data_dir: "/var/lib/pgsql/data"
 __postgresql_bin_path: "/usr/bin"
 __postgresql_config_path: "/var/lib/pgsql/data"
@@ -10,5 +10,5 @@ __postgresql_packages:
   - postgresql-contrib
   - postgresql-libs
 __postgresql_unix_socket_directories_mode: '0755'
-# Fedora 31 containers only have python3 by default
+# Fedora 32 containers only have python3 by default
 postgresql_python_library: python3-psycopg2

vars/RedHat-9.yml

@@ -1,5 +1,5 @@
 ---
-__postgresql_version: "10"
+__postgresql_version: "13"
 __postgresql_data_dir: "/var/lib/pgsql/data"
 __postgresql_bin_path: "/usr/bin"
 __postgresql_config_path: "/var/lib/pgsql/data"