From 0350b9e33b5b572449ad767a1b36cceb07fd5e0f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 20 Jul 2019 19:50:02 +0100 Subject: [PATCH] Fix daemon --- daemon.py | 5 ++--- epicyon.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/daemon.py b/daemon.py index 89aa49ad..d5b9af84 100644 --- a/daemon.py +++ b/daemon.py @@ -329,6 +329,8 @@ class PubServer(BaseHTTPRequestHandler): self.server.lastGET=currTimeGET self.server.GETbusy=True + #print('Content-type: '+self.headers['Accept']) + if not self._permittedDir(self.path): if self.server.debug: 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): print('Creating shared inbox: inbox@'+domain) 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') httpd.thrInboxQueue= \ diff --git a/epicyon.py b/epicyon.py index 46a70adf..df5e6ac6 100644 --- a/epicyon.py +++ b/epicyon.py @@ -199,7 +199,7 @@ parser.add_argument("--followersonly", type=str2bool, nargs='?', \ const=True, default=True, \ help="Send to followers only") parser.add_argument("--followerspending", type=str2bool, nargs='?', \ - const=True, default=True, \ + const=True, default=False, \ help="Show a list of followers pending") parser.add_argument('--approve', dest='approve', type=str,default=None, \ help='Approve a follow request')