diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2015-02-26 14:03:22 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2015-02-26 16:52:25 +0100 |
| commit | f7f516372e2218daf18a79241d1fd271faa237cc (patch) | |
| tree | 9f9653936f765241e606ed61b1c9eb1bb1720df3 /build-helpers | |
| parent | 1f35a8e32e9287d84b0d46f48a94eca85b59836f (diff) | |
| download | postgresql-setup-f7f516372e2218daf18a79241d1fd271faa237cc.tar.gz postgresql-setup-f7f516372e2218daf18a79241d1fd271faa237cc.tar.xz postgresql-setup-f7f516372e2218daf18a79241d1fd271faa237cc.zip | |
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.
Diffstat (limited to 'build-helpers')
| -rw-r--r-- | build-helpers/Makefile.inc | 7 | ||||
| -rwxr-xr-x | build-helpers/build-config | 11 |
2 files changed, 0 insertions, 18 deletions
diff --git a/build-helpers/Makefile.inc b/build-helpers/Makefile.inc deleted file mode 100644 index d54d239..0000000 --- a/build-helpers/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -config_builder = $(top_srcdir)/%D%/build-config - -noinst_SCRIPT = $(config_builder) - -EXTRA_DIST += $(noinst_SCRIPT) - -# vim: ft=automake noet diff --git a/build-helpers/build-config b/build-helpers/build-config deleted file mode 100755 index 27841f2..0000000 --- a/build-helpers/build-config +++ /dev/null @@ -1,11 +0,0 @@ -#! /bin/sh - -# For easier parsing in postgresql-setup, we want to have each upgrade scenario -# configured on separate line. - -eval set -- "$1" -while test -n "$1" -do - echo $(cat "$1" | grep -v ^# ) - shift -done |