Merge branch '0.8.x'
Documentation was updated for 0.8.x reflecting the new branching scheme.
diff --git a/src/chapters/custom-auth.xml b/src/chapters/custom-auth.xml
index 50156e1..7905b70 100644
--- a/src/chapters/custom-auth.xml
+++ b/src/chapters/custom-auth.xml
@@ -102,16 +102,6 @@
</dependencies>
- <repositories>
-
- <!-- Central Guacamole repository -->
- <repository>
- <id>guac-dev</id>
- <url>http://guac-dev.org/repo</url>
- </repository>
-
- </repositories>
-
</project></programlisting>
</example>
<para>We won't need to update this <filename>pom.xml</filename> throughout the rest of the
diff --git a/src/chapters/installing.xml b/src/chapters/installing.xml
index b7d3466..60fba44 100644
--- a/src/chapters/installing.xml
+++ b/src/chapters/installing.xml
@@ -812,7 +812,7 @@
Order allow,deny
Allow from all
ProxyPass ajp://<replaceable>HOSTNAME</replaceable>:<replaceable>8009</replaceable>/guacamole/ max=20 flushpackets=on
- ProxyPassReverse ajp://<replaceable>HOSTNAME</replaceable>:<replaceable>8009</replaceable>/guacamole/
+ ProxyPassReverse <replaceable>http://HOSTNAME</replaceable>/guacamole/
</Location></programlisting>
</informalexample>
<para>The most important thing in this entire section is the option
@@ -823,6 +823,12 @@
buffering this stream breaks Guacamole's communication.</para>
<para><emphasis>If the option <option>flushpackets=on</option> is not specified,
Guacamole will not work</emphasis>.</para>
+ <para>Note also the protocol of the URL specified in the
+ <parameter>ProxyPassReverse</parameter> directive. The protocol
+ <emphasis>MUST</emphasis> match the protocol that will be used to connect to
+ to Apache. The example above specifies <replaceable>http</replaceable>, but if
+ you are using HTTPS then the URL specified here will have to reflect
+ this.</para>
</section>
</section>
<section xml:id="http-proxy">
@@ -914,7 +920,7 @@
Order allow,deny
Allow from all
ProxyPass ajp://<replaceable>HOSTNAME</replaceable>:<replaceable>8009</replaceable>/guacamole/ max=20 flushpackets=on
- ProxyPassReverse ajp://<replaceable>HOSTNAME</replaceable>:<replaceable>8009</replaceable>/guacamole/
+ ProxyPassReverse <replaceable>http://HOSTNAME</replaceable>/guacamole/
ProxyPassReverseCookiePath /guacamole/ <replaceable>/new-path/</replaceable>
</Location></programlisting>
</informalexample>
@@ -924,6 +930,10 @@
instructing <package>mod_proxy</package> to update the cookie path, changing
<uri>/guacamole/</uri> to <uri>/new-path/</uri>, the same path specified when
the location was declared.</para>
+ <para>Be careful when specifying the URL in the <parameter>ProxyPassReverse</parameter>
+ directive. The protocol of the URL <emphasis>MUST</emphasis> match the protocol that
+ will be used to connect to to Apache, even if it differs from the protocol being
+ used to connect to Tomcat.</para>
</section>
</section>
</chapter>
diff --git a/src/chapters/yourown.xml b/src/chapters/yourown.xml
index 6e4edaa..b3cea68 100644
--- a/src/chapters/yourown.xml
+++ b/src/chapters/yourown.xml
@@ -322,25 +322,6 @@
<para>The Java Servlet API will be provided by your servlet container, so Maven does not
need to download it during the build, and it need not exist in any Maven
repository.</para>
- <para>The Guacamole APIs <emphasis>are</emphasis> required, and are
- <emphasis>not</emphasis> in any standard Maven repository, thus we must add the
- URL of the upstream Maven repository exposed by the Guacamole project. This
- repository will always have all stable releases of the Guacamole APIs:</para>
- <informalexample>
- <programlisting> ...
-
- <repositories>
-
- <!-- Main Guacamole repository -->
- <repository>
- <id>guac-dev</id>
- <url>http://guac-dev.org/repo</url>
- </repository>
-
- </repositories>
-
- ...</programlisting>
- </informalexample>
<para>With these changes, the web application will still build at this point, even
though no Java code has been written yet. You may wish to verify that everything
still works.</para>
