diff --git a/configs/postgresql/APKBUILD b/configs/postgresql/APKBUILD index bf8f2fe..f162e10 100644 --- a/configs/postgresql/APKBUILD +++ b/configs/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-config-postgresql -pkgver=2020.12.22 +pkgver=2020.12.29 pkgrel=0 pkgdesc="PostgreSQL configuration files" url="https://git.redxen.eu/RedXen" @@ -16,12 +16,12 @@ source=" " package() { - install -dm750 "$pkgdir"/databases/postgresql + install -dm750 "$pkgdir"/var/lib/postgresql install -Dm644 postgresql.conf "$pkgdir"/etc/postgresql/redxen/postgresql.conf install -Dm644 pg_hba.conf "$pkgdir"/etc/postgresql/redxen/pg_hba.conf install -Dm644 pg_ident.conf "$pkgdir"/etc/postgresql/redxen/pg_ident.conf } -sha512sums="488704a30e019d498f1cc27d1d3ae30c2e62be01549f593e72a4e42f476b46efdce5e97ffc9aa7f33d67c5d7752e5cc6f146f5377c459719bb2bcb07a404951c postgresql.conf +sha512sums="8bb7d9a9c442da7652a79f70f5ab253cab68cdc98652c8e3a9a90bacb953db8de9811a6fdec70b1eaa8552217240cb633ca3d7a3e5c8b9eed423532532dbbc67 postgresql.conf dfda1183c006f361874f8ab0f6b4e9b3f3e32dcd24b6089f3390c441e5c17b1ee823c68f4d932e3560ea5bb5fc95276bc7cafe6c00d7417ea164cf81193cc92a pg_hba.conf cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e pg_ident.conf" diff --git a/configs/postgresql/postgresql.conf b/configs/postgresql/postgresql.conf index f38b49a..996ce50 100644 --- a/configs/postgresql/postgresql.conf +++ b/configs/postgresql/postgresql.conf @@ -2,7 +2,7 @@ # FILE LOCATIONS #------------------------------------------------------------------------------ -data_directory = '/databases/postgresql' +data_directory = '/var/lib/postgresql' external_pid_file = '/run/postgresql/main.pid' #------------------------------------------------------------------------------ diff --git a/cron/postgresql/APKBUILD b/cron/postgresql/APKBUILD index 726e3b6..e0df73c 100644 --- a/cron/postgresql/APKBUILD +++ b/cron/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-cron-postgresql -pkgver=2020.12.27 +pkgver=2020.12.29 pkgrel=0 pkgdesc="Postgresql backup maintenance scripts" url="https://git.redxen.eu/RedXen" @@ -15,8 +15,8 @@ source=" options="!check" package() { - install -dm700 "$pkgdir"/databases/snapshots/postgresql + install -dm700 "$pkgdir"/var/lib/postgresql/redxen_snapshots install -Dm544 cron-daily "$pkgdir"/etc/periodic/daily/snapshot-postgresql } -sha512sums="784beb8f50222f477043a29c3feb63beb4a84903fcf8ba0210e2a5fd617b2f52e99faae9fcebf7a8234471cf28a685203ed8af503e6c12676c1d41a58f89b2a6 cron-daily" +sha512sums="c6dfc277e98287d715651a3b54a9661c527dac4cc4be932a23888a5cfa659fc971ffa20982820c9a91064dad90968124b5764e9827a4ecf038b35b4cce5d430b cron-daily" diff --git a/cron/postgresql/cron-daily b/cron/postgresql/cron-daily index d5cf329..495e063 100644 --- a/cron/postgresql/cron-daily +++ b/cron/postgresql/cron-daily @@ -1,3 +1,3 @@ #!/bin/sh -/sbin/btrfs subvolume delete /databases/snapshots/postgresql/`date +"%u"` -/sbin/btrfs subvolume snapshot -r /databases/postgresql /databases/snapshots/postgresql/`date +"%u"` +/sbin/btrfs subvolume delete /var/lib/postgresql/redxen_snapshots/`date +"%u"` +/sbin/btrfs subvolume snapshot -r /var/lib/postgresql /var/lib/postgresql/redxen_snapshots/`date +"%u"` diff --git a/openrc/postgresql/APKBUILD b/openrc/postgresql/APKBUILD index 119009f..305f602 100644 --- a/openrc/postgresql/APKBUILD +++ b/openrc/postgresql/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Alex Denes # Maintainer: Alex Denes pkgname=redxen-openrc-postgresql -pkgver=2020.12.13 +pkgver=2020.12.29 pkgrel=0 pkgdesc="PostgreSQL service files" url="https://git.redxen.eu/RedXen" @@ -20,4 +20,4 @@ package() { install -Dm644 conffile "$pkgdir"/etc/conf.d/postgresql.redxen } -sha512sums="bd483ee17f55bcf614f828d47325dec04665526bb0e5c0b314904378412501b1e8983a368be288c37608829a8bd116776de9ac5e2709707e50a2b9981b333b52 conffile" +sha512sums="9c4c494aead2906bf7da75a38385f1a096c99fb3d836da5c151e5969e56845baf359c3a8ccd7e4c857cb179be22f1c1179b953e2b1a55ea47b467643938ed375 conffile" diff --git a/openrc/postgresql/conffile b/openrc/postgresql/conffile index 2c933e9..7507e2c 100644 --- a/openrc/postgresql/conffile +++ b/openrc/postgresql/conffile @@ -9,6 +9,6 @@ #env_vars="PGPASSFILE=\"/path/to/.pgpass\"" logfile="/var/log/postgresql/postmaster.log" #auto_setup="yes" -data_dir="/databases/postgresql" +data_dir="/var/lib/postgresql" conf_dir="/etc/postgresql/redxen" #initdb_opts="--locale=en_US.UTF-8"