etebase: upgrade to 0.6.1

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>

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')"
 

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;

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

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' \