mj-saunders
/
epicyon
forked from indymedia/epicyon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add onion domain to daemon

main
Bob Mottram 2020-03-02 12:41:25 +00:00
parent b2dd5cd7d9
commit b366b9f80f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon.py
View File

@ -5947,7 +5947,7 @@ def runDaemon(blogsInstance: bool,mediaInstance: bool, \
enableSharedInbox: bool,registration: bool, \ enableSharedInbox: bool,registration: bool, \
language: str,projectVersion: str, \ language: str,projectVersion: str, \
instanceId: str,clientToServer: bool, \ instanceId: str,clientToServer: bool, \
baseDir: str,domain: str, \ baseDir: str,domain: str,onionDomain: str, \
port=80,proxyPort=80,httpPrefix='https', \ port=80,proxyPort=80,httpPrefix='https', \
fedList=[],maxMentions=10,maxEmoji=10, \ fedList=[],maxMentions=10,maxEmoji=10, \
authenticatedFetch=False, \ authenticatedFetch=False, \
@ -5982,6 +5982,7 @@ def runDaemon(blogsInstance: bool,mediaInstance: bool, \
print('ERROR: HTTP server failed to start. '+str(e)) print('ERROR: HTTP server failed to start. '+str(e))
return False return False
httpd.onionDomain=onionDomain
httpd.useBlurHash=useBlurHash httpd.useBlurHash=useBlurHash
httpd.mediaInstance=mediaInstance httpd.mediaInstance=mediaInstance
httpd.blogsInstance=blogsInstance httpd.blogsInstance=blogsInstance

2
epicyon.py
View File

@ -1536,7 +1536,7 @@ runDaemon(args.blogsinstance,args.mediainstance, \
not args.nosharedinbox, \ not args.nosharedinbox, \
registration,args.language,__version__, \ registration,args.language,__version__, \
instanceId,args.client,baseDir, \ instanceId,args.client,baseDir, \
domain,port,proxyPort,httpPrefix, \ domain,onionDomain,port,proxyPort,httpPrefix, \
federationList,args.maxMentions, \ federationList,args.maxMentions, \
args.maxEmoji,args.authenticatedFetch, \ args.maxEmoji,args.authenticatedFetch, \
args.noreply,args.nolike,args.nopics, \ args.noreply,args.nolike,args.nopics, \

9
tests.py
View File

@ -235,9 +235,10 @@ def createServerAlice(path: str,domain: str,port: int,bobAddress: str,federation
testServerAliceRunning = True testServerAliceRunning = True
maxMentions=10 maxMentions=10
maxEmoji=10 maxEmoji=10
onionDomain=None
print('Server running: Alice') print('Server running: Alice')
runDaemon(False,False,5,True,True,'en',__version__, \ 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, \ httpPrefix,federationList,maxMentions,maxEmoji,False, \
noreply,nolike,nopics,noannounce,cw,ocapAlways, \ noreply,nolike,nopics,noannounce,cw,ocapAlways, \
useTor,maxReplies, \ useTor,maxReplies, \
@ -291,9 +292,10 @@ def createServerBob(path: str,domain: str,port: int,aliceAddress: str,federation
testServerBobRunning = True testServerBobRunning = True
maxMentions=10 maxMentions=10
maxEmoji=10 maxEmoji=10
onionDomain=None
print('Server running: Bob') print('Server running: Bob')
runDaemon(False,False,5,True,True,'en',__version__, \ 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, \ httpPrefix,federationList,maxMentions,maxEmoji,False, \
noreply,nolike,nopics,noannounce,cw,ocapAlways, \ noreply,nolike,nopics,noannounce,cw,ocapAlways, \
useTor,maxReplies, \ useTor,maxReplies, \
@ -327,9 +329,10 @@ def createServerEve(path: str,domain: str,port: int,federationList: [], \
testServerEveRunning = True testServerEveRunning = True
maxMentions=10 maxMentions=10
maxEmoji=10 maxEmoji=10
onionDomain=None
print('Server running: Eve') print('Server running: Eve')
runDaemon(False,False,5,True,True,'en',__version__, \ 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, \ httpPrefix,federationList,maxMentions,maxEmoji,False, \
noreply,nolike,nopics,noannounce,cw,ocapAlways, \ noreply,nolike,nopics,noannounce,cw,ocapAlways, \
useTor,maxReplies,allowDeletion,True,True,False, \ useTor,maxReplies,allowDeletion,True,True,False, \