From 9da86d3be7d9ad0c87b95a20eaacfb7835a7a7ee Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Wed, 20 Jun 2018 13:12:12 +0200
Subject: store: Rename the key store binary and rendezvous point.

---
 Makefile                 | 2 +-
 store/Cargo.toml         | 2 +-
 store/src/backend/mod.rs | 2 +-
 store/src/lib.rs         | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index bac73bbf..93a7bb19 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ build-release:
 .PHONY: install
 install: build-release
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/lib/sequoia
-	$(INSTALL) -t $(DESTDIR)$(PREFIX)/lib/sequoia target/release/keystore
+	$(INSTALL) -t $(DESTDIR)$(PREFIX)/lib/sequoia target/release/sequoia-public-key-store
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL) -t $(DESTDIR)$(PREFIX)/bin target/release/sq target/release/sqv
 	$(MAKE) -Cffi install
diff --git a/store/Cargo.toml b/store/Cargo.toml
index 816adff1..43f672ba 100644
--- a/store/Cargo.toml
+++ b/store/Cargo.toml
@@ -30,7 +30,7 @@ name = "sequoia_store"
 path = "src/lib.rs"
 
 [[bin]]
-name = "keystore"
+name = "sequoia-public-key-store"
 path = "src/server.rs"
 doc = false
 required-features = ["background-services"]
diff --git a/store/src/backend/mod.rs b/store/src/backend/mod.rs
index a02fbf50..8edd2547 100644
--- a/store/src/backend/mod.rs
+++ b/store/src/backend/mod.rs
@@ -100,7 +100,7 @@ struct NodeServer {
 impl NodeServer {
     fn new(descriptor: ipc::Descriptor, handle: Handle) -> Result<Self> {
         let mut db_path = descriptor.context().home().to_path_buf();
-        db_path.push("keystore.sqlite");
+        db_path.push("public-key-store.sqlite");
 
         let c = Connection::open(db_path)?;
         c.execute_batch("PRAGMA secure_delete = true;")?;
diff --git a/store/src/lib.rs b/store/src/lib.rs
index fb8d3d37..d9c0a7be 100644
--- a/store/src/lib.rs
+++ b/store/src/lib.rs
@@ -95,8 +95,8 @@ pub mod backend;
 pub fn descriptor(c: &Context) -> ipc::Descriptor {
     ipc::Descriptor::new(
         c,
-        c.home().join("S.keystore"),
-        c.lib().join("keystore"),
+        c.home().join("public-key-store.cookie"),
+        c.lib().join("sequoia-public-key-store"),
         backend::factory,
     )
 }
-- 
cgit v1.2.3