From f7f516372e2218daf18a79241d1fd271faa237cc Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 26 Feb 2015 14:03:22 +0100 Subject: configuration: define upgrade-config directory Currently under /etc/postgresql-setup/upgrade. All '*.conf' files are going to be loaded run-time by postgresql-setup. * postgresql-setup.in (read_config_file): New helper to safely read configuration files. (set_var): Remove comment. (parse_upgrade_setup): Use new read_config_file(). (parse_configuration): Rename to service_configuration(). * Makefile.am: Don't include share/Makefile.inc. Indent fixes. Add install-data-hook helper to install config directory. * build-helpers/Makefile.inc: Removed. * build-helpers/build-config: Likewise. * upgrade_config.template: Removed. * etc/postgresql-setup/upgrade/postgresql.conf: New template. * configure.ac: Remove --with-upgrade-config. Package maintainers are supposed to provide those for now. * share/postgresql-setup/Makefile.inc: Removed. --- etc/postgresql-setup/upgrade/postgresql.conf | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 etc/postgresql-setup/upgrade/postgresql.conf (limited to 'etc/postgresql-setup/upgrade') diff --git a/etc/postgresql-setup/upgrade/postgresql.conf b/etc/postgresql-setup/upgrade/postgresql.conf new file mode 100644 index 0000000..db58470 --- /dev/null +++ b/etc/postgresql-setup/upgrade/postgresql.conf @@ -0,0 +1,18 @@ +# This is tempalte configuration for pg_upgrade via postgresql-setup. The +# format of config-line 'key[[:space:]][[:space:]]*value'. Keys must be +# valid shell identifiers and value should be either bare-word or string quoted +# by double quotes (as in shell). + +id postgresql + +# Major version of the previous stack +major 9.2 + +# Location of default data +data_default "/var/lib/pgsql/data" + +# Location of binaries +engine /usr/bin + +# Just to feed ./postgresql-setup --upgrade-ids help output +description "In-place upgrade from Fedora 19 (PostgreSQL 9.2)" -- cgit