diff --git a/README.md b/README.md index 6be5f02..0e74e3a 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,8 @@ Debian 12 | Yes | Yes | Yes | Yes | Yes Ubuntu 20.04 | Yes | Yes | Yes | Yes | Yes Ubuntu 22.04 | Yes | Yes | Yes | Yes | Yes Ubuntu 24.04 | Yes | Yes | Yes | Yes | Yes -RockyLinux 8.7 | Yes | Yes | Yes | Yes | Yes -RockyLinux 9.1 | Yes | Yes | Yes | Yes | Yes +RockyLinux 8.9 | Yes | Yes | Yes | Yes | Yes +RockyLinux 9.3 | Yes | Yes | Yes | Yes | Yes Fedora 38 | No | No | No | No | No ## Role features in use @@ -607,7 +607,7 @@ If you want to uninstall a Postgresql installation with this role, set both vari postgresql_autotune: true # postgresql_autotune_base_url: http://192.168.56.101:3000 - postgres_users_no_log: false + postgresql_users_no_log: false postgresql_users: # Create two groups 'group1' and 'group2' by making use of thr role_attr_flags attribute - name: group1 diff --git a/defaults/main.yml b/defaults/main.yml index 082de48..bd16213 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -134,7 +134,7 @@ postgresql_users: [] # port: # defaults to not set # state: # defaults to 'present' # Whether to output user data when managing users. -postgres_users_no_log: true +postgresql_users_no_log: true # Manage group/role memberships postgresql_memberships: [] diff --git a/molecule/shared/vars/main_all_features.yml b/molecule/shared/vars/main_all_features.yml index f304192..fcac9e6 100644 --- a/molecule/shared/vars/main_all_features.yml +++ b/molecule/shared/vars/main_all_features.yml @@ -17,7 +17,7 @@ postgresql_hba_entries_extra: [] postgresql_autotune: true # postgresql_autotune_base_url: http://192.168.56.101:3000 -postgres_users_no_log: false +postgresql_users_no_log: false postgresql_users: # Create two groups 'group1' and 'group2' by making use of thr role_attr_flags attribute - name: group1 diff --git a/tasks/configure.yml b/tasks/configure.yml index c0d03f9..885f512 100644 --- a/tasks/configure.yml +++ b/tasks/configure.yml @@ -47,10 +47,11 @@ mode: "{{ postgresql_tempfile_mode }}" when: postgresql_persist_permissions -- name: Set postgresql service enabled state +- name: Set postgresql service enabled and started state ansible.builtin.service: name: "{{ _postgresql_daemon }}" enabled: "{{ postgresql_service_enabled }}" + state: "{{ _postgresql_service_state | d(omit, true) }}" - name: Ensure postgresql service is running with latest up to date configuration ansible.builtin.meta: flush_handlers diff --git a/tasks/databases.yml b/tasks/databases.yml index 20243c4..2f0ba29 100644 --- a/tasks/databases.yml +++ b/tasks/databases.yml @@ -46,7 +46,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_schemas }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" vars: @@ -76,7 +76,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_tables }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" vars: diff --git a/tasks/ownerships.yml b/tasks/ownerships.yml index 931d4c1..265950e 100644 --- a/tasks/ownerships.yml +++ b/tasks/ownerships.yml @@ -15,7 +15,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_ownerships }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" vars: @@ -43,7 +43,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_privs }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" vars: diff --git a/tasks/redhat/install.yml b/tasks/redhat/install.yml index f1a8370..cbcd517 100644 --- a/tasks/redhat/install.yml +++ b/tasks/redhat/install.yml @@ -51,7 +51,7 @@ environment: "{{ _postgresql_pkg_proxy_env }}" # prereqs to install psycopg2 -- name: Install gcc rockylinux +- name: Install gcc ansible.builtin.dnf: name: gcc state: present diff --git a/tasks/replication-primary.yml b/tasks/replication-primary.yml index 57fa246..5873fe1 100644 --- a/tasks/replication-primary.yml +++ b/tasks/replication-primary.yml @@ -12,7 +12,7 @@ expires: infinity role_attr_flags: REPLICATION state: present - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" # See: https://github.com/ansible/ansible/issues/16048#issuecomment-229012509 diff --git a/tasks/sql.yml b/tasks/sql.yml index ee358ba..5cd49d9 100644 --- a/tasks/sql.yml +++ b/tasks/sql.yml @@ -16,7 +16,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_queries }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" vars: @@ -40,7 +40,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_scripts }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" changed_when: false become: true become_user: "{{ postgresql_user }}" diff --git a/tasks/tablespaces.yml b/tasks/tablespaces.yml index 7dd7b0b..188ced3 100644 --- a/tasks/tablespaces.yml +++ b/tasks/tablespaces.yml @@ -14,7 +14,7 @@ when: not postgresql_replication or postgresql_replication_role == "primary" become: true become_user: "{{ postgresql_user }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" vars: ansible_ssh_pipelining: true ansible_python_interpreter: "{{ _postgresql_ansible_python_interpreter }}" diff --git a/tasks/users.yml b/tasks/users.yml index 1060e75..d39f88a 100644 --- a/tasks/users.yml +++ b/tasks/users.yml @@ -22,7 +22,7 @@ loop: "{{ postgresql_users }}" loop_control: label: "{{ item.name }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" environment: @@ -47,7 +47,7 @@ session_role: "{{ item.session_role | d(omit) }}" trust_input: "{{ item.trust_input | d(omit) }}" loop: "{{ postgresql_memberships }}" - no_log: "{{ postgres_users_no_log }}" + no_log: "{{ postgresql_users_no_log }}" become: true become_user: "{{ postgresql_user }}" vars: diff --git a/vars/main.yml b/vars/main.yml index 2339010..6018f02 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -26,6 +26,8 @@ _postgresql_general_proxy_env: {} _postgresql_pkg_proxy_env: {} # How to handle configuration changes _postgresql_config_change_handler_state: reloaded +# Default service state after configuration regardless of configuration changes +_postgresql_service_state: started _postgresql_apt_mirror_url: http://apt.postgresql.org/pub/repos/apt _postgresql_repo_rpm_url: "https://download.postgresql.org/pub/repos/yum/reporpms/{{ (ansible_distro == 'fedora') | ternary('F', 'EL') }}-{{ ansible_distribution_major_version }}-x86_64/pgdg-{{ (ansible_distro == 'fedora') | ternary('fedora', 'redhat') }}-repo-latest.noarch.rpm"