forked from NixOS/nixpkgs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
knot: put runtime paths outside the nix store
Otherwise knot tries to write to non-writable directories. This for example breaks dnssec signing. While it's possible to overwrite these path in the configuration, having a sane defaults is nicer.
- Loading branch information
Showing
2 changed files
with
49 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
diff --git a/samples/Makefile.am b/samples/Makefile.am | ||
index c253c91..107401d 100644 | ||
--- a/samples/Makefile.am | ||
+++ b/samples/Makefile.am | ||
@@ -19,11 +19,6 @@ EXTRA_DIST = knot.sample.conf.in example.com.zone | ||
|
||
if HAVE_DAEMON | ||
|
||
-install-data-local: knot.sample.conf | ||
- if [ \! -f $(DESTDIR)/$(config_dir)/knot.sample.conf ]; then \ | ||
- $(INSTALL) -d $(DESTDIR)/$(config_dir); \ | ||
- $(INSTALL_DATA) knot.sample.conf $(srcdir)/example.com.zone $(DESTDIR)/$(config_dir); \ | ||
- fi | ||
uninstall-local: | ||
-rm -rf $(DESTDIR)/$(config_dir)/knot.sample.conf \ | ||
$(DESTDIR)/$(config_dir)/example.com.zone | ||
diff --git a/src/utils/Makefile.inc b/src/utils/Makefile.inc | ||
index e6765d9..d859d23 100644 | ||
--- a/src/utils/Makefile.inc | ||
+++ b/src/utils/Makefile.inc | ||
@@ -79,11 +79,6 @@ endif HAVE_DNSTAP | ||
endif HAVE_UTILS | ||
|
||
if HAVE_DAEMON | ||
-# Create storage and run-time directories | ||
-install-data-hook: | ||
- $(INSTALL) -d $(DESTDIR)/@config_dir@ | ||
- $(INSTALL) -d $(DESTDIR)/@run_dir@ | ||
- $(INSTALL) -d $(DESTDIR)/@storage_dir@ | ||
|
||
sbin_PROGRAMS = knotc knotd | ||
|