Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=236f4381b3b52e13c37885526c6f4136e57bd222
commit 236f4381b3b52e13c37885526c6f4136e57bd222 Author: James Buren <[email protected]> Date: Tue Jul 10 18:08:14 2012 -0500 postgresql-9.1.4-1-x86_64 * convert to systemd schema diff --git a/source/apps-extra/postgresql/FrugalBuild b/source/apps-extra/postgresql/FrugalBuild index 9b65971..02ad055 100644 --- a/source/apps-extra/postgresql/FrugalBuild +++ b/source/apps-extra/postgresql/FrugalBuild @@ -3,7 +3,7 @@ # Contributor: Miklos Vajna <[email protected]> pkgname=postgresql -pkgver=9.1.3 +pkgver=9.1.4 pkgrel=1 pkgdesc="An advanced Object-Relational database management system (DBMS)" url="http://www.postgresql.org/" @@ -13,7 +13,7 @@ rodepends=("libpq=$pkgver") groups=('apps-extra') archs=('i686' 'x86_64' 'arm') up2date="lynx -dump ftp://ftp.postgresql.org/pub/source/|egrep -v 'alpha|beta|rc[0-9]' |tail -n 1 |sed 's|.*/v||'" -source=(ftp://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2 rc.postgresql) +source=(ftp://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz2 rc.postgresql postgresql.service pg_setup) subpkgs=('libpq' "$pkgname-extras" "$pkgname-plperl" "$pkgname-plpython" "$pkgname-pltcl") subdescs=('PostgreSQL Library.' 'PostgreSQL extra tools' \ @@ -27,6 +27,11 @@ subreplaces=('' '' "$pkgname-perl" "$pkgname-python" "$pkgname-tcl") subprovides=('' '' "$pkgname-perl" "$pkgname-python" "$pkgname-tcl") subconflicts=('' '' "$pkgname-perl" "$pkgname-python" "$pkgname-tcl") +_F_systemd_scriptlet="postgresql.install" +_F_sysvinit_units=(postgresql) +_F_systemd_units=(postgresql=) +Finclude systemd + build() { Fmake \ @@ -58,6 +63,12 @@ build() make DESTDIR=$Fdestdir install || Fdie make -C doc/src/sgml DESTDIR=$Fdestdir install-man Frcd2 + Ffile /lib/systemd/system/postgresql.service + Fexe /usr/bin/pg_setup + Fgenscriptlet + Fmkdir /var/lib/pgsql/data /var/log/pgsql + Fdirschown /var/lib/pgsql 31 31 + Fdirschown /var/log/pgsql 31 31 ## Library package Fsplit libpq usr/lib/libpq.* Fsplit libpq usr/include/{libpq-fe,postgres_ext}.h @@ -70,6 +81,8 @@ build() Fsplit $pkgname-pltcl usr/lib/$pkgname/pltcl.so } -sha1sums=('1cf3044415df807c08bb8ad8e40e24e8d375cf34' \ - '387da593dd596655994eba0a7f648b6bc61dd5ab') +sha1sums=('c75fd5696af02a275a104260eac8b3a4abe35682' \ + '387da593dd596655994eba0a7f648b6bc61dd5ab' \ + '41423e125d1f8f5f6c57bcddd5eb5ad326b22561' \ + '30c843fe478fadcd3d8a1d80f7b12a7bccb41efb') # optimization OK diff --git a/source/apps-extra/postgresql/pg_setup b/source/apps-extra/postgresql/pg_setup new file mode 100644 index 0000000..d137c0b --- /dev/null +++ b/source/apps-extra/postgresql/pg_setup @@ -0,0 +1,7 @@ +#!/bin/sh + +FILES="$(ls -l /var/lib/pgsql/data/*)" + +if [ -z "$FILES" ]; then + initdb -D /var/lib/pgsql/data +fi diff --git a/source/apps-extra/postgresql/postgresql.install b/source/apps-extra/postgresql/postgresql.install index a8dd97f..9d02b72 100644 --- a/source/apps-extra/postgresql/postgresql.install +++ b/source/apps-extra/postgresql/postgresql.install @@ -1,27 +1,65 @@ -pre_remove() +sysvinit_units=(@_F_sysvinit_units@) +systemd_units=(@_F_systemd_units@) + +post_install() { - ## remove the init script if is ON - if [ -e /usr/sbin/chkconfig ]; then - if LC_ALL= LANG= /usr/sbin/chkconfig --list rc.postgresql|grep "on" >/dev/null; then - /usr/sbin/chkconfig --del rc.postgresql + local unit + local op + + getent group pgdb > /dev/null 2>&1 || groupadd -g 31 pgdb + getent passwd postgres > /dev/null 2>&1 || useradd -u 31 -g pgdb -d /var/lib/pgsql -s /bin/bash postgres + + for i in ${sysvinit_units[@]}; do + chkconfig --del rc.$i >/dev/null 2>&1 + done + + for i in ${systemd_units[@]}; do + unit=$(echo $i | cut -f 1 -d '=') + op=$(echo $i | cut -f 2 -d '=') + if echo $op | grep -q 'e'; then + systemctl enable $unit.service >/dev/null 2>&1 fi - fi + if echo $op | grep -q 's'; then + systemctl start $unit.service >/dev/null 2>&1 + fi + done +} + +post_upgrade() +{ + getent group pgdb > /dev/null 2>&1 || groupadd -g 31 pgdb + getent passwd postgres > /dev/null 2>&1 || useradd -u 31 -g pgdb -d /var/lib/pgsql -s /bin/bash postgres + + for i in ${sysvinit_units[@]}; do + chkconfig --del rc.$i >/dev/null 2>&1 + done + + systemctl daemon-reload >/dev/null 2>&1 +} + +pre_remove() +{ + local unit + + for i in ${sysvinit_units[@]}; do + chkconfig --del rc.$i >/dev/null 2>&1 + done + + for i in ${systemd_units[@]}; do + unit=$(echo $i | cut -f 1 -d '=') + systemctl --no-reload disable $unit.service >/dev/null 2>&1 + systemctl stop $unit.service >/dev/null 2>&1 + done } post_remove() { - ## remove user - if [ `egrep '^postgres:' /etc/passwd` ]; then - /usr/sbin/userdel postgres &>/dev/null - rm -rf /var/spool/mail/postgres - fi - ## the group - if [ `egrep '^pgdb:' /etc/group` ]; then - /usr/sbin/groupdel pgdb &>/dev/null - fi + getent passwd postgres > /dev/null 2>&1 && userdel postgres + getent group pgdb > /dev/null 2>&1 && groupdel pgdb + + systemctl daemon-reload >/dev/null 2>&1 } op=$1 shift - $op $* diff --git a/source/apps-extra/postgresql/postgresql.service b/source/apps-extra/postgresql/postgresql.service new file mode 100644 index 0000000..ba515f8 --- /dev/null +++ b/source/apps-extra/postgresql/postgresql.service @@ -0,0 +1,17 @@ +[Unit] +Description=PostgreSQL Daemon +After=network.target + +[Service] +Type=forking +User=postgres +Group=pgdb +OOMScoreAdjust=-1000 +TimeoutSec=300 +ExecStartPre=/usr/bin/pg_setup +ExecStart=/usr/bin/pg_ctl start -D /var/lib/pgsql/data -s -l /var/log/pgsql/postgresql.log -w -t 300 +ExecStop=/usr/bin/pg_ctl stop -D /var/lib/pgsql/data -s -l /var/log/pgsql/postgresql.log -m fast +ExecReload=/usr/bin/pg_ctl reload -D /var/lib/pgsql/data -s -l /var/log/pgsql/postgresql.log + +[Install] +WantedBy=multi-user.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
