Merge branch 'master' of git://git.evergreen-ils.org/OpenSRF

diff --git a/README b/README
index 414cce8..a3091d4 100644 (file)
--- a/README
+++ b/README
@@ -68,6 +68,7 @@ Well-tested values for <osname> include:
   * `debian-jessie` for Debian 8
   * `ubuntu-trusty` for Ubuntu 14.04
   * `ubuntu-xenial` for Ubuntu 16.04
+  * `ubuntu-bionic` for Ubuntu 18.04
 
 Patches and suggestions for improvement from users of these distributions,
 or others, are welcome!
@@ -212,7 +213,7 @@ work for OpenSRF.
 /etc/init.d/ejabberd stop
 ---------------------------------------------------------------------------
 +
-.(Debian / Ubuntu Xenial) Stopping ejabberd
+.(Debian / Ubuntu Xenial / Ubuntu Bionic) Stopping ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
 systemctl stop ejabberd.service
@@ -282,6 +283,32 @@ hosts:
     ##access_max_user_messages: max_user_offline_messages
 -----------------------
 +
+(Ubuntu Bionic) Ejabberd 18.x::
+Open `/etc/ejabberd/ejabberd.yml` and make the following
+changes:
+  a. Define your public and private domains in the `hosts` directive. For
+   example:
++
+[source, bash]
+---------------------------------------------------------------------------
+hosts:
+  - "localhost"
+  - "private.localhost"
+  - "public.localhost"
+---------------------------------------------------------------------------
++
+  b. Change `auth_password_format` to plain
+  c. Change `shaper:` `normal` and `fast` values to 500000
+  d. Increase the `max_user_sessions:` `all:` value to 10000
+  e. Change `starttls_required` to false
+  f. Uncomment the `mod_legacy_auth` directive
+  g. Comment out the `mod_offline` directive
++
+-----------------------
+##mod_offline:
+    ##access_max_user_messages: max_user_offline_messages
+-----------------------
++
 3. Restart the ejabberd server to make the changes take effect:
 +
 .(Ubuntu Trusty) Starting ejabberd
@@ -290,7 +317,7 @@ hosts:
 /etc/init.d/ejabberd start
 ---------------------------------------------------------------------------
 +
-.(Debian / Ubuntu Xenial) Starting ejabberd
+.(Debian / Ubuntu Xenial / Ubuntu Bionic) Starting ejabberd
 [source, bash]
 ---------------------------------------------------------------------------
 systemctl start ejabberd.service

diff --git a/src/extras/Makefile.install b/src/extras/Makefile.install
index d4b30d0..de87978 100644 (file)
--- a/src/extras/Makefile.install
+++ b/src/extras/Makefile.install
@@ -17,6 +17,8 @@
 #      make -f Makefile.install ubuntu-trusty
 #      - or -
 #      make -f Makefile.install ubuntu-xenial
+#   - or -
+#   make -f Makefile.install ubuntu-bionic
 #      - or -
 #      make -f Makefile.install fedora
 #
@@ -175,6 +177,11 @@ EXTRA_DEBS_UBUNTU_XENIAL = \
        apache2-dev \
        libncurses5-dev
 
+EXTRA_DEBS_UBUNTU_BIONIC = \
+       apache2 \
+       apache2-dev \
+       libncurses5-dev
+
 # ----------------------------------------------------------------------------
 
 all: 
@@ -191,8 +198,10 @@ fedora: install_fedora_rpms
 
 ubuntu-trusty: generic_ubuntu trusty apache_mpm_prefork_mods
 ubuntu-xenial: generic_ubuntu xenial apache_mpm_prefork_mods apache_perl_mod
+ubuntu-bionic: generic_ubuntu bionic apache_mpm_prefork_mods apache_perl_mod
 trusty: install_extra_debs install_extra_debs_trusty debian_sys_config
 xenial: install_extra_debs install_extra_debs_xenial debian_sys_config
+bionic: install_extra_debs install_extra_debs_bionic debian_sys_config
 generic_ubuntu: install_debs
 
 # ------------------------------------------------------------------
@@ -223,6 +232,10 @@ install_extra_debs_trusty:
 install_extra_debs_xenial:
        $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_XENIAL)
 
+install_extra_debs_bionic:
+       $(APT_TOOL) install $(EXTRA_DEBS_UBUNTU_BIONIC)
+
+
 # Some OSes activate the Apache mpm_event module by default.
 # OpenSRF requires prefork.
 apache_mpm_prefork_mods: