From e76468860270327c94d866b722792650ec1c159c Mon Sep 17 00:00:00 2001 From: Tim Bishop Date: Wed, 14 Jun 2017 12:03:47 +0100 Subject: [PATCH] Move to https where possible. The main site now always redirects to https, so we can remove the protocol agnostic links and update others as appropriate. Whilst here, update a number of external links where they've changed or gone, and use https where available. Also make master downloads sites links - the traffic is hardly an issue these days. --- cgi-bin/cvslog.cgi | 6 ++--- cgi-bin/logo.cgi | 4 +-- htdocs/cms/index.xhtml | 6 ++--- htdocs/contributing.xhtml | 2 +- htdocs/cvs.xhtml | 4 +-- htdocs/cvsplot/index.xhtml | 2 +- htdocs/doctype.inc | 4 +-- htdocs/footer.inc | 2 +- htdocs/git.xhtml | 6 ++--- htdocs/index.xhtml | 4 +-- htdocs/libstatgrab/index.xhtml | 18 ++++++------- htdocs/license.xhtml | 2 +- htdocs/mailinglists.xhtml | 12 ++++----- htdocs/menu-static.inc | 46 +++++++++++++++++----------------- htdocs/menu.inc | 44 ++++++++++++++++---------------- htdocs/mirrors.xhtml | 44 ++++++++++++++++---------------- htdocs/pystatgrab/index.xhtml | 8 +++--- htdocs/stats/index.xhtml | 2 +- htdocs/style.inc | 6 ++--- htdocs/support.xhtml | 2 +- htdocs/who.xhtml | 10 ++++---- 21 files changed, 118 insertions(+), 116 deletions(-) diff --git a/cgi-bin/cvslog.cgi b/cgi-bin/cvslog.cgi index e4fd342..49bb105 100755 --- a/cgi-bin/cvslog.cgi +++ b/cgi-bin/cvslog.cgi @@ -109,7 +109,7 @@ foreach my $module (@modules) { print <<"END";

- $module module + $module module

END @@ -189,7 +189,7 @@ END } $file = escapeHTML($file); print <<"END"; - $file + $file END if($rev =~ /\(([^\s]+)\.(\d+)(.*)\)/) { my $start = $1; @@ -212,7 +212,7 @@ END $other = escapeHTML($other); chomp $other; print <<"END"; - ($startend$other)$ext + ($startend$other)$ext END } else { diff --git a/cgi-bin/logo.cgi b/cgi-bin/logo.cgi index 69aaf8d..c191612 100755 --- a/cgi-bin/logo.cgi +++ b/cgi-bin/logo.cgi @@ -9,7 +9,7 @@ my($dir) = "/web/i-scream/htdocs/logos"; my($pattern) = "\\.jpg\$"; # URL to images - must match $dir -my($url) = "//www.i-scream.org/logos"; +my($url) = "https://www.i-scream.org/logos"; # Where the setbg command is my($setbg) = "/web/i-scream/bin/setbg.pl"; @@ -21,7 +21,7 @@ $imagepath =~ s/$dir/$url/; # Check for IPv6 if($ENV{SERVER_ADDR} =~ /:/) { - $imagepath = "//www.i-scream.org/images/ipv6-logo.gif"; + $imagepath = "https://www.i-scream.org/images/ipv6-logo.gif"; } print "Content-type: text/plain\n\n"; diff --git a/htdocs/cms/index.xhtml b/htdocs/cms/index.xhtml index b939a43..c83c561 100644 --- a/htdocs/cms/index.xhtml +++ b/htdocs/cms/index.xhtml @@ -91,7 +91,7 @@

@@ -175,8 +175,8 @@

The i-scream Distributed Central Monitoring System started off as a final year project for a group of - Computer Science - students at the University + Computer Science + students at the University of Kent, UK. The project was completed at 4pm on 29 March 2001. It consisted of five lever-arch folders containing mostly source code and documentation. The diff --git a/htdocs/contributing.xhtml b/htdocs/contributing.xhtml index 672bd11..7557ff5 100644 --- a/htdocs/contributing.xhtml +++ b/htdocs/contributing.xhtml @@ -26,7 +26,7 @@

If you've got changes for one of our active projects then it'll almost certainly be available on our - GitHub page. If + GitHub page. If you're familiar with Git the best way to send changes is to fork our project on GitHub, commit your changes to your copy, and then initiate a pull request. diff --git a/htdocs/cvs.xhtml b/htdocs/cvs.xhtml index dd6b9a5..3f34094 100644 --- a/htdocs/cvs.xhtml +++ b/htdocs/cvs.xhtml @@ -39,7 +39,7 @@ version of any section.

- http://cvs.i-scream.org/ + https://cvs.i-scream.org/

We also have a facility to allow people to keep tabs on @@ -97,7 +97,7 @@ CVSROOT = :ext:username@cvs.i-scream.org:/cvs/i-scream Other means of accessing CVS

- We currently provide CVSup + We currently provide CVSup access to the repository, either for mirroring or for maintaining an up-to-date local copy. You will probably want to create a supfile that looks something like this; diff --git a/htdocs/cvsplot/index.xhtml b/htdocs/cvsplot/index.xhtml index d477d8e..c6eb7da 100644 --- a/htdocs/cvsplot/index.xhtml +++ b/htdocs/cvsplot/index.xhtml @@ -21,7 +21,7 @@ page is updated at 7am daily.

- You can also browse + You can also browse the cvs repository.

diff --git a/htdocs/doctype.inc b/htdocs/doctype.inc index 6ae8c4c..03344c0 100644 --- a/htdocs/doctype.inc +++ b/htdocs/doctype.inc @@ -1,6 +1,6 @@ + "https://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - \ No newline at end of file + \ No newline at end of file diff --git a/htdocs/footer.inc b/htdocs/footer.inc index b4098cf..887b436 100644 --- a/htdocs/footer.inc +++ b/htdocs/footer.inc @@ -2,6 +2,6 @@

© 2000-2015 i-scream « » - www.i-scream.org + www.i-scream.org

\ No newline at end of file diff --git a/htdocs/git.xhtml b/htdocs/git.xhtml index 2fd3e5d..24ac190 100644 --- a/htdocs/git.xhtml +++ b/htdocs/git.xhtml @@ -34,7 +34,7 @@ latest version of any section.

- git.i-scream.org + git.i-scream.org

Anonymous Git Access (read-only) @@ -47,7 +47,7 @@ Choose whichever protocol you prefer. 

-git clone http://git.i-scream.org/libstatgrab
+git clone https://git.i-scream.org/libstatgrab
 git clone git://git.i-scream.org/libstatgrab

@@ -73,7 +73,7 @@ git clone ssh://git@git.i-scream.org/libstatgrab make changes and work with our code.

- http://github.com/i-scream + https://github.com/i-scream

Git guidelines diff --git a/htdocs/index.xhtml b/htdocs/index.xhtml index 10bbf6c..dc1ed40 100644 --- a/htdocs/index.xhtml +++ b/htdocs/index.xhtml @@ -116,9 +116,9 @@

We've moved both - libstatgrab + libstatgrab and - pystatgrab + pystatgrab to their own Git repositories. CVS will remain for everything else for now.

diff --git a/htdocs/libstatgrab/index.xhtml b/htdocs/libstatgrab/index.xhtml index e6d8d49..7459954 100644 --- a/htdocs/libstatgrab/index.xhtml +++ b/htdocs/libstatgrab/index.xhtml @@ -69,7 +69,7 @@ extends the use of libstatgrab to people writing scripts or anything else that can't easily make C function calls. Included with statgrab is a script to generate an - MRTG configuration file + MRTG configuration file to use statgrab.

@@ -100,7 +100,7 @@

A full list of changes can be found in the - NEWS + NEWS file contained within the release.

@@ -255,7 +255,7 @@

Official libstatgrab packages for Debian now - available. + available.

Thanks to the work of @@ -389,7 +389,7 @@ Python

  • - PHP + PHP
  • Perl @@ -409,28 +409,28 @@

    diff --git a/htdocs/license.xhtml b/htdocs/license.xhtml index e72e755..1d6e2d5 100644 --- a/htdocs/license.xhtml +++ b/htdocs/license.xhtml @@ -17,7 +17,7 @@ Unless explicitly mentioned all i-scream software is licensed under the GNU General Public License (GPL). The full license can be found - here, + here, but is also given below for reference. 

    diff --git a/htdocs/mailinglists.xhtml b/htdocs/mailinglists.xhtml
index 504689a..6d741e8 100644
--- a/htdocs/mailinglists.xhtml
+++ b/htdocs/mailinglists.xhtml
@@ -25,7 +25,7 @@
           
           
    
             Information:
-            http://lists.i-scream.org/mailman/listinfo/dev
    
+            https://lists.i-scream.org/mailman/listinfo/dev
    
             State: Closed
    
             Purpose: A discussion forum for developers only.
           
    
@@ -34,7 +34,7 @@
           
           
    
             Information:
-            http://lists.i-scream.org/mailman/listinfo/commits
    
+            https://lists.i-scream.org/mailman/listinfo/commits
    
             State: Open for subscription, but no posts should be
             sent here.
    
             Purpose: Emails are sent to this list whenever a
@@ -47,7 +47,7 @@
           
           
    
             Information:
-            http://lists.i-scream.org/mailman/listinfo/cvs-all
    
+            https://lists.i-scream.org/mailman/listinfo/cvs-all
    
             State: Retired.
    
             Purpose: This list contained CVS commit emails, but
             this has now been merged with the commits list above.
@@ -57,7 +57,7 @@
           
           
    
             Information:
-            http://lists.i-scream.org/mailman/listinfo/users
    
+            https://lists.i-scream.org/mailman/listinfo/users
    
             State: Open for subscription and posts.
    
             Purpose: For discussion between users, developers,
             and anyone else. This is the place to ask questions and get
@@ -85,8 +85,8 @@
           
           
    
             All lists are scanned using
-            ClamAV and
-            SpamAssassin to
+            ClamAV and
+            SpamAssassin to
             remove viruses before they get sent out to list members.
             We also tag spam messages accordingly, and ensure that such
             messages are moderated.
diff --git a/htdocs/menu-static.inc b/htdocs/menu-static.inc
index f29cce8..cbc09c8 100644
--- a/htdocs/menu-static.inc
+++ b/htdocs/menu-static.inc
@@ -1,61 +1,61 @@
       
    
\ No newline at end of file
diff --git a/htdocs/menu.inc b/htdocs/menu.inc
index 7dafbfa..9c5fba7 100644
--- a/htdocs/menu.inc
+++ b/htdocs/menu.inc
@@ -5,57 +5,57 @@
           Main
         
         
         
    
           Projects
         
    
         
         
         
    
           Resources
         
    
         
         
         
         
         
         
    
           i-scream
         
    
         
         
       
diff --git a/htdocs/mirrors.xhtml b/htdocs/mirrors.xhtml
index b066f5b..ac15159 100755
--- a/htdocs/mirrors.xhtml
+++ b/htdocs/mirrors.xhtml
@@ -26,7 +26,10 @@
             Master Site
           
           
           
    
             UK Mirrors
@@ -35,39 +38,31 @@
             
  • 
               
                 ftp://ftp.mirrorservice.org/pub/i-scream/
-              - Provided by The
+              - Provided by The
                 UK Mirror Service.
             
    • 
           
           
    
-            HTTP Mirrors
+            HTTPS Mirrors
           
    
           
    
             Master Site
           
    
-          
      
-            
    • http://ftp.i-scream.org/pub/i-scream/
      • 
-          
    
-          
    
-            UK Mirrors
-          
    
           
           
    
-            DE Mirrors
+            UK Mirrors
           
    
           
           
    
@@ -77,7 +72,10 @@
             Master Site
           
    
           
           
    
             UK Mirrors
@@ -86,7 +84,7 @@
             
  • 
               
                 rsync://rsync.mirrorservice.org/ftp.i-scream.org/pub/i-scream/
-              - Provided by The
+              - Provided by The
                 UK Mirror Service.
             
    • 
           
@@ -97,7 +95,11 @@
             Master Site
           
    
           
         
 
diff --git a/htdocs/pystatgrab/index.xhtml b/htdocs/pystatgrab/index.xhtml
index 048fd13..87d90ad 100644
--- a/htdocs/pystatgrab/index.xhtml
+++ b/htdocs/pystatgrab/index.xhtml
@@ -94,7 +94,7 @@
           
           
    
             Official pystatgrab packages for Debian now
-            available.
+            available.
           
    
           
    
             Thanks to the work of
@@ -165,11 +165,11 @@
           
    
             For installation instructions see the README file contained
             within the archive. If you're using
-            FreeBSD you can make use of
-            the 
+            FreeBSD you can make use of
+            the 
             devel/py-statgrab port to install pystatgrab (and
             libstatgrab) for you. There's also a
-            
+            
             Debian package available.
           
    
         
diff --git a/htdocs/stats/index.xhtml b/htdocs/stats/index.xhtml
index 0f649c6..6c42093 100644
--- a/htdocs/stats/index.xhtml
+++ b/htdocs/stats/index.xhtml
@@ -16,7 +16,7 @@
           
    
             Below are statistics for the various i-scream vhosts. They are
             generated using
-            Webalizer on a
+            Webalizer on a
             nightly basis.
           
    
           
      
diff --git a/htdocs/style.inc b/htdocs/style.inc
index c3938e4..bdbe3c9 100644
--- a/htdocs/style.inc
+++ b/htdocs/style.inc
@@ -1,3 +1,3 @@
-    
-    
-    
+    
+    
+    
diff --git a/htdocs/support.xhtml b/htdocs/support.xhtml
index 69c2ae2..0d62f18 100644
--- a/htdocs/support.xhtml
+++ b/htdocs/support.xhtml
@@ -16,7 +16,7 @@
           
      
             i-scream makes uses of the GitHub issue trackers
             associated with our projects over on
-            GitHub. If you've
+            GitHub. If you've
             found a bug with our software that's the best place to
             report and discuss it. If you have a fix, you can make a
             pull request there too.
diff --git a/htdocs/who.xhtml b/htdocs/who.xhtml
index 7dfdbb4..73d2393 100644
--- a/htdocs/who.xhtml
+++ b/htdocs/who.xhtml
@@ -15,7 +15,7 @@
           
           
      
             i-scream started out as a group of four final year
-            Computer Science
+            Computer Science
             students at the University of Kent doing a final year
             project. During that year they developed the
             CMS package more or less as it stands
@@ -35,13 +35,13 @@
           
      
           
           
      
@@ -55,7 +55,7 @@
           
      
           
           
      
-- 
2.44.0