jeena/hass-configurator
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Renamed LISTENPORT to PORT

Browse source
This commit is contained in:
Daniel Perna 2018-07-12 21:46:42 +02:00
parent 39b567845a
commit fa9d0d3ee4
3 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -40,8 +40,8 @@ Another way of passing settings is by using [environment variables](https://en.w
#### LISTENIP (string)
The IP address the service is listening on. By default it is binding to `0.0.0.0`, which is every IPv4 interface on the system. When using `::`, all available IPv6- and IPv4-addresses will be used.
#### LISTENPORT (integer)
The port the service is listening on. By default it is using 3218, but you can change this if you need to.
#### PORT (integer)
The port the service is listening on. By default it is using 3218, but you can change this if you need to. The former setting `LISTENPORT` still works but is deprecated. Please change your settings accordingly.
#### BASEPATH (string)
It is possible to place configurator.py somewhere else. Set the `BASEPATH` to something like `"/home/homeassistant/.homeassistant"`, and no matter where you are running the configurator from, it will start serving files from there. This is needed if you plan on running the configurator with systemd.
#### ENFORCE_BASEPATH (bool)

15
configurator.py
View file

@ -27,7 +27,7 @@ from urllib.parse import urlparse, parse_qs, unquote
### Some options for you to change
LISTENIP = "0.0.0.0"
LISTENPORT = 3218
PORT = 3218
# Set BASEPATH to something like "/home/hass/.homeassistant/" if you're not
# running the configurator from that path
BASEPATH = None
@ -3420,7 +3420,7 @@ def signal_handler(sig, frame):
sys.exit(0)
def load_settings(settingsfile):
global LISTENIP, LISTENPORT, BASEPATH, SSL_CERTIFICATE, SSL_KEY, HASS_API, \
global LISTENIP, PORT, BASEPATH, SSL_CERTIFICATE, SSL_KEY, HASS_API, \
HASS_API_PASSWORD, CREDENTIALS, ALLOWED_NETWORKS, BANNED_IPS, BANLIMIT, \
DEV, IGNORE_PATTERN, DIRSFIRST, SESAME, VERIFY_HOSTNAME, ENFORCE_BASEPATH, \
ENV_PREFIX, NOTIFY_SERVICE, USERNAME, PASSWORD, SESAME_TOTP_SECRET, TOTP, \
@ -3458,7 +3458,10 @@ def load_settings(settingsfile):
except ImportError:
LOG.warning("Unable to import Git module")
LISTENIP = settings.get("LISTENIP", LISTENIP)
LISTENPORT = settings.get("LISTENPORT", LISTENPORT)
LISTENPORT = settings.get("LISTENPORT", None)
PORT = settings.get("PORT", PORT)
if LISTENPORT is not None:
PORT = LISTENPORT
BASEPATH = settings.get("BASEPATH", BASEPATH)
ENFORCE_BASEPATH = settings.get("ENFORCE_BASEPATH", ENFORCE_BASEPATH)
SSL_CERTIFICATE = settings.get("SSL_CERTIFICATE", SSL_CERTIFICATE)
@ -3972,7 +3975,7 @@ class RequestHandler(BaseHTTPRequestHandler):
versionclass=color,
separator="\%s" % os.sep if os.sep == "\\" else os.sep,
listening_address="%s://%s:%i" % (
'https' if SSL_CERTIFICATE else 'http', LISTENIP, LISTENPORT),
'https' if SSL_CERTIFICATE else 'http', LISTENIP, PORT),
hass_api_address="%s" % (HASS_API, ),
hass_ws_address=ws_api,
api_password=HASS_API_PASSWORD if HASS_API_PASSWORD else "")
@ -4737,7 +4740,7 @@ def main(args):
CustomServer = SimpleServer
if ':' in LISTENIP:
CustomServer.address_family = socket.AF_INET6
server_address = (LISTENIP, LISTENPORT)
server_address = (LISTENIP, PORT)
if USERNAME and PASSWORD:
Handler = AuthHandler
else:
@ -4750,7 +4753,7 @@ def main(args):
server_side=True)
LOG.info('Listening on: %s://%s:%i' % ('https' if SSL_CERTIFICATE else 'http',
LISTENIP,
LISTENPORT))
PORT))
if BASEPATH:
os.chdir(BASEPATH)
HTTPD.serve_forever()

2
settings.conf
View file

@ -1,6 +1,6 @@
{
"LISTENIP": "0.0.0.0",
"LISTENPORT": 3218,
"PORT": 3218,
"GIT": false,
"BASEPATH": null,
"ENFORCE_BASEPATH": false,