active_postgres 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e51d5f1214cedf497a9b060e5c667c43711f9ff5e36024bfd8dc926b50fe272f
-  data.tar.gz: 618fa70d39a43e1c74ba2ed449b75138670bca92cb6bf418606f772de34c6a7d
+  metadata.gz: 12db7ee31476f31cae2fa436ade1c6fe3a94367b5013765603442df5fdc90feb
+  data.tar.gz: e31aa6b40e45b90b2c985e5347078e4886385e2a26c359c87ce5c951adf04eb9
 SHA512:
-  metadata.gz: 254b6fb4342d4e510076d05ebfbeaa0e7990b463df13ad6ddb7d6eb5a70562c23cc4f502ce6c435c6372fc3dd5f695285ee3fdfed522cc188f1b1cc21c6cc90d
-  data.tar.gz: d9147a4679529344ccb0ffd3d5c2ffacc3072464b9cf4e1c6e11150a66c142ef0d0b45f9b9cd9d34eceba6f4d0e50baa7c2f227a5b2b1719502972e2b4b39ee4
+  metadata.gz: 7ea49e121a8f72d4a8b271e5a270a7a25ce8ac5141d301ef623234b6951fb2874495bbf7d00e484df148e5be254cdbe12f1f54e677b81ed608326dd85a1d478e
+  data.tar.gz: 468c8eb9c90f8c51dbc666c81f89a3a0bae4477577309f82a49126fedec617bdbc228585bfe00cae7448e3de76f5fb587a1bf56748802c4243107c2720211902

data/README.md

@@ -187,12 +187,10 @@ rake postgres:backup:restore_at["2026-01-29 01:15:00",promote]
 ```
 
 If you want the old primary to rejoin without a full re-clone after failover,
-enable pg_rewind support in repmgr:
+use `repmgr node rejoin --force-rewind` once the node is ready to reattach:
 
-```yaml
-components:
-  repmgr:
-    use_rewind: true
+```bash
+repmgr node rejoin -f /etc/repmgr.conf --force-rewind
 ```
 
 ### Stable app endpoint with PgBouncer

data/lib/active_postgres/components/pgbackrest.rb

@@ -141,6 +141,7 @@ module ActivePostgres
       end
 
       def setup_backup_schedules(host, pgbackrest_config)
+        remove_backup_schedule(host)
         schedules = backup_schedules(pgbackrest_config)
         schedules.each do |entry|
           setup_backup_schedule(host, entry[:schedule], entry[:type], entry[:file])

data/lib/active_postgres/components/pgbouncer.rb

@@ -99,6 +99,8 @@ module ActivePostgres
 
         create_userlist(host)
 
+        ensure_firewall_port_open(host, pgbouncer_config[:listen_port] || 6432)
+
         ssh_executor.execute_on_host(host) do
           execute :sudo, 'systemctl', 'enable', 'pgbouncer'
           execute :sudo, 'systemctl', 'restart', 'pgbouncer'
@@ -194,6 +196,17 @@ module ActivePostgres
         end
       end
 
+      def ensure_firewall_port_open(host, port)
+        ssh_executor.execute_on_host(host) do
+          has_reject = test(:sudo, 'iptables', '-C', 'INPUT', '-j', 'REJECT', '2>/dev/null')
+          if has_reject
+            execute :sudo, 'iptables', '-I', 'INPUT', '-p', 'tcp', '--dport', port.to_s, '-j', 'ACCEPT'
+            execute :sudo, 'sh', '-c', "'iptables-save > /etc/iptables/rules.v4 2>/dev/null || true'"
+            puts "  ✓ Opened port #{port} in iptables"
+          end
+        end
+      end
+
       def install_follow_primary(host, pgbouncer_config)
         interval = pgbouncer_config[:follow_primary_interval] || 5
         interval = interval.to_i

data/lib/active_postgres/generators/active_postgres/install_generator.rb

@@ -79,7 +79,7 @@ module ActivePostgres
             default: &default
               adapter: postgresql
               encoding: unicode
-              pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>
+              pool: <%= ENV.fetch("DB_POOL") { ENV.fetch("RAILS_MAX_THREADS") { 5 } } %>
 
             development:
               <<: *default

data/lib/active_postgres/rails/database_config.rb

@@ -82,7 +82,7 @@ module ActivePostgres
           {
             'adapter' => 'postgresql',
             'encoding' => 'unicode',
-            'pool' => env_value('RAILS_MAX_THREADS', fallback: 5),
+            'pool' => pool_env_value,
             'username' => env_value('POSTGRES_APP_USER', fallback: app_name),
             'password' => env_value('POSTGRES_APP_PASSWORD'),
             'variables' => {
@@ -138,6 +138,10 @@ module ActivePostgres
           end
         end
 
+        def pool_env_value
+          "<%= ENV.fetch('DB_POOL') { ENV.fetch('RAILS_MAX_THREADS') { 5 } } %>"
+        end
+
         def normalize_app_name(custom_name)
           chosen = custom_name || ENV['BORING_APP_NAME'] || default_app_name
           chosen.to_s.tr('- ', '_')

data/lib/active_postgres/version.rb

@@ -1,3 +1,3 @@
 module ActivePostgres
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.3'.freeze
 end

data/templates/repmgr.conf.erb

@@ -37,9 +37,6 @@ service_restart_command='sudo systemctl restart postgresql@<%= config.version %>
 service_reload_command='sudo systemctl reload postgresql@<%= config.version %>-main'
 
 ssh_options='-i /var/lib/postgresql/.ssh/active_postgres_dns -o StrictHostKeyChecking=no'
-<% if repmgr_config.key?(:use_rewind) %>
-use_rewind=<%= repmgr_config[:use_rewind] ? 'yes' : 'no' %>
-<% end %>
 
 log_level=INFO
 log_facility=STDERR

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_postgres
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - BoringCache