]> git.madduck.net Git - etc/offlineimap.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

Lose --fqdn from hostname call because of MacOSX stupidity
authormartin f. krafft <madduck@madduck.net>
Tue, 22 Mar 2022 19:33:04 +0000 (20:33 +0100)
committermartin f. krafft <madduck@madduck.net>
Tue, 22 Mar 2022 19:33:04 +0000 (20:33 +0100)
.offlineimap/preauthtunnel.sh

index f70433b03fbcfbbe6aaaa53edd32dea95dfdbedc..56753b280e9c470d4400b7758b216217efd8bd79 100755 (executable)
@@ -7,7 +7,7 @@ SSH_KEY="$HOME/.offlineimap/${REMOTE_HOST}.ssh-seckey"
 SSH_OPTIONS="command=\"$IMAP_COMMAND\",no-agent-forwarding,no-X11-forwarding,no-port-forwarding,no-pty"
 
 if [ ! -f "$SSH_KEY" ]; then
 SSH_OPTIONS="command=\"$IMAP_COMMAND\",no-agent-forwarding,no-X11-forwarding,no-port-forwarding,no-pty"
 
 if [ ! -f "$SSH_KEY" ]; then
-  ssh-keygen -f "$SSH_KEY" -C "OfflineIMAP from $(hostname --fqdn)" -N '' -t ed25519
+  ssh-keygen -f "$SSH_KEY" -C "OfflineIMAP from $(hostname)" -N '' -t ed25519
   COMMAND="echo '$SSH_OPTIONS $(cat "$SSH_KEY.pub")' >> .ssh/authorized_keys"
   ssh -F ~/.offlineimap/ssh_config -o ControlPath=none -o IdentityAgent=SSH_AUTH_SOCK \
     ${REMOTE_HOST} "$COMMAND"
   COMMAND="echo '$SSH_OPTIONS $(cat "$SSH_KEY.pub")' >> .ssh/authorized_keys"
   ssh -F ~/.offlineimap/ssh_config -o ControlPath=none -o IdentityAgent=SSH_AUTH_SOCK \
     ${REMOTE_HOST} "$COMMAND"