Added separate public & private jellyfin address option

This commit is contained in:
2020-06-03 12:17:29 +01:00
parent cb07cbb5bf
commit 78de153557
4 changed files with 20 additions and 11 deletions

View File

@@ -102,7 +102,7 @@ def default_css():
css = {}
css = default_css()
if 'custom_css' in config['files']:
if 'custom_css' in config['files']:
if config['files']['custom_css'] != '':
try:
shutil.copy(config['files']['custom_css'],
@@ -113,8 +113,8 @@ if 'custom_css' in config['files']:
css['crossorigin'] = ''
except FileNotFoundError:
log.error(f'Custom CSS {config["files"]["custom_css"]} not found, using default.')
if ('email_html' not in config['password_resets'] or
config['password_resets']['email_html'] == ''):
log.debug('Using default password reset email HTML template')
@@ -134,6 +134,9 @@ if ('email_text' not in config['invite_emails'] or
log.debug('Using default invite email plaintext template')
config['invite_emails']['email_text'] = str(local_dir /
'invite-email.txt')
if ('public_server' not in config['jellyfin'] or
config['jellyfin']['public_server'] == ''):
config['jellyfin']['public_server'] = config['jellyfin']['server']
if args.get_policy:
import json
@@ -163,13 +166,13 @@ else:
def signal_handler(sig, frame):
print('Quitting...')
sys.exit(0)
signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler)
app = Flask(__name__, root_path=str(local_dir))
app.config['DEBUG'] = config.getboolean('ui', 'debug')
app.config['SECRET_KEY'] = secrets.token_urlsafe(16)
if __name__ == '__main__':
from waitress import serve
if first_run:
@@ -180,7 +183,7 @@ else:
serve(app,
host=host,
port=port)
else:
else:
import jellyfin_accounts.web_api
import jellyfin_accounts.web
host = config['ui']['host']