Rename because I'm a freak. Sorry siggi.

buildbuddy-io · Feb 15, 2020 · ccce7b0 · ccce7b0
1 parent 3e3af5b
commit ccce7b0
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/app/service/BUILD.bazel b/app/service/BUILD.bazel
@@ -6,7 +6,7 @@ ts_library(
     name = "service",
     srcs = glob(["*.ts"]),
     deps = [
-        "//proto:service_ts_proto",
+        "//proto:buildbuddy_service_ts_proto",
         "@npm//@types/fbemitter",
         "@npm//fbemitter",
         "@npm//protobufjs",

diff --git a/app/service/rpc_service.ts b/app/service/rpc_service.ts
@@ -1,4 +1,4 @@
-import { service } from 'buildbuddy/proto/service_ts_proto';
+import { service } from 'buildbuddy/proto/buildbuddy_service_ts_proto';
 import events from 'fbemitter';
 
 class RpcService {

diff --git a/server/buildfix.sh → buildfix.sh b/server/buildfix.sh → buildfix.sh
diff --git a/proto/BUILD b/proto/BUILD
@@ -131,23 +131,23 @@ ts_proto_library(
 )
 
 proto_library(
-    name = "service_proto",
-    srcs = ["service.proto"],
+    name = "buildbuddy_service_proto",
+    srcs = ["buildbuddy_service.proto"],
     deps = [
         ":invocation_proto",
     ],
 )
 
 go_grpc_library(
-    name = "service_go_proto",
-    importpath = "proto/service",
-    proto = ":service_proto",
+    name = "buildbuddy_service_go_proto",
+    importpath = "proto/buildbuddy_service",
+    proto = ":buildbuddy_service_proto",
     deps = [
         ":invocation_go_proto",
     ],
 )
 
 ts_proto_library(
-    name = "service_ts_proto",
-    deps = [":service_proto"],
+    name = "buildbuddy_service_ts_proto",
+    deps = [":buildbuddy_service_proto"],
 )
diff --git a/proto/service.proto → proto/buildbuddy_service.proto b/proto/service.proto → proto/buildbuddy_service.proto
diff --git a/server/main.go b/server/main.go
@@ -43,13 +43,13 @@ func main() {
 		log.Fatalf("Error initializing static file server: %v", err)
 	}
 
-	afs, err := static.NewStaticFileServer(*appDirectory, true)
+	afs, err := static.NewStaticFileServer(*appDirectory, false)
 	if err != nil {
 		log.Fatalf("Error initializing app server: %v", err)
 	}
 
-	http.Handle("/", redirectHTTPS(afs))
 	http.Handle("/static", redirectHTTPS(sfs))
+	http.Handle("/", redirectHTTPS(afs))
 
 	hostAndPort := fmt.Sprintf("%s:%d", *listen, *port)
 	log.Printf("HTTP listening on http://%s\n", hostAndPort)