This commit is contained in:
Erik Taal 2017-02-17 23:58:24 +00:00 committed by GitHub
commit fcca91dd66
3 changed files with 18 additions and 1 deletions

View File

@ -583,6 +583,11 @@ def cmdLineParser(argv=None):
help="Remote absolute path of temporary files "
"directory")
takeover.add_option("--rw-dirs", dest="rwDirs",
help="Remote absolute path of writable "
"directories for overriding defaults "
"(comma separated if multiple)")
# Windows registry options
windows = OptionGroup(parser, "Windows registry access", "These "
"options can be used to access the back-end "

View File

@ -196,7 +196,13 @@ class Web:
self.webApi = choices[int(choice) - 1]
break
directories = list(arrayizeValue(getManualDirectories()))
# If specified in the conf file/cmd line then use those, else ask/use defaults for them
if conf.rwDirs:
logger.info("Trying to upload to user supplied dirs: %s" % conf.rwDirs)
directories = conf.rwDirs.split(',')
else:
directories = list(arrayizeValue(getManualDirectories()))
directories.extend(getAutoDirectories())
directories = list(oset(directories))

View File

@ -624,6 +624,12 @@ msfPath =
# Valid: absolute file system path
tmpPath =
# Remote absolute path of writable directories
# for overriding defaults (comma separated if
# multiple)
# E.g.: /var/www/html/uploads,/var/www/wordpress/images
rwDirs =
# These options can be used to access the back-end database management
# system Windows registry.