diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2019-11-09 21:22:48 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2019-11-09 22:59:07 +0100 |
| commit | fe7ec012dae3df14ef36d7c68ffebc696f66f7a2 (patch) | |
| tree | 918a51409814b9844420ecb11a1539aa246007d7 | |
| parent | 722a4c5ab6554adebfae5a0b326d0daa91dce59f (diff) | |
| download | aports-fe7ec012dae3df14ef36d7c68ffebc696f66f7a2.tar.bz2 aports-fe7ec012dae3df14ef36d7c68ffebc696f66f7a2.tar.xz | |
main/pgpool: move config files from /etc to /etc/pgpool
Avoid mess in /etc. The reference spec file installs config files
to /etc/pgpool.
| -rw-r--r-- | main/pgpool/APKBUILD | 7 | ||||
| -rw-r--r-- | main/pgpool/pgpool.initd | 2 | ||||
| -rw-r--r-- | main/pgpool/pgpool.post-upgrade | 21 |
3 files changed, 26 insertions, 4 deletions
diff --git a/main/pgpool/APKBUILD b/main/pgpool/APKBUILD index 54c74f1e37..2eb725aad3 100644 --- a/main/pgpool/APKBUILD +++ b/main/pgpool/APKBUILD @@ -9,6 +9,7 @@ url="https://www.pgpool.net/" arch="all" license="BSD" makedepends="postgresql-dev linux-headers" +install="$pkgname.post-upgrade" subpackages="$pkgname-doc $pkgname-dev" source="$pkgname-$pkgver.tar.gz::https://www.pgpool.net/download.php?f=$_pkgname-$pkgver.tar.gz $pkgname.initd @@ -26,7 +27,7 @@ build() { --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ - --sysconfdir=/etc \ + --sysconfdir=/etc/$pkgname \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --with-openssl @@ -49,9 +50,9 @@ doc() { default_doc mkdir -p "$docdir" - find "$pkgdir"/etc -type f -maxdepth 1 -exec mv '{}' "$docdir"/ + + mv "$pkgdir"/etc/$pkgname/* "$docdir"/ } sha512sums="6e6d5cb40efd5357b5c428dedf71d7a772c23becc397d0ece86134b9d32d4911933d7d92f7e6e5fde8cf37efed74f44c4c9d1ab782994750e8d9e99e24603863 pgpool-4.1.0.tar.gz -de36d7aab6806f1e303901ac80284bb9861edaf9b682901db9f1ead3843ba8cb528c814e5dabfc2c450ebed6450daf3fff14166d08a530e1c44a29e4d4e29a2c pgpool.initd +52331b4b124d8ef6ed02e31f20fc16508c546fe9fb3af4f5dfab76e29613c9b7ba3505769265ef6a5dee2faed9d33fef6f82bf52be440a1d2e37a220ace7e749 pgpool.initd 37e8314f2dab6889c35edb679906db3997c4d5eba704a7337ff82926d400f2ab780103b6a162b1effa74c0d7f8d6655b62cddd2017d3ea7a5de5f370871ab088 musl-compat.patch" diff --git a/main/pgpool/pgpool.initd b/main/pgpool/pgpool.initd index c74d18d367..6d352c8de8 100644 --- a/main/pgpool/pgpool.initd +++ b/main/pgpool/pgpool.initd @@ -11,7 +11,7 @@ depend() { start() { ebegin "Starting pgpool-II" - start-stop-daemon --start --quiet --exec /usr/bin/pgpool --f /etc/pgpool.conf -F /etc/pcp.conf + start-stop-daemon --start --quiet --exec /usr/bin/pgpool --f /etc/pgpool/pgpool.conf -F /etc/pgpool/pcp.conf result=$? eend $result } diff --git a/main/pgpool/pgpool.post-upgrade b/main/pgpool/pgpool.post-upgrade new file mode 100644 index 0000000000..4c959a3c81 --- /dev/null +++ b/main/pgpool/pgpool.post-upgrade @@ -0,0 +1,21 @@ +#!/bin/sh + +ver_new="$1" +ver_old="$2" + +if [ "$(apk version -t "$ver_old" "4.1.0-r0")" = "<" ]; then + cat >&2 <<-EOF + * + * The pgpool's configuration files were moved from /etc to /etc/pgpool. + * Files /etc/pgpool.conf, /etc/pcp.conf and /etc/pg_hba.conf will be + * automatically moved to the new location, if exists. However, you should + * still check your configuration; pay attention to relative paths! + * + EOF + + for f in pgpool.conf pcp.conf pg_hba.conf; do + test -f /etc/$f && mv -nv /etc/$f /etc/pgpool/ + done +fi + +exit 0 |