testing/homer-app: upgrade to 1.1.37 and ui to 7.7.032

Depends on postgresql, set homedir for user
and remove initial setup script

4 files changed, 9 insertions, 67 deletions

diff --git a/testing/homer-app/APKBUILD b/testing/homer-app/APKBUILD
index 0e261f3d8d..63284b5cc2 100644
--- a/testing/homer-app/APKBUILD
+++ b/testing/homer-app/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
 pkgname=homer-app
-pkgver=1.1.35
-_uiver=7.7.031
-pkgrel=1
+pkgver=1.1.37
+_uiver=7.7.032
+pkgrel=0
 pkgdesc="HOMER 7.x Front-End and API Server"
 url="http://sipcapture.io"
 # checks fail: release/homer-app_linux_amd64/homer-app: line 1: syntax error: unterminated quoted string
@@ -15,7 +15,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/homer-app/archive
 	https://github.com/sipcapture/homer-app/releases/download/$pkgver/homer-ui-$_uiver.tgz
 	$pkgname.initd
 	change-default-locations.patch
-	initial-setup
 	"
 
 build() {
@@ -30,7 +29,6 @@ check() {
 package() {
 	install -D -m755 release/homer-app_linux_amd64/homer-app "$pkgdir"/usr/bin/homer-app
 	install -D -m644 etc/webapp_config.json "$pkgdir"/etc/homer/webapp_config.json
-	install -m755 "$srcdir"/initial-setup "$pkgdir"/etc/homer/initial-setup
 	mkdir -p "$pkgdir"/usr/share/webapps/homer \
 		"$pkgdir"/var/log/homer \
 		"$pkgdir"/usr/share/licenses/$pkgname
@@ -40,8 +38,7 @@ package() {
 	install -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 }
 
-sha512sums="49bafa645c2f4c4d9099973b51dd7a279f183afadd7e4509a4ce946a57888821af71e295f82823c22e360638865f07827692603331202cf032d37f8ac93e8fa3  homer-app-1.1.35.tar.gz
-c4ddb57afaf073f5c1473e46536b7219fdba10f7deb253d8b0f972e3662f07423272860f93a5550a08c0e64688d3e54a729ee0f6fac0fe3d7a6749f90029e0ab  homer-ui-7.7.031.tgz
-415eea4022a16b1efdd46fd499be0a93658dd850bc0f31ab2777b4bf42ed2d67c960497dd7b6e0000ea63bfdf58675e9048350d7582fb54245c86bb94c97c7a2  homer-app.initd
-0f27c5b357aa321e60cf9a5f754b79e7e8a1d430cb355dce52d3c79e40d2873c5d6fa97f548e98a78fb836930b0ab2f28ed1a82680dad4e11a436ec9ed56ca26  change-default-locations.patch
-5339905a793d210b4ecd477f129fb60a15f7d6fd144fc6f12753eb70172f5bd29765c1f0b9bbe08bed3b27da26c7ad190efd7bb8244a40f036265055a711f7a6  initial-setup"
+sha512sums="1c2a868d6fe28b0feef6c132bc8238af395022b0c6c8349ecebf01223a0585372aa6c82ae91cfa7da293e39810380b133c577cc5852c5e1c81ae69b3fd771b65  homer-app-1.1.37.tar.gz
+6b3bef1190e91526b049f0d1a478d13de1e4cc6dc78bed56bc29f20138a6eeb03c4f4b053448a32b4e3918182cda5bfc053a9abd1910286609f9f2e377565b24  homer-ui-7.7.032.tgz
+b8cd02ac9feadd89cf95edc6209bd22410480dece1d685a677364b4735e484611c4c1a214499467c906910c7d31a9d9217d0384ac8f8c3a06878e3e3d6d97ad8  homer-app.initd
+0f27c5b357aa321e60cf9a5f754b79e7e8a1d430cb355dce52d3c79e40d2873c5d6fa97f548e98a78fb836930b0ab2f28ed1a82680dad4e11a436ec9ed56ca26  change-default-locations.patch"
diff --git a/testing/homer-app/homer-app.initd b/testing/homer-app/homer-app.initd
index 175b7c456c..e2800c3e59 100644
--- a/testing/homer-app/homer-app.initd
+++ b/testing/homer-app/homer-app.initd
@@ -9,7 +9,7 @@ command_group=homer
 pidfile="/run/homer/${RC_SVCNAME}.pid"
 
 depend() {
-	need net
+	need net postgresql
 	after firewall
 }
 
diff --git a/testing/homer-app/homer-app.pre-install b/testing/homer-app/homer-app.pre-install
index aa6784b877..2daa2cbad5 100644
--- a/testing/homer-app/homer-app.pre-install
+++ b/testing/homer-app/homer-app.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S homer &>/dev/null
-adduser -S -G homer -s /sbin/nologin -D homer &>/dev/null
+adduser -S -h /run/homer -G homer -s /sbin/nologin -D homer &>/dev/null
 exit 0
diff --git a/testing/homer-app/initial-setup b/testing/homer-app/initial-setup
deleted file mode 100644
index 40fa27886a..0000000000
--- a/testing/homer-app/initial-setup
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-# Alpine Linux HOMER setup
-
-echo
-read -p "Did you customize /etc/homer/webapp_config.json before running this setup (y/n)? " answer
-
-test "$answer" = "y" || exit 1
-
-# Create user
-/usr/bin/homer-app \
-        -webapp-config-path=/etc/homer \
-	-create-homer-user \
-        -database-root=postgres \
-	-database-root-user=postgres \
-	-database-host=localhost
-
-# Create config and data DBs
-/usr/bin/homer-app \
-	-webapp-config-path=/etc/homer \
-	-create-config-db \
-	-database-root=postgres \
-	-database-root-user=postgres \
-	-database-host=localhost \
-	-database-homer-user=homer_user
-
-/usr/bin/homer-app \
-        -webapp-config-path=/etc/homer \
-	-create-data-db \
-        -database-root=postgres \
-	-database-root-user=postgres \
-	-database-host=localhost \
-	-database-root-password=postgres \
-	-database-homer-user=homer_user
-
-# Create role
-/usr/bin/homer-app \
-        -webapp-config-path=/etc/homer \
-	-create-homer-role \
-        -database-root=postgres \
-	-database-root-user=postgres \
-	-database-host=localhost \
-	-database-root-password=postgres \
-	-database-homer-data=homer_data \
-	-database-homer-config=homer_config
-
-# Populate connection data from webapp_config
-/usr/bin/homer-app \
-        -webapp-config-path=/etc/homer \
-	-create-table-db-config
-
-# Populate DB
-/usr/bin/homer-app \
-        -webapp-config-path=/etc/homer \
-	-populate-table-db-config
-