aljaz/addons
1
0
Fork 0
mirror of https://github.com/aljazceru/addons.git synced 2025-12-17 21:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

HomeMatic: Fix ingress (#1720)

Browse Source 
* HomeMatic: Fix ingress

* Fix count
This commit is contained in:
Pascal Vizeli
2020-12-16 17:08:18 +01:00
committed by GitHub
parent 0eae53cafa
commit e6a533c996
4 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
homematic/CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Changelog
## 11.0.3
- Fix Ingress path
## 11.0.2
- Fix issue with library

2
homematic/config.json
View File

@@ -1,6 +1,6 @@
{
"name": "HomeMatic CCU",
"version": "11.0.2",
"version": "11.0.3",
"slug": "homematic",
"description": "HomeMatic central based on OCCU",
"url": "https://github.com/home-assistant/hassio-addons/tree/master/homematic",

18
homematic/rootfs/etc/nginx/nginx.conf
View File

@@ -44,7 +44,7 @@ http {
location / {
proxy_pass http://127.0.0.1:80;
proxy_redirect ~^/(.+)$ $real_scheme://$http_host%%INGRESS_ENTRY%%/$1;
proxy_redirect ~^/(.+)$ $real_scheme://$http_host%%ingress_entry%%/$1;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
@@ -63,14 +63,14 @@ http {
sub_filter '/etc/config/' '/etc/config/';
# Make URLs relative
sub_filter '/webui/' '%%INGRESS_ENTRY%%/webui/';
sub_filter '/ise/' '%%INGRESS_ENTRY%%/ise/';
sub_filter '/pda/' '%%INGRESS_ENTRY%%/pda/';
sub_filter '/config/' '%%INGRESS_ENTRY%%/config/';
sub_filter '/api/' '%%INGRESS_ENTRY%%/api/';
sub_filter '/pages/' '%%INGRESS_ENTRY%%/pages/';
sub_filter '/jpages/' '%%INGRESS_ENTRY%%/jpages/';
sub_filter '/esp/' '%%INGRESS_ENTRY%%/esp/';
sub_filter '/webui/' '%%ingress_entry%%/webui/';
sub_filter '/ise/' '%%ingress_entry%%/ise/';
sub_filter '/pda/' '%%ingress_entry%%/pda/';
sub_filter '/config/' '%%ingress_entry%%/config/';
sub_filter '/api/' '%%ingress_entry%%/api/';
sub_filter '/pages/' '%%ingress_entry%%/pages/';
sub_filter '/jpages/' '%%ingress_entry%%/jpages/';
sub_filter '/esp/' '%%ingress_entry%%/esp/';
# Protect iframe breakouts
sub_filter 'top.window.location.href' 'location.href';

4
homematic/rootfs/usr/share/tempio/crRFD.conf
View File

@@ -43,6 +43,6 @@ Vertx.WorkerPoolSize=5
# USB HM/IP TRX Adapter Configuration
{{ range $index, $device := .hmip }}
Adapter.{{ $index }}.Type={{ $device.type }}
Adapter.{{ $index }}.Port={{ $device.device }}
Adapter.{{ if $index eq 0 }}1{{ else }}2{{ end }}.Type={{ $device.type }}
Adapter.{{ if $index eq 0 }}1{{ else }}2{{ end }}.Port={{ $device.device }}
{{ end }}