Update to Jetty 9, drop AJP

3 files changed, 4 insertions, 10 deletions

diff --git a/src/site/features.mkd b/src/site/features.mkd
index dc048804..5981f834 100644
--- a/src/site/features.mkd
+++ b/src/site/features.mkd
@@ -76,7 +76,6 @@
 - Integrated GUI tool to facilitate x509 PKI including ssl and client certificate generation, client certificate revocation, and client certificate distribution

 - Single text file for configuring server and gitblit

 - A Windows service installation script and configuration tool

-- Built-in AJP connector for Apache httpd

 

 ## Limitations

 - Built-in access controls are not branch-based, they are repository-based.

diff --git a/src/site/setup_go.mkd b/src/site/setup_go.mkd
index 2e8f864a..51ca295d 100644
--- a/src/site/setup_go.mkd
+++ b/src/site/setup_go.mkd
@@ -117,10 +117,10 @@ Command-Line parameters override the values in `gitblit.properties` at runtime.
     --baseFolder           The default base folder for all relative file reference settings

     --repositoriesFolder   Git Repositories Folder

     --userService          Authentication and Authorization Service (filename or fully qualified classname)

-    --useNio               Use NIO Connector else use Socket Connector.

     --httpPort             HTTP port for to serve. (port <= 0 will disable this connector)

     --httpsPort            HTTPS port to serve.  (port <= 0 will disable this connector)

-    --ajpPort              AJP port to serve.  (port <= 0 will disable this connector)

+    --sshPort              SSH Daemon port to serve.  (port <= 0 will disable this daemon)

+    --gitPort              Git Daemon port to serve.  (port <= 0 will disable this daemon)

     --alias                Alias in keystore of SSL cert to use for https serving

     --storePassword        Password for SSL (https) keystore.

     --shutdownPort         Port for Shutdown Monitor to listen on. (port <= 0 will disable this monitor)

diff --git a/src/site/setup_proxy.mkd b/src/site/setup_proxy.mkd
index f1435f12..4ae89875 100644
--- a/src/site/setup_proxy.mkd
+++ b/src/site/setup_proxy.mkd
@@ -1,6 +1,6 @@
 ## Running Gitblit behind Apache

 

-Gitblit runs fine behind Apache.  You may use either *mod_proxy* (GO or WAR) or *mod_proxy_ajp* (GO).

+Gitblit runs fine behind Apache.

 

 Each Linux distribution may vary on the exact configuration of Apache 2.2.  

 Here is a sample configuration that works on Debian 7.0 (Wheezy), your distribution may be different.

@@ -13,7 +13,6 @@ cd /etc/apache2/mods-enabled
 ln -s ../mods-available/proxy.load proxy.load

 ln -s ../mods-available/proxy_balancer.load proxy_balancer.load

 ln -s ../mods-available/proxy_http.load proxy_http.load

-ln -s ../mods-available/proxy_ajp.load proxy_ajp.load

 ```

 ### Configuring Apache to use the proxy modules

 

@@ -57,16 +56,12 @@ ProxyPreserveHost On
 # context path for your repository url.

 # If you are not using subdomain proxying, then ignore this setting.

 #RequestHeader set X-Forwarded-Context /

-

-#ProxyPass /gitblit ajp://localhost:8009/gitblit

 ```

 

 **Please** make sure to:  

     1. Review the security of these settings as appropriate for your deployment

-    2. Uncomment the *ProxyPass* setting for whichever connection you prefer (http/ajp)

+    2. Uncomment the *ProxyPass* setting

     3. Correctly set the ports and context paths both in the *ProxyPass* definition and your Gitblit installation  

-    If you are using Gitblit GO you can easily configure the AJP connector by specifying a non-zero AJP port.  

-    Please remember that on Linux/UNIX, ports < 1024 require root permissions to open.

     4. Set *web.mountParameters=false* in `gitblit.properties` or `web.xml` this will use parameterized URLs.  

     Alternatively, you can respecify *web.forwardSlashCharacter*.