Browse Source

Fixes to demo site.

Brad Fitzpatrick 11 years ago
parent
commit
107292a161
3 changed files with 7 additions and 5 deletions
  1. 3 1
      h2demo/.gitignore
  2. 1 1
      h2demo/Makefile
  3. 3 3
      h2demo/launch.go

+ 3 - 1
h2demo/.gitignore

@@ -1,3 +1,5 @@
 h2demo
 h2demo
 h2demo.linux
 h2demo.linux
-
+client-id.dat
+client-secret.dat
+token.dat

+ 1 - 1
h2demo/Makefile

@@ -1,5 +1,5 @@
 h2demo.linux: h2demo.go
 h2demo.linux: h2demo.go
 	GOOS=linux go build -o h2demo.linux .
 	GOOS=linux go build -o h2demo.linux .
 
 
-upload: h2demo
+upload: h2demo.linux
 	cat h2demo.linux | go run launch.go --write_object=http2-demo-server-tls/h2demo --write_object_is_public
 	cat h2demo.linux | go run launch.go --write_object=http2-demo-server-tls/h2demo --write_object_is_public

+ 3 - 3
h2demo/launch.go

@@ -71,7 +71,7 @@ coreos:
         
         
         [Service]
         [Service]
         ExecStartPre=/bin/bash -c 'mkdir -p /opt/bin && curl -s -o /opt/bin/h2demo http://storage.googleapis.com/http2-demo-server-tls/h2demo && chmod +x /opt/bin/h2demo'
         ExecStartPre=/bin/bash -c 'mkdir -p /opt/bin && curl -s -o /opt/bin/h2demo http://storage.googleapis.com/http2-demo-server-tls/h2demo && chmod +x /opt/bin/h2demo'
-        ExecStart=/opt/bin/h2demo
+        ExecStart=/opt/bin/h2demo --prod
         RestartSec=5s
         RestartSec=5s
         Restart=always
         Restart=always
         Type=simple
         Type=simple
@@ -232,8 +232,8 @@ OpLoop:
 }
 }
 
 
 func instanceDisk(svc *compute.Service) *compute.AttachedDisk {
 func instanceDisk(svc *compute.Service) *compute.AttachedDisk {
-	const imageURL = "https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-445-5-0-v20141016"
-	diskName := *instName + "-coreos-stateless-pd"
+	const imageURL = "https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-444-5-0-v20141016"
+	diskName := *instName + "-disk"
 
 
 	return &compute.AttachedDisk{
 	return &compute.AttachedDisk{
 		AutoDelete: true,
 		AutoDelete: true,