summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDevaev Maxim2018-12-15 16:55:30 +0300
committerDevaev Maxim2018-12-15 16:55:30 +0300
commit0791b9ccc489d8146b537918c57537f003494a36 (patch)
treec03cf17dd9414a3d48e91dbf7e7d3a5e201dfd0b
parenta5b6ac1d9b68a40c06a338b633714f5dcd9868a3 (diff)
downloadaur-0791b9ccc489d8146b537918c57537f003494a36.tar.gz
Update to 0.11-1
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
-rw-r--r--nginx.ctx-http.conf (renamed from nginx.http-ctx.conf)0
-rw-r--r--nginx.ctx-server.conf (renamed from nginx.server-ctx.conf)9
4 files changed, 11 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b5123e5f4f50..79ebacee0b1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = kvmd-webterm
pkgdesc = Pi-KVM Web Terminal (GoTTY)
- pkgver = 0.10
+ pkgver = 0.11
pkgrel = 1
url = https://github.com/pi-kvm/kvmd-webterm
install = kvmd-webterm.install
@@ -12,15 +12,15 @@ pkgbase = kvmd-webterm
source = kvmd-webterm.install
source = kvmd-webterm.service
source = terminal.svg
- source = nginx.http-ctx.conf
- source = nginx.server-ctx.conf
+ source = nginx.ctx-http.conf
+ source = nginx.ctx-server.conf
source = index.html
source = manifest.yaml
md5sums = a8119b6f675ca954c71ecd241745df0c
md5sums = 1a44d9a469c566b20bcf9b9dafa97fe6
md5sums = 8310f16f1892706c6ee5d07d51393e00
md5sums = dc9e0d328cb2710ef2921737fded3229
- md5sums = 4623292f8a4dab570ea14ec63e25216e
+ md5sums = 7a97a82f9e2a1b4c657699fcd6feffc9
md5sums = 322e19b66f30da453c9e7525400c64d4
md5sums = ad52c541f400b29e85770bbb3d6a5211
diff --git a/PKGBUILD b/PKGBUILD
index 68626238b308..2b3ab5350b3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=kvmd-webterm
-pkgver=0.10
+pkgver=0.11
pkgrel=1
pkgdesc="Pi-KVM Web Terminal (GoTTY)"
url="https://github.com/pi-kvm/kvmd-webterm"
@@ -16,8 +16,8 @@ source=(
$pkgname.install
kvmd-webterm.service
terminal.svg
- nginx.http-ctx.conf
- nginx.server-ctx.conf
+ nginx.ctx-http.conf
+ nginx.ctx-server.conf
index.html
manifest.yaml
)
@@ -26,7 +26,7 @@ md5sums=(
"1a44d9a469c566b20bcf9b9dafa97fe6"
"8310f16f1892706c6ee5d07d51393e00"
"dc9e0d328cb2710ef2921737fded3229"
- "4623292f8a4dab570ea14ec63e25216e"
+ "7a97a82f9e2a1b4c657699fcd6feffc9"
"322e19b66f30da453c9e7525400c64d4"
"ad52c541f400b29e85770bbb3d6a5211"
)
diff --git a/nginx.http-ctx.conf b/nginx.ctx-http.conf
index 3938e2ec2cdb..3938e2ec2cdb 100644
--- a/nginx.http-ctx.conf
+++ b/nginx.ctx-http.conf
diff --git a/nginx.server-ctx.conf b/nginx.ctx-server.conf
index 531817086079..f2dbcb7b34a2 100644
--- a/nginx.server-ctx.conf
+++ b/nginx.ctx-server.conf
@@ -4,10 +4,7 @@ location /extras/webterm/gotty {
rewrite ^/extras/webterm/gotty\?(.*)$ ?$1 break;
rewrite ^/extras/webterm/gotty/(.*)$ /$1 break;
proxy_pass http://gotty;
- include /etc/nginx/proxy-params.conf;
- proxy_set_header Upgrade $http_upgrade;
- proxy_set_header Connection "upgrade";
- proxy_connect_timeout 7d;
- proxy_send_timeout 7d;
- proxy_read_timeout 7d;
+ include /etc/nginx/loc-proxy.conf;
+ include /etc/nginx/loc-websocket.conf;
+ include /etc/nginx/loc-login.conf;
}