Replace pkg.cfssl.org with 'Packages' tab (#1050)

.gitignore

@@ -1,5 +1,5 @@
 dist/*
-cli/serve/static.rice-box.go
+cli/serve/rice-box.go
 coverage.txt
 profile.out
 bin

Makefile

@@ -7,26 +7,35 @@ export GOPROXY := off
 .PHONY: all
 all: bin/cfssl bin/cfssl-bundle bin/cfssl-certinfo bin/cfssl-newkey bin/cfssl-scan bin/cfssljson bin/mkbundle bin/multirootca
 
-bin/%: $(shell find . -type f -name '*.go')
+bin/%: $(shell find . -type f -name '*.go') cli/serve/rice-box.go
 	@mkdir -p $(dir $@)
 	go build -ldflags $(LDFLAGS) -o $@ ./cmd/$(@F)
 
+cli/serve/rice-box.go: bin/rice $(shell find cli/serve/static -type f)
+cli/serve/rice-box.go:
+	./bin/rice embed-go -i=./cli/serve
+
 .PHONY: install
 install: install-cfssl install-cfssl-bundle install-cfssl-certinfo install-cfssl-newkey install-cfssl-scan install-cfssljson install-mkbundle install-multirootca
 
 .PHONY: install-%
 install-%:
 	go install ./cmd/$(@F:install-%=%)
 
-bin/rice: $(shell find . -type f -name '*.go')
+.PHONY: serve
+serve: bin/cfssl
+serve:
+	./bin/cfssl serve
+
+bin/rice: $(shell find vendor -type f -name '*.go')
 	@mkdir -p $(dir $@)
 	go build -o $@ ./vendor/github.com/GeertJohan/go.rice/rice
 
-bin/golint: $(shell find . -type f -name '*.go')
+bin/golint: $(shell find vendor -type f -name '*.go')
 	@mkdir -p $(dir $@)
 	go build -o $@ ./vendor/golang.org/x/lint/golint
 
-bin/goose: $(shell find . -type f -name '*.go')
+bin/goose: $(shell find vendor -type f -name '*.go')
 	@mkdir -p $(dir $@)
 	go build -o $@ ./vendor/bitbucket.org/liamstask/goose/cmd/goose
 

cli/serve/serve.go

@@ -108,8 +108,9 @@ func (hb *httpBox) Open(name string) (http.File, error) {
 // staticBox is the box containing all static assets.
 var staticBox = &httpBox{
 	redirects: map[string]string{
-		"/scan":   "/index.html",
-		"/bundle": "/index.html",
+		"/scan":     "/index.html",
+		"/bundle":   "/index.html",
+		"/packages": "/index.html",
 	},
 }
 

cli/serve/static/assets/cfssl.js

@@ -121,7 +121,7 @@
               navLink('a', '/bundle', Tformat('bundle.title'))
             ]),
             m('ul.nav.navbar-nav.navbar-right', [
-              m('li', m('a[href="https://pkg.cfssl.org"]', Tformat('common.packages'))),
+              navLink('a', '/packages', Tformat('common.packages')),
               m('li', m('a[href="https://github.com/cloudflare/cfssl"]', 'GitHub')),
             ])
           ])
@@ -237,6 +237,23 @@
     }
   };
 
+  var packages = {
+    controller: function() {
+      page.title(Tformat('common.packages'));
+      return;
+    },
+    view: function() {
+      return appWrapper([
+        m('h1.page-header', Tformat('common.packages')),
+        m('ul', [
+          m('li', m('a[href="https://github.com/cloudflare/cfssl/releases"]', 'Download binaries (GitHub)')),
+          m('li', m('a[href="https://hub.docker.com/r/cloudflare/cfssl"]', 'Docker images')),
+          m('li', m('a[href="https://pkg.cloudflare.com/"]', 'Install from apt or yum'))
+        ])
+      ]);
+    }
+  };
+
   var scan = {
     vm: {
       init: function(domain) {
@@ -708,7 +725,8 @@
     '/bundle': bundle,
     '/bundle/:domain': bundle,
     '/scan': scan,
-    '/scan/:domain': scan
+    '/scan/:domain': scan,
+    '/packages': packages
   });
 
   window.scan = scan;