active_postgres 0.9.4 → 0.9.6

data/lib/tasks/postgres.rake

@@ -287,39 +287,39 @@ namespace :postgres do
     puts "\nTip: set RAILS_ENV=production for production targets"
 
     puts "\nSetup & Maintenance"
-    puts "  rake postgres:setup                  # Deploy HA cluster (CLEAN=true for fresh install)"
-    puts "  rake postgres:purge                  # Destroy cluster (DESTRUCTIVE)"
-    puts "  rake postgres:setup:core             # PostgreSQL config (postgresql.conf, pg_hba.conf)"
-    puts "  rake postgres:setup:repmgr           # HA + failover (repmgr)"
-    puts "  rake postgres:setup:pgbouncer        # PgBouncer pooling"
-    puts "  rake postgres:setup:pgbackrest       # Backups (pgBackRest)"
-    puts "  rake postgres:setup:monitoring       # postgres_exporter"
-    puts "  rake postgres:setup:ssl              # SSL certs"
+    puts '  rake postgres:setup                  # Deploy HA cluster (CLEAN=true for fresh install)'
+    puts '  rake postgres:purge                  # Destroy cluster (DESTRUCTIVE)'
+    puts '  rake postgres:setup:core             # PostgreSQL config (postgresql.conf, pg_hba.conf)'
+    puts '  rake postgres:setup:repmgr           # HA + failover (repmgr)'
+    puts '  rake postgres:setup:pgbouncer        # PgBouncer pooling'
+    puts '  rake postgres:setup:pgbackrest       # Backups (pgBackRest)'
+    puts '  rake postgres:setup:monitoring       # postgres_exporter'
+    puts '  rake postgres:setup:ssl              # SSL certs'
 
     puts "\nStatus & Health"
-    puts "  rake postgres:status                 # Cluster status (SSH by default)"
-    puts "  rake postgres:overview               # Control tower overview"
-    puts "  rake postgres:nodes                  # Topology view"
-    puts "  rake postgres:verify                 # Comprehensive checklist"
-    puts "  ACTIVE_POSTGRES_STATUS_MODE=ssh|direct rake postgres:status"
+    puts '  rake postgres:status                 # Cluster status (SSH by default)'
+    puts '  rake postgres:overview               # Control tower overview'
+    puts '  rake postgres:nodes                  # Topology view'
+    puts '  rake postgres:verify                 # Comprehensive checklist'
+    puts '  ACTIVE_POSTGRES_STATUS_MODE=ssh|direct rake postgres:status'
 
     puts "\nBackups"
-    puts "  rake postgres:backup:full            # Full backup"
-    puts "  rake postgres:backup:incremental     # Incremental backup"
-    puts "  rake postgres:backup:list            # List backups"
-    puts "  rake postgres:backup:restore[ID]     # Restore backup set"
-    puts "  rake postgres:backup:restore_at[\"YYYY-MM-DD HH:MM:SS\",promote]  # PITR"
+    puts '  rake postgres:backup:full            # Full backup'
+    puts '  rake postgres:backup:incremental     # Incremental backup'
+    puts '  rake postgres:backup:list            # List backups'
+    puts '  rake postgres:backup:restore[ID]     # Restore backup set'
+    puts '  rake postgres:backup:restore_at["YYYY-MM-DD HH:MM:SS",promote]  # PITR'
 
     puts "\nMigrations"
-    puts "  rake postgres:migrate                # Run migrations on primary only"
+    puts '  rake postgres:migrate                # Run migrations on primary only'
 
     puts "\nPgBouncer"
-    puts "  rake postgres:pgbouncer:update_userlist[users]  # Update userlist"
-    puts "  rake postgres:pgbouncer:stats        # Service status + stats"
+    puts '  rake postgres:pgbouncer:update_userlist[users]  # Update userlist'
+    puts '  rake postgres:pgbouncer:stats        # Service status + stats'
 
     puts "\nTests"
-    puts "  rake postgres:test:replication[rows] # Replication stress test"
-    puts "  rake postgres:test:pgbouncer[connections]  # PgBouncer load test"
+    puts '  rake postgres:test:replication[rows] # Replication stress test'
+    puts '  rake postgres:test:pgbouncer[connections]  # PgBouncer load test'
 
     puts
   end
@@ -380,7 +380,7 @@ namespace :postgres do
     end
 
     desc 'Restore to a point in time (PITR)'
-    task :restore_at, [:target_time, :target_action] => :environment do |_t, args|
+    task :restore_at, %i[target_time target_action] => :environment do |_t, args|
       require 'active_postgres'
 
       unless args[:target_time]
@@ -607,8 +607,8 @@ namespace :postgres do
               nil
             end
             if cert_issuer
-              issuer_o = cert_issuer.match(/O\s*=\s*"?([^",\/]+)"?/)&.captures&.first
-              issuer_cn = cert_issuer.match(/CN\s*=\s*([^,\/]+)/)&.captures&.first
+              issuer_o = cert_issuer.match(%r{O\s*=\s*"?([^",/]+)"?})&.captures&.first
+              issuer_cn = cert_issuer.match(%r{CN\s*=\s*([^,/]+)})&.captures&.first
               issuer_name = issuer_o || issuer_cn || cert_issuer.sub('issuer=', '')
               info "   Issuer: #{issuer_name.strip}"
             end

data/templates/pgbackrest.conf.erb

@@ -57,6 +57,8 @@ log-path=/var/log/pgbackrest
 
 # Process settings
 process-max=<%= pgbackrest_config[:process_max] || 2 %>
+archive-async=y
+spool-path=/var/spool/pgbackrest
 
 # Start/Stop (for consistent backups)
 start-fast=y
@@ -68,4 +70,3 @@ pg1-port=5432
 pg1-socket-path=/var/run/postgresql
 pg1-user=<%= config.postgres_user %>
 
-

data/templates/pgbouncer.ini.erb

@@ -36,6 +36,8 @@ client_idle_timeout = <%= pgbouncer_config[:client_idle_timeout] || 0 %>
 client_login_timeout = <%= pgbouncer_config[:client_login_timeout] || 60 %>
 query_timeout = <%= pgbouncer_config[:query_timeout] || 0 %>
 query_wait_timeout = <%= pgbouncer_config[:query_wait_timeout] || 120 %>
+dns_max_ttl = <%= pgbouncer_config[:dns_max_ttl] || 5 %>
+dns_nxdomain_ttl = <%= pgbouncer_config[:dns_nxdomain_ttl] || 15 %>
 
 # Logging and administration
 admin_users = <%= pgbouncer_config[:admin_users] || config.postgres_user %>
@@ -62,4 +64,3 @@ pidfile = <%= pgbouncer_config[:pidfile] %>
 logfile = <%= pgbouncer_config[:logfile] %>
 <% end %>
 
-

data/templates/pgbouncer_follow_dns_primary.sh.erb

@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+PRIMARY_RECORD="<%= primary_record %>"
+PGBOUNCER_INI="/etc/pgbouncer/pgbouncer.ini"
+PGBOUNCER_SERVICE="pgbouncer"
+STATE_DIR="/var/lib/active-postgres"
+STATE_FILE="${STATE_DIR}/pgbouncer-primary-ip"
+LOG_TAG="pgbouncer-follow-primary"
+
+resolved_ip=$(getent ahostsv4 "$PRIMARY_RECORD" | awk '{print $1; exit}' || true)
+if [[ -z "$resolved_ip" ]]; then
+  /usr/bin/logger -t "$LOG_TAG" "Could not resolve ${PRIMARY_RECORD}"
+  exit 1
+fi
+
+current_host=$(awk -F'host=' '/^\\* = host=/{print $2}' "$PGBOUNCER_INI" | awk '{print $1}')
+previous_ip=""
+if [[ -f "$STATE_FILE" ]]; then
+  previous_ip=$(cat "$STATE_FILE")
+fi
+
+changed=0
+if [[ "$current_host" != "$PRIMARY_RECORD" ]]; then
+  /usr/bin/sed -i -E "s/^(\\* = host=)[^ ]+/\\1${PRIMARY_RECORD}/" "$PGBOUNCER_INI"
+  changed=1
+fi
+
+if [[ "$previous_ip" != "$resolved_ip" ]]; then
+  changed=1
+fi
+
+/usr/bin/install -d -m 0755 "$STATE_DIR"
+printf "%s\n" "$resolved_ip" > "$STATE_FILE"
+
+if [[ "$changed" == "1" ]]; then
+  /usr/bin/systemctl restart "$PGBOUNCER_SERVICE"
+  /usr/bin/logger -t "$LOG_TAG" "Refreshed PgBouncer primary target ${PRIMARY_RECORD} (${resolved_ip})"
+fi

data/templates/postgres_log_archive.sh.erb

@@ -46,12 +46,43 @@ if [[ ${#tar_paths[@]} -eq 0 ]]; then
   exit 0
 fi
 
-tar -czf "$archive" -C / "${tar_paths[@]}"
+set +e
+tar --warning=no-file-changed --ignore-failed-read -czf "$archive" -C / "${tar_paths[@]}"
+tar_status=$?
+set -e
 
-destination="s3://${AWS_BUCKET}/${PREFIX%/}/${NODE}/${DATE_PATH}/$(basename "$archive")"
-aws_args=(s3 cp "$archive" "$destination" --only-show-errors)
-if [[ -n "${AWS_ENDPOINT_URL:-}" ]]; then
-  aws_args+=(--endpoint-url "$AWS_ENDPOINT_URL")
+if [[ $tar_status -gt 1 ]]; then
+  exit "$tar_status"
 fi
 
-aws "${aws_args[@]}"
+if [[ ! -s "$archive" ]]; then
+  exit 0
+fi
+
+destination="s3://${AWS_BUCKET}/${PREFIX%/}/${NODE}/${DATE_PATH}/$(basename "$archive")"
+if command -v aws >/dev/null 2>&1; then
+  aws_args=(s3 cp "$archive" "$destination" --only-show-errors)
+  if [[ -n "${AWS_ENDPOINT_URL:-}" ]]; then
+    aws_args+=(--endpoint-url "$AWS_ENDPOINT_URL")
+  fi
+
+  aws "${aws_args[@]}"
+elif command -v s3cmd >/dev/null 2>&1; then
+  s3cmd_args=(
+    --access_key="$AWS_ACCESS_KEY_ID"
+    --secret_key="$AWS_SECRET_ACCESS_KEY"
+    --region="${AWS_DEFAULT_REGION:-us-east-1}"
+    --no-progress
+  )
+
+  if [[ -n "${AWS_ENDPOINT_URL:-}" ]]; then
+    endpoint="${AWS_ENDPOINT_URL#https://}"
+    endpoint="${endpoint#http://}"
+    s3cmd_args+=(--host="$endpoint" --host-bucket="${endpoint}/%(bucket)")
+  fi
+
+  s3cmd "${s3cmd_args[@]}" put "$archive" "$destination"
+else
+  echo "missing aws or s3cmd command for PostgreSQL log archive" >&2
+  exit 1
+fi

data/templates/postgresql.conf.erb

@@ -52,6 +52,11 @@ archive_command = '<%= pg_config[:archive_command] %>'
 <% elsif config.component_enabled?(:pgbackrest) %>
 archive_command = 'pgbackrest --stanza=main archive-push %p'
 <% end %>
+<% if pg_config[:restore_command] %>
+restore_command = '<%= pg_config[:restore_command] %>'
+<% elsif config.component_enabled?(:pgbackrest) %>
+restore_command = 'pgbackrest --pg1-path=/var/lib/postgresql/<%= config.version %>/main --stanza=main archive-get %f "%p"'
+<% end %>
 <% if pg_config[:shared_memory_type] %>
 shared_memory_type = <%= pg_config[:shared_memory_type] %>
 <% end %>

data/templates/repmgr_dns_failover.sh.erb

@@ -17,13 +17,13 @@ REPMGR_DB=$(grep -oP "dbname=\K[^ ']+" "$REPMGR_CONF" | head -1)
 REPMGR_USER=$(grep -oP "user=\K[^ ']+" "$REPMGR_CONF" 2>/dev/null | head -1)
 REPMGR_USER="${REPMGR_USER:-repmgr}"
 
-cluster_data=$(psql -h /var/run/postgresql -d "$REPMGR_DB" -tAF',' -c "SELECT type, conninfo FROM repmgr.nodes WHERE active = true" 2>/dev/null || true)
+cluster_data=$(psql -h /var/run/postgresql -d "$REPMGR_DB" -tAF',' -c "SELECT type, conninfo FROM repmgr.nodes WHERE active = true ORDER BY node_id" 2>/dev/null || true)
 if [[ -z "$cluster_data" ]]; then
   exit 0
 fi
 
 primary_host=$(printf "%s\n" "$cluster_data" | awk -F',' '$1 == "primary" {print $2; exit}' | sed -n 's/.*host=\([^ ]*\).*/\1/p')
-standby_hosts=$(printf "%s\n" "$cluster_data" | awk -F',' '$1 == "standby" {print $2}' | sed -n 's/.*host=\([^ ]*\).*/\1/p' | sort -u)
+standby_hosts=$(printf "%s\n" "$cluster_data" | awk -F',' '$1 == "standby" {print $2; exit}' | sed -n 's/.*host=\([^ ]*\).*/\1/p')
 
 if [[ -z "$primary_host" ]]; then
   exit 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_postgres
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.6
 platform: ruby
 authors:
 - BoringCache
@@ -29,35 +29,35 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '8.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '9.0'
@@ -77,70 +77,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.50'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.50'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '1.5'
 description: Production-grade PostgreSQL HA with deep Rails integration. Automated
   deployment, replication, failover, and monitoring.
 email:
@@ -150,8 +108,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - LICENSE
 - README.md
+- SECURITY.md
 - exe/activepostgres
 - lib/active_postgres.rb
 - lib/active_postgres/cli.rb
@@ -199,6 +159,7 @@ files:
 - templates/pgbouncer-follow-primary.service.erb
 - templates/pgbouncer-follow-primary.timer.erb
 - templates/pgbouncer.ini.erb
+- templates/pgbouncer_follow_dns_primary.sh.erb
 - templates/pgbouncer_follow_primary.sh.erb
 - templates/postgres_log_archive.sh.erb
 - templates/postgresql.conf.erb
@@ -208,10 +169,10 @@ homepage: https://github.com/boringcache/active_postgres
 licenses:
 - MIT
 metadata:
-  homepage_uri: https://github.com/boringcache/active_postgres
   source_code_uri: https://github.com/boringcache/active_postgres
   documentation_uri: https://github.com/boringcache/active_postgres/blob/main/README.md
   changelog_uri: https://github.com/boringcache/active_postgres/blob/main/CHANGELOG.md
+  bug_tracker_uri: https://github.com/boringcache/active_postgres/issues
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -220,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 4.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.16
 specification_version: 4
 summary: PostgreSQL High Availability for Rails, made simple
 test_files: []