Added separate public & private jellyfin address option

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

View File

@ -93,8 +93,11 @@ For detailed descriptions of each setting, see [setup](https://github.com/hrfee/
; It is reccommended to create a limited admin account for this program. ; It is reccommended to create a limited admin account for this program.
username = username username = username
password = password password = password
; Server will also be used in the invite form, so make sure it's publicly accessible. ; Jellyfin server address. Can be public, or local for security purposes.
server = https://jellyf.in:443 server = http://jellyfin.local:8096
; Publicly accessible Jellyfin address, used on invite form.
; Leave blank to use the same address as above.
public_server = https://jellyf.in:443
client = jf-accounts client = jf-accounts
version = 0.1 version = 0.1
device = jf-accounts device = jf-accounts

View File

@ -2,8 +2,11 @@
; It is reccommended to create a limited admin account for this program. ; It is reccommended to create a limited admin account for this program.
username = username username = username
password = password password = password
; Server will also be used in the invite form, so make sure it's publicly accessible. ; Jellyfin server address. Can be public, or local for security purposes.
server = https://jellyf.in:443 server = http://jellyfin.local:8096
; Publicly accessible Jellyfin address, used on invite form.
; Leave blank to use the same address as above.
public_server = https://jellyf.in:443
client = jf-accounts client = jf-accounts
version = 0.1 version = 0.1
device = jf-accounts device = jf-accounts

View File

@ -60,7 +60,7 @@ def inviteProxy(path):
contactMessage=config['ui']['contact_message'], contactMessage=config['ui']['contact_message'],
helpMessage=config['ui']['help_message'], helpMessage=config['ui']['help_message'],
successMessage=config['ui']['success_message'], successMessage=config['ui']['success_message'],
jfLink=config['jellyfin']['server'], jfLink=config['jellyfin']['public_server'],
validate=config.getboolean( validate=config.getboolean(
'password_validation', 'password_validation',
'enabled'), 'enabled'),

View File

@ -134,6 +134,9 @@ if ('email_text' not in config['invite_emails'] or
log.debug('Using default invite email plaintext template') log.debug('Using default invite email plaintext template')
config['invite_emails']['email_text'] = str(local_dir / config['invite_emails']['email_text'] = str(local_dir /
'invite-email.txt') '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: if args.get_policy:
import json import json