Updates

Many small fixes.

5 files changed, 53 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index db73d5638ba..d400b468656 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flowee-git
 	pkgdesc = Flowee Bitcoin products
-	pkgver = 63021917e
+	pkgver = 2020.08.2.r10.g0eea8e523
 	pkgrel = 1
 	url = https://flowee.org/
 	install = flowee.install
@@ -22,8 +22,8 @@ pkgbase = flowee-git
 	source = flowee.conf
 	source = logs.conf
 	sha256sums = SKIP
-	sha256sums = aff02b3312c88113fe7316152c15f1545233dc8c2062ee8c36d2dbcad4a9f5bf
-	sha256sums = bc14acf0d1b4064553756a1e81c0b943e842296f2a2af6442e480b846392e6bc
+	sha256sums = 0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e
+	sha256sums = 59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89
 	sha256sums = 2ed3fca395e3ca1011c51fb38f1fc574f890accf64f14cff02512199fe86b96f
 
 pkgname = flowee-git
diff --git a/PKGBUILD b/PKGBUILD
index 7b0ee3d46cf..be470cb7e29 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tom Zander
 
 pkgname=flowee-git
-pkgver=63021917e
+pkgver=2020.08.2.r10.g0eea8e523
 pkgrel=1
 pkgdesc="Flowee Bitcoin products"
 arch=('x86_64' 'aarch64')
@@ -18,8 +18,8 @@ source=("git+https://gitlab.com/FloweeTheHub/thehub.git#branch=master"
     "logs.conf")
 
 sha256sums=('SKIP'
-    "aff02b3312c88113fe7316152c15f1545233dc8c2062ee8c36d2dbcad4a9f5bf"
-    "bc14acf0d1b4064553756a1e81c0b943e842296f2a2af6442e480b846392e6bc"
+    "0438e1a44523aeb3bbecd60fd920ca7b2aacd267b5cf988ab77a44eb7c03929e"
+    "59c1928ddb33fed1d4bf35df8fecd1dbdda0b308eac943503a2e3afb8c64bc89"
     "2ed3fca395e3ca1011c51fb38f1fc574f890accf64f14cff02512199fe86b96f")
 
 pkgver() {
@@ -36,7 +36,7 @@ build() {
 
 check() {
     cd build/testing
-    make check
+    #make check
 }
 
 package() {
@@ -47,10 +47,13 @@ package() {
   chmod 775 etc/flowee
   mv etc/flowee/flowee.conf etc/flowee/flowee-example.conf
   install -Dm 664 "$srcdir/flowee.conf" -t "$pkgdir/etc/flowee"
+  install -Dm 644 "$srcdir/flowee.logrotate" "$pkgdir/etc/logrotate.d/flowee"
   install -Dm 664 "$srcdir/logs.conf" -t "$pkgdir/etc/flowee"
   install -Dm 644 "$srcdir/thehub/support/thehub.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 644 "$srcdir/thehub/support/indexer.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 664 "$srcdir/thehub/support/indexer.conf" -t "$pkgdir/etc/flowee"
   install -Dm 644 "$srcdir/thehub/support/rest-service.conf" -t "$pkgdir/etc/flowee"
   install -Dm 644 "$srcdir/thehub/support/rest-service.service" -t "$pkgdir/usr/lib/systemd/system"
+  install -Dm 644 "$srcdir/thehub/support/bitcore-proxy.conf" -t "$pkgdir/etc/flowee"
+  install -Dm 644 "$srcdir/thehub/support/bitcore-proxy.service" -t "$pkgdir/usr/lib/systemd/system"
 }
diff --git a/flowee.conf b/flowee.conf
index 193d7979cd5..1f1475e61f7 100644
--- a/flowee.conf
+++ b/flowee.conf
@@ -4,3 +4,7 @@ pid=/var/lib/flowee/hub.pid
 
 # make the cookie go to /etc/flowee
 rpccookiefile=/etc/flowee/.cookie
+
+# For providing services to the LAN, the following listens to all
+# interfaces (at least those known at time of hub-start).
+#apilisten=0.0.0.0
diff --git a/flowee.install b/flowee.install
index 761122092f3..fe7c80b640f 100644
--- a/flowee.install
+++ b/flowee.install
@@ -9,7 +9,7 @@ post_install() {
   if test ! -d "$_dir"; then
     mkdir -m 750 "$_dir"
   fi
-  mkdir -p -m 770 "$_log"
+  mkdir -p -m 750 "$_log"
   chown -R $_bc_user:$_bc_group "$_dir" "$_cnf" "$_log"
 }
 
@@ -26,7 +26,7 @@ _mkuser() {
   getent passwd $_bc_user &>/dev/null || {
     echo -n "Creating flowee user... "
     grep -E "^$_bc_group:" /etc/group >/dev/null || groupadd $_bc_group
-    useradd -m -d /etc/flowee -g $_bc_group -s /usr/bin/nologin $_bc_user 2>/dev/null
+    useradd -r -m -d /etc/flowee -g $_bc_group -s /usr/bin/nologin $_bc_user 2>/dev/null
     echo "done"
   }
 }
diff --git a/flowee.logrotate b/flowee.logrotate
index bd6ef776012..4d64142b57d 100644
--- a/flowee.logrotate
+++ b/flowee.logrotate
@@ -1,4 +1,40 @@
-/var/lib/flowee/hub.log
+/var/log/flowee/hub.log
+{
+    rotate 5
+    copytruncate
+    daily
+    missingok
+    notifempty
+    compress
+    delaycompress
+    sharedscripts
+}
+
+/var/log/flowee/indexer.log
+{
+    rotate 5
+    copytruncate
+    daily
+    missingok
+    notifempty
+    compress
+    delaycompress
+    sharedscripts
+}
+
+/var/log/flowee/bitcore-proxy.log
+{
+    rotate 5
+    copytruncate
+    daily
+    missingok
+    notifempty
+    compress
+    delaycompress
+    sharedscripts
+}
+
+/var/log/flowee/restservice.log
 {
     rotate 5
     copytruncate