New version 2020.06.2

3 files changed, 11 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1790735bdb81..47928f48784f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = flowee
 	pkgdesc = Flowee Bitcoin products
-	pkgver = 2020.06.1
+	pkgver = 2020.06.2
 	pkgrel = 1
 	url = https://flowee.org/
 	install = flowee.install
@@ -16,14 +16,12 @@ pkgbase = flowee
 	provides = flowee-hub
 	provides = flowee-libs
 	backup = etc/flowee/flowee.conf
-	source = https://gitlab.com/FloweeTheHub/thehub/-/archive/2020.06.1/thehub-2020.06.1.tar.gz
+	source = https://gitlab.com/FloweeTheHub/thehub/-/archive/2020.06.2/thehub-2020.06.2.tar.gz
 	source = flowee.logrotate
 	source = flowee.conf
-	source = logs.conf
-	sha256sums = 79296ab7cfd5b51fd2fbf1aa4b4af27b571bc784901af255ba1cf39274bdecb3
+	sha256sums = debdbaa37ae67a3ee45e6e6af66ce650b629b575eb60b6bf158076e5c740b13a
 	sha256sums = aff02b3312c88113fe7316152c15f1545233dc8c2062ee8c36d2dbcad4a9f5bf
 	sha256sums = bc14acf0d1b4064553756a1e81c0b943e842296f2a2af6442e480b846392e6bc
-	sha256sums = 2c94fbbccd6981a22951e4696f72d26aa0b5f7ea32aa48e46a0b6ded909fc3db
 
 pkgname = flowee
 
diff --git a/PKGBUILD b/PKGBUILD
index 944f7be58c36..83872a554fad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Tom Zander
 
 pkgname=flowee
-pkgver=2020.06.1
+pkgver=2020.06.2
 pkgrel=1
 pkgdesc="Flowee Bitcoin products"
 arch=('x86_64')
@@ -15,13 +15,11 @@ backup=("etc/flowee/flowee.conf")
 install=flowee.install
 source=("https://gitlab.com/FloweeTheHub/thehub/-/archive/$pkgver/thehub-$pkgver.tar.gz"
     "flowee.logrotate"
-    "flowee.conf"
-    "logs.conf")
+    "flowee.conf")
 
-sha256sums=("79296ab7cfd5b51fd2fbf1aa4b4af27b571bc784901af255ba1cf39274bdecb3"
+sha256sums=("debdbaa37ae67a3ee45e6e6af66ce650b629b575eb60b6bf158076e5c740b13a"
     "aff02b3312c88113fe7316152c15f1545233dc8c2062ee8c36d2dbcad4a9f5bf"
-    "bc14acf0d1b4064553756a1e81c0b943e842296f2a2af6442e480b846392e6bc"
-    "2c94fbbccd6981a22951e4696f72d26aa0b5f7ea32aa48e46a0b6ded909fc3db")
+    "bc14acf0d1b4064553756a1e81c0b943e842296f2a2af6442e480b846392e6bc")
 
 build() {
   mkdir -p build
@@ -43,8 +41,11 @@ 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 664 "$srcdir/logs.conf" -t "$pkgdir/etc/flowee"
+  install -Dm 664 "$srcdir/thehub-$pkgver/support/logs.conf" -t "$pkgdir/etc/flowee"
   install -Dm 644 "$srcdir/thehub-$pkgver/support/thehub.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 644 "$srcdir/thehub-$pkgver/support/indexer.service" -t "$pkgdir/usr/lib/systemd/system"
   install -Dm 664 "$srcdir/thehub-$pkgver/support/indexer.conf" -t "$pkgdir/etc/flowee"
+  install -Dm 644 "$srcdir/thehub-$pkgver/support/indexer.service" -t "$pkgdir/usr/lib/systemd/system"
+  install -Dm 644 "$srcdir/thehub-$pkgver/support/rest-service.conf" -t "$pkgdir/etc/flowee"
+  install -Dm 644 "$srcdir/thehub-$pkgver/support/rest-service.service" -t "$pkgdir/usr/lib/systemd/system"
 }
diff --git a/logs.conf b/logs.conf
deleted file mode 100644
index 0bd1aa9f9b70..000000000000
--- a/logs.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Flowee the Hub log config.
-# See for more details https://flowee.org/docs/hub/log-config/
-
-channel file
-  # timestamp option takes [time, millisecond, date]. Any combination allowed. None of these 3 for no timestamps
-  option timestamp time millisecond
-  option path /var/log/flowee/
-
-# this makes the log go to the journal.
-channel console
-  option timestamp time
-
-#####  Set the verbosity of the logging per log-section
-# See for more details http://flowee.org/hub/log-sections/
-
-# silent only shows fatal
-# quiet only shows critical and fatal
-# info shows warning, info, critical and fatal
-# debug shows everything.