summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jeblair@hp.com>2015-09-08 10:41:21 -0700
committerJames E. Blair <jeblair@hp.com>2015-09-08 10:43:56 -0700
commit9babba139e2012e5504d0e7767315afeceade76f (patch)
tree917c19af11c8b5d43cfc7c2558e1f5d48a112329
parentc98efc9c7decd5404a6b3056b5cf285d6d8afbbf (diff)
Support apache /server-status
Notes
Notes (review): Code-Review+1: Anita Kuno <anteaya@anteaya.info> Code-Review+2: Jeremy Stanley <fungi@yuggoth.org> Workflow+1: Jeremy Stanley <fungi@yuggoth.org> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Tue, 08 Sep 2015 20:05:22 +0000 Reviewed-on: https://review.openstack.org/221424 Project: openstack-infra/puppet-ethercalc Branch: refs/heads/master
-rw-r--r--templates/etherpadlite.vhost.erb7
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/etherpadlite.vhost.erb b/templates/etherpadlite.vhost.erb
index 754a4ec..c579e43 100644
--- a/templates/etherpadlite.vhost.erb
+++ b/templates/etherpadlite.vhost.erb
@@ -44,6 +44,13 @@
44 # supporting "nice" urls as etherpad hardcodes /p/ in many places. 44 # supporting "nice" urls as etherpad hardcodes /p/ in many places.
45 # Adapted from https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy 45 # Adapted from https://github.com/ether/etherpad-lite/wiki/How-to-put-Etherpad-Lite-behind-a-reverse-Proxy
46 RewriteEngine on 46 RewriteEngine on
47
48 # Do not rewrite the /server-status URL (though by default, this
49 # is only accessible from localhost). Connect to it with:
50 # ssh -L 8443:localhost:443 $HOSTNAME
51 # https://localhost:8443/server-status
52 RewriteRule ^/server-status$ /server-status [L]
53
47 RewriteCond %{HTTP_HOST} !<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %> 54 RewriteCond %{HTTP_HOST} !<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %>
48 RewriteRule ^.*$ https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %> [L,R=301] 55 RewriteRule ^.*$ https://<%= scope.lookupvar("etherpad_lite::apache::vhost_name") %> [L,R=301]
49 56