gh-mirrors/openwrt-packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-18 00:21:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

postgresql: improve init script

Browse Source 
Use newly introduced procd_add_restart_mount_trigger to make sure
postmaster gets started only once PGDATA becomes available.
Relocate socket directory to /var/lib/postgresql to make it possible
to run postgresql inside a ujail.
Use signal for shutdown, so it works nicely with jail.
Allow multiple script in UCI 'config postgres-db' to be a list and
run them in order listed.
User more silent methods to check for db or role existence and make
it easy to create several databases owned by the same user by passing
the same credentials multiple times.
Remove disfunctional reload handler.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
This commit is contained in:
Daniel Golle
2021-08-11 00:48:15 +01:00
parent 05a198ed48
commit f518cfb250
3 changed files with 64 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
libs/postgresql/files/postgresql.sh
View File

@@ -5,21 +5,21 @@ PSQL="/usr/bin/psql"
free_megs() {
fsdir=$1
while [ ! -d "$fsdir" ]; do
fsdir=$(dirname $fsdir)
fsdir="$(dirname "$fsdir")"
done
df -m $fsdir | while read fs bl us av cap mnt; do [ "$av" = "Available" ] || echo $av; done
}
pg_init_data() {
# make sure we got at least 50MB of free space
[ $(free_megs $1) -lt 50 ] && return 1
pg_ctl initdb -U postgres -D $1
[ $(free_megs "$1") -lt 50 ] && return 1
pg_ctl initdb -U postgres -D "$1"
}
pg_server_ready() {
t=0
while [ $t -le 90 ]; do
pg_ctl status -U postgres -D $1 2>/dev/null >/dev/null && return 0
psql -h /var/run/postgresql/ -U postgres -c "\q" 1>/dev/null 2>/dev/null && return 0
t=$((t+1))
sleep 1
done
@@ -28,21 +28,19 @@ pg_server_ready() {
pg_test_db() {
if [ "$3" ]; then
echo "SHOW ALL;" | env PGPASSWORD="$3" $PSQL -U "$2" -d "$1" -q 2>/dev/null >/dev/null
return $?
else
echo "SHOW ALL;" | $PSQL -w -U "$2" -d "$1" -q 2>/dev/null >/dev/null
return $?
fi
echo "SELECT datname FROM pg_catalog.pg_database WHERE datname = '$1';" |
$PSQL -h /var/run/postgresql -w -U "postgres" -d "template1" -q |
grep -q "0 rows" && return 1
return 0
}
pg_include_sql() {
if [ "$3" ]; then
env PGPASSWORD="$3" $PSQL -U "$2" -d "$1" -e -f "$4"
env PGPASSWORD="$3" $PSQL -h /var/run/postgresql -U "$2" -d "$1" -e -f "$4"
return $?
else
$PSQL -w -U "$2" -d "$1" -e -f "$4"
$PSQL -w -h /var/run/postgresql -U "$2" -d "$1" -e -f "$4"
return $?
fi
}
@@ -50,22 +48,37 @@ pg_include_sql() {
# $1: dbname, $2: username, $3: password, $4: sql populate script
pg_require_db() {
local ret
local dbname="$1"
local dbuser="$2"
local dbpass="$3"
local exuser
pg_test_db $@ && return 0
( echo "CREATE DATABASE $1;"
echo -n "CREATE USER $2"
[ "$3" ] && echo -n " WITH PASSWORD '$3'"
echo " NOCREATEDB NOSUPERUSER NOCREATEROLE NOINHERIT;"
echo "GRANT ALL PRIVILEGES ON DATABASE \"$1\" TO $2;" ) |
$PSQL -U postgres -d template1 -e
ret=$?
[ "$ret" = "0" ] || return $ret
if [ "$4" ]; then
pg_include_sql "$@"
ret=$?
shift ; shift ; shift
echo "CREATE DATABASE $dbname;" |
$PSQL -h /var/run/postgresql -U postgres -d template1 -e || return $?
if [ "$dbuser" ]; then
echo "SELECT usename FROM pg_catalog.pg_user WHERE usename = '$dbuser';" |
$PSQL -h /var/run/postgresql -U postgres -d template1 -e | grep -q "0 rows" &&
( echo -n "CREATE USER $dbuser"
[ "$dbpass" ] && echo -n " WITH PASSWORD '$dbpass'"
echo " NOCREATEDB NOSUPERUSER NOCREATEROLE NOINHERIT;" ) |
$PSQL -h /var/run/postgresql -U postgres -d template1 -e
echo "GRANT ALL PRIVILEGES ON DATABASE \"$dbname\" TO $dbuser;" |
$PSQL -h /var/run/postgresql -U postgres -d template1 -e
fi
while [ "$1" ]; do
pg_include_sql "$dbname" "$dbuser" "$dbpass" "$1"
ret=$?
[ $ret != 0 ] && break
shift
done
return $ret
}
@@ -75,7 +88,7 @@ uci_require_db() {
config_get dbuser $1 user
config_get dbpass $1 pass
config_get dbscript $1 script
pg_require_db "$dbname" "$dbuser" "$dbpass" "$dbscript"
pg_require_db "$dbname" "$dbuser" "$dbpass" $dbscript
}
[ "$1" = "init" ] && {