From f7b787879c1f49a91c07c74a68caa74b4b4053f2 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 5 Sep 2013 14:27:00 -0400 Subject: [PATCH] wheezy installer: osrf_control; makefile.install pg changes Signed-off-by: Bill Erickson --- installer/wheezy/eg_wheezy_installer.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh index 37c75a943..1f84447cf 100755 --- a/installer/wheezy/eg_wheezy_installer.sh +++ b/installer/wheezy/eg_wheezy_installer.sh @@ -72,8 +72,6 @@ if [ ! "$(grep ^opensrf: /etc/passwd)" ]; then export LD_LIBRARY_PATH=/openils/lib:/usr/local/lib:/usr/local/lib/dbd:$LD_LIBRARY_PATH' >> /home/opensrf/.bashrc fi; -# XXX for now, fetch the debian-wheezy install target working branches and merge in master -# XXX The git-config pieces are only necessary for merging the working branches OSRF_COMMAND=' cd /home/opensrf; git clone git://git.evergreen-ils.org/OpenSRF.git; @@ -85,7 +83,7 @@ su - opensrf sh -c "$OSRF_COMMAND"; mkdir -p /usr/src/evergreen; cd /usr/src/evergreen; make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy -make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-wheezy install_pgsql_server_debs_91 +make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-wheezy postgres-server-debian-wheezy # Configure rsyslog and restart cp /home/opensrf/Evergreen/Open-ILS/examples/evergreen-rsyslog.conf /etc/rsyslog.d/evergreen.conf @@ -207,9 +205,7 @@ cat <