Skip to content

Commit 6609a6a

Browse files
committed
Fix .ssh/config defaults
1 parent fecbbff commit 6609a6a

7 files changed

Lines changed: 3 additions & 5 deletions

File tree

.gitattributes

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
* text=auto
2-
.ssh/config filter=git-crypt diff=git-crypt
2+
.ssh/config text=auto
33
.ssh/*.pem filter=git-crypt diff=git-crypt
44

.ssh/config

-293 Bytes
Binary file not shown.

.ssh/config.enc

-1.73 KB
Binary file not shown.
-1.67 KB
Binary file not shown.

.ssh/whatdropsnow-staging.pem.enc

-1.66 KB
Binary file not shown.

.ssh/wooga_heroku_id_rsa.enc

-1.66 KB
Binary file not shown.

Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -424,10 +424,8 @@ dotfiles: \
424424
cd ~ && ln -svf $(DOTFILES_ROOT) dotfiles
425425

426426
~/.ssh/config:
427-
# Test that .ssh/config is decrypted (gpg has been setup)
428-
grep "Host *" $(DOTFILES_ROOT)/.ssh/config
429-
# Symlink .ssh/config
430-
cd ~/.ssh && ln -svf $(DOTFILES_ROOT)/.ssh/config .
427+
# Copy a default .ssh/config
428+
grep "Host *" ~/.ssh/config || cp $(DOTFILES_ROOT)/.ssh/config ~/.ssh/config
431429

432430
~/.gnupg:
433431
# Ask where to get .gnupg from

0 commit comments

Comments
 (0)