Commit b33c02c5 authored by Evan Hunt's avatar Evan Hunt

Change xfrin to use $localstatedir/$package/zone.sqlite3 for the default

database file.


git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1516 e5f2f494-b856-4b98-b285-d166d9295462
parent 81cae9d7
......@@ -291,6 +291,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/cmdctl/unittest/cmdctl_test
src/bin/xfrin/unittest/xfrin_test
src/bin/xfrin/xfrin.py
src/bin/xfrin/xfrin.pre
src/bin/xfrin/run_b10-xfrin.sh
src/bin/bind10/bind10.py
src/bin/bind10/tests/bind10_test
......
......@@ -7,7 +7,7 @@ b10_xfrin_DATA = xfrin.spec
EXTRA_DIST = xfrin.spec
CLEANFILES= b10-xfrin
CLEANFILES = b10-xfrin xfrin.pre xfrin.spec
man_MANS = b10-xfrin.8
EXTRA_DIST += $(man_MANS) b10-xfrin.xml
......@@ -19,8 +19,12 @@ b10-xfrin.8: b10-xfrin.xml
endif
xfrin.spec: xfrin.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.pre >$@
# TODO: does this need $$(DESTDIR) also?
# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
b10-xfrin: xfrin.py
$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" xfrin.py >$@
$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
-e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.py >$@
chmod a+x $@
......@@ -50,7 +50,7 @@
"item_name": "db_file",
"item_type": "string",
"item_optional": True,
"item_default": '/tmp/zone.sqlite3'
"item_default": '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
}
]
},
......
......@@ -384,7 +384,7 @@ class Xfrin():
db_file = args.get('db_file')
if not db_file:
#TODO, the db file path should be got in auth server's configuration
db_file = '/tmp/zone.sqlite3'
db_file = '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
return (zone_name, master, port, db_file)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment