diff options
| author | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-12-20 21:57:29 +0100 |
|---|---|---|
| committer | Peter Stadler <peter.stadler@student.uibk.ac.at> | 2020-12-20 22:00:13 +0100 |
| commit | 6d20bbf734a5ae1f3cb6c2e04ffb9f5081f9e73f (patch) | |
| tree | fd6db15792a38fcf67578d730cb08fc6147f2916 /net/etebase/files | |
| parent | 49e053ac5270b08cfacde81fc03ee68c72c4ad51 (diff) | |
etebase: upgrade to 0.6.1
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
Diffstat (limited to 'net/etebase/files')
| -rw-r--r-- | net/etebase/files/81_setup-etebase | 4 | ||||
| -rw-r--r-- | net/etebase/files/etebase.locations | 7 | ||||
| -rw-r--r-- | net/etebase/files/uwsgi.ini | 2 | ||||
| -rw-r--r-- | net/etebase/files/uwsgi.init | 4 |
4 files changed, 13 insertions, 4 deletions
diff --git a/net/etebase/files/81_setup-etebase b/net/etebase/files/81_setup-etebase index 43a4ec789..4cf4fa642 100644 --- a/net/etebase/files/81_setup-etebase +++ b/net/etebase/files/81_setup-etebase @@ -6,12 +6,12 @@ python3 manage.pyc migrate --noinput || exit 1 # setup minimal ini for collectstatic: mkdir -p /var/etc/etebase/ || exit 1 -printf "[global]\nSTATIC_ROOT=/www/etebase/static" >etesync-server.ini || exit 1 +printf "[global]\nSTATIC_ROOT=/www/etebase/static" >etebase-server.ini || exit 1 python3 manage.pyc collectstatic --noinput || exit 1 ETEBASE_HAS_USER_PY3CMD="import sqlite3 c = sqlite3.connect('db.sqlite3').cursor() -c.execute('select * from auth_user') +c.execute('select * from myauth_user;') if c.fetchone()==None: print('0') else: print('1')" diff --git a/net/etebase/files/etebase.locations b/net/etebase/files/etebase.locations index cb5ea938d..5ef044190 100644 --- a/net/etebase/files/etebase.locations +++ b/net/etebase/files/etebase.locations @@ -5,6 +5,13 @@ location /etebase/static { try_files $uri $uri/ =404; } +location /etebase/media { + access_log off; + error_log /dev/null; + expires 1y; + try_files $uri $uri/ =404; +} + location /etebase { access_log off; error_log /dev/null; diff --git a/net/etebase/files/uwsgi.ini b/net/etebase/files/uwsgi.ini index 5f0c67d45..570047f06 100644 --- a/net/etebase/files/uwsgi.ini +++ b/net/etebase/files/uwsgi.ini @@ -10,7 +10,7 @@ strict = true plugin = python manage-script-name = true chdir = /usr/share/etebase -mount = /etebase=etesync_server.wsgi:application +mount = /etebase=etebase_server.wsgi:application pidfile = /var/etc/etebase/master.pid enable-threads = true diff --git a/net/etebase/files/uwsgi.init b/net/etebase/files/uwsgi.init index 72dbbefcc..516b424f7 100644 --- a/net/etebase/files/uwsgi.init +++ b/net/etebase/files/uwsgi.init @@ -30,7 +30,7 @@ etebase_validate_global() { uci_load_validate etebase django "global" "$1" \ 'secret_file:file:secret.txt' \ - 'static_url:string:/etebase/static' \ + 'static_url:string:static/' \ 'language_code:string:en-us' \ 'time_zone:string:UTC' \ 'debug:bool:false' \ @@ -51,6 +51,8 @@ etebase_print_global() { etebase_validate_allowed_hosts() { + cd /usr/share/etebase/ >/dev/null || return + uci_load_validate etebase django "allowed_hosts" "$1" \ 'uci_allow_all_ips_of:network' \ 'allowed_host:host' \ |