From da106a2392ebebb3cefb425d3f3ba9285a5e647d Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 7 Apr 2017 16:41:24 +0200
Subject: Emacs: Make encrypted configuration system-specific

---
 emacs/.emacs.d/ap-spotcap.local.el.gpg | Bin 0 -> 2438 bytes
 emacs/.emacs.d/init.org                |  26 ++++++++++++++------------
 emacs/.emacs.d/private.el.gpg          | Bin 2438 -> 0 bytes
 3 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 emacs/.emacs.d/ap-spotcap.local.el.gpg
 delete mode 100644 emacs/.emacs.d/private.el.gpg

(limited to 'emacs')

diff --git a/emacs/.emacs.d/ap-spotcap.local.el.gpg b/emacs/.emacs.d/ap-spotcap.local.el.gpg
new file mode 100644
index 00000000..37ce02ae
Binary files /dev/null and b/emacs/.emacs.d/ap-spotcap.local.el.gpg differ
diff --git a/emacs/.emacs.d/init.org b/emacs/.emacs.d/init.org
index 0b65c44c..6290bb45 100644
--- a/emacs/.emacs.d/init.org
+++ b/emacs/.emacs.d/init.org
@@ -1248,18 +1248,20 @@ rather useful.
 ; startup and caches it. Don't want emacs daemon to hang because of gpg-agent.
 (defun load-private-data ()
   (interactive)
-  (if (not have-private-key)
-      (message "ERROR: Private GPG key not found")
-    (unless (or (getenv "GPG_AGENT_INFO")
-                (getenv "SSH_AUTH_SOCK"))
-      (start-process "gpg-agent" nil "gpg-agent" "--daemon")
-      (setenv "SSH_AUTH_SOCK" gpg-agent-ssh-sock))
-    (setq password-cache-expiry nil)
-    (unless (file-exists-p (concat pinentry--socket-dir "pinentry"))
-      (pinentry-start)
-      (add-hook 'kill-emacs-hook 'pinentry-stop))
-    (add-to-list 'load-suffixes ".el.gpg")
-    (load-gpg (expand-file-name "private" user-emacs-directory))))
+  (if (not (file-exists-p (expand-file-name (concat system-name ".el.gpg") user-emacs-directory)))
+      (message "No encrypted configuration matches system name `%s'" system-name)
+    (if (not have-private-key)
+        (message "ERROR: Private GPG key not found")
+      (unless (or (getenv "GPG_AGENT_INFO")
+                  (getenv "SSH_AUTH_SOCK"))
+        (start-process "gpg-agent" nil "gpg-agent" "--daemon")
+        (setenv "SSH_AUTH_SOCK" gpg-agent-ssh-sock))
+      (setq password-cache-expiry nil)
+      (unless (file-exists-p (concat pinentry--socket-dir "pinentry"))
+        (pinentry-start)
+        (add-hook 'kill-emacs-hook 'pinentry-stop))
+      (add-to-list 'load-suffixes ".el.gpg")
+      (load-gpg (expand-file-name system-name user-emacs-directory)))))
 
 (defun first-frame-hook (frame)
   (remove-hook 'after-make-frame-functions #'first-frame-hook)
diff --git a/emacs/.emacs.d/private.el.gpg b/emacs/.emacs.d/private.el.gpg
deleted file mode 100644
index 37ce02ae..00000000
Binary files a/emacs/.emacs.d/private.el.gpg and /dev/null differ
-- 
cgit 1.4.1