Update install scripts for Ubuntu 18.04
authorJeff Davis <jdavis@sitka.bclibraries.ca>
Mon, 26 Oct 2020 21:04:55 +0000 (14:04 -0700)
committerJeff Davis <jdavis@sitka.bclibraries.ca>
Mon, 11 Jan 2021 20:12:58 +0000 (12:12 -0800)
deployment/install-eg.sh
deployment/install-osrf.sh

index 088f78d..ad0b225 100755 (executable)
@@ -83,7 +83,7 @@ else
 fi
 
 # as root
-cd ${BUILDDIR} && make -f Open-ILS/src/extras/Makefile.install ubuntu-xenial
+cd ${BUILDDIR} && make -f Open-ILS/src/extras/Makefile.install ubuntu-bionic
 if [[ ! -n "$TARBALL" ]] ; then
   cd ${BUILDDIR} && make -f Open-ILS/src/extras/Makefile.install ubuntu-xenial-translator # required for web client and custom translations
 fi
@@ -124,6 +124,7 @@ suwrap "cd ${BUILDDIR} && make" ${INSTALL_USER}
 # as root
 rm -rf ${INSTALLDIR}/var/web/eg2/en-US
 cd ${BUILDDIR} && make install
+ldconfig
 mv ${INSTALLDIR}/var/web/reports/fm_IDL.xml ${INSTALLDIR}/var/web/reports/fm_IDL.xml.orig && cp ${INSTALLDIR}/conf/fm_IDL.xml ${INSTALLDIR}/var/web/reports/
  
 # setup start page
index 2449309..e1ab77c 100755 (executable)
@@ -76,7 +76,7 @@ sed -i "s|__HOSTNAME__|${THISHOST}|g" /etc/apache2/apache2.conf
 
 # as root
 echo "Installing OpenSRF prerequisites for Ubuntu..."
-cd ${BUILDDIR} && make -f src/extras/Makefile.install ubuntu-xenial
+cd ${BUILDDIR} && make -f src/extras/Makefile.install ubuntu-bionic
  
 # as DEFAULT_USER
 echo "Configuring and building OpenSRF..."
@@ -120,24 +120,24 @@ ldconfig
 # as root
 echo "Setting up ejabberd..."
 mv /etc/ejabberd/ejabberd.yml /etc/ejabberd/ejabberd.yml.${TIMESTAMP}
-cp ${SITKACONF}/files/etc/ejabberd/ejabberd.yml/${HOSTNAME} /etc/ejabberd/ejabberd.yml
-sed -i "s|__HOSTNAME__|${THISHOST}|g" /etc/ejabberd/ejabberd.yml
-chgrp ejabberd /etc/ejabberd/ejabberd.yml
-chmod 640 /etc/ejabberd/ejabberd.yml
-systemctl stop ejabberd.service && systemctl start ejabberd.service
-if [[ ! -n "$SKIP_EJABBERD_REG" ]] ; then
-  if [[ ! -n "$PROD" ]] ; then
-    EJABBERD_HOST="localhost"
-  else
-    EJABBERD_HOST=$THISHOST
-  fi
-  sleep 5
-  su -c " \
-  ejabberdctl register router private.${EJABBERD_HOST} ${PRIVATE_ROUTER_PASSWD} && \
-  ejabberdctl register opensrf private.${EJABBERD_HOST} ${PRIVATE_OPENSRF_PASSWD} && \
-  ejabberdctl register router public.${EJABBERD_HOST} ${PUBLIC_ROUTER_PASSWD} && \
-  ejabberdctl register opensrf public.${EJABBERD_HOST} ${PUBLIC_OPENSRF_PASSWD} " ejabberd
-fi
+#cp ${SITKACONF}/files/etc/ejabberd/ejabberd.yml/${HOSTNAME} /etc/ejabberd/ejabberd.yml
+#sed -i "s|__HOSTNAME__|${THISHOST}|g" /etc/ejabberd/ejabberd.yml
+#chgrp ejabberd /etc/ejabberd/ejabberd.yml
+#chmod 640 /etc/ejabberd/ejabberd.yml
+#systemctl stop ejabberd.service && systemctl start ejabberd.service
+#if [[ ! -n "$SKIP_EJABBERD_REG" ]] ; then
+#  if [[ ! -n "$PROD" ]] ; then
+#    EJABBERD_HOST="localhost"
+#  else
+#    EJABBERD_HOST=$THISHOST
+#  fi
+#  sleep 5
+#  su -c " \
+#  ejabberdctl register router private.${EJABBERD_HOST} ${PRIVATE_ROUTER_PASSWD} && \
+#  ejabberdctl register opensrf private.${EJABBERD_HOST} ${PRIVATE_OPENSRF_PASSWD} && \
+#  ejabberdctl register router public.${EJABBERD_HOST} ${PUBLIC_ROUTER_PASSWD} && \
+#  ejabberdctl register opensrf public.${EJABBERD_HOST} ${PUBLIC_OPENSRF_PASSWD} " ejabberd
+#fi
 
 echo "OpenSRF is installed!"
 
@@ -155,3 +155,5 @@ if [[ ! -n "$SKIP_WEBSOCKETS" ]] ; then
 
   #echo "websockets is installed!"
 fi
+
+echo "*** IMPORTANT: you must configure ejabberd manually! ***"