keys.conf: New file, suggesting a possible implementation of `$SAFE'.

diff --git a/Makefile.am b/Makefile.am
index 886e012312b770d7fe9e619b8e1c0a7bd7388607..e169f41de38437dbf1100b1ddbfd015e58200fa7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -179,6 +179,8 @@ EXTRA_DIST          += claim-dir.tab
 dist_profile_DATA      += profile.d/00base
 dist_profile_DATA      += profile.d/02infra
 
 dist_profile_DATA      += profile.d/00base
 dist_profile_DATA      += profile.d/02infra
 

+EXTRA_DIST             += keys.conf
+

 ###--------------------------------------------------------------------------
 ### Release setup.
 
 ###--------------------------------------------------------------------------
 ### Release setup.
 

diff --git a/debian/control b/debian/control
index 7040f1bc0528f66c15ceae7cece2d6feedc12043..0e334b7596740a6e606334d902ba0b73963a8687 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.1.1
 Package: distorted-keys
 Architecture: all
 Depends: python (>= 2.5), userv, openssl (>= 0.9.8o), adduser
 Package: distorted-keys
 Architecture: all
 Depends: python (>= 2.5), userv, openssl (>= 0.9.8o), adduser

-Recommends: gnupg
+Recommends: gnupg, claim-dir

 Suggests: seccure, texlive-latex-recommended, qrencode
 Description: Basic key-management system with secure recovery features.
  The primary purpose of the distorted.org.uk key management system is
 Suggests: seccure, texlive-latex-recommended, qrencode
 Description: Basic key-management system with secure recovery features.
  The primary purpose of the distorted.org.uk key management system is

diff --git a/debian/distorted-keys.install b/debian/distorted-keys.install
index 8d099897092d0abf71604ca87e0366225bccbd2f..8ff9b4cf5190e74970fc6734ff4ec5c08c8250de 100644 (file)
--- a/debian/distorted-keys.install
+++ b/debian/distorted-keys.install
@@ -6,3 +6,4 @@ etc/distorted-keys
 debian/build/userv/distorted-keys      /etc/userv/default.d
 debian/admin.users                     /etc/distorted-keys
 debian/admin.groups                    /etc/distorted-keys
 debian/build/userv/distorted-keys      /etc/userv/default.d
 debian/admin.users                     /etc/distorted-keys
 debian/admin.groups                    /etc/distorted-keys

+keys.conf                              /etc/distorted-keys

diff --git a/keys.conf b/keys.conf
new file mode 100644 (file)
index 0000000..4ce3451
--- /dev/null
+++ b/keys.conf
@@ -0,0 +1,7 @@
+### -*-sh-*-
+###
+### Configuration for `distorted-keys'.  This is a shell-script fragment.
+
+## A `safe' directory for storing short-lived secrets.  Ideally, this
+## shouldn't be backed by disk.
+SAFE=$(userv root claim-dir safe </dev/null)