Merge remote-tracking branch 'upstream/main'

.drone.yml

@@ -0,0 +1,24 @@
+kind: pipeline
+type: kubernetes
+name: default
+
+steps:
+- name: submodules
+  image: alpine/git
+  commands:
+  - git submodule init
+  - git submodule update --recursive --remote
+
+- name: docker
+  image: harbor.ntppool.org/ntppool/drone-kaniko:main
+  pull: always
+  settings:
+    repo: perl/perlweb
+    registry: harbor.ntppool.org
+    auto_tag: true
+    tags: SHA7,${DRONE_SOURCE_BRANCH}
+    cache: true
+    username:
+      from_secret: harbor_username
+    password:
+      from_secret: harbor_password

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "combust"]
 	path = combust
-	url = git://github.com/abh/combust.git
+	url = https://github.com/abh/combust.git
 [submodule "docs/static/cdn"]
 	path = docs/static/cdn
-	url = git://git.develooper.com/devcdn.git
+	url = https://github.com/devel/cdn.git

.modules

@@ -4,16 +4,13 @@
 
 local::lib
 
-# for cpanratings
+# for cpanratings, maybe something else ...
 DBI
 DBD::mysql
-DBIx::Class
-DBIx::Class::Helper::Row::ToJSON
 XML::RSS
 Template::Plugin::XML::RSS
 DateTime::Format::ISO8601
-Encode
-String::Truncate
+URI::Encode
 
 # general
 Template::Plugin::JSON

Dockerfile

@@ -1,4 +1,4 @@
-FROM quay.io/perl/base-os:v3.11.6
+FROM harbor.ntppool.org/perlorg/base-os:3.15.0-1
 
 # Note that this only builds dependencies and such, it doesn't
 # actually include the site code etc itself. The site code
@@ -7,14 +7,13 @@ FROM quay.io/perl/base-os:v3.11.6
 
 # Cache buster for occasionally resetting the cached images even if
 # the base doesn't change.
-ENV LAST_UPDATED 2020-06-07
+ENV LAST_UPDATED 2021-08-24
 
 USER root
 
 RUN apk update; apk upgrade ; apk add curl git \
   perl-dev wget make \
-  inotify-tools \
-  expat-dev zlib-dev libressl-dev libressl \
+  expat-dev zlib-dev \
   mariadb-client mariadb-dev build-base
 
 ADD .modules /tmp/modules.txt

apache/conf/sites/cpanratings.tmpl

@@ -9,16 +9,6 @@
        PerlHandler CPANRatings::Control::Basic->super
     </Location>
 
-    <Location /logout>
-       SetHandler perl-script
-       PerlHandler CPANRatings::Control::Logout->super
-    </Location>
-
-    <Location /rate>
-       SetHandler perl-script
-       PerlHandler CPANRatings::Control::Rate->super
-    </Location>
-
     <Location /search>
        SetHandler perl-script
        PerlHandler CPANRatings::Control::Search->super
@@ -34,21 +24,11 @@
 
     [% END %]
 
-    <Location /csv/all_ratings.csv>
-       SetHandler perl-script
-       PerlHandler CPANRatings::Control::ShowAll->super
-    </Location>
-
     <Location /index.rss>
        SetHandler perl-script
        PerlHandler CPANRatings::Control::RecentRSS->super
     </Location>
 
-    <Location /api>
-       SetHandler perl-script
-       PerlHandler CPANRatings::Control::API->super
-    </Location>
-
     <Location /static/>
        SetHandler perl-script
        PerlHandler PerlOrg::Control::Basic

combust.docker.conf

@@ -49,7 +49,8 @@ alias=combust
 [apache]
 
 [www]
-servername = www.perl.org
+servername = wwwperl.lh.rbrt.com
+#servername = www.perl.org
 #googleanalytics = UA-xxx
 #static_base = //st.pimg.net/perlweb/
 deployment_mode = devel
@@ -72,7 +73,8 @@ servername = combust.develooper.com
 deployment_mode = devel
 
 [dev]
-servername = dev.perl.org
+#servername = dev.perl.org
+servername = devperl.lh.rbrt.com
 googleanalytics = UA-xxx-6
 #static_base = //st.pimg.net/perlweb/
 deployment_mode = devel

docs/cpanratings/about.html

@@ -36,17 +36,14 @@ <h3>Contact</h3>
 </script>
 </div>
 
-<p>
-Report issues in
-the <a href="https://github.com/perlorg/perlweb/issues?labels=cpanratings&amp;sort=created&amp;direction=desc&amp;state=open&amp;page=1">issue
-tracker</a> or <a href="http://www.perl.org/siteinfo.html">email
-us</a>.
-</p>
-
 <h3>Release Notes</h3>
 
 <ul>
 
+<li>February 2022: Redirect pages to MetaCPAN.</li>  
+
+<li>June 2018: Disable adding new reviews pending MetaCPAN features.</li>
+
 <li>July 2012: HTML markup fixes.</li>
 
 <li>June 2011: Run on Plack, better formatting, better javascript,
@@ -63,10 +60,9 @@ <h3>Release Notes</h3>
 for the RSS.  A bunch of general code cleanup. Implemented a proper
 API for the helpful votes.</li>
 
-<li>September 12, 2005: Fixed problem with updating reviews. Thanks <a
-href="http://cpanratings.perl.org/user/aristotle">Aristotle</a>!</li>
+<li>September 12, 2005: Fixed problem with updating reviews. Thanks Aristotle!</li>
 
-<li>August 25, 2005: Went through a bunch of the little TODO items.  Oh, and added a link to the until now well hidden <a href="/index.rss">index.rss feed</a>!
+<li>August 25, 2005: Went through a bunch of the little TODO items.  Oh, and added a link to the until now well hidden index.rss feed!
 <li>July 20, 2005: Changed to use <a href="http://www.bitcard.org/">Bitcard</a> for authentication.  Added "was this review helpful" votes.  Also changed the URLs to be a little nicer (we couldn't do that while using the old auth server (don't ask)).  You can now add a review without giving it any ratings.
 <li>September 28, 2004: Bugfix to the "show reviews" page by Ivan Tubert-Brohman.
 <li>August 13, 2003: RSS finished, validating distribution names now, lots of other tweaks.