mirror of https://gitlab.com/bashrc2/epicyon
Add onion domain to daemon
parent
b2dd5cd7d9
commit
b366b9f80f
|
@ -5947,7 +5947,7 @@ def runDaemon(blogsInstance: bool,mediaInstance: bool, \
|
|||
enableSharedInbox: bool,registration: bool, \
|
||||
language: str,projectVersion: str, \
|
||||
instanceId: str,clientToServer: bool, \
|
||||
baseDir: str,domain: str, \
|
||||
baseDir: str,domain: str,onionDomain: str, \
|
||||
port=80,proxyPort=80,httpPrefix='https', \
|
||||
fedList=[],maxMentions=10,maxEmoji=10, \
|
||||
authenticatedFetch=False, \
|
||||
|
@ -5982,6 +5982,7 @@ def runDaemon(blogsInstance: bool,mediaInstance: bool, \
|
|||
print('ERROR: HTTP server failed to start. '+str(e))
|
||||
return False
|
||||
|
||||
httpd.onionDomain=onionDomain
|
||||
httpd.useBlurHash=useBlurHash
|
||||
httpd.mediaInstance=mediaInstance
|
||||
httpd.blogsInstance=blogsInstance
|
||||
|
|
|
@ -1536,7 +1536,7 @@ runDaemon(args.blogsinstance,args.mediainstance, \
|
|||
not args.nosharedinbox, \
|
||||
registration,args.language,__version__, \
|
||||
instanceId,args.client,baseDir, \
|
||||
domain,port,proxyPort,httpPrefix, \
|
||||
domain,onionDomain,port,proxyPort,httpPrefix, \
|
||||
federationList,args.maxMentions, \
|
||||
args.maxEmoji,args.authenticatedFetch, \
|
||||
args.noreply,args.nolike,args.nopics, \
|
||||
|
|
9
tests.py
9
tests.py
|
@ -235,9 +235,10 @@ def createServerAlice(path: str,domain: str,port: int,bobAddress: str,federation
|
|||
testServerAliceRunning = True
|
||||
maxMentions=10
|
||||
maxEmoji=10
|
||||
onionDomain=None
|
||||
print('Server running: Alice')
|
||||
runDaemon(False,False,5,True,True,'en',__version__, \
|
||||
"instanceId",False,path,domain,port,port, \
|
||||
"instanceId",False,path,domain,onionDomain,port,port, \
|
||||
httpPrefix,federationList,maxMentions,maxEmoji,False, \
|
||||
noreply,nolike,nopics,noannounce,cw,ocapAlways, \
|
||||
useTor,maxReplies, \
|
||||
|
@ -291,9 +292,10 @@ def createServerBob(path: str,domain: str,port: int,aliceAddress: str,federation
|
|||
testServerBobRunning = True
|
||||
maxMentions=10
|
||||
maxEmoji=10
|
||||
onionDomain=None
|
||||
print('Server running: Bob')
|
||||
runDaemon(False,False,5,True,True,'en',__version__, \
|
||||
"instanceId",False,path,domain,port,port, \
|
||||
"instanceId",False,path,domain,onionDomain,port,port, \
|
||||
httpPrefix,federationList,maxMentions,maxEmoji,False, \
|
||||
noreply,nolike,nopics,noannounce,cw,ocapAlways, \
|
||||
useTor,maxReplies, \
|
||||
|
@ -327,9 +329,10 @@ def createServerEve(path: str,domain: str,port: int,federationList: [], \
|
|||
testServerEveRunning = True
|
||||
maxMentions=10
|
||||
maxEmoji=10
|
||||
onionDomain=None
|
||||
print('Server running: Eve')
|
||||
runDaemon(False,False,5,True,True,'en',__version__, \
|
||||
"instanceId",False,path,domain,port,port, \
|
||||
"instanceId",False,path,domain,onionDomain,port,port, \
|
||||
httpPrefix,federationList,maxMentions,maxEmoji,False, \
|
||||
noreply,nolike,nopics,noannounce,cw,ocapAlways, \
|
||||
useTor,maxReplies,allowDeletion,True,True,False, \
|
||||
|
|
Loading…
Reference in New Issue