Merge pull request #524 from kuba/work-dir-dvsni-tmp

Store temporary DVSNI files in IConfig.work_dir.
This commit is contained in:
James Kasten 2015-06-21 15:50:55 -04:00
commit e503601d3b
2 changed files with 2 additions and 2 deletions

View file

@ -141,7 +141,7 @@ class ApacheDvsni(common.Dvsni):
"""
ips = " ".join(str(i) for i in ip_addrs)
document_root = os.path.join(
self.configurator.config.config_dir, "dvsni_page/")
self.configurator.config.work_dir, "dvsni_page/")
# TODO: Python docs is not clear how mutliline string literal
# newlines are parsed on different platforms. At least on
# Linux (Debian sid), when source file uses CRLF, Python still

View file

@ -124,7 +124,7 @@ class NginxDvsni(common.Dvsni):
"""
document_root = os.path.join(
self.configurator.config.config_dir, "dvsni_page")
self.configurator.config.work_dir, "dvsni_page")
block = [['listen', str(addr)] for addr in addrs]