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

Fix daemon

master
Bob Mottram 2019-07-20 19:50:02 +01:00
parent d95ebd9439
commit 0350b9e33b
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
daemon.py
View File

@ -329,6 +329,8 @@ class PubServer(BaseHTTPRequestHandler):
self.server.lastGET=currTimeGET self.server.lastGET=currTimeGET
self.server.GETbusy=True self.server.GETbusy=True
#print('Content-type: '+self.headers['Accept'])
if not self._permittedDir(self.path): if not self._permittedDir(self.path):
if self.server.debug: if self.server.debug:
print('DEBUG: GET Not permitted') print('DEBUG: GET Not permitted')
@ -921,9 +923,6 @@ def runDaemon(clientToServer: bool,baseDir: str,domain: str, \
if not os.path.isdir(baseDir+'/accounts/inbox@'+domain): if not os.path.isdir(baseDir+'/accounts/inbox@'+domain):
print('Creating shared inbox: inbox@'+domain) print('Creating shared inbox: inbox@'+domain)
createSharedInbox(baseDir,'inbox',domain,port,httpPrefix) createSharedInbox(baseDir,'inbox',domain,port,httpPrefix)
print('See config.json for the password. You can remove the password from config.json after moving it elsewhere.')
adminPassword=createPassword(10)
setConfigParam(baseDir,'adminPassword',adminPassword)
print('Creating inbox queue') print('Creating inbox queue')
httpd.thrInboxQueue= \ httpd.thrInboxQueue= \

2
epicyon.py
View File

@ -199,7 +199,7 @@ parser.add_argument("--followersonly", type=str2bool, nargs='?', \
const=True, default=True, \ const=True, default=True, \
help="Send to followers only") help="Send to followers only")
parser.add_argument("--followerspending", type=str2bool, nargs='?', \ parser.add_argument("--followerspending", type=str2bool, nargs='?', \
const=True, default=True, \ const=True, default=False, \
help="Show a list of followers pending") help="Show a list of followers pending")
parser.add_argument('--approve', dest='approve', type=str,default=None, \ parser.add_argument('--approve', dest='approve', type=str,default=None, \
help='Approve a follow request') help='Approve a follow request')