better postgres 11 compat in config/pidfile path references

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PMG/Config.pm b/src/PMG/Config.pm
index 2392db8eaefeff84eba5351280cfeea4c4d472ff..996d4854a2a20d012c1de305a51eb1e5954ec721 100755 (executable)
--- a/src/PMG/Config.pm
+++ b/src/PMG/Config.pm
@@ -1399,7 +1399,7 @@ sub rewrite_config_freshclam {
 sub rewrite_config_postgres {
     my ($self) = @_;
 
-    my $pgconfdir = "/etc/postgresql/9.6/main";
+    my $pgconfdir = "/etc/postgresql/11/main";
 
     my $changes = 0;
 

diff --git a/src/PMG/Utils.pm b/src/PMG/Utils.pm
index a33ea90ca2950dbc63c69c3474db6db8dda614f8..aa6aac770ad77d29b9bba0a3fe54f62cab1bbed9 100644 (file)
--- a/src/PMG/Utils.pm
+++ b/src/PMG/Utils.pm
@@ -702,7 +702,7 @@ sub find_local_network_for_ip {
 
 my $service_aliases = {
     'postfix' =>  'postfix@-',
-    'postgres' => 'postgresql@9.6-main',
+    'postgres' => 'postgresql@11-main',
 };
 
 sub lookup_real_service_name {

diff --git a/src/templates/postgresql.conf.in b/src/templates/postgresql.conf.in
index 28f8a429db25096bbd00248dd338b7e4f12d1b50..c13fe20caddbb6608e0decaee3746d8fb2191c17 100644 (file)
--- a/src/templates/postgresql.conf.in
+++ b/src/templates/postgresql.conf.in
@@ -38,15 +38,15 @@
 # The default values of these variables are driven from the -D command-line
 # option or PGDATA environment variable, represented here as ConfigDir.
 
-data_directory = '/var/lib/postgresql/9.6/main'                # use data in another directory
+data_directory = '/var/lib/postgresql/11/main'         # use data in another directory
                                        # (change requires restart)
-hba_file = '/etc/postgresql/9.6/main/pg_hba.conf'      # host-based authentication file
+hba_file = '/etc/postgresql/11/main/pg_hba.conf'       # host-based authentication file
                                        # (change requires restart)
-ident_file = '/etc/postgresql/9.6/main/pg_ident.conf'  # ident configuration file
+ident_file = '/etc/postgresql/11/main/pg_ident.conf'   # ident configuration file
                                        # (change requires restart)
 
 # If external_pid_file is not explicitly set, no extra PID file is written.
-external_pid_file = '/var/run/postgresql/9.6-main.pid'                 # write an extra PID file
+external_pid_file = '/var/run/postgresql/11-main.pid'                  # write an extra PID file
                                        # (change requires restart)
 
 
@@ -460,7 +460,7 @@ log_timezone = 'localtime'
 
 # - Process Title -
 
-cluster_name = '9.6/main'                      # added to process titles if nonempty
+cluster_name = '11/main'                       # added to process titles if nonempty
                                        # (change requires restart)
 #update_process_title = on
 
@@ -476,7 +476,7 @@ cluster_name = '9.6/main'                   # added to process titles if nonempty
 #track_io_timing = off
 #track_functions = none                        # none, pl, all
 #track_activity_query_size = 1024      # (change requires restart)
-stats_temp_directory = '/var/run/postgresql/9.6-main.pg_stat_tmp'
+stats_temp_directory = '/var/run/postgresql/11-main.pg_stat_tmp'
 
 
 # - Statistics Monitoring -