From c42fd33f51e23b14b4912fb3e2b651cd7f289fe6 Mon Sep 17 00:00:00 2001 From: mpl Date: Thu, 11 Jan 2018 01:21:35 +0100 Subject: [PATCH] pkg/deploy/gce: warn about autocert being broken Fix s/Camlistore/Perkeep/ while we're there. Change-Id: Ifce76b77ce04af8952e37953e1646ee785e9d09d --- pkg/deploy/gce/handler.go | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/pkg/deploy/gce/handler.go b/pkg/deploy/gce/handler.go index d594e1d8b..c04ddda66 100644 --- a/pkg/deploy/gce/handler.go +++ b/pkg/deploy/gce/handler.go @@ -72,7 +72,7 @@ var ( } ) -// DeployHandler serves a wizard that helps with the deployment of Camlistore on Google +// DeployHandler serves a wizard that helps with the deployment of Perkeep on Google // Compute Engine. It must be initialized with NewDeployHandler. type DeployHandler struct { scheme string // URL scheme for the URLs served by this handler. Defaults to "https". @@ -212,7 +212,7 @@ func NewDeployHandler(host, prefix string) (*DeployHandler, error) { var refreshCamliVersionFn func() refreshCamliVersionFn = func() { if err := h.refreshCamliVersion(); err != nil { - h.logger.Printf("error while refreshing Camlistore version: %v", err) + h.logger.Printf("error while refreshing Perkeep version: %v", err) } time.AfterFunc(time.Hour, refreshCamliVersionFn) } @@ -962,7 +962,7 @@ var googURLPattern = regexp.MustCompile(`(https://([a-zA-Z0-9\-\.]+)?\.google.co var noTheme = ` {{define "header"}} - Camlistore on Google Cloud + Perkeep on Google Cloud {{end}} {{define "banner"}} @@ -1046,7 +1046,7 @@ func tplHTML() string { window.document.open(); window.document.write(xmlhttp.responseText); window.document.close(); - history.pushState(null, 'Camlistore on Google Cloud', progressURL); + history.pushState(null, 'Perkeep on Google Cloud', progressURL); } } @@ -1055,20 +1055,20 @@ func tplHTML() string { {{define "messages"}}
-

Camlistore on Google Cloud

+

Perkeep on Google Cloud

{{if .InstanceIP}} {{if .InstanceHostname}} -

Success. Your Camlistore instance is running at {{.InstanceHostname}}.

+

Success. Your Perkeep instance is running at {{.InstanceHostname}}.

{{else}} -

Success. Your Camlistore instance is deployed at {{.InstanceIP}}. Refresh this page in a couple of minutes to know your hostname. Or go to camlistore-server instance, and look for camlistore-hostname (which might take a while to appear too) in the custom metadata section.

+

Success. Your Perkeep instance is deployed at {{.InstanceIP}}. Refresh this page in a couple of minutes to know your hostname. Or go to camlistore-server instance, and look for camlistore-hostname (which might take a while to appear too) in the custom metadata section.

{{end}}

Please save the information on this page.

First connection

- The password to access the web interface of your Camlistore instance was automatically generated. Go to the camlistore-server instance page to view it, and possibly change it. It is camlistore-password in the custom metadata section. Similarly, the username is camlistore-username. Then restart Camlistore from the /status page if you changed anything. + The password to access the web interface of your Perkeep instance was automatically generated. Go to the camlistore-server instance page to view it, and possibly change it. It is camlistore-password in the custom metadata section. Similarly, the username is camlistore-username. Then restart Perkeep from the /status page if you changed anything.

Further configuration

@@ -1077,10 +1077,10 @@ func tplHTML() string {

- If you want to use your own HTTPS certificate and key, go to the storage browser. Delete "` + certFilename() + `", "` + keyFilename() + `", and replace them by uploading your own files (with the same names). Then restart Camlistore. + If you want to use your own HTTPS certificate and key, go to the storage browser. Delete "` + certFilename() + `", "` + keyFilename() + `", and replace them by uploading your own files (with the same names). Then restart Perkeep.

-

Camlistore should not require system +

Perkeep should not require system administration but to manage/add SSH keys, go to the camlistore-server instance page. Scroll down to the SSH Keys section. Note that the @@ -1203,23 +1203,25 @@ or corrupted.

-

Deploy Camlistore

+

Deploy Perkeep

+ +

Perkeep relies on Let's Encrypt to automatically provide your instance with an HTTPS certificate. Unfortunately, due to a security issue, this is currently not possible anymore. If you are not prepared to use your own certificate, or a self-signed one, or no HTTPS, we advise you to wait for this issue to be resolved before using the launcher.

This tool creates your own private -Camlistore instance running on Google Cloud Platform. Be sure to understand Compute Engine pricing and Cloud Storage pricing -before proceeding. Note that Camlistore metadata adds overhead on top of the size +before proceeding. Note that Perkeep metadata adds overhead on top of the size of any raw data added to your instance. To delete your instance and stop paying Google for the virtual machine, visit the Google Cloud console and visit both the "Compute Engine" and "Storage" sections for your project.

{{if .CamliVersion}} -

Camlistore version deployed by this tool: {{.CamliVersion}}

+

Perkeep version deployed by this tool: {{.CamliVersion}}

{{end}}