]> git.madduck.net Git - etc/ssh.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:

projects / etc / ssh.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1ee9c47)
add support for having a config.local file
authormartin f. krafft <madduck@madduck.net>
Sat, 3 Jan 2015 13:53:30 +0000 (14:53 +0100)
committermartin f. krafft <madduck@madduck.net>
Sat, 3 Jan 2015 13:53:30 +0000 (14:53 +0100)
.ssh/.gitignore patch | blob | history
.ssh/Makefile patch | blob | history

diff --git a/.ssh/.gitignore b/.ssh/.gitignore
index 69f3f1c6c8892b603b7da1ea3159af056918b6fb..31eb6b735530ebce08ed9a1ee7c8d138f9cfa7c6 100644 (file)
--- a/.ssh/.gitignore
+++ b/.ssh/.gitignore
@@ -3,3 +3,4 @@
 /authorized_keys
 /known_hosts
 /config
+/config.local
diff --git a/.ssh/Makefile b/.ssh/Makefile
index 0e26cbbc879e10d2b0239ccd6cc6ffdf0241a924..cfb923b6b7f18cc34de7cf96824794aeb1f7c044 100644 (file)
--- a/.ssh/Makefile
+++ b/.ssh/Makefile
@@ -18,9 +18,15 @@ authorized_keys: $(wildcard authorized_keys.d/*)
          echo; \
        done > $@
 
+ifeq ($(strip $(wildcard config.local)),)
+LOCAL_CONFIG=/dev/null
+else
+LOCAL_CONFIG=config.local
+endif
+
 SSH_VERSION = $(shell ssh -V 2>&1)
-config: config.in
-       cp $< $@
+config: $(LOCAL_CONFIG) config.in
+       cat $^ > $@
        case "$(SSH_VERSION)" in \
          (OpenSSH_6.[0123]*) \
            sed -ri -e 's,^.+\bCanonical.+$$,##UNSUPPORTED##&,' \
OpenSSH configuration

Legalese

All content available in this repository is copyright © martin f. krafft, unless otherwise noted.

All files and their content are released under the terms of the Artistic Licence 2.0, unless otherwise noted.

The operator of this repository shall not be held liable for offending content in pages linking to or linked from these page, nor does he endorse their content unless stated otherwise.