dockeruser
/
sabnzbd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Allow setting inet_exposure from command line 

Closes #1872
pull/1876/head
Safihre 4 years ago
parent
43817aef20
commit
b5ce0e0766
1 changed files with 33 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 59
      SABnzbd.py

59
SABnzbd.py
View File

@ -182,35 +182,36 @@ def print_help():
print("Options marked [*] are stored in the config file") print("Options marked [*] are stored in the config file")
print() print()
print("Options:") print("Options:")
print(" -f --config-file <ini> Location of config file") print(" -f --config-file <ini> Location of config file")
print(" -s --server <srv:port> Listen on server:port [*]") print(" -s --server <srv:port> Listen on server:port [*]")
print(" -t --templates <templ> Template directory [*]") print(" -t --templates <templ> Template directory [*]")
print() print()
print(" -l --logging <-1..2> Set logging level (-1=off, 0= least, 2= most) [*]") print(" -l --logging <-1..2> Set logging level (-1=off, 0=least,2= most) [*]")
print(" -w --weblogging Enable cherrypy access logging") print(" -w --weblogging Enable cherrypy access logging")
print() print()
print(" -b --browser <0..1> Auto browser launch (0= off, 1= on) [*]") print(" -b --browser <0..1> Auto browser launch (0= off, 1= on) [*]")
if sabnzbd.WIN32: if sabnzbd.WIN32:
print(" -d --daemon Use when run as a service") print(" -d --daemon Use when run as a service")
else: else:
print(" -d --daemon Fork daemon process") print(" -d --daemon Fork daemon process")
print(" --pid <path> Create a PID file in the given folder (full path)") print(" --pid <path> Create a PID file in the given folder (full path)")
print(" --pidfile <path> Create a PID file with the given name (full path)") print(" --pidfile <path> Create a PID file with the given name (full path)")
print() print()
print(" -h --help Print this message") print(" -h --help Print this message")
print(" -v --version Print version information") print(" -v --version Print version information")
print(" -c --clean Remove queue, cache and logs") print(" -c --clean Remove queue, cache and logs")
print(" -p --pause Start in paused mode") print(" -p --pause Start in paused mode")
print(" --repair Add orphaned jobs from the incomplete folder to the queue") print(" --repair Add orphaned jobs from the incomplete folder to the queue")
print(" --repair-all Try to reconstruct the queue from the incomplete folder") print(" --repair-all Try to reconstruct the queue from the incomplete folder")
print(" with full data reconstruction") print(" with full data reconstruction")
print(" --https <port> Port to use for HTTPS server") print(" --https <port> Port to use for HTTPS server")
print(" --ipv6_hosting <0|1> Listen on IPv6 address [::1] [*]") print(" --ipv6_hosting <0|1> Listen on IPv6 address [::1] [*]")
print(" --no-login Start with username and password reset") print(" --inet_exposure <0..5> Set external internet access [*]")
print(" --log-all Log all article handling (for developers)") print(" --no-login Start with username and password reset")
print(" --disable-file-log Logging is only written to console") print(" --log-all Log all article handling (for developers)")
print(" --console Force logging to console") print(" --disable-file-log Logging is only written to console")
print(" --new Run a new instance of SABnzbd") print(" --console Force logging to console")
print(" --new Run a new instance of SABnzbd")
print() print()
print("NZB (or related) file:") print("NZB (or related) file:")
print(" NZB or compressed NZB file, with extension .nzb, .zip, .rar, .7z, .gz, or .bz2") print(" NZB or compressed NZB file, with extension .nzb, .zip, .rar, .7z, .gz, or .bz2")
@ -778,10 +779,9 @@ def commandline_handler():
"server=", "server=",
"templates", "templates",
"ipv6_hosting=", "ipv6_hosting=",
"template2", "inet_exposure=",
"browser=", "browser=",
"config-file=", "config-file=",
"force",
"disable-file-log", "disable-file-log",
"version", "version",
"https=", "https=",
@ -872,6 +872,7 @@ def main():
pid_file = None pid_file = None
new_instance = False new_instance = False
ipv6_hosting = None ipv6_hosting = None
inet_exposure = None
_service, sab_opts, _serv_opts, upload_nzbs = commandline_handler() _service, sab_opts, _serv_opts, upload_nzbs = commandline_handler()
@ -951,6 +952,8 @@ def main():
new_instance = True new_instance = True
elif opt == "--ipv6_hosting": elif opt == "--ipv6_hosting":
ipv6_hosting = arg ipv6_hosting = arg
elif opt == "--inet_exposure":
inet_exposure = arg
sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME)) sabnzbd.MY_FULLNAME = os.path.normpath(os.path.abspath(sabnzbd.MY_FULLNAME))
sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME) sabnzbd.MY_NAME = os.path.basename(sabnzbd.MY_FULLNAME)
@ -1362,6 +1365,10 @@ def main():
sabnzbd.cfg.username.set("") sabnzbd.cfg.username.set("")
sabnzbd.cfg.password.set("") sabnzbd.cfg.password.set("")
# Overwrite inet_exposure from command-line for VPS-setups
if inet_exposure:
sabnzbd.cfg.inet_exposure.set(inet_exposure)
mime_gzip = ( mime_gzip = (
"text/*", "text/*",
"application/javascript", "application/javascript",

Write Preview
Loading…
Cancel
Save