This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/comdev-people.git
The following commit(s) were added to refs/heads/main by this push:
new 51739df Drop *.apache.org references; they do not make sense
51739df is described below
commit 51739dfdf391a027704cee703c67f6659b3746ea
Author: Sebb <[email protected]>
AuthorDate: Wed Nov 6 14:16:38 2024 +0000
Drop *.apache.org references; they do not make sense
---
html/404.html | 2 +-
tools/committers.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/html/404.html b/html/404.html
index 431204c..48ec11b 100644
--- a/html/404.html
+++ b/html/404.html
@@ -16,7 +16,7 @@
</p>
<p>
As a work-round, this host will redirect such URLs to the first
Personal URL found in
- the user's LDAP record (ignoring URLs which refer to home.apache.org
or people.apache.org).
+ the user's LDAP record (ignoring URLs which refer to apache.org
domains).
<br>
The URL must start with 'http://' or 'https://'.
</p>
diff --git a/tools/committers.py b/tools/committers.py
index 0b7b83d..a9fa3b5 100755
--- a/tools/committers.py
+++ b/tools/committers.py
@@ -279,14 +279,14 @@
template.generate(open(join(HTML_DIR,'committers-by-project.html'), mode='w'),
############################################################################
# Generate redirects for personal directories
-SELF_RE = r"://(home|people)\.apache\.org/" # self
+SELF_RE = r"://(\w+\.)?apache\.org/" # self
if isfile(HTACCESS):
with open(HTACCESS, 'w') as hta:
for id in ldap_people:
person = ldap_people[id]
if 'urls' in person:
for url in person['urls']:
- # Must be an http[s] URL and must not be self reference
+ # Must be an http[s] URL and must not be an ASF reference
if re.match(r"^https?://", url) and not re.search(SELF_RE,
url, re.IGNORECASE):
hta.write(f"RedirectMatch ^/~{id}(/.*)?$ {url}$1\n")
break
