fixed up apache 2.2 docs

NodeBB · Mar 6, 2015 · e6e6e65 · e6e6e65
1 parent 4b21508
commit e6e6e65
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/configuring/proxies/apache.rst b/configuring/proxies/apache.rst
@@ -1,28 +1,7 @@
 Configuring apache as a proxy
 =============================
 
-**Prerequisites to making this work:**
-Apache 2.4.x
-
-What if I'm on 2.2.x (Debian/Ubuntu)?
-------------------------------------
-
-you need to manually compile and add the module "mod_proxy_wstunnel" to the Apache 2.2 branch. If you're running Ubuntu or Debian, you're likely on the 2.2 branch of code.
-
-The following guide will assist with that if you're on Debian or Ubuntu. This is what I used to backport the mod_proxy_wstunnel module to the 2.2 code base of Apache;
-
-http://www.amoss.me.uk/2013/06/apache-2-2-websocket-proxying-ubuntu-mod_proxy_wstunnel/
-
-NOTE: On ubuntu, if you’re missing the ./configure file
-------------------------------------
-You need to first run ./buildconf. After this is complete, you will then be able to use ./configure.
-
-**automake & libtool package was needed too.**
-
-.. code::
-
-    apt-get install automake libtool
-
+*Note: This requires Apache v2.4.x or greater. If your version of Apache is lower, please see :doc:`Apache v2.2.x Instructions <configuring/proxies/apache2.2>`*
 
 Enable the necessary modules
 -----------------------------
@@ -34,7 +13,9 @@ Enable the necessary modules
 Add the config to Apache
 -----------------------------
 
-The next step is adding the configuration to your virtualhost.conf file, typically located in /etc/apache2/sites-available/. The below configuration assumes you've used 4567 (default) port for NobeBB installation. It also assumes you have the bind address set to 127.0.0.1.
+The next step is adding the configuration to your ``virtualhost.conf`` file, typically located in ``/etc/apache2/sites-available/``.
+The below configuration assumes you've used 4567 (default) port for NobeBB installation. It also assumes you have the bind address
+set to 127.0.0.1.
 
 .. code::
 
@@ -54,7 +35,7 @@ The next step is adding the configuration to your virtualhost.conf file, typical
     ProxyPassReverse / http://127.0.0.1:4567/
 
 
-The last thing you need to be sure of is that the config.json in the NodeBB folder defines the node.js port outside of the url:
+The last thing you need to be sure of is that the ``config.json`` in the NodeBB folder defines the node.js port outside of the url:
 
 
 

diff --git a/configuring/proxies/apache2.2.rst b/configuring/proxies/apache2.2.rst
@@ -0,0 +1,17 @@
+Configuring Apache v2.2.x as a reverse proxy to NodeBB
+======================================================
+
+Prerequisites: \* ``build-essential`` \* ``automake`` \* ``libtool`` \*
+`You can install these packages via
+``apt`` <https://help.ubuntu.com/community/AptGet/Howto#Installation_commands>`__
+
+You need to manually compile and add the module ``mod_proxy_wstunnel``
+to the Apache 2.2 branch. If you're running Ubuntu (prior to 14.04) or
+Debian, you're likely on the 2.2 branch of code.
+
+`Please use this guide to backport the ``mod_proxy_wstunnel`` module into the 2.2 code base of Apache <http://www.amoss.me.uk/2013/06/apache-2-2-websocket-proxying-ubuntu-mod_proxy_wstunnel/>`__
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+\*Note: On ubuntu, if you’re missing the ./configure file, you need to
+first run ``./buildconf``. After this is complete, you will then be able
+to use ``./configure``.