X Sync with pg-vup

component/postgresql/buildout.cfg

@@ -9,12 +9,11 @@ parts = postgresql
 
 
 [postgresql]
-<= postgresql94
+<= postgresql92
 
 
 [postgresql-common]
 recipe = slapos.recipe.cmmi
-#configure-options = --with-openssl --with-perl
 configure-options = --with-openssl
 environment =
   CPPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${openssl:location}/include -I${ncurses:location}/lib
@@ -30,15 +29,9 @@ configure-options += --with-perl
 
 [postgresql92]
 <= postgresql-common
-url = http://ftp.postgresql.org/pub/source/v9.2.8/postgresql-9.2.8.tar.bz2
-md5sum = c5c65a9b45ee53ead0b659be21ca1b97
-# no --with-perl
-
-[postgresql94]
-<= postgresql-common
-url = http://ftp.postgresql.org/pub/source/v9.4.4/postgresql-9.4.4.tar.bz2
-md5sum = 1fe952c44ed26d7e6a335cf991a9c1c6
+url = http://ftp.postgresql.org/pub/source/v9.2.14/postgresql-9.2.14.tar.bz2
+md5sum = ce2e50565983a14995f5dbcd3c35b627
 # ld: .../perl/libs-c/libperl.a(op.o): relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a shared object; recompile with -fPIC
 # .../parts/perl/libs-c/libperl.a: could not read symbols: Bad value
-# (because libperla. is not compiled with fPIC)
+# (because libperl.a is not compiled with fPIC)
 # -> no --with-perl

slapos/recipe/postgres/__init__.py

@@ -140,8 +140,7 @@ class Recipe(GenericBaseRecipe):
                     lc_time = 'en_US.UTF-8'
                     default_text_search_config = 'pg_catalog.english'
 
-                    # XXX directory vs directories depends on pg version
-                    unix_socket_directories = '%s'
+                    unix_socket_directory = '%s'
                     unix_socket_permissions = 0700
                     """ % (
                         ','.join(ipv4.union(ipv6)),

software/postgres/instance.cfg.in

@@ -43,8 +43,7 @@ port = 5432
 dbname = db
 # pgdata_directory is created by initdb, and should not exist beforehand.
 pgdata-directory = $${directories:var}/data
-# XXX was building postgres twice
-bin = ${postgresql94:location}/bin
+bin = ${postgresql92:location}/bin
 services = $${directories:services}
 
 

software/postgres/software.cfg

@@ -8,7 +8,7 @@ parts =
   slapos-cookbook-develop
   slapos-cookbook
   instance
-  postgresql94
+  postgresql92
 
 
 #----------------
@@ -18,7 +18,7 @@ parts =
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
-#md5sum = d8b833a2054b82b6031a9420008b58fd
+md5sum = 9c3ff5e5c326e12c23ba56039b76eb8a
 mode = 0644
 
 [versions]