Updates to streamline monolithic style

source/guides/administrator.rst

@@ -11,7 +11,7 @@ Installing Mattermost
    :glob:
 
    /install/requirements.rst
-   Installing on Ubuntu 14.04 LTS </install/install-ubuntu-1404-overview.rst>
+   Installing on Ubuntu 14.04 LTS </install/install-ubuntu-1404.rst>
    /install/docker-local*
    /install/docker-ebs*
    /install/ee-install*

source/install/config-proxy-nginx.rst

@@ -80,6 +80,3 @@ Configuring NGINX as a proxy for Mattermost Server
 **What to do next**
 
 You can configure NGINX to use SSL. This will allow you to use HTTPS connections and the HTTP/2 protocol.
-
-**Related links**
-  - :ref:`config-ssl-http2-nginx`

source/install/install-common-intro.rst

@@ -1,5 +1,3 @@
 A complete Mattermost installation consists of 3 major components: a proxy server, a database server, and the Mattermost server. You can install all components on 1 machine, or you can install each component on its own machine. If you have only 2 machines, then install the proxy and the Mattermost server on one machine, and install the database on the other machine.
 
 The Mattermost server must be installed on a 64-bit machine, but the database and proxy can be on 32-bit machines. For the database, you can install either MySQL or ProstgreSQL. The proxy is NGINX.
-
-After all the components are installed, some configuration is required. You can set up email notifications, SSL, TSL, and HTTP/2. For more information about configuring, see :ref:`config-mattermost`.

source/install/install-nginx.rst

@@ -15,15 +15,12 @@ The main benefits of using a proxy are as follows:
 **To install NGINX on Ubuntu Server:**
 
 1. Log into the server that will host the proxy and open a terminal window.
-2. Make sure that your package index is up to date. 
 
-  ``sudo apt-get update``
-
-3. Install NGINX.
+2. Install NGINX.
 
   ``sudo apt-get install nginx``
 
-4. After the installation is complete, verify that NGINX is running.
+3. After the installation is complete, verify that NGINX is running.
 
   ``curl http://localhost``
 
@@ -56,6 +53,3 @@ The main benefits of using a proxy are as follows:
 
 1. Map a fully qualified domain name (FQDN) such as ``mattermost.example.com`` to point to the NGINX server.
 2. Configure NGINX to proxy connections from the internet to the Mattermost Server.
-
-**Related links**
-  - :ref:`config-proxy-nginx` 

source/install/install-ubuntu-1404-mattermost.rst

@@ -91,3 +91,5 @@ Assume that the IP address of this server is 10.10.10.2
    -  You should see a page titles *Mattermost - Signup*
    -  You can also stop the process by running the command
       ``sudo stop mattermost``, but we will skip this step for now.
+
+In a production environment, you should install NGINX. Using NGINX as a proxy server increases the security and performance of your Mattermost installation. See :ref:`install-nginx`

source/install/install-ubuntu-1404-mysql.rst

@@ -3,47 +3,41 @@
 Installing MySQL Database Server
 ================================
 
-Mattermost supports either MySQL or PostgreSQL.
+You can install either MySQL or PostgreSQL. To install PostgreSQL, see :ref:`install-ubuntu-1404-postgresql`
 
 **To install MySQL 5.6 on Ubuntu Server:**
 
 1. Log into the server that will host the database and open a terminal window.
-2. Make sure that your package index is up to date. 
 
-  ``sudo apt-get update``
-
-3. Install MySQL version 5.6.
+2. Install MySQL version 5.6.
 
   ``sudo apt-get install mysql-server-5.6``
 
-4. Log in to MySQL as root.
+  .. note::
+    During the install, you'll be prompted to create a password for the MySQL root user. Make a note of the password because you'll need it in the next step.
+
+3. Log in to MySQL as root.
 
   ``mysql -u root -p``
 
   When prompted, enter the root password that you created when installing MySQL.
 
-5. Create the Mattermost user 'mmuser'.
+4. Create the Mattermost user 'mmuser'.
 
   ``mysql> create user 'mmuser'@'%' identified by 'mmuser-password';``
 
-  **Notes**:
-
-  1. Use a password that is more secure than 'mmuser-password'
-  2. The '%' means that mmuser can connect from any machine on the network. However, it's more secure to use the IP address of the machine that hosts Mattermost. For example, if you install Mattermost on the machine with IP address 10.10.10.2, then use the following command:
+  .. note::
+    1. Use a password that is more secure than 'mmuser-password'
+    2. The '%' means that mmuser can connect from any machine on the network. However, it's more secure to use the IP address of the machine that hosts Mattermost. For example, if you install Mattermost on the machine with IP address 10.10.10.2, then use the following command:
 
   ``mysql> create user 'mmuser'@'10.10.10.2' identified by 'mmuser-password';``
 
-6. Create the Mattermost database.
+5. Create the Mattermost database.
 
   ``mysql> create database mattermost;``
 
-7. Grant access privileges to the user 'mmuser'
+6. Grant access privileges to the user 'mmuser'
 
   ``mysql> grant all privileges on mattermost.* to 'mmuser'@'%';``
 
 **What to do next**
-
-In a production environment, you should install NGINX. Using NGINX as a proxy server increases the security and performance of your Mattermost installation.
-
-**Related links**
-  - :ref:`install-nginx`

source/install/install-ubuntu-1404-postgresql.rst

@@ -3,7 +3,7 @@
 Installing PostgreSQL Database Server
 ====================================
 
-Mattermost supports either PostgreSQL or MySQL.
+You can install either PostgreSQL or MySQL. To install MySQL, see :ref:`install-ubuntu-1404-mysql`
 
 Assume that the IP address of this server is 10.10.10.1
 
@@ -47,8 +47,7 @@ Assume that the IP address of this server is 10.10.10.1
     -  ``sudo vi /etc/postgresql/9.3/main/postgresql.conf``
     -  Uncomment ``listen_addresses`` and change ``localhost`` to ``*``
 
-10. Alter pg\_hba.conf to allow the mattermost server to talk to the
-    postgres database
+10. Modify ``pg_hba.conf`` to allow the mattermost server to talk to the postgres database. Assume that the Mattermost server IP address is ``10.10.10.2``
 
     -  ``sudo vi /etc/postgresql/9.3/main/pg_hba.conf``
     -  Add the following line to the ``IPv4 local connections``
@@ -75,6 +74,3 @@ Assume that the IP address of this server is 10.10.10.1
 **What to do next**
 
 In a production environment, you should install NGINX. Using NGINX as a proxy server increases the security and performance of your Mattermost installation.
-
-**Related links**
-  - :ref:`install-nginx`

source/install/install-ubuntu-1404-server.rst

@@ -0,0 +1,19 @@
+Installing Ubuntu Server 14.04 LTS
+==================================
+
+Install Ubuntu Server on each machine that hosts one or more of the components. In most cases you need the 64-bit version.
+
+You can use the 32-bit version on a machine that hosts the database and proxy server, but the Mattermost server requires 64-bit.
+
+**To install Ubuntu Server:**
+
+1. Download the appropriate ISO image from http://releases.ubuntu.com/14.04.5/ and burn it to a CD-ROM.
+
+2. Boot the system from the CD-ROM drive and follow the on-screen prompts.
+
+3. After the system is installed, make sure that it's up to date with the most recent security patches. Open a terminal window and issue the following commands:
+
+   -  ``sudo apt-get update``
+   -  ``sudo apt-get upgrade``
+
+Now that the system is up to date, you can install the database.

source/install/install-ubuntu-1404.rst

@@ -1,25 +1,23 @@
-Installing Ubuntu Server 14.04 LTS
-==================================
-
-Install Ubuntu Server on each machine that hosts one or more of the components. In most cases you need the 64-bit version.
-
-You can use the 32-bit version on a machine that hosts the database and proxy server, but the Mattermost server requires 64-bit.
-
-**To install Ubuntu Server:**
-
-1. Download the appropriate ISO image from http://releases.ubuntu.com/14.04.5/ and burn it to a CD-ROM.
-
-2. Boot the system from the CD-ROM drive and follow the on-screen prompts.
-
-3. After the system is installed, make sure that it's up to date with the most recent security patches. Open a terminal window and issue the following commands:
-
-   -  ``sudo apt-get update``
-   -  ``sudo apt-get upgrade``
-
-**What to do next**
-
-Install a database. You can install either MySQL 5.6 or PostgreSQL version 9.3 or later.
-
-**Related links**
-  - :ref:`install-ubuntu-1404-mysql`
-  - :ref:`install-ubuntu-1404-postgresql`
+.. _install-ubuntu-1404:
+
+=========================================
+Installing Mattermost on Ubuntu 14.04 LTS
+=========================================
+
+Install a production-ready Mattermost system on 1 to 3 machines.
+
+.. include:: install-common-intro.rst
+
+.. contents:: Install and configure the components in the following order. Note that you need only one database, either MySQL or PostgrSQL.
+  :backlinks: top
+  :local:
+
+.. include:: install-ubuntu-1404-server.rst
+.. include:: install-ubuntu-1404-mysql.rst
+.. include:: install-ubuntu-1404-postgresql.rst
+.. include:: install-ubuntu-1404-mattermost.rst
+.. include:: config-mattermost-server.rst
+.. include:: config-tls-mattermost.rst
+.. include:: install-nginx.rst
+.. include:: config-proxy-nginx.rst
+.. include:: config-ssl-http2-nginx.rst