Changes to make files work for multiple installs (rhel, ubuntu)

JeffSchering · JeffSchering · commit a1515c58bf8f · 2016-12-14T22:19:31.000-08:00
diff --git a/source/install/config-proxy-nginx.rst b/source/install/config-proxy-nginx.rst
@@ -69,9 +69,15 @@ Configuring NGINX as a proxy for Mattermost Server
 
 5. Restart NGINX.
 
+  On Ubuntu 14.04 and RHEL 6.6:
+  
   ``sudo service nginx restart``
+  
+  On Ubuntu 16.04 and RHEL 7.1:
+  
+  ``sudo systemctl restart nginx``
 
-6. Verify you can see Mattermost thru the proxy.
+6. Verify that you can see Mattermost thru the proxy.
 
   ``curl http://localhost``
   
diff --git a/source/install/config-ssl-http2-nginx.rst b/source/install/config-ssl-http2-nginx.rst
@@ -25,7 +25,13 @@ You can use any certificate that you want, but these instructions show you how t
 
 5. Stop NGINX.
 
+  On Ubuntu 14.04 and RHEL 6.6:
+  
   ``sudo service nginx stop``
+  
+  On Ubuntu 16.04 and RHEL 7.1:
+  
+  ``sudo systemctl stop nginx``
 
 6. Run ``netstat`` to make sure that nothing is listening on port 80.
 
@@ -37,7 +43,7 @@ You can use any certificate that you want, but these instructions show you how t
 
   When prompted, enter your domain name. The certificate is located in  ``/etc/letsencrypt/live``
 
-8. Open the file ``/etc/nginx/sites-available/mattermost`` as root and update it to incorporate the following lines. Make sure that you use your own values for the Mattermost server IP address and FQDN for *server_name*.
+8. Open the file ``/etc/nginx/sites-available/mattermost`` as root in a text editor and update it to incorporate the following lines. Make sure that you use your own values for the Mattermost server IP address and FQDN for *server_name*.
 
   .. code-block:: none
 
@@ -106,7 +112,13 @@ You can use any certificate that you want, but these instructions show you how t
 
 9. Restart NGINX
 
+  On Ubuntu 14.04 and RHEL 6.6:
+  
   ``sudo service nginx start``
+  
+  On Ubuntu 16.04 and RHEL 7.1:
+  
+    ``sudo systemctl start nginx``
 
 10. Check that your SSL certificate is set up correctly.
 
diff --git a/source/install/install-rhel-66-nginx.rst b/source/install/install-rhel-66-nginx.rst
diff --git a/source/install/install-rhel-66.rst b/source/install/install-rhel-66.rst
@@ -18,6 +18,6 @@ Install a production-ready Mattermost system on 1 to 3 machines.
 .. include:: install-rhel-66-mattermost.rst
 .. include:: config-mattermost-server.rst
 .. include:: config-tls-mattermost.rst
-.. include:: install-rhel-66-nginx.rst
+.. include:: install-rhel-nginx.rst
 .. include:: config-proxy-nginx.rst
 .. include:: config-ssl-http2-nginx.rst
diff --git a/source/install/install-rhel-nginx.rst b/source/install/install-rhel-nginx.rst
@@ -0,0 +1,78 @@
+.. _install-rhel-nginx:
+
+Installing NGINX Server
+=======================
+
+In a production setting, use a proxy server for greater security and performance of Mattermost.
+
+The main benefits of using a proxy are as follows:
+
+  -  SSL termination
+  -  HTTP to HTTPS redirect
+  -  Port mapping ``:80`` to ``:8065``
+  -  Standard request logs
+
+**To install NGINX on RHEL 6.6 or 7.1:**
+
+1. Log into the server that will host the proxy, and open a terminal window.
+
+2. Create the file /etc/yum.repos.d/nginx.repo.
+  ``sudo touch /etc/yum.repos.d/nginx.repo``
+
+3. Open the file as root in a text editor and add the following contents, where *{version}* is **6** for RHEL 6.6, and **7** for RHEL 7.1:
+
+  .. code-block:: none
+  
+    [nginx]
+    name=nginx repo
+    baseurl=http://nginx.org/packages/rhel/{version}/$basearch/
+    gpgcheck=0
+    enabled=1
+
+4. Install NGINX.
+
+  ``sudo yum install nginx.x86_64``
+
+5. After the installation is complete, start NGINX.
+    On RHEL 6.6:
+  
+    ``sudo service nginx start``
+  
+    On RHEL 7.1:
+  
+    ``sudo systemctl start nginx``
+  
+6. **Optional** Set NGINX to start at system boot.
+  
+    On RHEL 6.6:
+  
+    ``sudo chkconfig nginx on``
+  
+    On RHEL 7.1:
+  
+    ``sudo systemctl enable nginx``
+
+4. Verify that NGINX is running.
+
+  ``curl http://localhost``
+  
+  If NGINX is running, you see the following output:
+  
+  .. code-block:: html
+  
+    <!DOCTYPE html>
+    <html>
+    <head>
+    <title>Welcome to nginx!</title>
+    .
+    .
+    .
+    <p><em>Thank you for using nginx.</em></p>
+    </body>
+    </html>
+
+
+**What to do next**
+
+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.
