whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ru...@apache.org
Subject [whimsy] branch master updated: sync whimsy.conf with whimsy-vm4
Date Thu, 04 May 2017 13:41:27 GMT
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  290ebc8   sync whimsy.conf with whimsy-vm4
290ebc8 is described below

commit 290ebc806b6847ce94dea7caf64f61e1cc3af346
Author: Sam Ruby <rubys@intertwingly.net>
AuthorDate: Thu May 4 09:41:15 2017 -0400

    sync whimsy.conf with whimsy-vm4
---
 config/whimsy.conf | 52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/config/whimsy.conf b/config/whimsy.conf
index 0e3da0a..e1bfe4d 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -23,8 +23,9 @@
   CustomLog "/var/log/apache2/whimsy_access.log" combined 
 
   ## Server aliases
-  ServerAlias whimsy3.apache.org
-  ServerAlias whimsy-vm3.apache.org
+  ServerAlias whimsy-test.apache.org
+  ServerAlias whimsy4.apache.org
+  ServerAlias whimsy-vm4.apache.org
 
   ## Custom fragment
 
@@ -71,7 +72,6 @@ RedirectMatch ^/classic/roster/committer$ https://whimsy.apache.org/classic/rost
 RedirectMatch ^/officers/mlreq(/.*)?$ https://infra.apache.org/officers/mlreq$1
 
 RedirectMatch ^/officers/public_names https://whimsy.apache.org/secretary/public-names
-
 ProxyPass "/board/agenda/websocket/"  "ws://localhost:34234/"
 
 # We now have local custom error pages
@@ -86,7 +86,7 @@ PassengerBaseURI /board/agenda
   PassengerAppRoot /Users/rubys/git/whimsy/www/board/agenda
   Options -MultiViews
   CheckSpelling Off
-  SetEnv HTTPS on
+  # SetEnv HTTPS on
 </Location>
 
 Alias /racktest/ /Users/rubys/git/whimsy/www/racktest/public
@@ -96,7 +96,7 @@ PassengerBaseURI /racktest
   PassengerAppRoot /Users/rubys/git/whimsy/www/racktest
   Options -MultiViews
   CheckSpelling Off
-  SetEnv HTTPS on
+  # SetEnv HTTPS on
 </Location>
 
 Alias /roster/ /Users/rubys/git/whimsy/www/roster/public
@@ -106,7 +106,7 @@ PassengerBaseURI /roster
   PassengerAppRoot /Users/rubys/git/whimsy/www/roster
   Options -MultiViews
   CheckSpelling Off
-  SetEnv HTTPS on
+  # SetEnv HTTPS on
 </Location>
 
 Alias /secretary/workbench/ /Users/rubys/git/whimsy/www/secretary/workbench/public
@@ -116,7 +116,7 @@ PassengerBaseURI /secretary/workbench
   PassengerAppRoot /Users/rubys/git/whimsy/www/secretary/workbench
   Options -MultiViews
   CheckSpelling Off
-  SetEnv HTTPS on
+  # SetEnv HTTPS on
 </Location>
 
 Alias /test/icla/ /Users/rubys/git/whimsy/www/test/icla/public
@@ -126,14 +126,14 @@ PassengerBaseURI /test/icla
   PassengerAppRoot /Users/rubys/git/whimsy/www/test/icla
   Options -MultiViews
   CheckSpelling Off
-  SetEnv HTTPS on
+  # SetEnv HTTPS on
 </Location>
 
 <LocationMatch ^/board/subscriptions>
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -143,7 +143,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -153,7 +153,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -163,7 +163,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -173,7 +173,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -183,7 +183,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -193,7 +193,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Incubator PMC"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -203,7 +203,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Incubator PMC"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -213,7 +213,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -223,7 +223,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -233,7 +233,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -243,7 +243,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -253,7 +253,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members and Officers"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=committers,ou=groups,dc=apache,dc=org
@@ -263,7 +263,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=member,ou=groups,dc=apache,dc=org
@@ -273,7 +273,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=member,ou=groups,dc=apache,dc=org
@@ -283,7 +283,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  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 ldap-group cn=member,ou=groups,dc=apache,dc=org
@@ -293,7 +293,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Secretarial Team"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
   AuthLDAPGroupAttribute member
   AuthLDAPGroupAttributeIsDN on
   <RequireAny>
@@ -306,7 +306,7 @@ AuthType Basic
 AuthType Basic
   AuthName "ASF Secretarial Team"
   AuthBasicProvider ldap
-  AuthLDAPUrl "ldaps://ldap-lb-us.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
+  AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
   AuthLDAPGroupAttribute member
   AuthLDAPGroupAttributeIsDN on
   <RequireAny>

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <commits@whimsical.apache.org>'].

Mime
View raw message