Version 0.2.0

4 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9aa12a3fe68a..916d7af8e292 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,26 @@
 pkgbase = etesync-server
 	pkgdesc = A self-hostable EteSync server
-	pkgver = 0.1.0
-	pkgrel = 3
+	pkgver = 0.2.0
+	pkgrel = 1
 	url = https://github.com/etesync/server-skeleton
 	install = etesync-server.install
 	arch = any
 	license = AGPLv3
-	depends = python-django
 	depends = python-django-cors-headers
 	depends = python-django-etesync-journal
-	depends = python-django-rest-framework
-	depends = python-drf-nested-routers
 	depends = python-pytz
 	optdepends = postgresql: storage backend
 	optdepends = uwsgi-plugin-python: application container
 	options = !emptydirs
-	backup = usr/share/etesync-server/etesync_server/settings.py
-	source = https://github.com/etesync/server-skeleton/archive/v0.1.0.tar.gz
+	backup = etc/etesync-server/etesync-server.ini
+	source = https://github.com/etesync/server-skeleton/archive/v0.2.0.tar.gz
 	source = etesync-server.install
 	source = etesync-server.sysusers
 	source = etesync-server
-	sha256sums = 9ab6ac6d3517023ad6702843e855dc2f89edf32388a058439d6248c2d6f1ae52
-	sha256sums = 8737998b58b9a101f33e911e4f1f413399a0bfa6b72533ddf00eb7dd963e8ddd
+	sha256sums = 435aef6f8f33f82b13dbb99f00c16fa92743194aedb0b4a88ee51001e51244f1
+	sha256sums = 965e5eb9664f7aaf4e071c901d3be9b345b6480846c7146697d945e877a5480e
 	sha256sums = 7363b065206a40e067675d072c5ff269b32704ec89c4eed98e5d3edd71fca122
-	sha256sums = d822ce24a223016f4576ea46c86d912721eb423ebc6c54f0db5f0c9cff1613e7
+	sha256sums = d695d13c339c72fde298d5f751e99a6f6c4da467692a6c1be352dfe7a9c8791a
 
 pkgname = etesync-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d0e221c6c91..40dd4bca9da1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,48 +1,50 @@
 # Maintainer: Pierre-Alain TORET <pierre-alain.toret@protonmail.com>
 pkgname=('etesync-server')
-pkgver=0.1.0
-pkgrel=3
+pkgver=0.2.0
+pkgrel=1
 pkgdesc="A self-hostable EteSync server"
 arch=(any)
-depends=('python-django'
-         'python-django-cors-headers' 
+depends=('python-django-cors-headers'
          'python-django-etesync-journal' 
-         'python-django-rest-framework' 
-         'python-drf-nested-routers' 
          'python-pytz')
 optdepends=('postgresql: storage backend'
             'uwsgi-plugin-python: application container')
 url="https://github.com/etesync/server-skeleton"
 license=('AGPLv3')
-backup=('usr/share/etesync-server/etesync_server/settings.py')
+backup=('etc/etesync-server/etesync-server.ini')
 options=(!emptydirs)
-source=('https://github.com/etesync/server-skeleton/archive/v0.1.0.tar.gz'
+source=(https://github.com/etesync/server-skeleton/archive/v"$pkgver".tar.gz
         $pkgname.install
         $pkgname.sysusers
         $pkgname)
-sha256sums=('9ab6ac6d3517023ad6702843e855dc2f89edf32388a058439d6248c2d6f1ae52'
-            '8737998b58b9a101f33e911e4f1f413399a0bfa6b72533ddf00eb7dd963e8ddd'
+sha256sums=('435aef6f8f33f82b13dbb99f00c16fa92743194aedb0b4a88ee51001e51244f1'
+            '965e5eb9664f7aaf4e071c901d3be9b345b6480846c7146697d945e877a5480e'
             '7363b065206a40e067675d072c5ff269b32704ec89c4eed98e5d3edd71fca122'
-            'd822ce24a223016f4576ea46c86d912721eb423ebc6c54f0db5f0c9cff1613e7')
+            'd695d13c339c72fde298d5f751e99a6f6c4da467692a6c1be352dfe7a9c8791a')
 install=$pkgname.install
 
 package() {
 	mkdir -p "$pkgdir/etc/etesync-server/"
 	mkdir -p "$pkgdir/usr/bin/"
-	mkdir -p "$pkgdir/usr/share"
+	mkdir -p "$pkgdir/usr/lib"
 	mkdir -p "$pkgdir/usr/share/doc/$pkgname"
 	mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
 
 	install -Dm644 "$pkgname.sysusers" "$pkgdir/usr/lib/sysusers.d/$pkgname.conf"
 
+	install -Dm644 "server-skeleton-$pkgver/$pkgname.ini" "$pkgdir/etc/$pkgname/$pkgname.ini"
+	sed -i "s@secret.txt@/var/lib/$pkgname/secret.txt@;s@db.sqlite3@/var/lib/$pkgname/db.sqlite3@" "$pkgdir/etc/$pkgname/$pkgname.ini"
+
 	install -Dm644 "server-skeleton-$pkgver/README.md" "$pkgdir/usr/share/doc/$pkgname/README.md"
+	mv "server-skeleton-$pkgver/example-configs" "$pkgdir/usr/share/doc/$pkgname/"
 	rm -f "server-skeleton-$pkgver/README.md"
+
 	install -Dm644 "server-skeleton-$pkgver/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 	rm -f "server-skeleton-$pkgver/LICENSE"
+
 	rm -f "server-skeleton-$pkgver/icon.svg"
-	rm -rf "server-skeleton-$pkgver/example-configs"
-	cp -a "server-skeleton-$pkgver" "$pkgdir/usr/share/$pkgname" 
-	sed -i 's@SECRET_FILE = os.path.join(BASE_DIR, "secret.txt")@SECRET_FILE = os.path.join("/etc/etesync-server/", "secret.txt")@' "$pkgdir/usr/share/$pkgname/etesync_server/settings.py"
+
+	cp -r "server-skeleton-$pkgver" "$pkgdir/usr/lib/$pkgname"
 
 	install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname"
 	chmod +x "$pkgdir/usr/bin/etesync-server"
diff --git a/etesync-server b/etesync-server
index 58936dc61d6b..4a7fe38a6be1 100755
--- a/etesync-server
+++ b/etesync-server
@@ -6,4 +6,4 @@ then
 	exit 0
 fi
 
-ETESYNC_DB_PATH=/var/lib/etesync-server/db.sqlite3 /usr/share/etesync-server/manage.py $@
+/usr/lib/etesync-server/manage.py $@
diff --git a/etesync-server.install b/etesync-server.install
index 5a74e28c592e..1bc24aa31377 100644
--- a/etesync-server.install
+++ b/etesync-server.install
@@ -1,6 +1,4 @@
 post_install() {
-	mkdir -p /etc/etesync-server
-	chown -R etesync: /etc/etesync-server
-	mkdir -p /var/lib/etesync-server
-	chown -R etesync:etesync /var/lib/etesync &>/dev/null
+    mkdir -p /var/lib/etesync-server
+    chown -R etesync:etesync /var/lib/etesync-server &>/dev/null
 }