Update to 0.130-1

3 files changed, 117 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9013660ef500..5cc5f6e5b4ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kvmd
 	pkgdesc = The main Pi-KVM daemon
-	pkgver = 0.129
+	pkgver = 0.130
 	pkgrel = 1
 	url = https://github.com/pi-kvm/kvmd
 	arch = any
@@ -19,18 +19,91 @@ pkgbase = kvmd
 	depends = python-dbus
 	depends = python-pygments
 	depends = v4l-utils
-	depends = nginx
-	source = https://github.com/pi-kvm/kvmd/archive/v0.129.tar.gz
+	depends = nginx-mainline
+	depends = openssl
+	source = https://github.com/pi-kvm/kvmd/archive/v0.130.tar.gz
 	md5sums = SKIP
 
 pkgname = kvmd
 	install = kvmd.install
 
 pkgname = kvmd-platform-v1-vga-rpi2
+	pkgdesc = Pi-KVM platform configs - v1-vga for rpi2
+	depends = python
+	depends = python-yaml
+	depends = python-aiohttp
+	depends = python-aiofiles
+	depends = python-passlib
+	depends = python-pyudev
+	depends = python-raspberry-gpio
+	depends = python-pyserial
+	depends = python-setproctitle
+	depends = python-systemd
+	depends = python-dbus
+	depends = python-pygments
+	depends = v4l-utils
+	depends = nginx-mainline
+	depends = openssl
+	depends = dkms
+	depends = tc358743-dkms
 
 pkgname = kvmd-platform-v1-vga-rpi3
+	pkgdesc = Pi-KVM platform configs - v1-vga for rpi3
+	depends = python
+	depends = python-yaml
+	depends = python-aiohttp
+	depends = python-aiofiles
+	depends = python-passlib
+	depends = python-pyudev
+	depends = python-raspberry-gpio
+	depends = python-pyserial
+	depends = python-setproctitle
+	depends = python-systemd
+	depends = python-dbus
+	depends = python-pygments
+	depends = v4l-utils
+	depends = nginx-mainline
+	depends = openssl
+	depends = dkms
+	depends = tc358743-dkms
 
 pkgname = kvmd-platform-v1-hdmi-rpi2
+	pkgdesc = Pi-KVM platform configs - v1-hdmi for rpi2
+	depends = python
+	depends = python-yaml
+	depends = python-aiohttp
+	depends = python-aiofiles
+	depends = python-passlib
+	depends = python-pyudev
+	depends = python-raspberry-gpio
+	depends = python-pyserial
+	depends = python-setproctitle
+	depends = python-systemd
+	depends = python-dbus
+	depends = python-pygments
+	depends = v4l-utils
+	depends = nginx-mainline
+	depends = openssl
+	depends = dkms
+	depends = tc358743-dkms
 
 pkgname = kvmd-platform-v1-hdmi-rpi3
+	pkgdesc = Pi-KVM platform configs - v1-hdmi for rpi3
+	depends = python
+	depends = python-yaml
+	depends = python-aiohttp
+	depends = python-aiofiles
+	depends = python-passlib
+	depends = python-pyudev
+	depends = python-raspberry-gpio
+	depends = python-pyserial
+	depends = python-setproctitle
+	depends = python-systemd
+	depends = python-dbus
+	depends = python-pygments
+	depends = v4l-utils
+	depends = nginx-mainline
+	depends = openssl
+	depends = dkms
+	depends = tc358743-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 8d1038354824..77004d396fde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ for _platform in $_PLATFORMS; do
 	done
 done
 pkgbase=kvmd
-pkgver=0.129
+pkgver=0.130
 pkgrel=1
 pkgdesc="The main Pi-KVM daemon"
 url="https://github.com/pi-kvm/kvmd"
@@ -33,7 +33,8 @@ depends=(
 	python-dbus
 	python-pygments
 	v4l-utils
-	nginx
+	nginx-mainline
+	openssl
 )
 makedepends=(python-setuptools)
 source=("$url/archive/v$pkgver.tar.gz")
@@ -57,11 +58,13 @@ package_kvmd() {
 	mkdir -p "$pkgdir/usr/lib/systemd/system"
 	cp configs/os/systemd/*.service "$pkgdir/usr/lib/systemd/system"
 
-	_cfgdir="$pkgdir/usr/share/kvmd/configs.default"
 	mkdir -p "$pkgdir/usr/share/kvmd"
 	cp -r web "$pkgdir/usr/share/kvmd"
 	cp -r extras "$pkgdir/usr/share/kvmd"
-	cp -r configs "$_cfgdir"
+
+	_cfgdir="$pkgdir/usr/share/kvmd/configs.default"
+	mkdir -p "$_cfgdir"
+	cp -r configs/* "$_cfgdir"
 
 	rm -rf "$_cfgdir/os/systemd"
 	find "$pkgdir" -name ".gitignore" -delete
@@ -69,8 +72,15 @@ package_kvmd() {
 	find "$_cfgdir" -type f -exec chmod 444 '{}' \;
 	chmod 440 "$_cfgdir/kvmd/htpasswd"
 
-	mkdir -p "$pkgdir/etc/kvmd/nginx"
-	for path in "$_cfgdir/nginx/*.conf"; do
+	mkdir -p "$pkgdir/etc/kvmd/nginx/ssl"
+	chmod 750 "$pkgdir/etc/kvmd/nginx/ssl"
+	for path in "$_cfgdir/kvmd"/*.yaml; do
+		ln -sf "/usr/share/kvmd/configs.default/kvmd/`basename $path`" "$pkgdir/etc/kvmd"
+	done
+	rm "$pkgdir/etc/kvmd/meta.yaml"
+	cp "$_cfgdir/kvmd/meta.yaml" "$pkgdir/etc/kvmd"
+	cp -a "$_cfgdir/kvmd/htpasswd" "$pkgdir/etc/kvmd"
+	for path in "$_cfgdir/nginx"/*.conf; do
 		ln -sf "/usr/share/kvmd/configs.default/nginx/`basename $path`" "$pkgdir/etc/kvmd/nginx"
 	done
 }
@@ -79,11 +89,21 @@ export pkgdir
 for _platform in $_PLATFORMS; do
 	for _board in $_BOARDS; do
 		eval "package_kvmd-platform-$_platform-$_board() {
+			pkgdesc=\"Pi-KVM platform configs - $_platform for $_board\"
+
 			mkdir -p \"$pkgdir/etc/\"{sysctl.d,udev/rules.d,modules-load.d}
-			_osdir=\"/usr/share/kvmd/configs.default/os\"
-			ln -sf \"$_osdir/sysctl.conf\" \"$pkgdir/etc/sysctl.d/99-pikvm.conf\"
-			ln -sf \"$_osdir/udev/$_platform-$_board.rules\" \"$pkgdir/etc/udev/rules.d/99-pikvm.rules\"
-			ln -sf \"$_osdir/modules-load/$_platform.conf\" \"$pkgdir/etc/modules-load.d/pikvm.conf\"
+
+			_cfgdir=\"/usr/share/kvmd/configs.default/os\"
+
+			ln -sf \"$_cfgdir/os/sysctl.conf\" \"$pkgdir/etc/sysctl.d/99-pikvm.conf\"
+			ln -sf \"$_cfgdir/os/udev/$_platform-$_board.rules\" \"$pkgdir/etc/udev/rules.d/99-pikvm.rules\"
+			ln -sf \"$_cfgdir/os/modules-load/$_platform.conf\" \"$pkgdir/etc/modules-load.d/pikvm.conf\"
+
+			ln -sf \"$_cfgdir/kvmd/main/$_platform.yaml\" \"$pkgdir/etc/kvmd/main.yaml\"
+			if [ $_platform == v1-hdmi ]; then
+				depends+=(dkms tc358743-dkms)
+				ln -sf \"$_cfgdir/kvmd/tc358743-edid.hex\" \"$pkgdir/etc/kvmd/tc358743-edid.hex\"
+			fi
 		}"
 	done
 done
diff --git a/kvmd.install b/kvmd.install
index b77e1248ef50..2f10284defd5 100644
--- a/kvmd.install
+++ b/kvmd.install
@@ -1,5 +1,16 @@
 post_install() {
 	id kvmd &>/dev/null || useradd -r -c "The main Pi-KVM daemon" -s /sbin/nologin kvmd
+
+	chown root:kvmd \
+		/usr/share/kvmd/configs.default/kvmd/htpasswd \
+		/etc/kvmd/htpasswd
+
+	cd /etc/kvmd/nginx/ssl
+	openssl req -new -x509 -nodes -newkey rsa:4096 -keyout server.key -out server.crt -days 3650 \
+		-subj "/C=RU/ST=Moscow/L=Moscow/O=Pi-KVM/OU=Pi-KVM/CN=localhost"
+	chown -R root:http /etc/kvmd/nginx/ssl
+	chmod 400 server.key
+	chmod 444 server.crt
 }
 
 post_remove() {