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 16f30eb4 Simplify
16f30eb4 is described below
commit 16f30eb46ad4358b931eba29db14da24e83377d7
Author: Sebb <[email protected]>
AuthorDate: Sat Sep 28 13:56:39 2024 +0100
Simplify
---
docker-config/whimsy.conf | 135 ++++++++++------------------------------------
1 file changed, 27 insertions(+), 108 deletions(-)
diff --git a/docker-config/whimsy.conf b/docker-config/whimsy.conf
index 13802e9b..4afda68e 100644
--- a/docker-config/whimsy.conf
+++ b/docker-config/whimsy.conf
@@ -69,10 +69,7 @@ ExpiresActive On
Options +Indexes
AuthType Basic
AuthName "ASF Members"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-member
</Directory>
@@ -216,50 +213,35 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<LocationMatch ^/board/subscriptions>
AuthType Basic
AuthName "ASF Committers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</LocationMatch>
<Directory /srv/whimsy/www/committers>
AuthType Basic
AuthName "ASF Committers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<Directory /srv/whimsy/www/project/icla>
AuthType Basic
AuthName "ASF Committers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<Directory /srv/whimsy/www/roster>
AuthType Basic
AuthName "ASF Committers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<LocationMatch ^/incubator/moderators>
AuthType Basic
AuthName "ASF Members and Incubator PMC"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
<RequireAny>
Require ldap-alias-member
Require ldap-alias-incubator-pmc
@@ -269,10 +251,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<LocationMatch ^/incubator/signoff>
AuthType Basic
AuthName "ASF Members and Incubator PMC"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
<RequireAny>
Require ldap-alias-member
Require ldap-alias-incubator-pmc
@@ -282,40 +261,28 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Directory /srv/whimsy/www/fundraising>
AuthType Basic
AuthName "ASF Members and Officers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<Directory /srv/whimsy/www/officers>
AuthType Basic
AuthName "ASF Members and Officers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<Directory /srv/whimsy/www/treasurer>
AuthType Basic
AuthName "ASF Members and Officers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<Directory /srv/whimsy/www/board/agenda>
AuthType Basic
AuthName "ASF Members and Officers"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require expr %{REQUEST_URI} == '/board/agenda/app.js'
Require expr %{REQUEST_URI} == '/board/agenda/app.js.map'
Require expr %{REQUEST_URI} =~ m#^/board/agenda/.*\.js\.rb$#
@@ -329,50 +296,35 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Directory /srv/whimsy/www/apmail>
AuthType Basic
AuthName "ASF Members"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-member
</Directory>
<Directory /srv/whimsy/www/members>
AuthType Basic
AuthName "ASF Members"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-member
</Directory>
<Directory /srv/whimsy/www/voter>
AuthType Basic
AuthName "ASF Members"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-member
</Directory>
<Directory /srv/whimsy/www/infra>
AuthType Basic
AuthName "ASF Infrastructure Team"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-infrastructure
</Directory>
<Directory /srv/whimsy/www/secretary>
AuthType Basic
AuthName "ASF Secretarial Team"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
<RequireAny>
Require ldap-alias-secretary
Require ldap-alias-apldap
@@ -382,10 +334,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<LocationMatch ^/board/publish_minutes>
AuthType Basic
AuthName "ASF Secretarial Team"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
<RequireAny>
Require ldap-alias-secretary
Require ldap-alias-apldap
@@ -395,40 +344,28 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Directory /srv/whimsy/www/test/committer>
AuthType Basic
AuthName "ASF Committer"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Directory>
<Directory /srv/whimsy/www/test/member>
AuthType Basic
AuthName "ASF Member"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-member
</Directory>
<Directory /srv/whimsy/www/test/incubator>
AuthType Basic
AuthName "Incubator PMC"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-incubator-pmc
</Directory>
<Directory /srv/whimsy/www/test/member-incubator>
AuthType Basic
AuthName "ASF Members and Incubator PMC"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
<RequireAny>
Require ldap-alias-member
Require ldap-alias-incubator-pmc
@@ -438,30 +375,21 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Directory /srv/whimsy/www/test/pmc-chair>
AuthType Basic
AuthName "PMC Chair"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-pmc-chair
</Directory>
<Directory /srv/whimsy/www/test/secretary>
AuthType Basic
AuthName "Secretary"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-secretary
</Directory>
<Directory /srv/whimsy/www/test/apldap>
AuthType Basic
AuthName "Apldap"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-apldap
</Directory>
@@ -485,10 +413,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Location /repos/infra>
AuthType Basic
AuthName "ASF Committer"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-committer
</Location>
@@ -496,10 +421,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Location /repos/private>
AuthType Basic
AuthName "ASF Members"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-member
</Location>
@@ -507,10 +429,7 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
<Location /repos/private/documents/withdrawn>
AuthType Basic
AuthName "Secretary"
- AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn %>
- AuthLDAPBindPassword "<%= ldapbindpw %>"
+ AuthBasicProvider ldap-people
Require ldap-alias-secretary
</Location>
