Merge pull request #1756 from metacpan/oalders/staticpan

Begin using st.aticpan.org
metacpan · Jul 27, 2016 · 35c8eb4 · 35c8eb4
2 parents e8254d8 + 63d04a5
commit 35c8eb4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -29,7 +29,6 @@ user can be changed in the `metacpan_web.conf` file.  Ideally you would create a
 new file called `metacpan_web_local.conf` that contains
 
     api                 http://127.0.0.1:5000
-    api_external        http://127.0.0.1:5000
     api_secure          http://127.0.0.1:5000
     api_external_secure http://127.0.0.1:5000
 

diff --git a/lib/MetaCPAN/Web/Controller/Root.pm b/lib/MetaCPAN/Web/Controller/Root.pm
@@ -102,16 +102,13 @@ sub end : ActionClass('RenderView') {
     $c->stash->{req}        = $c->req;
     $c->stash->{api}        = $c->config->{api};
     $c->stash->{api_secure} = $c->config->{api_secure} || $c->config->{api};
-    $c->stash->{api_external}
-        = $c->config->{api_external} || $c->config->{api};
-    $c->stash->{api_external_secure}
-        = $c->config->{api_external_secure}
-        || $c->config->{api_external}
+    $c->stash->{api_external_secure} = $c->config->{api_external_secure}
         || $c->stash->{api_secure};
     $c->stash->{oauth_prefix}
         = $c->stash->{api_external_secure}
         . '/oauth2/authorize?client_id='
         . $c->config->{consumer_key};
+    $c->stash->{source_host} = $c->config->{source_host};
 
     $c->stash->{site_alert_message} = $c->config->{site_alert_message};
 

diff --git a/metacpan_web.conf b/metacpan_web.conf
@@ -5,6 +5,7 @@ default_view HTML
 
 api_secure      = https://api-v1.metacpan.org
 api_external_secure = https://api-v1.metacpan.org
+source_host     = https://st.aticpan.org
 consumer_key    = metacpan.dev
 cookie_secret   = seekrit
 consumer_secret = ClearAirTurbulence

diff --git a/root/browse.html b/root/browse.html
@@ -13,7 +13,7 @@
   <li class="nav-header">Tools</li>
   <li><a data-keyboard-shortcut="g d" href="/release/<% author %>/<% release %>"><i class="fa fa-fw fa-info-circle black"></i>Release Info</a></li>
   <li><a data-keyboard-shortcut="g a" href="/author/<% author %>"><i class="fa fa-user fa-fw black"></i>Author</a></li>
-  <li><a href="<% api_external_secure %>/source/<% base %>"><i class="fa fa-file-text-o fa-fw black"></i>Raw browser</a></li>
+  <li><a href="<% source_host %>/source/<% base %>"><i class="fa fa-file-text-o fa-fw black"></i>Raw browser</a></li>
   <li class="nav-header">Info</li>
   <li><% count = files.grep(->{this.directory == 1 }).size; count %> folder<% count != 1 ? "s" : "" %></li>
   <li><% count = files.grep(->{this.directory == 0 }).size; count %> file<% count != 1 ? "s" : "" %></li>

diff --git a/root/pod.html b/root/pod.html
@@ -25,11 +25,11 @@
     <% END %>
     <li>
       <a data-keyboard-shortcut="g s" href="/source/<% module.author %>/<% module.release %>/<% module.path %>"><i class="fa fa-fw fa-file-code-o black"></i>Source</a>
-      (<a href="<% api_external_secure %>/source/<% module.author %>/<% module.release %>/<% module.path %>">raw</a>)
+      (<a href="<% source_host %>/source/<% module.author %>/<% module.release %>/<% module.path %>">raw</a>)
     </li>
     <li>
       <a data-keyboard-shortcut="g b" href="/source/<% module.author %>/<% module.release %>/<% module.path.split("/").splice(0,-1).join("/") %>"><i class="fa fa-fw fa-folder-open black"></i>Browse</a>
-      (<a href="<% api_external_secure %>/source/<% module.author %>/<% module.release %>/">raw</a>)
+      (<a href="<% source_host %>/source/<% module.author %>/<% module.release %>/">raw</a>)
     </li>
     <% PROCESS inc/release-info.html schema_org = 1 %>
     <li class="nav-header">Activity</li>

diff --git a/root/release.html b/root/release.html
@@ -10,7 +10,7 @@
     <% INCLUDE mobile/toolbar-search-form.html %>
     </li>
     <li class="nav-header"><span class="relatize"><% release.date.dt_http %></span></li>
-    <li><a href="/source/<% release.author %>/<% release.name %>"><i class="fa fa-fw fa-folder-open black"></i>Browse</a> (<a href="<% api_external_secure %>/source/<% release.author %>/<% release.name %>/">raw</a>)</li>
+    <li><a href="/source/<% release.author %>/<% release.name %>"><i class="fa fa-fw fa-folder-open black"></i>Browse</a> (<a href="<% source_host %>/source/<% release.author %>/<% release.name %>/">raw</a>)</li>
     <% PROCESS inc/release-info.html %>
     <li class="nav-header">Activity</li>
     <li><% INCLUDE inc/activity.html query = 'distribution=' _ release.distribution %></li>