use cryptonomic-gpg instead of redundant implementation

1 files changed, 3 insertions, 39 deletions

diff --git a/selfpublish.sh b/selfpublish.sh
index 2f6caae..47adb59 100644
--- a/selfpublish.sh
+++ b/selfpublish.sh
@@ -311,12 +311,13 @@ make_directories_maybe_become_root()
             [ -w "$hu_dir" ] || exec sudo -- "$0" "$@" || die "failed to exec sudo"
         else
             [ -w "$html_dir" ] || exec sudo -- "$0" "$@" || die "failed to exec sudo"
-            mkdir -p "$hu_dir"
+            mkdir -m0755 -p "$hu_dir"
         fi
     else
         die "Directory not found: '$html_dir' -- you probably need to run selfpublish.sh"
         # TODO: just run selfpublish here
     fi
+    find "$html_dir"/.well-known/openpgpkey/ -xdev -type d -exec chmod 755 '{}' ';'
 }
 
 process_key()
@@ -711,46 +712,9 @@ install_tls_public_certificate()
     fi
 }
 
-get_home()
-{
-    [ "$1" ] && getent passwd "$1" | (IFS=: read _ _ _ _ _ h _ && echo $h)
-}
-
-process_key()
-{
-    local uid="$1" domain="${1#*@}" destdir="$2" tdir
-    while read keyid some_uid
-    do
-        [ "$some_uid" = "$uid" ] || continue
-        tempdir=$(mktemp -d)
-        /usr/lib/gnupg/gpg-wks-client --install-key -C "$tempdir" "$keyid" "$uid" 2>/dev/null
-        mkdir -p "$destdir"
-        mv "$tempdir"/"$domain"/hu/* -t "$destdir"
-        rm -rf "$tempdir"
-    done
-}
-
 install_gpg_rings()
 {
-    (
-        domain=$DOMAIN
-        dest=/srv/$domain/public_html/.well-known/openpgpkey/hu
-        uid=${SUDO_USER:-$(id -un)}@$domain
-
-        if [ "$SUDO_USER" -a ! "$GNUPGHOME" ]
-        then
-            GNUPGHOME=$(get_home "$SUDO_USER")/.gnupg
-            export GNUPGHOME
-        fi
-
-        [ -d "$dest" ] || mkdir -p "$dest"
-
-        gpg --list-options show-only-fpr-mbox -k "$uid" 2>&- | process_key "$uid" "$dest"
-
-        find /srv/"$DOMAIN"/public_html/.well-known/openpgpkey/ -type d -exec chmod 755 '{}' ';'
-
-        ln -sfT .well-known/openpgpkey/hu /srv/"$domain"/public_html/openpgpkey
-    )
+    cryptonomic gpg
 }
 
 configure_apache_vhost()