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 003ecbf0 Synch recent changes
003ecbf0 is described below
commit 003ecbf0a872fe9a39bba983cbcf4aee826e6967
Author: Sebb <[email protected]>
AuthorDate: Sat Jan 20 17:41:50 2024 +0000
Synch recent changes
---
Dockerfile | 2 +
.../maintenance_banner.lua | 6 +-
docker-config/whimsy.conf | 148 +++++++++++----------
3 files changed, 79 insertions(+), 77 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index a5db53d4..4bb215cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -84,6 +84,8 @@ RUN DEBIAN_FRONTEND='noninteractive' apt-get install -y
libyaml-dev
# Allow www-data user to use Git repo owned by root
COPY docker-config/gitconfig-www /var/www/.gitconfig
+COPY docker-config/maintenance_banner.lua /etc/apache2
+
# disable security check and telemetry
# Must use the same user and group as apache
RUN sed -i -e '$i PassengerDisableSecurityUpdateCheck on'
/etc/apache2/conf-enabled/passenger.conf && \
diff --git a/maintenance_banner.lua b/docker-config/maintenance_banner.lua
similarity index 86%
rename from maintenance_banner.lua
rename to docker-config/maintenance_banner.lua
index 55ebe91d..f537c918 100644
--- a/maintenance_banner.lua
+++ b/docker-config/maintenance_banner.lua
@@ -3,7 +3,7 @@
It adds a banner when maintenance mode is detected
It is invoked by the following file exists:
- /srv/whimsy/www/maintenance.tct
+ /srv/whimsy/www/maintenance.txt
The mod_lua API is described here:
https://httpd.apache.org/docs/current/mod/mod_lua.html#modifying_buckets
@@ -22,12 +22,10 @@ function output_filter(r)
-- create the customised banner
local divstyle =
'font-size:x-large;padding:15px;color:white;background:red;z-index:99;' ;
- -- local astyle = 'color:white;text-decoration:underline' ; -- <a>
local div = ([[
<div style='%s'>
The Whimsy server is undergoing maintenance. Not all functions are
available.
- %s
- </div>]]):format(divstyle, r.content_type)
+ </div>]]):format(divstyle)
-- add header:
coroutine.yield(div)
diff --git a/docker-config/whimsy.conf b/docker-config/whimsy.conf
index 243ac9c4..9072a420 100644
--- a/docker-config/whimsy.conf
+++ b/docker-config/whimsy.conf
@@ -31,8 +31,6 @@
## Custom fragment
-## Needed? SetEnv PATH /usr/local/rvm/wrappers/ruby-2.7:${PATH}
-
PassengerFriendlyErrorPages on
AddCharset UTF-8 .json
@@ -72,9 +70,9 @@ ExpiresActive On
AuthType Basic
AuthName "ASF Members"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute memberUid
AuthLDAPGroupAttributeIsDN off
AuthLDAPMaxSubGroupDepth 0
@@ -121,7 +119,7 @@ ErrorDocument 500 /500.html
# However an empty file will work
# To end maintenance, remove the file.
-LuaOutputFilter maintenance "/srv/whimsy/maintenance_banner.lua" output_filter
+LuaOutputFilter maintenance "/etc/apache2/maintenance_banner.lua" output_filter
<If "-f '/srv/whimsy/www/maintenance.txt'">
AddOutputFilter maintenance html cgi
</If>
@@ -141,9 +139,13 @@ RewriteCond %{REQUEST_URI} !^/assets/
RewriteCond %{REQUEST_URI} !^/icons/
RewriteCond %{REQUEST_URI} !=/whimsy.svg
RewriteCond %{REQUEST_URI} !=/favicon.ico
-# Allow access to JSON files
+# Allow access to public URLs
RewriteCond %{REQUEST_URI} !^/public$
RewriteCond %{REQUEST_URI} !^/public/
+RewriteCond %{REQUEST_URI} !^/board/minutes/
+RewriteCond %{REQUEST_URI} !^/incubator/podlings/by-age
+RewriteCond %{REQUEST_URI} !^/site/
+RewriteCond %{REQUEST_URI} !^/pods/
# Access to linked docs
RewriteCond %{REQUEST_URI} !=/test/dataflow.cgi
RewriteCond %{REQUEST_URI} !=/test/dataflow.json
@@ -218,9 +220,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Committers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -231,9 +233,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Committers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -244,9 +246,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Committers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -257,9 +259,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Committers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -270,9 +272,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Incubator PMC"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -283,9 +285,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Incubator PMC"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -296,9 +298,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -309,9 +311,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -322,9 +324,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -335,9 +337,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Officers"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -355,9 +357,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute memberUid
AuthLDAPGroupAttributeIsDN off
AuthLDAPMaxSubGroupDepth 0
@@ -368,9 +370,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute memberUid
AuthLDAPGroupAttributeIsDN off
AuthLDAPMaxSubGroupDepth 0
@@ -381,9 +383,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute memberUid
AuthLDAPGroupAttributeIsDN off
AuthLDAPMaxSubGroupDepth 0
@@ -394,9 +396,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Infrastructure Team"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -407,9 +409,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Secretarial Team"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -423,9 +425,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Secretarial Team"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
AuthLDAPGroupAttribute member
AuthLDAPGroupAttributeIsDN on
AuthLDAPMaxSubGroupDepth 0
@@ -439,9 +441,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Committer"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
Require ldap-alias-committer
</Directory>
@@ -449,9 +451,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Member"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
Require ldap-alias-member
</Directory>
@@ -459,9 +461,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "Incubator PMC"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
Require ldap-alias-incubator-pmc
</Directory>
@@ -469,9 +471,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "ASF Members and Incubator PMC"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
<RequireAny>
Require ldap-alias-member
Require ldap-alias-incubator-pmc
@@ -482,9 +484,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "PMC Chair"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
Require ldap-alias-pmc-chair
</Directory>
@@ -492,9 +494,9 @@ Alias /project/icla/ /srv/whimsy/www/project/icla/public
AuthType Basic
AuthName "Secretary"
AuthBasicProvider ldap
- AuthLDAPUrl "ldaps://<%= ldaphosts%>/ou=people,dc=apache,dc=org?uid"
- AuthLDAPBindDN <%= ldapbinddn%>
- AuthLDAPBindPassword "<%= ldapbindpw%>"
+ AuthLDAPUrl "ldaps://<%= ldaphosts %>/ou=people,dc=apache,dc=org?uid"
+ AuthLDAPBindDN <%= ldapbinddn %>
+ AuthLDAPBindPassword "<%= ldapbindpw %>"
Require ldap-alias-secretary
</Directory>
