From e66e3e8f72d20f6825f6a659f2515611dfb15401 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Thu, 19 May 2016 14:36:11 -0400 Subject: [PATCH] More 16.04/ejabberd updates; script logging Signed-off-by: Bill Erickson --- installer/16.04-xenial/eg_xenial_installer.sh | 6 +++++- installer/16.04-xenial/ejabberd.EG.defaults.patch | 14 +++++++------- installer/16.04-xenial/ejabberd.EG.patch | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/installer/16.04-xenial/eg_xenial_installer.sh b/installer/16.04-xenial/eg_xenial_installer.sh index fb6adeae0..76b266111 100755 --- a/installer/16.04-xenial/eg_xenial_installer.sh +++ b/installer/16.04-xenial/eg_xenial_installer.sh @@ -89,7 +89,7 @@ function init_variables { export ADMIN_PASS='demo123'; # ----------------------------------------------------------------------- # You can override these like so: - # EVERGREEN_BRANCH='master' ./eg_xenial_installer.sh + # sudo EVERGREEN_BRANCH='master' ./eg_xenial_installer.sh # ----------------------------------------------------------------------- [ -z "$OPENSRF_REPO" ] && \ OPENSRF_REPO='git://git.evergreen-ils.org/OpenSRF.git' @@ -108,6 +108,10 @@ function init_variables { echo OPENSRF_PREREQ_TARGET=${OPENSRF_PREREQ_TARGET} echo EVERGREEN_PREREQ_TARGET=${EVERGREEN_PREREQ_TARGET} echo EVERGREEN_DB_PREREQ_TARGET=${EVERGREEN_DB_PREREQ_TARGET} + echo OPENSRF_REPO=$OPENSRF_REPO + echo OPENSRF_BRANCH=$OPENSRF_BRANCH + echo EVERGREEN_REPO=$EVERGREEN_REPO + echo EVERGREEN_BRANCH=$EVERGREEN_BRANCH echo End of intializing installer =~-._ } diff --git a/installer/16.04-xenial/ejabberd.EG.defaults.patch b/installer/16.04-xenial/ejabberd.EG.defaults.patch index b9d55a3a1..a98421d31 100644 --- a/installer/16.04-xenial/ejabberd.EG.defaults.patch +++ b/installer/16.04-xenial/ejabberd.EG.defaults.patch @@ -1,11 +1,11 @@ ---- ejabberd 2013-11-11 14:31:09.000000000 -0500 -+++ /tmp/ejabberd.EG.defaults 2014-11-20 16:11:29.782544331 -0500 -@@ -23,7 +23,7 @@ +--- ejabberd.orig 2016-05-19 14:35:10.738213949 -0400 ++++ ejabberd 2016-05-19 14:35:03.374311857 -0400 +@@ -24,7 +24,7 @@ # - # Default: disable + # Default: auto # --#SMP=disable +-#SMP=auto +SMP=auto - # ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports - # + #. + #' ERL_MAX_PORTS: Maximum number of simultaneously open Erlang ports diff --git a/installer/16.04-xenial/ejabberd.EG.patch b/installer/16.04-xenial/ejabberd.EG.patch index 828f42b20..57eb560fa 100644 --- a/installer/16.04-xenial/ejabberd.EG.patch +++ b/installer/16.04-xenial/ejabberd.EG.patch @@ -32,7 +32,7 @@ ## The "normal" shaper limits traffic speed to 1000 B/s ## - normal: 1000 -+ normal: 10000 ++ normal: 50000 ## ## The "fast" shaper limits traffic speed to 50000 B/s -- 2.11.0