You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whimsical.apache.org by ru...@apache.org on 2017/10/15 12:20:53 UTC
[whimsy] branch master updated: resync whimsy.config
This is an automated email from the ASF dual-hosted git repository.
rubys pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 170e47a resync whimsy.config
170e47a is described below
commit 170e47ab671df4c87a272f156f2f179db628d17d
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Sun Oct 15 08:20:10 2017 -0400
resync whimsy.config
---
config/whimsy.conf | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/config/whimsy.conf b/config/whimsy.conf
index 3187f85..2bd9e62 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -67,6 +67,9 @@ RewriteRule ^.*$ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
RedirectMatch permanent ^/secmail /secretary/workbench
RedirectMatch permanent ^/officers/public_names /secretary/public-names
+
+# redirect obsolete mailing list request form to replacement application
+RedirectMatch permanent ^/officers/mlreq https://selfserve.apache.org/mail.html
ProxyPass "/board/agenda/websocket/" "ws://localhost:34234/"
# We now have local custom error pages
@@ -194,7 +197,7 @@ Alias /test/icla/ /srv/whimsy/www/test/icla/public
Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
</LocationMatch>
-<Directory /srv/whimsy/www/board/agenda>
+<Directory /srv/whimsy/www/fundraising>
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
@@ -204,7 +207,7 @@ Alias /test/icla/ /srv/whimsy/www/test/icla/public
Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
</Directory>
-<Directory /srv/whimsy/www/fundraising>
+<Directory /srv/whimsy/www/officers>
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
@@ -214,7 +217,7 @@ Alias /test/icla/ /srv/whimsy/www/test/icla/public
Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
</Directory>
-<Directory /srv/whimsy/www/officers>
+<Directory /srv/whimsy/www/treasurer>
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
@@ -224,13 +227,16 @@ Alias /test/icla/ /srv/whimsy/www/test/icla/public
Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
</Directory>
-<Directory /srv/whimsy/www/treasurer>
+<Directory /srv/whimsy/www/board/agenda>
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
AuthLDAPGroupAttribute memberUid
AuthLDAPGroupAttributeIsDN off
+ require expr %{REQUEST_URI} == '/board/agenda/app.js'
+ require expr %{REQUEST_URI} =~ m#^/board/agenda/[-\d]+/bootstrap.html$#
+ require expr %{REQUEST_URI} == '/board/agenda/stylesheets/app.css'
Require ldap-group cn=committers,ou=groups,dc=apache,dc=org
</Directory>
--
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].