Author: sebb Date: Sat Jun 28 11:51:43 2025 New Revision: 1926804 URL: http://svn.apache.org/viewvc?rev=1926804&view=rev Log: http: => https: (it will be redirected anyway)
Modified: comdev/projects.apache.org/trunk/README_NEWTLP comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py comdev/projects.apache.org/trunk/scripts/cronjobs/pubsubber.py comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py comdev/projects.apache.org/trunk/scripts/project2attic.py Modified: comdev/projects.apache.org/trunk/README_NEWTLP URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/README_NEWTLP?rev=1926804&r1=1926803&r2=1926804&view=diff ============================================================================== --- comdev/projects.apache.org/trunk/README_NEWTLP (original) +++ comdev/projects.apache.org/trunk/README_NEWTLP Sat Jun 28 11:51:43 2025 @@ -12,4 +12,4 @@ This can be done using scripts/update_cr * create the project DOAP somewhere in the project SVN or Git space * add the DOAP location to data/projects.xml -Data is not immediately reflected in http://projects.apache.org/: it will be processed daily at 2 AM UTC +Data is not immediately reflected in https://projects.apache.org/: it will be processed daily at 2 AM UTC Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py?rev=1926804&r1=1926803&r2=1926804&view=diff ============================================================================== --- comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py (original) +++ comdev/projects.apache.org/trunk/scripts/cronjobs/parsecommitteeinfo.py Sat Jun 28 11:51:43 2025 @@ -38,10 +38,8 @@ group_ids = { 'ws': 'webservices' } -# homepages not matching http://<committee id>.apache.org/ and not defined in committee-info.json / index.html +# homepages not matching https?://<committee id>.apache.org/ and not defined in committee-info.json / index.html homepages = { - 'comdev': 'http://community.apache.org/', # temporary (accidentally used https: in site.rb local table) - 'whimsy': 'http://whimsical.apache.org/', # incorrect in index.html because actual site does not yet exist } # Print to log and send an email (intended for WARN messages) @@ -173,7 +171,7 @@ for group in sorted(committees, key=keyo # Fix up name where PMC RDF does not agree with LDAP group committeeId = group_ids.get(group, group) - img = "http://www.apache.org/logos/res/%s/default.png" % committeeId + img = "https://www.apache.org/logos/res/%s/default.png" % committeeId if not skipImageTest and not URLexists(img): print("WARN: could not find logo: %s" % (img)) @@ -199,14 +197,14 @@ for group in sorted(committees, key=keyo if ctte['site']: homepage = ctte['site'] else: - homepage = 'http://%s.apache.org/' % group + homepage = 'https://%s.apache.org/' % group committee['homepage'] = homepage if ctte['description']: committee['shortdesc'] = ctte['description'] else: # N.B. Whimsy parses index.html to generate the description entry in committee-info.json - printMail("WARN: %s (%s) missing from http://www.apache.org/index.html#projects-list" % (group, fullName)) + printMail("WARN: %s (%s) missing from https://www.apache.org/index.html#projects-list" % (group, fullName)) if committeeId in pmcDataUrls: committee['rdf'] = pmcDataUrls[committeeId] Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py?rev=1926804&r1=1926803&r2=1926804&view=diff ============================================================================== --- comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py (original) +++ comdev/projects.apache.org/trunk/scripts/cronjobs/podlings.py Sat Jun 28 11:51:43 2025 @@ -8,14 +8,14 @@ from datetime import datetime from urlutils import URLopen """ -Reads http://incubator.apache.org/podlings.xml +Reads https://incubator.apache.org/podlings.xml Creates: ../../site/json/foundation/podlings.json ../../site/json/foundation/podlings-history.json """ -data = URLopen("http://incubator.apache.org/podlings.xml").read() +data = URLopen("https://incubator.apache.org/podlings.xml").read() xmldoc = minidom.parseString(data) itemlist = xmldoc.getElementsByTagName('podling') @@ -71,7 +71,7 @@ for s in itemlist : 'ended': ed, 'name': "Apache %s (Incubating)" % name, 'description': desc, - 'homepage': "http://%s.incubator.apache.org/" % uname + 'homepage': "https://%s.incubator.apache.org/" % uname } elif status == "retired": if not ed: @@ -84,7 +84,7 @@ for s in itemlist : 'ended': ed, 'name': "Apache %s (Incubating)" % name, 'description': desc, - 'homepage': "http://%s.incubator.apache.org/" % uname + 'homepage': "https://%s.incubator.apache.org/" % uname } elif status == "current": current += 1 @@ -93,7 +93,7 @@ for s in itemlist : 'name': "Apache %s (Incubating)" % name, 'pmc': 'incubator', 'description': desc, - 'homepage': "http://%s.incubator.apache.org/" % uname, + 'homepage': "https://%s.incubator.apache.org/" % uname, 'podling': True } Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/pubsubber.py URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/pubsubber.py?rev=1926804&r1=1926803&r2=1926804&view=diff ============================================================================== --- comdev/projects.apache.org/trunk/scripts/cronjobs/pubsubber.py (original) +++ comdev/projects.apache.org/trunk/scripts/cronjobs/pubsubber.py Sat Jun 28 11:51:43 2025 @@ -288,7 +288,7 @@ def main(): # Start the svn thread svn_thread = PubSubClient() - svn_thread.url = "http://svn-master.apache.org:2069/commits/*" + svn_thread.url = "http://svn-master.apache.org:2069/commits/*" # https: not currently supported? svn_thread.start() while True: Modified: comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py?rev=1926804&r1=1926803&r2=1926804&view=diff ============================================================================== --- comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py (original) +++ comdev/projects.apache.org/trunk/scripts/cronjobs/urlutils.py Sat Jun 28 11:51:43 2025 @@ -295,12 +295,12 @@ def main(): fc = UrlCache(interval=0) name = "_wao.html" fc._deleteCacheFile(name) # pylint: disable=protected-access - icla_info = fc.get("http://www.apache.org/", name, encoding='utf-8') + icla_info = fc.get("https://www.apache.org/", name, encoding='utf-8') print(icla_info.readline().rstrip()) print(icla_info.readline().rstrip()) print(icla_info.readline().rstrip()) print(icla_info.readline().rstrip()) - icla_info = fc.get("http://www.apache.org/", name, encoding='utf-8') + icla_info = fc.get("https://www.apache.org/", name, encoding='utf-8') fc._deleteCacheFile(name) # pylint: disable=protected-access if __name__ == '__main__': Modified: comdev/projects.apache.org/trunk/scripts/project2attic.py URL: http://svn.apache.org/viewvc/comdev/projects.apache.org/trunk/scripts/project2attic.py?rev=1926804&r1=1926803&r2=1926804&view=diff ============================================================================== --- comdev/projects.apache.org/trunk/scripts/project2attic.py (original) +++ comdev/projects.apache.org/trunk/scripts/project2attic.py Sat Jun 28 11:51:43 2025 @@ -54,7 +54,7 @@ def update_pmc_xml(pmc): # match one of: # committees/<pmc>.rdf # https://ofbiz.apache.org/<pmc>/... - # http://svn.apache.org/repos/asf/<pmc>/... + # https?://svn.apache.org/repos/asf/<pmc>/... regex = r"^(committees/%s\.rdf|https?://%s\.apache\.org/.+|https?://svn.apache.org/repos/asf/%s/.+)$" % (pmc,pmc,pmc) if re.search(regex, url, flags=re.IGNORECASE): print("Found %s at %s" % (pmc, url)) @@ -87,7 +87,7 @@ def update_doap(doap, source): if re.search("<rdf:RDF",l): w.write("<!-- Copied from %s -->\n" % source) if re.search("<asfext:pmc rdf:resource=", l): - w.write(re.sub("=['\"].+?['\"]",'="http://attic.apache.org/"',l)) + w.write(re.sub("=['\"].+?['\"]",'="https://attic.apache.org/"',l)) continue # don't write original line if catWrite and re.search("<category",l): catWrite = False