mirror of
https://github.com/YunoHost-Apps/ffsync_ynh.git
synced 2024-09-03 18:26:38 +02:00
update 1.5.2
This commit is contained in:
parent
b9f8590619
commit
134de97aea
6 changed files with 22 additions and 10 deletions
|
@ -1,9 +1,9 @@
|
||||||
[server:main]
|
[server:main]
|
||||||
use = egg:gunicorn
|
use = egg:gunicorn
|
||||||
host = 127.0.0.1
|
host = 0.0.0.0
|
||||||
port = 5000
|
port = 5000
|
||||||
workers = 2
|
workers = 1
|
||||||
timeout = 60
|
timeout = 30
|
||||||
|
|
||||||
[app:main]
|
[app:main]
|
||||||
use = egg:syncserver
|
use = egg:syncserver
|
||||||
|
@ -29,8 +29,16 @@ secret = changesecret
|
||||||
# Only request by existing accounts will be honoured.
|
# Only request by existing accounts will be honoured.
|
||||||
allow_new_users = true
|
allow_new_users = true
|
||||||
|
|
||||||
|
# Set this to "true" to work around a mismatch between public_url and
|
||||||
|
# the application URL as seen by python, which can happen in certain reverse-
|
||||||
|
# proxy hosting setups. It will overwrite the WSGI environ dict with the
|
||||||
|
# details from public_url. This could have security implications if e.g.
|
||||||
|
# you tell the app that it's on HTTPS but it's really on HTTP, so it should
|
||||||
|
# only be used as a last resort and after careful checking of server config.
|
||||||
|
force_wsgi_environ = true
|
||||||
|
|
||||||
# Uncomment and edit the following to use a local BrowserID verifier
|
# Uncomment and edit the following to use a local BrowserID verifier
|
||||||
# rather than posing assertions to the mozilla-hosted verifier.
|
# rather than posting assertions to the mozilla-hosted verifier.
|
||||||
# Audiences should be set to your public_url without a trailing slash.
|
# Audiences should be set to your public_url without a trailing slash.
|
||||||
#[browserid]
|
#[browserid]
|
||||||
#backend = tokenserver.verifiers.LocalVerifier
|
#backend = tokenserver.verifiers.LocalVerifier
|
||||||
|
|
|
@ -32,7 +32,7 @@ test: | $(TOOLS)
|
||||||
# $(ENV)/bin/nosetests -s tokenserver.tests
|
# $(ENV)/bin/nosetests -s tokenserver.tests
|
||||||
|
|
||||||
# Test against a running server
|
# Test against a running server
|
||||||
$(ENV)/bin/pserve syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
|
$(ENV)/bin/gunicorn --paste syncserver/tests.ini 2> /dev/null & SERVER_PID=$$!; \
|
||||||
sleep 2; \
|
sleep 2; \
|
||||||
$(ENV)/bin/python -m syncstorage.tests.functional.test_storage \
|
$(ENV)/bin/python -m syncstorage.tests.functional.test_storage \
|
||||||
--use-token-server http://localhost:5000/token/1.0/sync/1.5; \
|
--use-token-server http://localhost:5000/token/1.0/sync/1.5; \
|
||||||
|
@ -43,7 +43,7 @@ $(TOOLS): | $(ENV)/COMPLETE
|
||||||
|
|
||||||
.PHONY: serve
|
.PHONY: serve
|
||||||
serve: | $(ENV)/COMPLETE
|
serve: | $(ENV)/COMPLETE
|
||||||
$(ENV)/bin/pserve ./syncserver.ini
|
$(ENV)/bin/gunicorn --paste ./syncserver.ini
|
||||||
|
|
||||||
.PHONY: clean
|
.PHONY: clean
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
cornice==0.16.2
|
cornice==0.16.2
|
||||||
gunicorn==19.1.1
|
gunicorn==19.1.1
|
||||||
pyramid==1.5
|
pyramid==1.5
|
||||||
requests==2.2.1
|
requests==2.7
|
||||||
simplejson==3.4
|
simplejson==3.4
|
||||||
SQLAlchemy==0.9.4
|
SQLAlchemy==0.9.4
|
||||||
unittest2==0.5.1
|
unittest2==0.5.1
|
||||||
|
|
|
@ -10,7 +10,7 @@ main = syncserver:main
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name='syncserver',
|
name='syncserver',
|
||||||
version="1.5.1",
|
version="1.5.2",
|
||||||
packages=['syncserver'],
|
packages=['syncserver'],
|
||||||
entry_points=entry_points
|
entry_points=entry_points
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
[server:main]
|
[server:main]
|
||||||
use = egg:Paste#http
|
use = egg:gunicorn
|
||||||
host = 0.0.0.0
|
host = 0.0.0.0
|
||||||
port = 5000
|
port = 5000
|
||||||
|
workers = 1
|
||||||
|
timeout = 30
|
||||||
|
|
||||||
[app:main]
|
[app:main]
|
||||||
use = egg:syncserver
|
use = egg:syncserver
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
[server:main]
|
[server:main]
|
||||||
use = egg:Paste#http
|
use = egg:gunicorn
|
||||||
host = 0.0.0.0
|
host = 0.0.0.0
|
||||||
port = 5000
|
port = 5000
|
||||||
|
workers = 1
|
||||||
|
timeout = 30
|
||||||
|
|
||||||
[app:main]
|
[app:main]
|
||||||
use = egg:SyncServer
|
use = egg:SyncServer
|
||||||
|
|
Loading…
Reference in a new issue