diff --git a/aiortc/CHANGELOG.md b/aiortc/CHANGELOG.md deleted file mode 100644 index e69de29..0000000 diff --git a/aiortc/README.md b/aiortc/README.md deleted file mode 100644 index 562501b..0000000 --- a/aiortc/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# aiortc - -Provide streaming with support for WebRTC. \ No newline at end of file diff --git a/aiortc/rootfs/etc/cont-init.d/aiortc.sh b/aiortc/rootfs/etc/cont-init.d/aiortc.sh deleted file mode 100644 index 046504e..0000000 --- a/aiortc/rootfs/etc/cont-init.d/aiortc.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/with-contenv bashio -# ============================================================================== -# Add-on: aiortc -# Configures aiortc configuration -# ============================================================================== - -# mkdir -p /data/aiortc - -# touch /data/aiortc/aiortc.conf - -# if bashio::config.has_value 'webrtc_arguments'; then -# bashio::config 'webrtc_arguments' > /data/aiortc/aiortc.conf -# fi diff --git a/aiortc/translations/en.yaml b/aiortc/translations/en.yaml deleted file mode 100644 index 80921a0..0000000 --- a/aiortc/translations/en.yaml +++ /dev/null @@ -1,6 +0,0 @@ -configuration: - message: - name: Message - description: The message that will be printed to the log when starting this example add-on. -network: - 5000/TCP: OctoPrint port (not used for Ingress) \ No newline at end of file diff --git a/aiortc/DOCS.md b/camera-rtc/DOCS.md similarity index 100% rename from aiortc/DOCS.md rename to camera-rtc/DOCS.md diff --git a/aiortc/Dockerfile b/camera-rtc/Dockerfile similarity index 95% rename from aiortc/Dockerfile rename to camera-rtc/Dockerfile index caa5c67..8b7e3c4 100644 --- a/aiortc/Dockerfile +++ b/camera-rtc/Dockerfile @@ -27,4 +27,4 @@ COPY rootfs / # Make files executable RUN chmod +x /etc/cont-init.d/*.sh -RUN chmod +x /etc/services.d/*/* \ No newline at end of file +RUN chmod +x /etc/services.d/*/* diff --git a/camera-rtc/README.md b/camera-rtc/README.md new file mode 100644 index 0000000..3556dfa --- /dev/null +++ b/camera-rtc/README.md @@ -0,0 +1,3 @@ +# Camera-RTC + +Camera addon with support for WebRTC. diff --git a/aiortc/build.yaml b/camera-rtc/build.yaml similarity index 98% rename from aiortc/build.yaml rename to camera-rtc/build.yaml index b9abb9a..5523b9b 100644 --- a/aiortc/build.yaml +++ b/camera-rtc/build.yaml @@ -1,4 +1,3 @@ ---- build_from: aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye diff --git a/aiortc/config.yaml b/camera-rtc/config.yaml similarity index 63% rename from aiortc/config.yaml rename to camera-rtc/config.yaml index 7f8713c..81e07e9 100644 --- a/aiortc/config.yaml +++ b/camera-rtc/config.yaml @@ -1,9 +1,8 @@ ---- -name: "3DPrinter-aiortc" -version: "2022.7.008" -slug: "3dprinter-aiortc" +name: "Camera-RTC" +version: "2022.7.009" +slug: "camera-aiortc" description: "Camera stream with support for WebRTC." -url: "https://github.com/fredrikbaberg/3dprinter-addons/tree/main/3dprinter-aiortc" +url: "https://github.com/fredrikbaberg/3dprinter-addons/tree/main/camera-rtc" ingress: true ingress_stream: true panel_icon: mdi:camera @@ -14,11 +13,8 @@ arch: - armv7 - i386 init: false -ports: - 80/tcp: null -ports_description: - 80/tcp: Web interface (Not required for Ingress) video: true +usb: true options: webrtc_arguments: '' schema: diff --git a/aiortc/rootfs/etc/cont-init.d/nginx.sh b/camera-rtc/rootfs/etc/cont-init.d/nginx.sh similarity index 100% rename from aiortc/rootfs/etc/cont-init.d/nginx.sh rename to camera-rtc/rootfs/etc/cont-init.d/nginx.sh diff --git a/aiortc/rootfs/etc/nginx/includes/mime.types b/camera-rtc/rootfs/etc/nginx/includes/mime.types similarity index 100% rename from aiortc/rootfs/etc/nginx/includes/mime.types rename to camera-rtc/rootfs/etc/nginx/includes/mime.types diff --git a/aiortc/rootfs/etc/nginx/includes/proxy_params.conf b/camera-rtc/rootfs/etc/nginx/includes/proxy_params.conf similarity index 100% rename from aiortc/rootfs/etc/nginx/includes/proxy_params.conf rename to camera-rtc/rootfs/etc/nginx/includes/proxy_params.conf diff --git a/aiortc/rootfs/etc/nginx/includes/server_params.conf b/camera-rtc/rootfs/etc/nginx/includes/server_params.conf similarity index 100% rename from aiortc/rootfs/etc/nginx/includes/server_params.conf rename to camera-rtc/rootfs/etc/nginx/includes/server_params.conf diff --git a/aiortc/rootfs/etc/nginx/includes/ssl_params.conf b/camera-rtc/rootfs/etc/nginx/includes/ssl_params.conf similarity index 100% rename from aiortc/rootfs/etc/nginx/includes/ssl_params.conf rename to camera-rtc/rootfs/etc/nginx/includes/ssl_params.conf diff --git a/aiortc/rootfs/etc/nginx/includes/upstream.conf b/camera-rtc/rootfs/etc/nginx/includes/upstream.conf similarity index 100% rename from aiortc/rootfs/etc/nginx/includes/upstream.conf rename to camera-rtc/rootfs/etc/nginx/includes/upstream.conf diff --git a/aiortc/rootfs/etc/nginx/nginx.conf b/camera-rtc/rootfs/etc/nginx/nginx.conf similarity index 100% rename from aiortc/rootfs/etc/nginx/nginx.conf rename to camera-rtc/rootfs/etc/nginx/nginx.conf diff --git a/aiortc/rootfs/etc/nginx/servers/.gitkeep b/camera-rtc/rootfs/etc/nginx/servers/.gitkeep similarity index 100% rename from aiortc/rootfs/etc/nginx/servers/.gitkeep rename to camera-rtc/rootfs/etc/nginx/servers/.gitkeep diff --git a/aiortc/rootfs/etc/nginx/templates/direct.gtpl b/camera-rtc/rootfs/etc/nginx/templates/direct.gtpl similarity index 100% rename from aiortc/rootfs/etc/nginx/templates/direct.gtpl rename to camera-rtc/rootfs/etc/nginx/templates/direct.gtpl diff --git a/aiortc/rootfs/etc/nginx/templates/ingress.gtpl b/camera-rtc/rootfs/etc/nginx/templates/ingress.gtpl similarity index 100% rename from aiortc/rootfs/etc/nginx/templates/ingress.gtpl rename to camera-rtc/rootfs/etc/nginx/templates/ingress.gtpl diff --git a/aiortc/rootfs/etc/services.d/aiortc/finish b/camera-rtc/rootfs/etc/services.d/aiortc/finish similarity index 100% rename from aiortc/rootfs/etc/services.d/aiortc/finish rename to camera-rtc/rootfs/etc/services.d/aiortc/finish diff --git a/aiortc/rootfs/etc/services.d/aiortc/run b/camera-rtc/rootfs/etc/services.d/aiortc/run similarity index 58% rename from aiortc/rootfs/etc/services.d/aiortc/run rename to camera-rtc/rootfs/etc/services.d/aiortc/run index 293803c..6d5c4ee 100644 --- a/aiortc/rootfs/etc/services.d/aiortc/run +++ b/camera-rtc/rootfs/etc/services.d/aiortc/run @@ -6,16 +6,11 @@ declare -a options -bashio::log.info "Starting aiortc..." +basio::log.info "Starting aiortc with arguments: '$options'" -# options+=$(cat /data/aiortc/aiortc.conf) - -# # Enable debug mode -# if bashio::debug; then -# options+=" --verbose" -# fi - -# basio::log.info "Starting aiortc with arguments: '$options'" +if bashio::config.has_value 'webrtc_arguments'; then + options+="${bashio::config 'webrtc_arguments'}" +fi # Run aiortc exec python3 /aiortc/examples/webcam/webcam.py "${options[@]}" diff --git a/aiortc/rootfs/etc/services.d/nginx/finish b/camera-rtc/rootfs/etc/services.d/nginx/finish similarity index 100% rename from aiortc/rootfs/etc/services.d/nginx/finish rename to camera-rtc/rootfs/etc/services.d/nginx/finish diff --git a/aiortc/rootfs/etc/services.d/nginx/run b/camera-rtc/rootfs/etc/services.d/nginx/run similarity index 100% rename from aiortc/rootfs/etc/services.d/nginx/run rename to camera-rtc/rootfs/etc/services.d/nginx/run