whimsical-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [whimsy] branch master updated: Fix alignment; sync with puppet copy
Date Thu, 03 Aug 2017 15:40:51 GMT
This is an automated email from the ASF dual-hosted git repository.

sebb 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 4229c7d  Fix alignment; sync with puppet copy
4229c7d is described below

commit 4229c7d9f407031668e9589f1589b7d3029026cb
Author: Sebb <sebb@apache.org>
AuthorDate: Thu Aug 3 16:40:45 2017 +0100

    Fix alignment; sync with puppet copy
---
 config/whimsy.conf | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/config/whimsy.conf b/config/whimsy.conf
index 58c2106..a806808 100644
--- a/config/whimsy.conf
+++ b/config/whimsy.conf
@@ -66,7 +66,7 @@ RewriteRule ^.*$ - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
 # for secretary workbench
 RedirectMatch permanent ^/secmail /secretary/workbench
 
-RedirectMatch ^/officers/public_names /secretary/public-names
+RedirectMatch permanent ^/officers/public_names /secretary/public-names
 ProxyPass "/board/agenda/websocket/"  "ws://localhost:34234/"
 
 # We now have local custom error pages
@@ -77,7 +77,7 @@ ErrorDocument 500 /500.html
 Alias /board/agenda/ /srv/whimsy/www/board/agenda/public
 
 <Location /board/agenda>
-PassengerBaseURI /board/agenda
+  PassengerBaseURI /board/agenda
   PassengerAppRoot /srv/whimsy/www/board/agenda
   Options -MultiViews
   CheckSpelling Off
@@ -87,7 +87,7 @@ PassengerBaseURI /board/agenda
 Alias /racktest/ /srv/whimsy/www/racktest/public
 
 <Location /racktest>
-PassengerBaseURI /racktest
+  PassengerBaseURI /racktest
   PassengerAppRoot /srv/whimsy/www/racktest
   Options -MultiViews
   CheckSpelling Off
@@ -97,7 +97,7 @@ PassengerBaseURI /racktest
 Alias /roster/ /srv/whimsy/www/roster/public
 
 <Location /roster>
-PassengerBaseURI /roster
+  PassengerBaseURI /roster
   PassengerAppRoot /srv/whimsy/www/roster
   Options -MultiViews
   CheckSpelling Off
@@ -107,7 +107,7 @@ PassengerBaseURI /roster
 Alias /secretary/workbench/ /srv/whimsy/www/secretary/workbench/public
 
 <Location /secretary/workbench>
-PassengerBaseURI /secretary/workbench
+  PassengerBaseURI /secretary/workbench
   PassengerAppRoot /srv/whimsy/www/secretary/workbench
   Options -MultiViews
   CheckSpelling Off
@@ -117,7 +117,7 @@ PassengerBaseURI /secretary/workbench
 Alias /test/icla/ /srv/whimsy/www/test/icla/public
 
 <Location /test/icla>
-PassengerBaseURI /test/icla
+  PassengerBaseURI /test/icla
   PassengerAppRoot /srv/whimsy/www/test/icla
   Options -MultiViews
   CheckSpelling Off
@@ -125,7 +125,7 @@ PassengerBaseURI /test/icla
 </Location>
 
 <LocationMatch ^/board/subscriptions>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -135,7 +135,7 @@ AuthType Basic
 </LocationMatch>
 
 <Directory /srv/whimsy/www/committers>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -145,7 +145,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/test/icla>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -155,7 +155,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/roster>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -165,7 +165,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/test/roster>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Committers"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -175,7 +175,7 @@ AuthType Basic
 </Directory>
 
 <LocationMatch ^/incubator/moderators>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Members and Incubator PMC"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -185,7 +185,7 @@ AuthType Basic
 </LocationMatch>
 
 <LocationMatch ^/incubator/signoff>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Members and Incubator PMC"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -195,7 +195,7 @@ AuthType Basic
 </LocationMatch>
 
 <Directory /srv/whimsy/www/board/agenda>
-AuthType Basic
+  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"
@@ -205,7 +205,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/fundraising>
-AuthType Basic
+  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"
@@ -215,7 +215,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/officers>
-AuthType Basic
+  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"
@@ -225,7 +225,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/treasurer>
-AuthType Basic
+  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"
@@ -235,7 +235,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/apmail>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -245,7 +245,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/members>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -255,7 +255,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/voter>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Members"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"
@@ -265,7 +265,7 @@ AuthType Basic
 </Directory>
 
 <Directory /srv/whimsy/www/secretary>
-AuthType Basic
+  AuthType Basic
   AuthName "ASF Secretarial Team"
   AuthBasicProvider ldap
   AuthLDAPUrl "ldaps://ldap2-us-west.apache.org:636 ldap1-us-west.apache.org:636/ou=people,dc=apache,dc=org?uid"

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

Mime
View raw message