Skip to content

Commit

Permalink
Merge pull request #587 from MrMegaNova/master
Browse files Browse the repository at this point in the history
Update ansible on workflow
  • Loading branch information
MrMegaNova authored Jan 8, 2025
2 parents 176b474 + 05f51b6 commit 387320b
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ jobs:
strategy:
matrix:
include:
- distro: rockylinux8
- distro: rockylinux9
# - distro: rockylinux8
# - distro: rockylinux9
- distro: debian11
- distro: debian12
- distro: ubuntu2004
Expand All @@ -64,7 +64,7 @@ jobs:
python-version: '3.x'

- name: Install test dependencies.
run: pip3 install "ansible>9,<10" molecule molecule-plugins[docker] docker
run: pip3 install "ansible>10,<12" molecule molecule-plugins[docker] docker

- name: Run Molecule tests.
run: molecule -v test
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ Icon
.vagrant
test
*.retry
ANXS-postgresql.code-workspace
1 change: 1 addition & 0 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ postgresql_ident_file: "{{ postgresql_conf_directory }}/pg_ident.conf"
postgresql_varlib_directory_name: "postgresql"
postgresql_data_directory: "/var/lib/{{ postgresql_varlib_directory_name }}/{{ postgresql_version }}/{{ postgresql_cluster_name }}"
postgresql_wal_directory: ""
postgresql_wal_segsize: ""
postgresql_pid_directory: "/var/run/postgresql"
# If external_pid_file is not explicitly set, on extra PID file is written
postgresql_external_pid_file: "{{ postgresql_pid_directory }}/{{ postgresql_version }}-{{ postgresql_cluster_name }}.pid"
Expand Down
1 change: 1 addition & 0 deletions tasks/configure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@
{% if postgresql_pwfile != "" %}--pwfile={{ postgresql_pwfile }} {% endif %}
{% if postgresql_wal_directory != "" and postgresql_version is version_compare('10', '<') %}--xlogdir={{ postgresql_wal_directory }} {% endif %}
{% if postgresql_wal_directory != "" and postgresql_version is version_compare('10', '>=') %}--waldir={{ postgresql_wal_directory }} {% endif %}
{% if postgresql_wal_segsize != "" and postgresql_version is version_compare('11', '>=') %}--wal-segsize={{ postgresql_wal_segsize }} {% endif %}
become: yes
become_user: "{{ postgresql_service_user }}"
when: ansible_os_family == "RedHat" and
Expand Down

0 comments on commit 387320b

Please sign in to comment.