diff --git a/scrutiny_fa/CHANGELOG.md b/scrutiny_fa/CHANGELOG.md deleted file mode 100644 index f5cfbf72f..000000000 --- a/scrutiny_fa/CHANGELOG.md +++ /dev/null @@ -1,106 +0,0 @@ -- Align behavior with other addons : map /addons_config/xxx-scrutiny to enable env injection or custom scripts - -## v0.8.1-8 (13-11-2024) -- Minor bugs fixed -## v0.8.1-7 (13-11-2024) -- New feature : if you select "Custom" as "Updates" variable, you can define specific updates in natural language in the "Updates_custom_time" field. Example : select "Custom" as "Updates", then type a custom intervals like "5m", "2h", "1w", or "2mo" to have an update every 5 minutes, or every 2 hours, or evey week, or every 2 months - -## v0.8.1-5 (02-11-2024) -- Minor bugs fixed -## v0.8.1-4 (30-07-2024) -- Minor bugs fixed -## v0.8.1-3 (11-06-2024) -- Minor bugs fixed -## v0.8.1-2 (13-04-2024) -- Minor bugs fixed - -## v0.8.1 (13-04-2024) -- Update to latest version from analogj/scrutiny (changelog : https://github.com/analogj/scrutiny/releases) -## v0.8.0-3 (18-03-2024) -- Minor bugs fixed -## v0.8.0-2 (17-03-2024) -- Minor bugs fixed - -## v0.8.0 (16-03-2024) -- Update to latest version from analogj/scrutiny - -## v0.7.3 (02-03-2024) - -- Update to latest version from analogj/scrutiny - -## v0.7.2 (20-10-2023) - -- Update to latest version from analogj/scrutiny -## v0.7.1-2 (27-06-2023) - -- Minor bugs fixed -- Add privileges in addition to full_access @dm82m @https://github.com/alexbelgium/hassio-addons/issues/880 - -## v0.7.1 (15-04-2023) - -- Update to latest version from analogj/scrutiny - -## v0.7.0 (08-04-2023) - -- Update to latest version from analogj/scrutiny -- Implemented healthcheck - -## v0.6.0 (14-01-2023) - -- Update to latest version from analogj/scrutiny -- WARNING : update to supervisor 2022.11 before installing -- New options SMARTCTL_COMMAND_DEVICE_TYPE & SMARTCTL_MEGARAID_DISK_NUM (@scavara) -- New option "Mode" : Collector+WebUI or Collector only - -## v0.5.0 (26-08-2022) - -- Update to latest version from analogj/scrutiny - -- BACKUP BEFORE UPDATE : major version change -- PUID/PGID, ssl values deprecated - -## 2ab714f5-ls35 (11-05-2022) - -- Update to latest version from linuxserver/scrutiny - -## version-c397a323 (10-05-2022) - -- Update to latest version from linuxserver/scrutiny - -## 8e34ef8d-ls35 (05-05-2022) - -- Require unprotected -- Added full access. Use only if you can't connect without -- Update to latest version from linuxserver/scrutiny -- Add codenotary sign -- New standardized logic for Dockerfile build and packages installation -- Added : "/dev/nvme0" - -## 0.3.13 (26-10-2021) - -- Update to latest version from analogj/scrutiny -- Allow mounting of devices up to sdg2 - -## 0.3.12 (29-09-2021) - -- Update to latest version from AnalogJ/scrutiny -- Aligned with AnalogJ namings - -## fd4f0429 - -- New ingress icon, thanks to @ElVit -- New features, selecting of update rate with addon option -- Add banner in log -- Align to upstream - -## 27b923b5-ls12 - -- Removed full access flag -- Improved code for local devices scanning after first installation -- Solved an issue that made a blank screen on mobile devices -- Implementation of Ingress with/without ssl - -## 27b923b5-ls11 - -- Enables PUID/PGID options -- Daily update of values diff --git a/scrutiny_fa/CHANGELOG.md b/scrutiny_fa/CHANGELOG.md new file mode 120000 index 000000000..18854179d --- /dev/null +++ b/scrutiny_fa/CHANGELOG.md @@ -0,0 +1 @@ +../scrutiny/CHANGELOG.md \ No newline at end of file diff --git a/scrutiny_fa/apparmor.txt b/scrutiny_fa/apparmor.txt deleted file mode 100644 index 2cf1edb58..000000000 --- a/scrutiny_fa/apparmor.txt +++ /dev/null @@ -1,78 +0,0 @@ -#include - -profile db21ed7f_scrutiny flags=(attach_disconnected,mediate_deleted) { - #include - - capability, - file, - signal, - mount, - umount, - remount, - network udp, - network tcp, - network dgram, - network stream, - network inet, - network inet6, - network netlink raw, - network unix dgram, - - capability setgid, - capability setuid, - capability dac_override, - capability sys_admin, - capability dac_read_search, - capability sys_rawio, - -# S6-Overlay - /init ix, - /run/{s6,s6-rc*,service}/** ix, - /package/** ix, - /command/** ix, - /run/{,**} rwk, - /dev/tty rw, - /bin/** ix, - /usr/bin/** ix, - /usr/lib/bashio/** ix, - /etc/s6/** rix, - /run/s6/** rix, - /etc/services.d/** rwix, - /etc/cont-init.d/** rwix, - /etc/cont-finish.d/** rwix, - /init rix, - /var/run/** mrwkl, - /var/run/ mrwkl, - /dev/i2c-1 mrwkl, - # Files required - /dev/fuse mrwkl, - /dev/sda1 mrwkl, - /dev/sdb1 mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/mmcblk0p1 mrwkl, - /dev/* mrwkl, - /tmp/** mrkwl, - /dev/sda mrwkl, - /dev/sdb mrwkl, - /dev/sdc mrwkl, - /dev/sdd mrwkl, - /dev/sde mrwkl, - /dev/sdf mrwkl, - /dev/sdg mrwkl, - /dev/nvme0 mrwkl, - /dev/nvme1 mrwkl, - /dev/nvme2 mrwkl, - /dev/nvme3 mrwkl, - /dev/nvme4 mrwkl, - - # Data access - /data/** rw, - - # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container - ptrace (trace,read) peer=docker-default, - - # docker daemon confinement requires explict allow rule for signal - signal (receive) set=(kill,term) peer=/usr/bin/docker, - -} diff --git a/scrutiny_fa/apparmor.txt b/scrutiny_fa/apparmor.txt new file mode 120000 index 000000000..e3bc61033 --- /dev/null +++ b/scrutiny_fa/apparmor.txt @@ -0,0 +1 @@ +../scrutiny/apparmor.txt \ No newline at end of file diff --git a/scrutiny_fa/build.json b/scrutiny_fa/build.json deleted file mode 100644 index 79f0bcfa5..000000000 --- a/scrutiny_fa/build.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "build_from": { - "aarch64": "ghcr.io/analogj/scrutiny:master-omnibus", - "amd64": "ghcr.io/analogj/scrutiny:master-omnibus" - }, - "codenotary": { - "signer": "alexandrep.github@gmail.com" - } -} diff --git a/scrutiny_fa/build.json b/scrutiny_fa/build.json new file mode 120000 index 000000000..66e795b83 --- /dev/null +++ b/scrutiny_fa/build.json @@ -0,0 +1 @@ +../scrutiny/build.json \ No newline at end of file diff --git a/scrutiny_fa/icon.png b/scrutiny_fa/icon.png deleted file mode 100644 index 0ba94a22a..000000000 Binary files a/scrutiny_fa/icon.png and /dev/null differ diff --git a/scrutiny_fa/icon.png b/scrutiny_fa/icon.png new file mode 120000 index 000000000..455464fd6 --- /dev/null +++ b/scrutiny_fa/icon.png @@ -0,0 +1 @@ +../scrutiny/icon.png \ No newline at end of file diff --git a/scrutiny_fa/logo.png b/scrutiny_fa/logo.png deleted file mode 100644 index 0ba94a22a..000000000 Binary files a/scrutiny_fa/logo.png and /dev/null differ diff --git a/scrutiny_fa/logo.png b/scrutiny_fa/logo.png new file mode 120000 index 000000000..69feb8321 --- /dev/null +++ b/scrutiny_fa/logo.png @@ -0,0 +1 @@ +../scrutiny/logo.png \ No newline at end of file diff --git a/scrutiny_fa/rootfs b/scrutiny_fa/rootfs new file mode 120000 index 000000000..67f720f31 --- /dev/null +++ b/scrutiny_fa/rootfs @@ -0,0 +1 @@ +../scrutiny/rootfs \ No newline at end of file diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh b/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh deleted file mode 100755 index 0f24d344c..000000000 --- a/scrutiny_fa/rootfs/etc/cont-init.d/01-configuration.sh +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -####################### -# Require unprotected # -####################### - -bashio::require.unprotected - -################# -# Create folder # -################# - -echo "Updating folders structure" -DATABASELOCATION="/data" -mkdir -p "$DATABASELOCATION"/config -mkdir -p "$DATABASELOCATION"/influxdb -if [ -d /opt/scrutiny/config ]; then rm -r /opt/scrutiny/config; fi -if [ -d /opt/scrutiny/influxdb ]; then rm -r /opt/scrutiny/influxdb; fi -ln -s "$DATABASELOCATION"/config /opt/scrutiny -ln -s "$DATABASELOCATION"/influxdb /opt/scrutiny - -############################### -# Migrating previous database # -############################### - -if [ -f /data/scrutiny.db ]; then - bashio::log.warning "Previous database detected, migration will start. Backup stored in /share/scrutiny.db.bak" - cp /data/scrutiny.db /share/scrutiny.db.bak - mv /data/scrutiny.db "$DATABASELOCATION"/config/ -fi - -###### -# TZ # -###### - -# Align timezone with options -if bashio::config.has_value "TZ"; then - TZ="$(bashio::config 'TZ')" - bashio::log.info "Timezone : $TZ" - sed -i "1a export TZ=$TZ" /etc/cont-init.d/01-timezone -fi - -################ -# CRON OPTIONS # -################ - -# Align update with options -FREQUENCY="$(bashio::config 'Updates')" -bashio::log.info "$FREQUENCY updates as defined in the 'Updates' option" - -case "$FREQUENCY" in - "Quarterly") - sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"*/15 * * * *\"" /etc/cont-init.d/50-cron-config - ;; - - "Hourly") - sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 * * * *\"" /etc/cont-init.d/50-cron-config - ;; - - "Daily") - sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * *\"" /etc/cont-init.d/50-cron-config - ;; - - "Weekly") - sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"0 0 * * 0\"" /etc/cont-init.d/50-cron-config - ;; - - "Custom") - interval="$(bashio::config 'Updates_custom_time')" - bashio::log.info "... frequency is defined manually as $interval" - - case "$interval" in - *m) # Matches intervals in minutes, like "5m" or "30m" - minutes="${interval%m}" - if [[ "$minutes" -gt 0 && "$minutes" -le 59 ]]; then - cron_schedule="*/$minutes * * * *" - else - bashio::log.error "Invalid minute interval: $interval" - fi - ;; - - *h) # Matches intervals in hours, like "2h" - hours="${interval%h}" - if [[ "$hours" -gt 0 && "$hours" -le 23 ]]; then - cron_schedule="0 */$hours * * *" - else - bashio::log.error "Invalid hour interval: $interval" - fi - ;; - - *w) # Matches intervals in weeks, like "1w" - weeks="${interval%w}" - if [[ "$weeks" -gt 0 && "$weeks" -le 4 ]]; then - cron_schedule="0 0 * * 0" # Weekly on Sunday (adjust if needed for multi-week) - else - bashio::log.error "Invalid week interval: $interval" - fi - ;; - - *mo) # Matches intervals in months, like "1mo" - months="${interval%mo}" - if [[ "$months" -gt 0 && "$months" -le 12 ]]; then - cron_schedule="0 0 1 */$months *" # Monthly on the 1st - else - bashio::log.error "Invalid month interval: $interval" - fi - ;; - - *) - bashio::log.error "Empty or unsupported custom interval. It should be in the format of 5m (every 5 minutes), 10d (every 10 days), 3w (every 3 weeks), 3mo (every 3 months)" - ;; - esac - - if [[ -n "$cron_schedule" ]]; then - sed -i "/customize the cron schedule/a export COLLECTOR_CRON_SCHEDULE=\"$cron_schedule\"" /etc/cont-init.d/50-cron-config - bashio::log.info "Custom cron schedule set to: $cron_schedule" - fi - ;; -esac - diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/32-nginx_ingress.sh b/scrutiny_fa/rootfs/etc/cont-init.d/32-nginx_ingress.sh deleted file mode 100755 index 3b8d0806b..000000000 --- a/scrutiny_fa/rootfs/etc/cont-init.d/32-nginx_ingress.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -################# -# NGINX SETTING # -################# -declare port -declare certfile -declare ingress_interface -declare ingress_port -declare keyfile - -port=$(bashio::addon.port 80) -if bashio::var.has_value "${port}"; then - bashio::config.require.ssl - - if bashio::config.true 'ssl'; then - certfile=$(bashio::config 'certfile') - keyfile=$(bashio::config 'keyfile') - - mv /etc/nginx/servers/direct-ssl.disabled /etc/nginx/servers/direct.conf - sed -i "s/%%certfile%%/${certfile}/g" /etc/nginx/servers/direct.conf - sed -i "s/%%keyfile%%/${keyfile}/g" /etc/nginx/servers/direct.conf - - else - mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf - fi -fi - -ingress_port=$(bashio::addon.ingress_port) -ingress_interface=$(bashio::addon.ip_address) -ingress_entry=$(bashio::addon.ingress_entry) -sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf -sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf -sed -i "s|%%ingress_entry%%|${ingress_entry}|g" /etc/nginx/servers/ingress.conf diff --git a/scrutiny_fa/rootfs/etc/cont-init.d/90-run.sh b/scrutiny_fa/rootfs/etc/cont-init.d/90-run.sh deleted file mode 100755 index 23652a378..000000000 --- a/scrutiny_fa/rootfs/etc/cont-init.d/90-run.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e - -######################### -# EXPOSE COLLECTOR.YAML # -######################### - -if bashio::config.true "expose_collector"; then - bashio::log.info "collector.yaml exposed in /share/scrutiny" - mkdir -p /share/scrutiny - if [ -f /data/config/collector.yaml ] ; then - cp -rnf /data/config/collector.yaml /share/scrutiny || true - rm -R /data/config/collector.yaml - fi - if [ -f /opt/scrutiny/config/collector.yaml ] ; then - cp -rnf /opt/scrutiny/config/collector.yaml /share/scrutiny || true - rm /opt/scrutiny/config/collector.yaml - fi - touch /share/scrutiny/collector.yaml - ln -sf /share/scrutiny/collector.yaml /data/config || true - mkdir -p /opt/scrutiny/config - ln -sf /share/scrutiny/collector.yaml /opt/scrutiny/config/collector.yaml || true - chmod 777 -R /share/scrutiny -fi - -######## -# MODE # -######## - -if [[ "$(bashio::config "Mode")" == Collector ]]; then - # Clean services - bashio::log.warning "Collector only mode. WebUI and Influxdb will be disabled" - rm -r /etc/services.d/influxdb - rm -r /etc/services.d/scrutiny - rm -r /etc/services.d/nginx - sed -i "/wait/d" /etc/services.d/collector-once/run - sed -i "/scrutiny api not ready/d" /etc/services.d/collector-once/run - - # Check collector - if bashio::config.has_value "COLLECTOR_API_ENDPOINT"; then - echo "export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" >> /env.sh - sed -i "1a export COLLECTOR_API_ENDPOINT=$(bashio::config "COLLECTOR_API_ENDPOINT")" /etc/services.d/collector-once/run - bashio::log.info "Using 'COLLECTOR_API_ENDPOINT' $(bashio::config "COLLECTOR_API_ENDPOINT")" - else - bashio::exit.nok "Mode is set to 'Collector', but 'COLLECTOR_API_ENDPOINT' is not defined" - fi -fi diff --git a/scrutiny_fa/rootfs/etc/nginx/includes/mime.types b/scrutiny_fa/rootfs/etc/nginx/includes/mime.types deleted file mode 100644 index 7c7cdef2d..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/includes/mime.types +++ /dev/null @@ -1,96 +0,0 @@ -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; -} diff --git a/scrutiny_fa/rootfs/etc/nginx/includes/proxy_params.conf b/scrutiny_fa/rootfs/etc/nginx/includes/proxy_params.conf deleted file mode 100644 index 1990d4959..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/includes/proxy_params.conf +++ /dev/null @@ -1,15 +0,0 @@ -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; diff --git a/scrutiny_fa/rootfs/etc/nginx/includes/resolver.conf b/scrutiny_fa/rootfs/etc/nginx/includes/resolver.conf deleted file mode 100644 index 70f4982b9..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/includes/resolver.conf +++ /dev/null @@ -1 +0,0 @@ -resolver 127.0.0.11 ipv6=off; diff --git a/scrutiny_fa/rootfs/etc/nginx/includes/server_params.conf b/scrutiny_fa/rootfs/etc/nginx/includes/server_params.conf deleted file mode 100644 index a0ff6baa0..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/includes/server_params.conf +++ /dev/null @@ -1,5 +0,0 @@ -server_name $hostname; - -add_header X-Content-Type-Options nosniff; -add_header X-XSS-Protection "1; mode=block"; -add_header X-Robots-Tag none; diff --git a/scrutiny_fa/rootfs/etc/nginx/includes/ssl_params.conf b/scrutiny_fa/rootfs/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index 6f1500599..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,9 +0,0 @@ -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; diff --git a/scrutiny_fa/rootfs/etc/nginx/includes/upstream.conf b/scrutiny_fa/rootfs/etc/nginx/includes/upstream.conf deleted file mode 100644 index b292326bd..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:8080; -} diff --git a/scrutiny_fa/rootfs/etc/nginx/nginx.conf b/scrutiny_fa/rootfs/etc/nginx/nginx.conf deleted file mode 100644 index 7e5bc6f7c..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/nginx.conf +++ /dev/null @@ -1,56 +0,0 @@ -# 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; -} diff --git a/scrutiny_fa/rootfs/etc/nginx/servers/ingress.conf b/scrutiny_fa/rootfs/etc/nginx/servers/ingress.conf deleted file mode 100644 index 70b217f39..000000000 --- a/scrutiny_fa/rootfs/etc/nginx/servers/ingress.conf +++ /dev/null @@ -1,28 +0,0 @@ -server { - listen %%interface%%:%%port%% default_server; - - include /etc/nginx/includes/server_params.conf; - include /etc/nginx/includes/proxy_params.conf; - - client_max_body_size 0; - - root /opt/scrutiny/web; - - location = / { - absolute_redirect off; # Do not add port to redirect - return 301 %%ingress_entry%%/web/dashboard; - } - - location /api { - add_header Access-Control-Allow-Origin *; - proxy_read_timeout 30; - proxy_pass http://backend/api; - } - - location /web/ { - add_header Access-Control-Allow-Origin *; - proxy_read_timeout 30; - proxy_pass http://backend/web/; - } - -} diff --git a/scrutiny_fa/rootfs/etc/services.d/nginx/finish b/scrutiny_fa/rootfs/etc/services.d/nginx/finish deleted file mode 100644 index 444240135..000000000 --- a/scrutiny_fa/rootfs/etc/services.d/nginx/finish +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 diff --git a/scrutiny_fa/rootfs/etc/services.d/nginx/run b/scrutiny_fa/rootfs/etc/services.d/nginx/run deleted file mode 100644 index 623775fc4..000000000 --- a/scrutiny_fa/rootfs/etc/services.d/nginx/run +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/with-contenv bashio -# shellcheck shell=bash -set -e -# ============================================================================== - -# Wait for transmission to become available -bashio::net.wait_for 8080 localhost 900 - -bashio::log.info "Starting NGinx..." - -exec nginx diff --git a/scrutiny_fa/updater.json b/scrutiny_fa/updater.json deleted file mode 100644 index 9fa8d2604..000000000 --- a/scrutiny_fa/updater.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "github_fulltag": "true", - "last_update": "13-04-2024", - "paused": false, - "repository": "alexbelgium/hassio-addons", - "slug": "scrutiny_fa", - "source": "github", - "upstream_repo": "analogj/scrutiny", - "upstream_version": "v0.8.1" -} diff --git a/scrutiny_fa/updater.json b/scrutiny_fa/updater.json new file mode 120000 index 000000000..a6d33dde2 --- /dev/null +++ b/scrutiny_fa/updater.json @@ -0,0 +1 @@ +../scrutiny/updater.json \ No newline at end of file