Compare commits
No commits in common. "f0e76b814b854bd0b60b472a26309a65894cf82c" and "d02fdddd95eb9114756300c4a8fbe18b7c465ba1" have entirely different histories.
f0e76b814b
...
d02fdddd95
25
Makefile
25
Makefile
|
@ -10,27 +10,12 @@ sign: $(patsubst %,%.sig,$(wildcard *.zone))
|
|||
|
||||
.PHONY: check-clean
|
||||
check-clean:
|
||||
@git diff-index --exit-code HEAD >/dev/null && \
|
||||
git ls-files --other --directory --exclude-standard | \
|
||||
sed -n '/.*\.zone/{p;q1}' || { \
|
||||
printf 'Commit your changes before uploading!\n' >&2; \
|
||||
git status -s; exit 1; }
|
||||
[ ! -e .git ] || git diff-index --exit-code HEAD
|
||||
[ ! -e .git ] || \
|
||||
git ls-files --other --directory --exclude-standard | \
|
||||
sed -n '/.*\.zone/{p;q1}'
|
||||
|
||||
GIT_BRANCH=$(shell git name-rev --name-only HEAD)
|
||||
GIT_BRANCH_REMOTE=$(shell git config branch.$(GIT_BRANCH).remote)
|
||||
GIT_BRANCH_MERGE=$(shell git config branch.$(GIT_BRANCH).merge) # remote branch
|
||||
.PHONY: fetch
|
||||
check-uptodate: FORCE
|
||||
git fetch $(GIT_BRANCH_REMOTE) $(GIT_BRANCH_MERGE)
|
||||
@[ -z "`git rev-list -n1 HEAD@{upstream} --not HEAD`" ] || { \
|
||||
printf 'Unpulled changes, refusing to upload zones!\n' >&2; \
|
||||
git log --decorate --oneline --graph -n3 \
|
||||
HEAD@{upstream} --not HEAD; \
|
||||
}
|
||||
|
||||
.PHONY: upload
|
||||
upload: check-clean check-uptodate
|
||||
upload: sign
|
||||
upload:
|
||||
printf 'put %s\n' *.zone *.sig | \
|
||||
sftp $(SFTP_FLAGS) zones@ns0.it-syndikat.org:zones/
|
||||
|
||||
|
|
7
README
7
README
|
@ -20,13 +20,12 @@ this by default, just say'in.
|
|||
Note: Knot handles DNSSEC signing on the server side.
|
||||
|
||||
|
||||
Using a non-default GPG/ssh key
|
||||
-------------------------------
|
||||
Using a non-default GPG key
|
||||
---------------------------
|
||||
|
||||
Create a file `local.mk` and specify GPG_FLAGS and/or SFTP_FLAGS as follows:
|
||||
Create a file `local.mk` and specify GPG_FLAGS as follows:
|
||||
|
||||
```
|
||||
# local.mk
|
||||
GPG_FLAGS=--default-key=<YOUR KEY FINGERPRINT>
|
||||
SFTP_FLAGS=~/.ssh/id_non_default
|
||||
```
|
||||
|
|
Reference in a new issue