defaults/main.yml

@@ -98,9 +98,8 @@ pgpool_wd_heartbeat_dest0_port: '{{ pgpool_wd_heartbeat_port }}'
 pgpool_enable_ssl: False
 pgpool_letsencrypt_managed: True
 pgpool_ssl_key: /etc/pki/pgpool2/pgpool2.key
-pgpool_ssl_cert: '/var/lib/acme/live/{{ ansible_fqdn }}/fullchain'
+pgpool_ssl_cert: '/var/lib/acme/live/{{ ansible_fqdn }}/cert'
-# In CentOS/RHEL is /etc/pki/tls/cert.pem
+pgpool_ssl_ca: '/var/lib/acme/live/{{ ansible_fqdn }}/fullchain'
-pgpool_ssl_ca: '/etc/ssl/certs/ca-certificates.crt'
 pgpool_ssl_ca_dir: /etc/ssl/certs
 pgpool_virtual_ip: 127.0.0.1
 pgpool_virtual_netmask: 24

files/backuppc_pg_wal.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-su - postgres -c "/usr/local/sbin/postgresql_wal_backup_and_removal > /var/log/postgresql/wal_removal.log 2>&1"
-

tasks/postgres_pgpool.yml

@@ -117,11 +117,6 @@
 
   - name: Install a script that cleans up the wal log archives
     template: src=postgresql_wal_backup_and_removal.j2 dest=/usr/local/sbin/postgresql_wal_backup_and_removal owner=root group=root mode=0755
-    tags: [ 'postgres_backuppc', 'postgres', 'postgresql', 'sudo', 'pgpool' ]
-
-  - name: backuppc root script to syncronize backup and wal clean up
-    copy: src=backuppc_pg_wal.sh dest=/usr/local/sbin/backuppc_pg_wal.sh owner=root mode=0744
-    tags: [ 'postgres_backuppc', 'postgres', 'postgresql', 'pgpool' ]
 
 # The script is started by the backup server after the file copy, crontab action must be deleted
   #- name: Install a cron job to cleanup the wal log archives

templates/postgresql_wal_backup_and_removal.j2

@@ -1,12 +1,5 @@
 #!/bin/bash
 
-ISMASTER=`psql -t -c "SELECT pg_is_in_recovery();"`
-if [ $ISMASTER != 'f' ]
-then
-   echo "Not on master, nothing to do."
-   exit 0
-fi
-
 BASE_BACKUP_DIR={{ psql_base_backup_dir }}
 WAL_ARCHIVES_LOG_DIR={{ psql_wal_archiving_log_dir }}
 WAL_LATEST_BACKUP=
@@ -22,4 +15,3 @@ pg_archivecleanup $WAL_ARCHIVES_LOG_DIR $WAL_LATEST_BACKUP
 
 exit $?
 
-