Put all the UNIX domain sockets in /var/vcap/sys/run

This was a lot more work than it should have been.  Specifically:

- Upgraded pgpoolII to 3.5.4 (from 3.5.0) because 3.5.0 didn't properly
  parse the config file to pull out the `pcp_socket_dir` option.
- Patch pgpoolII 3.5.4 to set the default UNIX domain socket directories
  to be in `/var/vcap/sys/run`, so we don't have to configure it.
- Patch postgresql 9.5.1 to set the default UNIX domain socket
  directories to be in `/var/vcap/sys/run` as well.

Fixes #7

Author: jhunt

ci/release_notes.md

@@ -0,0 +1,8 @@
+## Upgrades
+
+- pgpoolII upgraded from 3.5.0 to 3.5.4
+
+## Improvements
+
+- All UNIX domain sockets now reside under `/var/vcap/sys/run`,
+  where they ought to, and not in `/tmp`.

config/blobs.yml

@@ -1,8 +1,4 @@
 ---
-pgpool2/pgpool-II-3.5.0.tar.gz:
-  object_id: 80b22485-079c-408f-9bb6-b8691bdfd734
-  sha: f5041afe078bc8c414e4db8ab0119c4e76aaaaab
-  size: 2205490
 pgrt/pgrt:
   object_id: b7968265-d373-404d-b6e0-12caa15f9f98
   sha: 2f6c7cc5a7b89712be68f2663fdf3fa9f997a2fa
@@ -11,3 +7,7 @@ postgres/postgresql-9.5.1.tar.bz2:
   object_id: c3acc49c-a9ec-49a1-ae82-e97a00672695
   sha: 905bc31bc4d500e9498340407740a61835a2022e
   size: 18441638
+pgpool2/pgpool-II-3.5.4.tar.gz:
+  object_id: c0821167-44de-470e-ad15-48309d6dd44a
+  sha: 4ea15dc8bb740baf720b18f182b400ea60b1ae45
+  size: 2237911

jobs/pgpool/templates/config/pcppass

@@ -1 +1 @@
-localhost:<%= p('pgpool.config.pcp_port', 9898) %>:system:<%= p('pcp.system_password') %>
+*:<%= p('pgpool.config.pcp_port', 9898) %>:system:<%= p('pcp.system_password') %>

jobs/postgres/templates/config/postgresql.conf

@@ -1,4 +1,7 @@
 # postgres main configuration
+unix_socket_directories = '/var/vcap/sys/run/postgres/'
+
+##
 <%
   pgs = link("db").instances
   replication = p('postgres.replication.enabled', false) && pgs.size() > 1

packages/pgpool2/packaging

@@ -1,5 +1,5 @@
-set -e # exit immediately if a simple command exits with a non-zero status
-set -u # report the usage of uninitialized variables
+#!/bin/bash
+set -eu
 
 # Detect # of CPUs so make jobs can be parallelized
 CPUS=$(grep -c ^processor /proc/cpuinfo)
@@ -10,10 +10,60 @@ export HOME=/var/vcap
 
 
 # see http://www.pgpool.net/download.php?f=pgpool-II-3.5.0.tar.gz
-VERSION=3.5.0
+VERSION=3.5.4
 
 tar -xzf pgpool2/pgpool-II-${VERSION}.tar.gz
 cd pgpool-II-${VERSION}/
+# patch it up, since there isn't much in the way of configure options....
+patch -p1 <<EOF
+diff -u -ur pgpool-II-3.5.4.pristine/src/include/parser/pg_config_manual.h pgpool-II-3.5.4/src/include/parser/pg_config_manual.h
+--- pgpool-II-3.5.4.pristine/src/include/parser/pg_config_manual.h	2016-08-30 05:04:13.000000000 -0400
++++ pgpool-II-3.5.4/src/include/parser/pg_config_manual.h	2016-11-01 22:12:34.000000000 -0400
+@@ -189,7 +189,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/vcap/sys/run/postgres"
+ 
+ /*
+  * This is the default event source for Windows event log.
+diff -u -ur pgpool-II-3.5.4.pristine/src/include/pcp/pcp_stream.h pgpool-II-3.5.4/src/include/pcp/pcp_stream.h
+--- pgpool-II-3.5.4.pristine/src/include/pcp/pcp_stream.h	2016-08-30 05:04:13.000000000 -0400
++++ pgpool-II-3.5.4/src/include/pcp/pcp_stream.h	2016-11-01 22:11:45.000000000 -0400
+@@ -48,6 +48,6 @@
+ extern int pcp_write(PCP_CONNECTION *pc, void *buf, int len);
+ extern int pcp_flush(PCP_CONNECTION *pc);
+ 
+-#define UNIX_DOMAIN_PATH "/tmp"
++#define UNIX_DOMAIN_PATH "/var/vcap/sys/run/pgpool"
+ 
+ #endif /* PCP_STREAM_H */
+diff -u -ur pgpool-II-3.5.4.pristine/src/include/pool.h pgpool-II-3.5.4/src/include/pool.h
+--- pgpool-II-3.5.4.pristine/src/include/pool.h	2016-08-30 05:17:56.000000000 -0400
++++ pgpool-II-3.5.4/src/include/pool.h	2016-11-01 22:10:17.000000000 -0400
+@@ -72,16 +72,16 @@
+ #define HBA_CONF_FILE_NAME "pool_hba.conf"
+ 
+ /* pid file directory */
+-#define DEFAULT_LOGDIR "/tmp"
++#define DEFAULT_LOGDIR "/var/vcap/sys/log/pgpool"
+ 
+ /* Unix domain socket directory */
+-#define DEFAULT_SOCKET_DIR "/tmp"
++#define DEFAULT_SOCKET_DIR "/var/vcap/sys/run/pgpool"
+ 
+ /* Unix domain socket directory for watchdog IPC */
+-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
++#define DEFAULT_WD_IPC_SOCKET_DIR "/var/vcap/sys/run/pgpool"
+ 
+ /* pid file name */
+-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
++#define DEFAULT_PID_FILE_NAME "/var/vcap/sys/run/pgpool/pgpool.pid"
+ 
+ /* status file name */
+ #define STATUS_FILE_NAME "pgpool_status"
+EOF
 ./configure --prefix ${BOSH_INSTALL_TARGET} --with-pgsql=/var/vcap/packages/postgres
 make
 make install

packages/postgres/packaging

@@ -1,5 +1,5 @@
-set -e # exit immediately if a simple command exits with a non-zero status
-set -u # report the usage of uninitialized variables
+#!/bin/bash
+set -eu
 
 # Detect # of CPUs so make jobs can be parallelized
 CPUS=$(grep -c ^processor /proc/cpuinfo)
@@ -12,6 +12,20 @@ export HOME=/var/vcap
 VERSION=9.5.1
 tar -xjf postgres/postgresql-${VERSION}.tar.bz2
 cd postgresql-${VERSION}/
+patch -p1 <<EOF
+diff -u -ur postgresql-9.5.1.pristine/src/include/pg_config_manual.h postgresql-9.5.1/src/include/pg_config_manual.h
+--- postgresql-9.5.1.pristine/src/include/pg_config_manual.h	2016-02-08 16:12:28.000000000 -0500
++++ postgresql-9.5.1/src/include/pg_config_manual.h	2016-11-01 22:21:21.000000000 -0400
+@@ -169,7 +169,7 @@
+  * here's where to twiddle it.  You can also override this at runtime
+  * with the postmaster's -k switch.
+  */
+-#define DEFAULT_PGSOCKET_DIR  "/tmp"
++#define DEFAULT_PGSOCKET_DIR  "/var/vcap/sys/run/postgres"
+ 
+ /*
+  * This is the default event source for Windows event log.
+EOF
 ./configure --prefix ${BOSH_INSTALL_TARGET}
 make world
 make install-world