From 8b7ba9f90410eb52e5a11dfa7360d35f9c3a099a Mon Sep 17 00:00:00 2001 From: Andy Witter Date: Tue, 10 Dec 2019 14:42:30 -0500 Subject: [PATCH] add debs for the DB server that are missing from Bionic repos and re-enable add eg db user --- templates/setup-functions | 8 ++++++++ templates/setup.sh | 2 ++ 2 files changed, 10 insertions(+) diff --git a/templates/setup-functions b/templates/setup-functions index 521a03d..02a1af3 100755 --- a/templates/setup-functions +++ b/templates/setup-functions @@ -68,6 +68,7 @@ if $APT_TOOL update gdebi --n libemail-send-perl*.deb gdebi --n libreturn-value-perl*.deb ### the three below needs to be installed in the current order. + ### we include them here because they missing from the repo in Bionic. gdebi --n libmarc-charset-perl*.deb gdebi --n libmarc-xml-perl*.deb gdebi --n libnet-z3950-simple2zoom-perl*.deb @@ -116,6 +117,13 @@ cd .. chown -R opensrf:opensrf /openils } +Install_DB_Debs () { ### install debs for the db server + + ### the three below needs to be installed in the current order. + ### we include them here because they missing from the repo in Bionic. + gdebi --n debs/libmarc-charset-perl*.deb + gdebi --n debs/libmarc-xml-perl*.deb +} PG_Deps_Warning () { ### Dependency install error message echo diff --git a/templates/setup.sh b/templates/setup.sh index 80f8762..c53a89a 100755 --- a/templates/setup.sh +++ b/templates/setup.sh @@ -131,6 +131,7 @@ fi Install_DB_Deps() { ### Install Additional Database dependencies. if [ "$OSDISTRO" == "Ubuntu" ] then + Install_DB_Debs $APT_TOOL -y install gcc libxml-libxml-perl libxml-libxslt-perl libjson-xs-perl libmarc-record-perl libmarc-xml-perl libuuid-tiny-perl libbusiness-isbn-perl liblibrary-callnumber-lc-perl else $APT_TOOL -y install gcc libxml-libxml-perl libxml-libxslt-perl @@ -433,6 +434,7 @@ then #fi ### Set file ownership correctly on /etc/postgres chown -R postgres:postgres /etc/postgres + Add_EG_DB_User fi fi -- 2.11.0