Disable canonical links for now.

They seem to interact badly with our Apache redirects, so disable until we have that fixed.
salilab · Sep 12, 2015 · ce92598 · ce92598
1 parent 472329b
commit ce92598
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/doc/configfile.rst b/doc/configfile.rst
@@ -37,10 +37,7 @@ service_name
 
 urltop
     The URL under which the service's web pages live. This is used to construct
-    URLs containing job results, for example. This is the 'canonical' URL,
-    which is usually something like http://salilab.org/modfoo/, as opposed
-    to the 'real' URL, something like http://modbase.compbio.ucsf.edu/modfoo/.
-    The former is preferred as it gives cleaner results in search engines.
+    URLs containing job results, for example.
 
 google_ua
     The Google Analytics UA for tracking traffic. Please ask a sysadmin to 

diff --git a/doc/using.rst b/doc/using.rst
@@ -6,13 +6,13 @@ Using the web service
 This section covers the use of the web service by an end user. Here the
 'ModFoo' example web service is used, which is defined by the
 :ref:`configuration file <configfile>` to be deployed at
-`http://salilab.org/modfoo`.
+`http://modbase.compbio.ucsf.edu/modfoo`.
 
 Web interface
 =============
 
 End users can simply use the web service by pointing their web browsers to
-`http://salilab.org/modfoo/`. This will display the index page,
+`http://modbase.compbio.ucsf.edu/modfoo/`. This will display the index page,
 from where they can submit jobs or navigate to other pages.
 
 User authentication
@@ -37,7 +37,7 @@ obtain the generated results. This is achieved with a
 `REST <http://en.wikipedia.org/wiki/REST>`_-style interface that talks a simple
 form of XML. This interface is provided by a 'job' script; for the fictional
 ModFoo web service this would be found at
-`http://salilab.org/modfoo/job`. Jobs can be submitted by
+`http://modbase.compbio.ucsf.edu/modfoo/job`. Jobs can be submitted by
 sending an HTTP POST request to this URL containing the same form data that
 would be sent to the regular submit page. On successful submission, the
 returned XML file will contain a URL pointing to the job results.

diff --git a/perl/saliweb/frontend.pm b/perl/saliweb/frontend.pm
@@ -749,11 +749,11 @@ sub get_start_html_parameters {
                            {-language => 'JavaScript',
                             -code     => $JS_Google_Analytics}]);
     my $canon = $self->{canonical_url};
-    if (defined $canon) {
+#   if (defined $canon) {
         # Prefer https for canonical URLs
-        $canon =~ s/^http:/https:/;
-        $param{-head} = $q->Link({-rel=>'canonical', -href=>$canon});
-    }
+#       $canon =~ s/^http:/https:/;
+#       $param{-head} = $q->Link({-rel=>'canonical', -href=>$canon});
+#   }
     return %param;
 }
 

diff --git a/test/frontend/frontend.pl b/test/frontend/frontend.pl
@@ -451,11 +451,6 @@ sub test_display_page {
                "<title>$title<\/title>.*<body.*Link 1.*Project menu for.*" .
                "test_${page_type}_page.*<\/html>/s",
          "$sub generates valid complete HTML page");
-    if ($page_type eq "index") {
-        like($out, "/<head>.*<link rel=\"canonical\" " .
-                   "href=\"https://foo/bar/\" />.*</head>/s",
-             "$sub adds canonical link");
-    }
 
     $self = make_test_frontend("access${page_type}");
     $out = stdout_from { $self->$sub() };