diff options
| -rw-r--r-- | man/man8/monkeysphere-host.8 | 2 | ||||
| -rwxr-xr-x | src/monkeysphere-host | 10 | ||||
| -rwxr-xr-x | tests/basic | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/man/man8/monkeysphere-host.8 b/man/man8/monkeysphere-host.8 index 79da91b..be27220 100644 --- a/man/man8/monkeysphere-host.8 +++ b/man/man8/monkeysphere-host.8 @@ -212,7 +212,7 @@ If set to `false', never prompt the user for confirmation. (true) /etc/monkeysphere/monkeysphere\-host.conf System monkeysphere\-host config file. .TP -/var/lib/monkeysphere/host_keys.pub.gpg +/var/lib/monkeysphere/host_keys.pub.pgp A world-readable copy of the host's OpenPGP certificates in ASCII armored format. This includes the certificates (including the public diff --git a/src/monkeysphere-host b/src/monkeysphere-host index ef4107a..2335f1a 100755 --- a/src/monkeysphere-host +++ b/src/monkeysphere-host @@ -34,7 +34,7 @@ MHSHAREDIR="${SYSSHAREDIR}/mh" MHDATADIR="${SYSDATADIR}/host" # host pub key files -HOST_KEY_FILE="${SYSDATADIR}/host_keys.pub.gpg" +HOST_KEY_FILE="${SYSDATADIR}/host_keys.pub.pgp" # UTC date in ISO 8601 format if needed DATE=$(date -u '+%FT%T') @@ -89,8 +89,8 @@ gpg_host_edit() { gpg_host --command-fd 0 --edit-key "$@" } -# export the monkeysphere gpg pub key file -update_gpg_pub_file() { +# export the monkeysphere OpenPGP pub key file +update_pgp_pub_file() { log debug "updating openpgp public key file '$HOST_KEY_FILE'..." gpg_host --export --armor --export-options export-minimal \ $(gpg_host --list-secret-keys --with-colons --fingerprint | grep ^fpr | cut -f9 -d:) \ @@ -331,8 +331,8 @@ case $COMMAND in diagnostics ;; - 'update-gpg-pub-file') - update_gpg_pub_file + 'update-pgp-pub-file') + update_pgp_pub_file ;; 'version'|'v') diff --git a/tests/basic b/tests/basic index ad9fb12..d8d24ce 100755 --- a/tests/basic +++ b/tests/basic @@ -133,7 +133,7 @@ export MONKEYSPHERE_SYSCONFIGDIR="$TEMPDIR" export MONKEYSPHERE_SYSSHAREDIR="$TESTDIR"/../src/share export MONKEYSPHERE_MONKEYSPHERE_USER=$(whoami) -HOST_KEY_FILE="$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.gpg +HOST_KEY_FILE="$MONKEYSPHERE_SYSCONFIGDIR"/host_keys.pub.pgp export MONKEYSPHERE_CHECK_KEYSERVER=false # example.org does not respond to the HKP port, so this should cause |