Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

etebase: upgrade to 0.6.1

Browse source 
Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
This commit is contained in:
Peter Stadler 2020-12-20 21:57:29 +01:00
parent 49e053ac52
commit 6d20bbf734
5 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
net/etebase/Makefile
View file

@ -1,12 +1,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=etebase PKG_NAME:=etebase
PKG_VERSION:=0.3.0 PKG_VERSION:=0.6.1
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=etesync-server-$(PKG_VERSION).tar.gz PKG_SOURCE:=etebase-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/etesync/server/archive/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/etesync/server/archive/v$(PKG_VERSION)
PKG_HASH:=d0728effa898a8b7afb4ce7439e0d0fd46bc819008925f21788d7e113435b579 PKG_HASH:=4832c35fa1b46936bfde894a8c888989e9a37dd64ca588df22524825f3e568ec
PKG_LICENSE:=AGPL-3.0-only PKG_LICENSE:=AGPL-3.0-only
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE
@ -25,18 +25,19 @@ define Package/etebase
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
SUBMENU:=Web Servers/Proxies SUBMENU:=Web Servers/Proxies
TITLE:=End-to-End Encrypted Secure Data Sync TITLE:=End-to-end encrypted backend
URL:=https://www.etesync.com/ URL:=https://www.etebase.com/
DEPENDS:=+nginx-ssl +python3-light +python3-django \ DEPENDS:=+nginx-ssl +uwsgi +uwsgi-syslog-plugin +uwsgi-python3-plugin +python3-light \
+python3-django-restframework +python3-drf-nested-routers \ +python3-asgiref +python3-cffi +python3-django-cors-headers +python3-django \
+python3-django-cors-headers +python3-django-etesnc-journal \ +python3-django-restframework +python3-drf-nested-routers +python3-msgpack \
+uwsgi +uwsgi-python3-plugin +uwsgi-syslog-plugin +python3-pycparser +python3-pynacl +python3-pytz +python3-six +python3-sqlparse
USERID:=etebase=44313 # +psycopg2-binary would be needed for using postgres db.
USERID:=etebase=44312
endef endef
define Package/etebase/description define Package/etebase/description
End-to-End Encrypted Secure Data Sync End-to-end encrypted backend
endef endef
@ -65,12 +66,18 @@ define Py3Package/etebase/install
# Upstream application: # Upstream application:
$(INSTALL_DIR) $(1)/usr/share/etebase/ $(INSTALL_DIR) $(1)/usr/share/etebase/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/manage.py $(1)/usr/share/etebase/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/manage.py $(1)/usr/share/etebase/
#init creates /var/etc/etebase/server.ini from uci.cfg: #init creates /var/etc/etebase/server.ini from uci.cfg:
$(LN) /var/etc/etebase/server.ini $(1)/usr/share/etebase/etesync-server.ini $(LN) /var/etc/etebase/server.ini $(1)/usr/share/etebase/etebase-server.ini
$(INSTALL_DIR) $(1)/usr/share/etebase/etesync_server/ $(INSTALL_DIR) $(1)/usr/share/etebase/django_etebase/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/etesync_server/* $(1)/usr/share/etebase/etesync_server/ $(CP) $(PKG_BUILD_DIR)/django_etebase/* $(1)/usr/share/etebase/django_etebase/
$(INSTALL_DIR) $(1)/usr/share/etebase/etebase_server/
$(CP) $(PKG_BUILD_DIR)/etebase_server/* $(1)/usr/share/etebase/etebase_server/
$(INSTALL_DIR) $(1)/usr/share/etebase/myauth/
$(CP) $(PKG_BUILD_DIR)/myauth/* $(1)/usr/share/etebase/myauth/
$(INSTALL_DIR) $(1)/usr/share/etebase/templates/ $(INSTALL_DIR) $(1)/usr/share/etebase/templates/
$(INSTALL_DATA) $(PKG_BUILD_DIR)/templates/* $(1)/usr/share/etebase/templates/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/templates/* $(1)/usr/share/etebase/templates/
@ -85,10 +92,10 @@ Py3Package/etebase/filespec:=
define Package/etebase/postrm define Package/etebase/postrm
#!/bin/sh #!/bin/sh
[ -n "$${IPKG_INSTROOT}" ] && exit 0 [ -n "$${IPKG_INSTROOT}" ] && exit 0
rmdir --ignore-fail-on-non-empty /usr/share/etebase/etebase cd /usr/share/etebase/ && rmdir */*/*/*/* */*/*/* */*/* */* * 2>/dev/null
[ "$${PKG_UPGRADE}" = "1" ] && exit 0 [ "$${PKG_UPGRADE}" = "1" ] && exit 0
rm -r /www/etebase/static rm -r /www/etebase/static
rmdir /www/etebase rmdir --ignore-fail-on-non-empty /www/etebase /var/etc/etebase
exit 0 exit 0
endef endef

4
net/etebase/files/81_setup-etebase
View file

@ -6,12 +6,12 @@ python3 manage.pyc migrate --noinput || exit 1
# setup minimal ini for collectstatic: # setup minimal ini for collectstatic:
mkdir -p /var/etc/etebase/ || exit 1 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 python3 manage.pyc collectstatic --noinput || exit 1
ETEBASE_HAS_USER_PY3CMD="import sqlite3 ETEBASE_HAS_USER_PY3CMD="import sqlite3
c = sqlite3.connect('db.sqlite3').cursor() c = sqlite3.connect('db.sqlite3').cursor()
c.execute('select * from auth_user') c.execute('select * from myauth_user;')
if c.fetchone()==None: print('0') if c.fetchone()==None: print('0')
else: print('1')" else: print('1')"

7
net/etebase/files/etebase.locations
View file

@ -5,6 +5,13 @@ location /etebase/static {
try_files $uri $uri/ =404; try_files $uri $uri/ =404;
} }
location /etebase/media {
access_log off;
error_log /dev/null;
expires 1y;
try_files $uri $uri/ =404;
}
location /etebase { location /etebase {
access_log off; access_log off;
error_log /dev/null; error_log /dev/null;

2
net/etebase/files/uwsgi.ini
View file

@ -10,7 +10,7 @@ strict = true
plugin = python plugin = python
manage-script-name = true manage-script-name = true
chdir = /usr/share/etebase chdir = /usr/share/etebase
mount = /etebase=etesync_server.wsgi:application mount = /etebase=etebase_server.wsgi:application
pidfile = /var/etc/etebase/master.pid pidfile = /var/etc/etebase/master.pid
enable-threads = true enable-threads = true

4
net/etebase/files/uwsgi.init
View file

@ -30,7 +30,7 @@ etebase_validate_global() {
uci_load_validate etebase django "global" "$1" \ uci_load_validate etebase django "global" "$1" \
'secret_file:file:secret.txt' \ 'secret_file:file:secret.txt' \
'static_url:string:/etebase/static' \ 'static_url:string:static/' \
'language_code:string:en-us' \ 'language_code:string:en-us' \
'time_zone:string:UTC' \ 'time_zone:string:UTC' \
'debug:bool:false' \ 'debug:bool:false' \
@ -51,6 +51,8 @@ etebase_print_global() {
etebase_validate_allowed_hosts() { etebase_validate_allowed_hosts() {
cd /usr/share/etebase/ >/dev/null || return
uci_load_validate etebase django "allowed_hosts" "$1" \ uci_load_validate etebase django "allowed_hosts" "$1" \
'uci_allow_all_ips_of:network' \ 'uci_allow_all_ips_of:network' \
'allowed_host:host' \ 'allowed_host:host' \