Merge pull request #1491 from m-anish/patch-1

Docs: pbx/README.rst, tasks/asterisk.yml, tasks/freepbx.yml, minetest/README.rst

roles/minetest/README.rst

@@ -14,7 +14,7 @@ Connecting to the Server
 
 To connect to the server, you will also need to download Minetest client software for each of your client devices, e.g. from: https://www.minetest.net/downloads/
 
-The port is nominally the standard 30000.  This can be changed in `/etc/iiab/local_vars.yml <http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F>`_ using variable: ``minetest_port``
+The port is nominally the standard 30000.  If necessary, change the ``minetest_port`` as explained below.
 
 The admin user is the usual: ``Admin``
 
@@ -23,6 +23,8 @@ No password is required.
 Configurable Parameters
 -----------------------
 
+If changes are necessary, please edit `/etc/iiab/local_vars.yml <http://wiki.laptop.org/go/IIAB/FAQ#What_is_local_vars.yml_and_how_do_I_customize_it.3F>`_ (adding any variables that you need) prior to installation if possible:
+
 - ``minetest_install:`` set Minetest up to install; default is False
 - ``minetest_enabled:`` set Minetest up to be enabled; default is False
 - ``minetest_port:`` port on which client should connect; default is 30000
@@ -31,6 +33,10 @@ Configurable Parameters
 - ``minetest_default_game:`` only carbone-ng and minetest are supported; default is `carbone-ng <https://github.com/Calinou/carbone-ng>`_
 - ``minetest_flat_world:`` use a flat mapgen engine to lower computation on client; default is False
 
+After installation, you can monitor the 'minetest-server' service with command::
+
+  systemctl minetest-server freepbx
+
 File Locations
 --------------
 
@@ -46,12 +52,14 @@ File Locations on Raspberry Pi
 
 File Locations on Other Platforms
 ---------------------------------
+
 - The server binary is ``/usr/lib/minetest/minetestserver``
 - The working directory is ``/usr/share/games/minetest``
 - mods are in  ``/usr/share/games/minetest/games/<game>/mods``
 
 To Do
 -----
+
 - Add more mods — currently only the default mods are there in carbone-ng
 - Add more games
 - Minetest client software for Windows and Android, included onboard IIAB for offline communities (`#1465 <https://github.com/iiab/iiab/issues/1465>`_)

roles/pbx/README.rst

@@ -4,7 +4,7 @@ PBX README
 
 This 'pbx' playbook adds `Asterisk <https://asterisk.org/>`_ and `FreePBX <https://freepbx.org/>`_ to Internet-in-a-Box (IIAB) for VoIP and SIP functionality e.g. for rural telephony.
 
-This initial release (for IIAB 6.7 in February 2019) supports Ubuntu 18.04 and Debian 9 "Stretch" — in future Raspberry Pi (Raspbian) might also be possible! (`#1467 <https://github.com/iiab/iiab/issues/1467>`_)
+This initial release (for IIAB 6.7 in February 2019) supports Ubuntu 18.04, Debian 9 "Stretch" — and experimentally supports Raspberry Pi: `#1467 <https://github.com/iiab/iiab/issues/1467>`_
 
 Explanation
 -----------
@@ -27,9 +27,9 @@ Optionally, you may want to enable `chan_dongle <https://github.com/wdoekes/aste
 
 After installing PBX as part of IIAB, please visit http://pbx.lan/freepbx and proceed with initial configuration (no login/password is required initially — you will be asked to set this up).
 
-**CAUTION: it is sometimes necessary to put "[ACTUAL IP ADDRESS] pbx.lan" into the 'hosts' file on the client machine (where the browser is being used) to get http://pbx.lan/freepbx to work.**  CLARIF: customizing the hosts file is _not_ necessary if your browser is accessing the `'LAN' side <https://github.com/iiab/iiab/wiki/IIAB-Networking#internet-in-a-box-iiab-networking>`_ of your IIAB server.
+**CAUTION: it is sometimes necessary to put "[ACTUAL IP ADDRESS] pbx.lan" into the 'hosts' file on the client machine (where the browser is being used) to get http://pbx.lan/freepbx to work.**  This file is ``/etc/hosts`` on Linux and macOS, or ``c:\Windows\System32\Drivers\etc\hosts`` on most Windows machines (conversely, customizing the hosts file is *not* necessary if your browser is able to access the `'LAN' side <https://github.com/iiab/iiab/wiki/IIAB-Networking#internet-in-a-box-iiab-networking>`_ of your IIAB server).
 
-You can monitor the PBX service with command::
+You can monitor the FreePBX service with command::
 
   systemctl status freepbx
 

roles/pbx/tasks/asterisk.yml

@@ -43,7 +43,7 @@
     name: aptitude
     state: latest
 
-- name: Asterisk - Ensure all dependencies are resolved - CAN TAKE 2 MIN OR LONGER!
+- name: Asterisk - Ensure all dependencies are resolved - CAN TAKE 5 MIN OR LONGER!
   shell: export DEBIAN_FRONTEND=noninteractive && ./contrib/scripts/install_prereq install 
   args:
     chdir: "{{ asterisk_src_dir }}"
@@ -68,13 +68,13 @@
   args:
     chdir: "{{ asterisk_src_dir }}"
 
-- name: Asterisk - Run 'make' - CAN TAKE 10 MIN OR LONGER!
+- name: Asterisk - Run 'make' - CAN TAKE 30 MIN OR LONGER!
   command: make 
   args:
     chdir: "{{ asterisk_src_dir }}"
     creates: "defaults.h"
 
-- name: Asterisk - Run 'make install' - CAN TAKE 3 MIN OR LONGER!
+- name: Asterisk - Run 'make install' - CAN TAKE 2 MIN OR LONGER!
   command: make install
   args:
     chdir: "{{ asterisk_src_dir }}"

roles/pbx/tasks/freepbx.yml

@@ -91,7 +91,7 @@
     group: asterisk
     recurse: yes
  
-- name: FreePBX - Install (just run once) - CAN TAKE 2 MIN OR LONGER!
+- name: FreePBX - Install (just run once) - CAN TAKE 12 MIN OR LONGER!
   command: "{{ item }}"
   args:
     chdir: "{{ freepbx_src_dir }}"