[arch-commits] Commit in postgresql/trunk (3 files)

[Jan Steffens]

    Date: Friday, August 17, 2012 @ 19:10:03
  Author: heftig
Revision: 165391

Add systemd service

Added:
  postgresql/trunk/postgresql-initdb
  postgresql/trunk/postgresql.service
Modified:
  postgresql/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   34 +++++++++++++++++++++-------------
 postgresql-initdb  |   33 +++++++++++++++++++++++++++++++++
 postgresql.service |   20 ++++++++++++++++++++
 3 files changed, 74 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-17 23:03:39 UTC (rev 165390)
+++ PKGBUILD	2012-08-17 23:10:03 UTC (rev 165391)
@@ -5,13 +5,28 @@
 pkgname=('postgresql-libs' 'postgresql-docs' 'postgresql')
 pkgver=9.1.4
 _majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.postgresql.org/"
 license=('custom:PostgreSQL')
 makedepends=('krb5' 'libxml2' 'python2' 'perl' 'tcl' 'openssl>=1.0.0')
 source=(ftp://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
-        postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate)
+        postgresql.rcd postgresql.confd postgresql.pam postgresql.logrotate
+        postgresql.service postgresql-initdb)
+md5sums=('a8035688dba988b782725ac1aec60186'
+         '1ddd1df8010549f237e7983bb326025e'
+         'a54d09a20ab1672adf08f037df188d53'
+         '96f82c38f3f540b53f3e5144900acf17'
+         'd28e443f9f65a5712c52018b84e27137'
+         '1ec1fbf1ce998324248c543e6cc2c5e6'
+         '1488a98a5d5d96a04416e4f5872223bf')
+sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712'
+            '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
+            '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
+            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
+            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e'
+            '7014ccc8f3bbac8be9473a43fca2ed4037ee04e56d8e07d6027b3b4ef0317c89'
+            'c22f82a3cf5b555935039853fab2d7e5ff6188cdb1fb528fa9171a87b94f42b0')
 
 build() {
   cd "${srcdir}/postgresql-${pkgver}"
@@ -122,6 +137,10 @@
 
   # install launch script
   install -D -m755 "${srcdir}/postgresql.rcd" "${pkgdir}/etc/rc.d/postgresql"
+  install -D -m644 "${srcdir}/postgresql.service" \
+    "${pkgdir}/usr/lib/systemd/system/postgresql.service"
+  install -D -m755 "${srcdir}/postgresql-initdb" \
+    "${pkgdir}/usr/lib/systemd/scripts/postgresql-initdb"
 
   # install conf file
   install -D -m644 ${srcdir}/postgresql.confd \
@@ -133,14 +152,3 @@
   install -D -m644 ${srcdir}/postgresql.logrotate \
     "${pkgdir}/etc/logrotate.d/postgresql"
 }
-
-md5sums=('a8035688dba988b782725ac1aec60186'
-         '1ddd1df8010549f237e7983bb326025e'
-         'a54d09a20ab1672adf08f037df188d53'
-         '96f82c38f3f540b53f3e5144900acf17'
-         'd28e443f9f65a5712c52018b84e27137')
-sha256sums=('a0795a8eb3ae2d1a2914b63bf143d20182835d90699915ff43567c041d3c9712'
-            '9f6307b1358892e304f9474a456f0cb9160cfb8812a9da0430abe647f8a9cf45'
-            '3de5c059eead8816db15c2c5588e6196d6c4b0d704faf1a20912796cf589ba81'
-            '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
-            '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e')

Added: postgresql-initdb
===================================================================
--- postgresql-initdb	                        (rev 0)
+++ postgresql-initdb	2012-08-17 23:10:03 UTC (rev 165391)
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+set -e
+
+. /etc/conf.d/postgresql
+
+# 2nd clause is necessary to prevent symlinking the directory to itself when it
+# doesn't exist yet
+if [ ! /var/lib/postgres -ef "$PGROOT" ] && [ /var/lib/postgres != "$PGROOT" ]; then
+    echo "Creating symlink /var/lib/postgres -> $PGROOT"
+
+    # Remove /var/lib/postgres if empty dir, but not if symlink
+    if [ ! -L /var/lib/postgres ] && [ -d /var/lib/postgres ]; then
+        rmdir /var/lib/postgres
+    fi
+
+    ln -sf "$PGROOT" /var/lib/postgres
+fi
+
+PGDATA="$PGROOT/data"
+
+if [ ! -d "$PGDATA" ]; then
+    echo "Initializing database in $PGDATA"
+
+    mkdir -p "$PGDATA"
+    chown -R postgres:postgres "$PGDATA"
+
+    su - postgres -m -c "/usr/bin/initdb $INITOPTS -D '$PGDATA'" >/dev/null
+
+    if [ -f /etc/postgresql/postgresql.conf ]; then
+        ln -sf /etc/postgresql/postgresql.conf "$PGDATA/postgresql.conf"
+    fi
+fi


Property changes on: postgresql/trunk/postgresql-initdb
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Added: postgresql.service
===================================================================
--- postgresql.service	                        (rev 0)
+++ postgresql.service	2012-08-17 23:10:03 UTC (rev 165391)
@@ -0,0 +1,20 @@
+[Unit]
+Description=PostgreSQL database server
+
+[Service]
+Type=forking
+SyslogIdentifier=postgres
+PIDFile=/var/lib/postgres/data/postmaster.pid
+
+# initdb script takes care for symlinking $PGROOT to /var/lib/postgres
+ExecStartPre=/usr/lib/systemd/scripts/postgresql-initdb
+ExecStart= /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data start"
+ExecReload=/bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data reload"
+ExecStop=  /bin/su - postgres -m -c "/usr/bin/pg_ctl -s -D /var/lib/postgres/data stop -m fast"
+
+# Due to PostgreSQL's use of shared memory, OOM killer is often overzealous in
+# killing Postgres
+OOMScoreAdjust=-200
+
+[Install]
+WantedBy=multi-user.target