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

etesync-server: use relative path for static_url

Browse source 
Django 3.1 supports relative paths for static_url.
Use it to make it more flexible.
Minor fixes for upgrade:
* ignore-fail-on-non-empty for rmdir /usr/share/etesync-server/etesync_server
* do not stop service (it is stopped already and init file is removed)

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
This commit is contained in:
Peter Stadler 2020-10-17 21:08:03 +02:00
parent b24b837822
commit edb201b9d4
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/etesync-server/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=etesync-server PKG_NAME:=etesync-server
PKG_VERSION:=0.3.0 PKG_VERSION:=0.3.0
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=etesync-server-$(PKG_VERSION).tar.gz PKG_SOURCE:=etesync-server-$(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)
@ -88,7 +88,7 @@ Py3Package/etesync-server/filespec:=
define Package/etesync-server/postrm define Package/etesync-server/postrm
#!/bin/sh #!/bin/sh
[ -n "$${IPKG_INSTROOT}" ] && exit 0 [ -n "$${IPKG_INSTROOT}" ] && exit 0
rmdir /usr/share/etesync-server/etesync_server rmdir --ignore-fail-on-non-empty /usr/share/etesync-server/etesync_server
[ "$${PKG_UPGRADE}" = "1" ] && exit 0 [ "$${PKG_UPGRADE}" = "1" ] && exit 0
rm -r /www/etesync/static rm -r /www/etesync/static
rmdir /www/etesync rmdir /www/etesync

2
net/etesync-server/files/81_setup-etesync-server
View file

@ -1,7 +1,5 @@
#!/bin/sh #!/bin/sh
[ "${PKG_UPGRADE}" = "1" ] && /etc/init.d/etesync-server stop
cd /usr/share/etesync-server || exit 1 cd /usr/share/etesync-server || exit 1
python3 manage.pyc migrate --noinput || exit 1 python3 manage.pyc migrate --noinput || exit 1

2
net/etesync-server/files/uci.cfg
View file

@ -1,6 +1,6 @@
config django 'global' config django 'global'
option static_url '/etesync/static/' # TODO for django 3.1: "static/" option static_url 'static/'
option debug 'false' option debug 'false'
config django 'allowed_hosts' config django 'allowed_hosts'