avm/hassio-addons
1
0
Fork 0
mirror of https://github.com/alexbelgium/hassio-addons.git synced 2026-05-31 04:44:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Ingress addition test

Browse Source 
https://github.com/alexbelgium/hassio-addons/issues/649
This commit is contained in:
Alexandre
2023-01-26 17:32:25 +01:00
parent a9c00d4c97
commit 790ea51702
26 changed files with 471 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
enedisgateway2mqtt/CHANGELOG.md
View File

@@ -1,3 +1,4 @@
- Ingress addition
## 0.8.13 (22-01-2023) ## 0.8.13 (22-01-2023)
- Update to latest version from m4dm4rtig4n/myelectricaldata - Update to latest version from m4dm4rtig4n/myelectricaldata

4
enedisgateway2mqtt/Dockerfile
View File

@@ -51,9 +51,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
&& chmod -R 755 /etc/cont-init.d && chmod -R 755 /etc/cont-init.d
# Manual apps # Manual apps
ENV PACKAGES="jq \ ENV PACKAGES="nginx yamllint"
curl \
yamllint"
# Automatic apps & bashio # Automatic apps & bashio
# hadolint ignore=SC2015 # hadolint ignore=SC2015

5
enedisgateway2mqtt/config.json
View File

@@ -7,6 +7,7 @@
"codenotary": "alexandrep.github@gmail.com", "codenotary": "alexandrep.github@gmail.com",
"description": "Use Enedis Gateway API to send data in your MQTT Broker (latest channel)", "description": "Use Enedis Gateway API to send data in your MQTT Broker (latest channel)",
"image": "ghcr.io/alexbelgium/myelectricaldata-{arch}", "image": "ghcr.io/alexbelgium/myelectricaldata-{arch}",
"ingress": true,
"map": [ "map": [
"config:rw" "config:rw"
], ],
@@ -17,6 +18,7 @@
"mqtt_autodiscover": true, "mqtt_autodiscover": true,
"verbose": true "verbose": true
}, },
"panel_icon": "mdi:lightning-bolt-outline",
"ports": { "ports": {
"5000/tcp": 5000 "5000/tcp": 5000
}, },
@@ -34,6 +36,5 @@
], ],
"slug": "enedisgateway2mqtt", "slug": "enedisgateway2mqtt",
"url": "https://github.com/alexbelgium/hassio-addons", "url": "https://github.com/alexbelgium/hassio-addons",
"version": "0.8.13-4", "version": "0.8.13-5"
"webui": "http://[HOST]:[PORT:5000]"
} }

96
enedisgateway2mqtt/rootfs/etc/nginx/includes/mime.types Normal file
View File

@@ -0,0 +1,96 @@
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/svg+xml svg svgz;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/webp webp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
font/woff woff;
font/woff2 woff2;
application/java-archive jar war ear;
application/json json;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.apple.mpegurl m3u8;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt;
application/vnd.oasis.opendocument.graphics odg;
application/vnd.oasis.opendocument.presentation odp;
application/vnd.oasis.opendocument.spreadsheet ods;
application/vnd.oasis.opendocument.text odt;
application/vnd.openxmlformats-officedocument.presentationml.presentation
pptx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
xlsx;
application/vnd.openxmlformats-officedocument.wordprocessingml.document
docx;
application/vnd.wap.wmlc wmlc;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/xspf+xml xspf;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream iso img;
application/octet-stream msi msp msm;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp2t ts;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}

15
enedisgateway2mqtt/rootfs/etc/nginx/includes/proxy_params.conf Normal file
View File

@@ -0,0 +1,15 @@
proxy_http_version 1.1;
proxy_ignore_client_abort off;
proxy_read_timeout 86400s;
proxy_redirect off;
proxy_send_timeout 86400s;
proxy_max_temp_file_size 0;
proxy_set_header Accept-Encoding "";
proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-NginX-Proxy true;
proxy_set_header X-Real-IP $remote_addr;

1
enedisgateway2mqtt/rootfs/etc/nginx/includes/resolver.conf Normal file
View File

@@ -0,0 +1 @@
resolver 127.0.0.11;

6
enedisgateway2mqtt/rootfs/etc/nginx/includes/server_params.conf Normal file
View File

@@ -0,0 +1,6 @@
root /dev/null;
server_name $hostname;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;

9
enedisgateway2mqtt/rootfs/etc/nginx/includes/ssl_params.conf Normal file
View File

@@ -0,0 +1,9 @@
ssl_protocols TLSv1.2;
ssl_prefer_server_ciphers on;
ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
ssl_ecdh_curve secp384r1;
ssl_session_timeout 10m;
ssl_session_cache shared:SSL:10m;
ssl_session_tickets off;
ssl_stapling on;
ssl_stapling_verify on;

3
enedisgateway2mqtt/rootfs/etc/nginx/includes/upstream.conf Normal file
View File

@@ -0,0 +1,3 @@
upstream backend {
server 127.0.0.1:2202;
}

56
enedisgateway2mqtt/rootfs/etc/nginx/nginx.conf Normal file
View File

@@ -0,0 +1,56 @@
# Run nginx in foreground.
daemon off;
# This is run inside Docker.
user root;
# Pid storage location.
pid /var/run/nginx.pid;
# Set number of worker processes.
worker_processes 1;
# Enables the use of JIT for regular expressions to speed-up their processing.
pcre_jit on;
# Write error log to Hass.io add-on log.
error_log /proc/1/fd/1 error;
# Load allowed environment vars
env HASSIO_TOKEN;
# Load dynamic modules.
include /etc/nginx/modules/*.conf;
# Max num of simultaneous connections by a worker process.
events {
worker_connections 512;
}
http {
include /etc/nginx/includes/mime.types;
log_format hassio '[$time_local] $status '
'$http_x_forwarded_for($remote_addr) '
'$request ($http_user_agent)';
access_log /proc/1/fd/1 hassio;
client_max_body_size 4G;
default_type application/octet-stream;
gzip on;
keepalive_timeout 65;
sendfile on;
server_tokens off;
tcp_nodelay on;
tcp_nopush on;
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
include /etc/nginx/includes/resolver.conf;
include /etc/nginx/includes/upstream.conf;
include /etc/nginx/servers/*.conf;
}

25
enedisgateway2mqtt/rootfs/etc/nginx/servers/ingress.conf Normal file
View File

@@ -0,0 +1,25 @@
server {
listen %%interface%%:%%port%% default_server;
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
location / {
proxy_pass http://127.0.0.1:5000;
root /app;
# Sub_filter
proxy_set_header Accept-Encoding "";
sub_filter_once off;
sub_filter_types *;
sub_filter /account %%ingress_entry%%/account;
sub_filter /config %%ingress_entry%%/config;
sub_filter /gateway %%ingress_entry%%/gateway;
sub_filter /import %%ingress_entry%%/import;
sub_filter /lock %%ingress_entry%%/lock;
sub_filter /new %%ingress_entry%%/new;
sub_filter /reset %%ingress_entry%%/reset;
sub_filter /static %%ingress_entry%%/static;
sub_filter /usage %%ingress_entry%%/usage;
}
}

8
enedisgateway2mqtt/rootfs/etc/services.d/nginx/finish Normal file
View File

@@ -0,0 +1,8 @@
#!/usr/bin/execlineb -S0
# ==============================================================================
# Take down the S6 supervision tree when Nginx fails
# ==============================================================================
if { s6-test ${1} -ne 0 }
if { s6-test ${1} -ne 256 }
s6-svscanctl -t /var/run/s6/services

10
enedisgateway2mqtt/rootfs/etc/services.d/nginx/run Normal file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Wait for transmission to become available
bashio::net.wait_for 5000 localhost 900
bashio::log.info "Starting NGinx..."
exec nginx

1
enedisgateway2mqtt_dev/CHANGELOG.md
View File

@@ -1,3 +1,4 @@
- Ingress addition
## 0.8.13 (22-01-2023) ## 0.8.13 (22-01-2023)
- Update to latest version from m4dm4rtig4n/myelectricaldata - Update to latest version from m4dm4rtig4n/myelectricaldata

10
enedisgateway2mqtt_dev/Dockerfile
View File

@@ -2,11 +2,11 @@
# ALEXBELGIUM'S DOCKERFILE # # ALEXBELGIUM'S DOCKERFILE #
#============================# #============================#
# _.------. # _.------.
# _.-` ('>.-`"""-. # _.-` ('>.-`"0.8.13""-.
# '.--'` _'` _ .--.) # '.--'` _'` _ .--.)
# -' '-.-';` ` # -' '-.-';` `
# ' - _.' ``'--. # ' - _.' ``'--.
# _.-` ('>.-`"""-. # '---` .-'"0.8.13"`
# /` # /`
#=== Home Assistant Addon ===# #=== Home Assistant Addon ===#
@@ -15,7 +15,7 @@
################# #################
ARG BUILD_UPSTREAM="0.8.13" ARG BUILD_UPSTREAM="0.8.13"
FROM m4dm4rtig4n/myelectricaldata:latest-dev FROM m4dm4rtig4n/myelectricaldata:latest
################## ##################
@@ -51,9 +51,7 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get
&& chmod -R 755 /etc/cont-init.d && chmod -R 755 /etc/cont-init.d
# Manual apps # Manual apps
ENV PACKAGES="jq \ ENV PACKAGES="nginx yamllint"
curl \
yamllint"
# Automatic apps & bashio # Automatic apps & bashio
# hadolint ignore=SC2015 # hadolint ignore=SC2015

5
enedisgateway2mqtt_dev/config.json
View File

@@ -7,6 +7,7 @@
"codenotary": "alexandrep.github@gmail.com", "codenotary": "alexandrep.github@gmail.com",
"description": "Use Enedis Gateway API to send data in your MQTT Broker (dev channel)", "description": "Use Enedis Gateway API to send data in your MQTT Broker (dev channel)",
"image": "ghcr.io/alexbelgium/myelectricaldata_dev-{arch}", "image": "ghcr.io/alexbelgium/myelectricaldata_dev-{arch}",
"ingress": true,
"map": [ "map": [
"config:rw" "config:rw"
], ],
@@ -17,6 +18,7 @@
"mqtt_autodiscover": true, "mqtt_autodiscover": true,
"verbose": true "verbose": true
}, },
"panel_icon": "mdi:lightning-bolt-outline",
"ports": { "ports": {
"5000/tcp": 5000 "5000/tcp": 5000
}, },
@@ -34,6 +36,5 @@
], ],
"slug": "enedisgateway2mqtt_dev", "slug": "enedisgateway2mqtt_dev",
"url": "https://github.com/alexbelgium/hassio-addons", "url": "https://github.com/alexbelgium/hassio-addons",
"version": "0.8.14-beta1-2", "version": "0.8.14-beta1-3"
"webui": "http://[HOST]:[PORT:5000]"
} }

96
enedisgateway2mqtt_dev/rootfs/etc/nginx/includes/mime.types Normal file
View File

@@ -0,0 +1,96 @@
types {
text/html html htm shtml;
text/css css;
text/xml xml;
image/gif gif;
image/jpeg jpeg jpg;
application/javascript js;
application/atom+xml atom;
application/rss+xml rss;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/svg+xml svg svgz;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/webp webp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
font/woff woff;
font/woff2 woff2;
application/java-archive jar war ear;
application/json json;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.apple.mpegurl m3u8;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/vnd.ms-excel xls;
application/vnd.ms-fontobject eot;
application/vnd.ms-powerpoint ppt;
application/vnd.oasis.opendocument.graphics odg;
application/vnd.oasis.opendocument.presentation odp;
application/vnd.oasis.opendocument.spreadsheet ods;
application/vnd.oasis.opendocument.text odt;
application/vnd.openxmlformats-officedocument.presentationml.presentation
pptx;
application/vnd.openxmlformats-officedocument.spreadsheetml.sheet
xlsx;
application/vnd.openxmlformats-officedocument.wordprocessingml.document
docx;
application/vnd.wap.wmlc wmlc;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/xspf+xml xspf;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream iso img;
application/octet-stream msi msp msm;
audio/midi mid midi kar;
audio/mpeg mp3;
audio/ogg ogg;
audio/x-m4a m4a;
audio/x-realaudio ra;
video/3gpp 3gpp 3gp;
video/mp2t ts;
video/mp4 mp4;
video/mpeg mpeg mpg;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-m4v m4v;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}

15
enedisgateway2mqtt_dev/rootfs/etc/nginx/includes/proxy_params.conf Normal file
View File

@@ -0,0 +1,15 @@
proxy_http_version 1.1;
proxy_ignore_client_abort off;
proxy_read_timeout 86400s;
proxy_redirect off;
proxy_send_timeout 86400s;
proxy_max_temp_file_size 0;
proxy_set_header Accept-Encoding "";
proxy_set_header Connection $connection_upgrade;
proxy_set_header Host $http_host;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-NginX-Proxy true;
proxy_set_header X-Real-IP $remote_addr;

1
enedisgateway2mqtt_dev/rootfs/etc/nginx/includes/resolver.conf Normal file
View File

@@ -0,0 +1 @@
resolver 127.0.0.11;

6
enedisgateway2mqtt_dev/rootfs/etc/nginx/includes/server_params.conf Normal file
View File

@@ -0,0 +1,6 @@
root /dev/null;
server_name $hostname;
add_header X-Content-Type-Options nosniff;
add_header X-XSS-Protection "1; mode=block";
add_header X-Robots-Tag none;

9
enedisgateway2mqtt_dev/rootfs/etc/nginx/includes/ssl_params.conf Normal file
View File

@@ -0,0 +1,9 @@
ssl_protocols TLSv1.2;
ssl_prefer_server_ciphers on;
ssl_ciphers ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA;
ssl_ecdh_curve secp384r1;
ssl_session_timeout 10m;
ssl_session_cache shared:SSL:10m;
ssl_session_tickets off;
ssl_stapling on;
ssl_stapling_verify on;

3
enedisgateway2mqtt_dev/rootfs/etc/nginx/includes/upstream.conf Normal file
View File

@@ -0,0 +1,3 @@
upstream backend {
server 127.0.0.1:2202;
}

56
enedisgateway2mqtt_dev/rootfs/etc/nginx/nginx.conf Normal file
View File

@@ -0,0 +1,56 @@
# Run nginx in foreground.
daemon off;
# This is run inside Docker.
user root;
# Pid storage location.
pid /var/run/nginx.pid;
# Set number of worker processes.
worker_processes 1;
# Enables the use of JIT for regular expressions to speed-up their processing.
pcre_jit on;
# Write error log to Hass.io add-on log.
error_log /proc/1/fd/1 error;
# Load allowed environment vars
env HASSIO_TOKEN;
# Load dynamic modules.
include /etc/nginx/modules/*.conf;
# Max num of simultaneous connections by a worker process.
events {
worker_connections 512;
}
http {
include /etc/nginx/includes/mime.types;
log_format hassio '[$time_local] $status '
'$http_x_forwarded_for($remote_addr) '
'$request ($http_user_agent)';
access_log /proc/1/fd/1 hassio;
client_max_body_size 4G;
default_type application/octet-stream;
gzip on;
keepalive_timeout 65;
sendfile on;
server_tokens off;
tcp_nodelay on;
tcp_nopush on;
map $http_upgrade $connection_upgrade {
default upgrade;
'' close;
}
include /etc/nginx/includes/resolver.conf;
include /etc/nginx/includes/upstream.conf;
include /etc/nginx/servers/*.conf;
}

25
enedisgateway2mqtt_dev/rootfs/etc/nginx/servers/ingress.conf Normal file
View File

@@ -0,0 +1,25 @@
server {
listen %%interface%%:%%port%% default_server;
include /etc/nginx/includes/server_params.conf;
include /etc/nginx/includes/proxy_params.conf;
location / {
proxy_pass http://127.0.0.1:5000;
root /app;
# Sub_filter
proxy_set_header Accept-Encoding "";
sub_filter_once off;
sub_filter_types *;
sub_filter /account %%ingress_entry%%/account;
sub_filter /config %%ingress_entry%%/config;
sub_filter /gateway %%ingress_entry%%/gateway;
sub_filter /import %%ingress_entry%%/import;
sub_filter /lock %%ingress_entry%%/lock;
sub_filter /new %%ingress_entry%%/new;
sub_filter /reset %%ingress_entry%%/reset;
sub_filter /static %%ingress_entry%%/static;
sub_filter /usage %%ingress_entry%%/usage;
}
}

8
enedisgateway2mqtt_dev/rootfs/etc/services.d/nginx/finish Normal file
View File

@@ -0,0 +1,8 @@
#!/usr/bin/execlineb -S0
# ==============================================================================
# Take down the S6 supervision tree when Nginx fails
# ==============================================================================
if { s6-test ${1} -ne 0 }
if { s6-test ${1} -ne 256 }
s6-svscanctl -t /var/run/s6/services

10
enedisgateway2mqtt_dev/rootfs/etc/services.d/nginx/run Normal file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/with-contenv bashio
# shellcheck shell=bash
# ==============================================================================
# Wait for transmission to become available
bashio::net.wait_for 5000 localhost 900
bashio::log.info "Starting NGinx..."
exec nginx