From acedb0e02adc845b9ce35219d553b1518d214960 Mon Sep 17 00:00:00 2001
From: Jay McCarthy <jay@racket-lang.org>
Date: Fri, 11 Oct 2013 15:32:44 -0600
Subject: [PATCH] New URLs for S3 hosted catalogs

---
 pkgs/plt-services/meta/pkg-index/official/dynamic.rkt       | 5 ++---
 pkgs/plt-services/meta/pkg-index/official/static/index.js   | 4 ++--
 .../racket-doc/pkg/scribblings/getting-started.scrbl        | 4 ++--
 pkgs/racket-pkgs/racket-doc/pkg/scribblings/pkg.scrbl       | 6 +++---
 racket/collects/pkg/lib.rkt                                 | 4 ++--
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt b/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt
index a30e136e24..27c78944e9 100644
--- a/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt
+++ b/pkgs/plt-services/meta/pkg-index/official/dynamic.rkt
@@ -65,9 +65,8 @@
    (url->string
     (struct-copy url (request-uri req)
                  [scheme "http"]
-                 ;; XXX change these to the real static site
-                 [host "localhost"]
-                 [port 8001]))))
+                 [host "pkgs.racket-lang.org"]
+                 [port 80]))))
 
 (define-syntax-rule (define-jsonp/auth (f . pat) . body)
   (define-jsonp
diff --git a/pkgs/plt-services/meta/pkg-index/official/static/index.js b/pkgs/plt-services/meta/pkg-index/official/static/index.js
index c4b494e8b9..236c10bb02 100644
--- a/pkgs/plt-services/meta/pkg-index/official/static/index.js
+++ b/pkgs/plt-services/meta/pkg-index/official/static/index.js
@@ -1,5 +1,5 @@
-var dynamic_host = "pkg-dyn.racket-lang.org";
-var dynamic_port = 9004;
+var dynamic_host = "pkgd.racket-lang.org";
+var dynamic_port = 443;
 
 function dynamic_url ( u ) {
     return "https://" + dynamic_host + ":" + dynamic_port + u + "?callback=?"; }
diff --git a/pkgs/racket-pkgs/racket-doc/pkg/scribblings/getting-started.scrbl b/pkgs/racket-pkgs/racket-doc/pkg/scribblings/getting-started.scrbl
index 27e341b6e3..80a9a85808 100644
--- a/pkgs/racket-pkgs/racket-doc/pkg/scribblings/getting-started.scrbl
+++ b/pkgs/racket-pkgs/racket-doc/pkg/scribblings/getting-started.scrbl
@@ -131,7 +131,7 @@ treated as a explicitly installed package.
 
 The PLT @tech{package catalog} at
 
-@centerline{@url{https://pkg.racket-lang.org}}
+@centerline{@url{http://pkgs.racket-lang.org}}
 
 provides a centralized listing of available Racket packages. The PLT
 @tech{package catalog} normally will be the first place you check when
@@ -423,7 +423,7 @@ by a simple name until it is listed on a @tech{package catalog}.
 
 If you'd like to use the PLT @tech{package catalog}, browse
 to
-@link["https://pkg.racket-lang.org/manage/upload"]{https://pkg.racket-lang.org/manage/upload}
+@link["http://pkgs.racket-lang.org/manage/upload"]{http://pkgs.racket-lang.org/manage/upload}
 and upload a new package. You will need to create an account and log
 in first.
 
diff --git a/pkgs/racket-pkgs/racket-doc/pkg/scribblings/pkg.scrbl b/pkgs/racket-pkgs/racket-doc/pkg/scribblings/pkg.scrbl
index 2d6c120443..c7b3d0e1fc 100644
--- a/pkgs/racket-pkgs/racket-doc/pkg/scribblings/pkg.scrbl
+++ b/pkgs/racket-pkgs/racket-doc/pkg/scribblings/pkg.scrbl
@@ -239,8 +239,8 @@ URL indicates a remote server, and a @litchar{file://} URL indicates a
 local catalog in the form of an SQLite database or a directory tree.
 
 PLT supports two @tech{package catalog} servers that are enabled by
-default: @url{https://pkg.racket-lang.org} for new packages and
-@url{http://planet-compat.racket-lang.org} for automatically
+default: @url{http://pkgs.racket-lang.org} for new packages and
+@url{http://planet-compats.racket-lang.org} for automatically
 generated packages for old @|PLaneT| packages. Anyone may host a
 @tech{package catalog}, and any file-serving HTTP host can act
 as a basic @tech{package catalog} server. See @secref["catalog-protocol"]
@@ -796,7 +796,7 @@ PLT maintains a @tech{package catalog} to serve packages that
 were developed using the original @seclink[#:doc '(lib
 "planet/planet.scrbl") "top"]{@|Planet1|} package system.  This
 compatibility catalog is at
-@link["http://planet-compat.racket-lang.org/"]{http://planet-compat.racket-lang.org/},
+@link["http://planet-compats.racket-lang.org/"]{http://planet-compats.racket-lang.org/},
 which is included by default in the package-server search path.
 
 Copies of @|Planet1| packages are automatically created by the
diff --git a/racket/collects/pkg/lib.rkt b/racket/collects/pkg/lib.rkt
index 543c3c0cb9..96453a63af 100644
--- a/racket/collects/pkg/lib.rkt
+++ b/racket/collects/pkg/lib.rkt
@@ -558,8 +558,8 @@
   (define (get-default)
     (match k
       ['catalogs
-       (list "https://pkg.racket-lang.org"
-             "http://planet-compat.racket-lang.org")]
+       (list "http://pkgs.racket-lang.org"
+             "http://planet-compats.racket-lang.org")]
       ['default-scope "user"]
       ['installation-name (version)]
       [_ #f]))