YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dev' of github.com:YunoHost/moulinette into dev

Browse source
This commit is contained in:
Kload 2013-07-06 10:18:01 +02:00
commit 1a39660f1e
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
yunohost.tac
View file

@ -18,6 +18,8 @@ if not __debug__:
gettext.install('YunoHost') gettext.install('YunoHost')
dev = False
installed = True
action_dict = {} action_dict = {}
api = APIResource() api = APIResource()
@ -35,10 +37,10 @@ def http_exec(request, **kwargs):
return '' return ''
# Simple HTTP auth # Simple HTTP auth
else: elif installed:
authorized = request.getUser() == 'admin' authorized = request.getUser() == 'admin'
pwd = request.getPassword() pwd = request.getPassword()
if 'api_key' in request.args: if dev and 'api_key' in request.args:
pwd = request.args['api_key'][0] pwd = request.args['api_key'][0]
authorized = True authorized = True
if authorized: if authorized:
@ -55,7 +57,7 @@ def http_exec(request, **kwargs):
if kwargs: if kwargs:
for k, v in kwargs.iteritems(): for k, v in kwargs.iteritems():
dynamic_key = path.split('/')[-1] dynamic_key = path.split('/')[-1]
path = path.replace(dynamic_key, '(?P<'+ k +'>[^/]+)') path = path.replace(dynamic_key, '{'+ k +'}')
given_args[k] = [v] given_args[k] = [v]
print given_args print given_args
@ -202,6 +204,7 @@ def main():
try: try:
with open('/etc/yunohost/installed') as f: pass with open('/etc/yunohost/installed') as f: pass
except IOError: except IOError:
installed = False
api = APIResource() api = APIResource()
api.register('POST', '/postinstall', http_exec) api.register('POST', '/postinstall', http_exec)
api.register('OPTIONS', '/postinstall', http_exec) api.register('OPTIONS', '/postinstall', http_exec)
@ -213,7 +216,11 @@ def main():
if __name__ == '__main__': if __name__ == '__main__':
startLogging(open('/var/log/yunohost.log', 'a+')) # Log actions to API if '--dev' in sys.argv:
dev = True
startLogging(sys.stdout)
else:
startLogging(open('/var/log/yunohost.log', 'a+')) # Log actions to file
main() main()
reactor.listenTCP(6767, Site(api, timeout=None)) reactor.listenTCP(6767, Site(api, timeout=None))
reactor.run() reactor.run()