diff options
| author | Jan Vcelak <jan.vcelak@nic.cz> | 2013-07-04 17:27:05 +0200 |
|---|---|---|
| committer | Jan Vcelak <jan.vcelak@nic.cz> | 2013-07-04 17:27:35 +0200 |
| commit | bbb24702ba5d14ce69a44ed7cc31d53ef3c32809 (patch) | |
| tree | fe03d1742035ad33ce91d6ca61bbf4fdb625c3cc /samples | |
| parent | configure: add --with-configdir option, defaults to $(sysconfdir)/knot (diff) | |
| download | knot-bbb24702ba5d14ce69a44ed7cc31d53ef3c32809.tar.xz knot-bbb24702ba5d14ce69a44ed7cc31d53ef3c32809.zip | |
knot.sample.conf: variable replacement fixes
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Makefile.am | 4 | ||||
| -rw-r--r-- | samples/knot.sample.conf.in | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/samples/Makefile.am b/samples/Makefile.am index f3ab8a55a..73f8760ce 100644 --- a/samples/Makefile.am +++ b/samples/Makefile.am @@ -4,7 +4,9 @@ edit = sed \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ - -e 's|@config_dir[@]|$(config_dir)|g' + -e 's|@config_dir[@]|$(config_dir)|g' \ + -e 's|@storage_dir[@]|$(storage_dir)|g' \ + -e 's|@run_dir[@]|$(run_dir)|g' knot.sample.conf: knot.sample.conf.in rm -f $@ $@.tmp diff --git a/samples/knot.sample.conf.in b/samples/knot.sample.conf.in index 806e7c9d3..cf78741bc 100644 --- a/samples/knot.sample.conf.in +++ b/samples/knot.sample.conf.in @@ -16,11 +16,11 @@ system { # Working directory of the server # Used to store compiled zones and PID file # default: ${sharedstatedir}/knot, configured with --with-storage - # storage "/var/lib/knot"; + # storage "@storage_dir@"; # Directory for storing run-time data # default: ${localstatedir}/run/knot, configured with --with-rundir - # rundir "/var/run/knot"; + # rundir "@run_dir@"; } interfaces { @@ -36,7 +36,7 @@ interfaces { control { # Specifies interface, syntax is exactly the same as in 'interfaces' section - # Default: $(run_dir)/knot.sock + # Default: knot.sock (relative to rundir) listen-on "knot.sock"; # As an alternative, you can use an IPv4/v6 address and port @@ -68,7 +68,7 @@ zones { # # Example slave zone # example.net { -# file "@localstatedir@/example.net.zone +# file "@storage_dir@/example.net.zone # xfr-in master0; # notify-in master0; # } |