[Pkg-remote-commits] [guacamole-client] 01/03: Configure Apache 2.4 if available.

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository guacamole-client.

commit e28bfb5d374f14fbf93ff16cd7526a51add4f6de
Author: Dominik George <nik at naturalnet.de>
Date:   Tue Nov 29 12:37:08 2016 +0100

    Configure Apache 2.4 if available.
---
 debian/changelog          |  2 ++
 debian/control            |  2 ++
 debian/etc/apache.conf    | 11 +++++++++++
 debian/guacamole.dirs     |  1 +
 debian/guacamole.links    |  1 +
 debian/guacamole.postinst | 11 +++++++++++
 debian/guacamole.prerm    | 12 ++++++++++++
 7 files changed, 40 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fd83e01..91cb0bc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ guacamole-client (0.9.9+dfsg-1) UNRELEASED; urgency=medium
     + Repackaged to remove some pre-built library code.
   * Suggest xrdp.
   * Merge guacamole and guacamole-tomcat packages into guacamole.
+    + Deploys Guacamole to the system tomcat8 instance.
+    + Configures Apache 2.4 if available.
   * Add the noauth extension.
   * Move to Debian Remote Maintainers team.
      + Move git to pkg-remote.
diff --git a/debian/control b/debian/control
index 5d87f68..9d8c895 100644
--- a/debian/control
+++ b/debian/control
@@ -61,6 +61,8 @@ Depends:
  libatinject-jsr330-api-java,
  ${maven:Depends},
  ${misc:Depends},
+Recommends:
+ apache2 | httpd,
 Suggests:
  xrdp,
 Conflicts:
diff --git a/debian/etc/apache.conf b/debian/etc/apache.conf
new file mode 100644
index 0000000..ae777bc
--- /dev/null
+++ b/debian/etc/apache.conf
@@ -0,0 +1,11 @@
+<Location /guacamole/>
+    Require all granted
+    ProxyPass http://localhost:8080/guacamole/ flushpackets=on
+    ProxyPassReverse http://localhost:8080/guacamole/
+</Location>
+
+<Location /guacamole/websocket-tunnel>
+    Require all granted
+    ProxyPass ws://localhost:8080/guacamole/websocket-tunnel
+    ProxyPassReverse ws://localhost:8080/guacamole/websocket-tunnel
+</Location>
diff --git a/debian/guacamole.dirs b/debian/guacamole.dirs
index ffcc71f..b69803c 100644
--- a/debian/guacamole.dirs
+++ b/debian/guacamole.dirs
@@ -1,3 +1,4 @@
+/etc/apache2/conf-available
 /etc/guacamole
 /usr/share/guacamole
 /usr/share/java
diff --git a/debian/guacamole.links b/debian/guacamole.links
index b01aeef..9c418e7 100644
--- a/debian/guacamole.links
+++ b/debian/guacamole.links
@@ -38,3 +38,4 @@
 # Config
 /etc/guacamole/guacamole.properties /usr/share/tomcat8/lib/guacamole.properties
 /etc/guacamole/tomcat.xml /etc/tomcat8/Catalina/localhost/guacamole.xml
+/etc/guacamole/apache.conf /etc/apache2/conf-available/guacamole.conf
diff --git a/debian/guacamole.postinst b/debian/guacamole.postinst
index 9a8cc43..29b2ab9 100644
--- a/debian/guacamole.postinst
+++ b/debian/guacamole.postinst
@@ -54,3 +54,14 @@ then
     invoke-rc.d tomcat8 restart
 fi
 
+# Configure webserver
+if test -e /usr/share/apache2/apache2-maintscript-helper; then
+	db_stop
+	. /usr/share/apache2/apache2-maintscript-helper
+	apache2_invoke enmod proxy
+	apache2_invoke enmod proxy_http
+	apache2_invoke enmod proxy_wstunnel
+	apache2_invoke enconf guacamole
+fi
+
+exit 0
diff --git a/debian/guacamole.prerm b/debian/guacamole.prerm
new file mode 100644
index 0000000..a4a9fda
--- /dev/null
+++ b/debian/guacamole.prerm
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+# Exit on errors
+set -e
+
+# Deconfigure webserver
+if test -e /usr/share/apache2/apache2-maintscript-helper; then
+	. /usr/share/apache2/apache2-maintscript-helper
+	apache2_invoke disconf guacamole
+fi
+
+exit 0

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-remote/packages/guacamole-client.git