diff --git a/bitwarden/CHANGELOG.md b/bitwarden/CHANGELOG.md deleted file mode 100644 index 7e1ab1ba2..000000000 --- a/bitwarden/CHANGELOG.md +++ /dev/null @@ -1,154 +0,0 @@ - -## 1.35.0 (28-12-2025) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) -- The Home Assistant project has deprecated support for the armv7, armhf and i386 architectures. Support wil be fully dropped in the upcoming Home Assistant 2025.12 release - -- Added support for configuring extra environment variables via the `env_vars` add-on option alongside config.yaml. See https://github.com/alexbelgium/hassio-addons/wiki/Add-Environment-variables-to-your-Addon-2 for details. - -## 1.34.3 (01-08-2025) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.34.1 (31-05-2025) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.33.2 (15-02-2025) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.33.1 (08-02-2025) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.33.0 (01-02-2025) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.7 (21-12-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.6 (14-12-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.5 (23-11-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.4 (16-11-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.3 (02-11-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.2 (19-10-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.1 (05-10-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.32.0 (17-08-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.31.0 (13-07-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) - -## 1.30.5 (04-05-2024) -- Update to latest version from dani-garcia/bitwarden_rs (changelog : https://github.com/dani-garcia/bitwarden_rs/releases) -- Deprecated, please use version from community repository. Just export your vault from this addon, and import it in the official addon. - -## 1.30.1 (21-11-2023) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.30.0 (11-11-2023) - -- Update to latest version from dani-garcia/bitwarden_rs -## 1.29.2-2 (02-09-2023) - -- Minor bugs fixed -- Fix https://github.com/alexbelgium/hassio-addons/issues/975 - -## 1.29.2 (02-09-2023) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.29.1 (29-07-2023) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.29.0 (15-07-2023) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.28.1 (08-04-2023) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.28.0 (31-03-2023) - -- Update to latest version from dani-garcia/bitwarden_rs -- Implemented healthcheck - -## 1.27.0 (25-12-2022) - -- Update to latest version from dani-garcia/bitwarden_rs -- WARNING : update to supervisor 2022.11 before installing - -## 1.26.0 (15-10-2022) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.25.2 (28-07-2022) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.25.1 (17-07-2022) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.25.0 (24-05-2022) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.24.0 (27-04-2022) - -- Update to latest version from dani-garcia/bitwarden_rs -- Add codenotary sign - -## 1.24.0 (31-01-2022) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.23.1 (15-12-2021) - -- Update to latest version from dani-garcia/bitwarden_rs -- New standardized logic for Dockerfile build and packages installation - -## 1.23.0 (21-10-2021) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.22.2 (26-07-2021) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.22.1 (30-06-2021) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.22.0 (29-06-2021) - -- Update to latest version from dani-garcia/bitwarden_rs -- Project renamed to vaultwarden - -## 1.21.0 (30-04-2021) - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.20.0 - -- Update to latest version from dani-garcia/bitwarden_rs (Implemented Send functionality, Updated web vault to 2.19.0, CORS fixes, Updated diagnostics page with more info, Updated dependencies) - -## 1.19.0 - -- Update to latest version from dani-garcia/bitwarden_rs - -## 1.18.0 - -- Exposed settings.json in /share/transmission -- Add smb and local disks mount [(@dianlight)](https://github.com/dianlight) diff --git a/bitwarden/rootfs/etc/nginx/includes/ssl_params.conf b/bitwarden/rootfs/etc/nginx/includes/ssl_params.conf deleted file mode 100644 index e6789cbb9..000000000 --- a/bitwarden/rootfs/etc/nginx/includes/ssl_params.conf +++ /dev/null @@ -1,8 +0,0 @@ -ssl_protocols TLSv1.2 TLSv1.3; -ssl_prefer_server_ciphers off; -ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; -ssl_session_timeout 10m; -ssl_session_cache shared:SSL:10m; -ssl_session_tickets off; -ssl_stapling on; -ssl_stapling_verify on; diff --git a/bitwarden/rootfs/etc/nginx/includes/upstream.conf b/bitwarden/rootfs/etc/nginx/includes/upstream.conf deleted file mode 100644 index 3bda00eab..000000000 --- a/bitwarden/rootfs/etc/nginx/includes/upstream.conf +++ /dev/null @@ -1,3 +0,0 @@ -upstream backend { - server 127.0.0.1:80; -} \ No newline at end of file diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/dependencies.d/base deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type deleted file mode 100644 index bdd22a185..000000000 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up deleted file mode 100644 index b3b5b494b..000000000 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-nginx/run diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/init-nginx deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/vaultwarden b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/dependencies.d/vaultwarden deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish deleted file mode 100644 index 91e575465..000000000 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/finish +++ /dev/null @@ -1,26 +0,0 @@ -#!/command/with-contenv bashio -# ============================================================================== -# Home Assistant Community Add-on: Vaultwarden -# Take down the S6 supervision tree when Nginx fails -# ============================================================================== -declare exit_code -readonly exit_code_container=$( /run/s6-linux-init-container-results/exitcode - fi - [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt -elif [[ "${exit_code_service}" -ne 0 ]]; then - if [[ "${exit_code_container}" -eq 0 ]]; then - echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode - fi - exec /run/s6/basedir/bin/halt -fi diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/type b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/type deleted file mode 100644 index 5883cff0c..000000000 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-nginx deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/nginx deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/vaultwarden b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/vaultwarden deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/dependencies.d/base b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/dependencies.d/base deleted file mode 100644 index e69de29bb..000000000 diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/finish b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/finish deleted file mode 100644 index a6dc42f92..000000000 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/finish +++ /dev/null @@ -1,27 +0,0 @@ -#!/command/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== -# Home Assistant Community Add-on: Vaultwarden -# Take down the S6 supervision tree when the server fails -# ============================================================================== -declare exit_code -readonly exit_code_container=$( /run/s6-linux-init-container-results/exitcode - fi - [[ "${exit_code_signal}" -eq 15 ]] && exec /run/s6/basedir/bin/halt -elif [[ "${exit_code_service}" -ne 0 ]]; then - if [[ "${exit_code_container}" -eq 0 ]]; then - echo "${exit_code_service}" > /run/s6-linux-init-container-results/exitcode - fi - exec /run/s6/basedir/bin/halt -fi diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/type b/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/type deleted file mode 100644 index 5883cff0c..000000000 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/type +++ /dev/null @@ -1 +0,0 @@ -longrun diff --git a/bitwarden/DOCS.md b/zzz_archived_bitwarden/DOCS.md similarity index 100% rename from bitwarden/DOCS.md rename to zzz_archived_bitwarden/DOCS.md diff --git a/bitwarden/Dockerfile b/zzz_archived_bitwarden/Dockerfile similarity index 83% rename from bitwarden/Dockerfile rename to zzz_archived_bitwarden/Dockerfile index 404fe878d..87086c418 100644 --- a/bitwarden/Dockerfile +++ b/zzz_archived_bitwarden/Dockerfile @@ -14,43 +14,18 @@ # 1 Build Image # ################# -ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base:9.1.0 -############################################################################### -# Get prebuild containers from Vaultwarden -############################################################################### -FROM "vaultwarden/server:latest" AS vaultwarden -SHELL ["/bin/bash", "-o", "pipefail", "-c"] - -############################################################################### -# Build the actual add-on. -############################################################################### -# hadolint ignore=DL3006 +ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:7.1.0 +ARG BUILD_VERSION +ARG BUILD_UPSTREAM="1.35.0" +FROM "vaultwarden/server:${BUILD_UPSTREAM}" as vaultwarden FROM ${BUILD_FROM} - -# Set shell SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Get the Bitwarden from official images COPY --from=vaultwarden /vaultwarden /opt/vaultwarden +#COPY --from=vaultwarden /Rocket.toml /opt/Rocket.toml COPY --from=vaultwarden /web-vault /opt/web-vault -# add Nginx -# hadolint ignore=DL3009 -RUN \ - apt-get update \ - \ - && apt-get install -y --no-install-recommends \ - libmariadb-dev-compat=1:11.8.3-0+deb13u1 \ - libpq5=17.6-0+deb13u1 \ - nginx=1.26.3-3+deb13u1 \ - sqlite3=3.46.1-7 \ - && apt-get clean \ - && rm -f -r \ - /etc/nginx \ - \ - && mkdir -p /var/log/nginx \ - && touch /var/log/nginx/error.log - ################## # 2 Modify Image # ################## diff --git a/bitwarden/README.md b/zzz_archived_bitwarden/README.md similarity index 100% rename from bitwarden/README.md rename to zzz_archived_bitwarden/README.md diff --git a/bitwarden/apparmor.txt b/zzz_archived_bitwarden/apparmor.txt similarity index 100% rename from bitwarden/apparmor.txt rename to zzz_archived_bitwarden/apparmor.txt diff --git a/bitwarden/build.yaml b/zzz_archived_bitwarden/build.yaml similarity index 100% rename from bitwarden/build.yaml rename to zzz_archived_bitwarden/build.yaml diff --git a/bitwarden/config.yaml b/zzz_archived_bitwarden/config.yaml similarity index 85% rename from bitwarden/config.yaml rename to zzz_archived_bitwarden/config.yaml index 3c5ec0fa1..2b0ba5e09 100644 --- a/bitwarden/config.yaml +++ b/zzz_archived_bitwarden/config.yaml @@ -1,7 +1,7 @@ arch: - aarch64 - amd64 -description: Open source password management solution +description: Deprecated - please use community version image: ghcr.io/alexbelgium/vaultwarden-{arch} init: false map: @@ -9,25 +9,25 @@ map: name: zzz_archived - Vaultwarden options: env_vars: [] - ssl: true certfile: fullchain.pem keyfile: privkey.pem + ssl: true ports: 7277/tcp: 7277 ports_description: - 7277/tcp: Vaultwarden Web interface + 7277/tcp: Bitwarden Vault schema: env_vars: - name: match(^[A-Za-z0-9_]+$) value: str? - log_level: list(trace|debug|info|notice|warning|error|fatal)? - ssl: bool certfile: str keyfile: str + log_level: list(trace|debug|info|notice|warning|error|fatal)? request_size_limit: int? + ssl: bool slug: bitwarden stage: deprecated udev: true url: https://github.com/alexbelgium/hassio-addons/tree/master/bitwarden -version: 1.35.0 +version: "1.35.0" webui: "[PROTO:ssl]://[HOST]:[PORT:7277]" diff --git a/bitwarden/icon.png b/zzz_archived_bitwarden/icon.png similarity index 100% rename from bitwarden/icon.png rename to zzz_archived_bitwarden/icon.png diff --git a/bitwarden/logo.png b/zzz_archived_bitwarden/logo.png similarity index 100% rename from bitwarden/logo.png rename to zzz_archived_bitwarden/logo.png diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run b/zzz_archived_bitwarden/rootfs/etc/cont-init.d/nginx.sh old mode 100644 new mode 100755 similarity index 65% rename from bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run rename to zzz_archived_bitwarden/rootfs/etc/cont-init.d/nginx.sh index 0eb1f8027..0ce2350b6 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/init-nginx/run +++ b/zzz_archived_bitwarden/rootfs/etc/cont-init.d/nginx.sh @@ -1,11 +1,13 @@ #!/command/with-contenv bashio # shellcheck shell=bash +set -e # ============================================================================== -# Home Assistant Community Add-on: Vaultwarden -# This file configures NGINX +# Home Assistant Community Add-on: Bitwarden +# This file configures nginx # ============================================================================== declare certfile declare keyfile +declare max_body_size bashio::config.require.ssl @@ -19,3 +21,11 @@ if bashio::config.true 'ssl'; then else mv /etc/nginx/servers/direct.disabled /etc/nginx/servers/direct.conf fi + +max_body_size="10M" +# Increase body size to match config +if bashio::config.has_value 'request_size_limit'; then + max_body_size=$(bashio::config 'request_size_limit') +fi +sed -i "s/%%max_body_size%%/${max_body_size}/g" \ + /etc/nginx/includes/server_params.conf diff --git a/bitwarden/rootfs/etc/nginx/includes/mime.types b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/mime.types similarity index 100% rename from bitwarden/rootfs/etc/nginx/includes/mime.types rename to zzz_archived_bitwarden/rootfs/etc/nginx/includes/mime.types diff --git a/bitwarden/rootfs/etc/nginx/includes/proxy_params.conf b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/proxy_params.conf similarity index 100% rename from bitwarden/rootfs/etc/nginx/includes/proxy_params.conf rename to zzz_archived_bitwarden/rootfs/etc/nginx/includes/proxy_params.conf diff --git a/bitwarden/rootfs/etc/nginx/includes/server_params.conf b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/server_params.conf similarity index 80% rename from bitwarden/rootfs/etc/nginx/includes/server_params.conf rename to zzz_archived_bitwarden/rootfs/etc/nginx/includes/server_params.conf index 09c06543e..b6fceca86 100644 --- a/bitwarden/rootfs/etc/nginx/includes/server_params.conf +++ b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/server_params.conf @@ -4,3 +4,5 @@ server_name $hostname; add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; + +client_max_body_size %%max_body_size%%; diff --git a/zzz_archived_bitwarden/rootfs/etc/nginx/includes/ssl_params.conf b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/ssl_params.conf new file mode 100644 index 000000000..6cf1b5a3e --- /dev/null +++ b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/ssl_params.conf @@ -0,0 +1,9 @@ +ssl_protocols TLSv1.2 TLSv1.3; +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/zzz_archived_bitwarden/rootfs/etc/nginx/includes/upstream.conf b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/upstream.conf new file mode 100644 index 000000000..b8b7af611 --- /dev/null +++ b/zzz_archived_bitwarden/rootfs/etc/nginx/includes/upstream.conf @@ -0,0 +1,7 @@ +upstream backend { + server 127.0.0.1:80; +} + +upstream wsbackend { + server 127.0.0.1:8080; +} \ No newline at end of file diff --git a/bitwarden/rootfs/etc/nginx/nginx.conf b/zzz_archived_bitwarden/rootfs/etc/nginx/nginx.conf similarity index 81% rename from bitwarden/rootfs/etc/nginx/nginx.conf rename to zzz_archived_bitwarden/rootfs/etc/nginx/nginx.conf index 886e407b2..c1fbd4b5f 100644 --- a/bitwarden/rootfs/etc/nginx/nginx.conf +++ b/zzz_archived_bitwarden/rootfs/etc/nginx/nginx.conf @@ -27,7 +27,11 @@ events { http { include /etc/nginx/includes/mime.types; - access_log off; + log_format homeassistant '[$time_local] $status ' + '$http_x_forwarded_for($remote_addr) ' + '$request ($http_user_agent)'; + + access_log /proc/1/fd/1 homeassistant; client_max_body_size 4G; default_type application/octet-stream; gzip on; diff --git a/bitwarden/rootfs/etc/nginx/servers/direct-ssl.disabled b/zzz_archived_bitwarden/rootfs/etc/nginx/servers/direct-ssl.disabled similarity index 67% rename from bitwarden/rootfs/etc/nginx/servers/direct-ssl.disabled rename to zzz_archived_bitwarden/rootfs/etc/nginx/servers/direct-ssl.disabled index 89c75114a..9189013e1 100644 --- a/bitwarden/rootfs/etc/nginx/servers/direct-ssl.disabled +++ b/zzz_archived_bitwarden/rootfs/etc/nginx/servers/direct-ssl.disabled @@ -12,4 +12,12 @@ server { proxy_pass http://backend; } + location /notifications/hub { + proxy_pass http://wsbackend; + } + + location /notifications/hub/negotiate { + proxy_pass http://backend; + } + } \ No newline at end of file diff --git a/bitwarden/rootfs/etc/nginx/servers/direct.disabled b/zzz_archived_bitwarden/rootfs/etc/nginx/servers/direct.disabled similarity index 55% rename from bitwarden/rootfs/etc/nginx/servers/direct.disabled rename to zzz_archived_bitwarden/rootfs/etc/nginx/servers/direct.disabled index 55efdf180..cc4d38593 100644 --- a/bitwarden/rootfs/etc/nginx/servers/direct.disabled +++ b/zzz_archived_bitwarden/rootfs/etc/nginx/servers/direct.disabled @@ -8,4 +8,12 @@ server { proxy_pass http://backend; } + location /notifications/hub { + proxy_pass http://wsbackend; + } + + location /notifications/hub/negotiate { + proxy_pass http://backend; + } + } \ No newline at end of file diff --git a/zzz_archived_bitwarden/rootfs/etc/services.d/bitwarden/finish b/zzz_archived_bitwarden/rootfs/etc/services.d/bitwarden/finish new file mode 100644 index 000000000..c6acda3cd --- /dev/null +++ b/zzz_archived_bitwarden/rootfs/etc/services.d/bitwarden/finish @@ -0,0 +1,12 @@ +#!/command/with-contenv bashio +# ============================================================================== +# Home Assistant Community Add-on: Vaultwarden +# Take down the S6 supervision tree when Nginx fails +# ============================================================================== + +if [[ "${1}" -ne 0 ]] && [[ "${1}" -ne 256 ]]; then +bashio::log.warning "NGINX crashed, halting add-on" +/run/s6/basedir/bin/halt +fi + +bashio::log.info "NGINX stopped, restarting..." diff --git a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/run b/zzz_archived_bitwarden/rootfs/etc/services.d/bitwarden/run old mode 100644 new mode 100755 similarity index 89% rename from bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/run rename to zzz_archived_bitwarden/rootfs/etc/services.d/bitwarden/run index 45cf56410..53c8cdfb3 --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/vaultwarden/run +++ b/zzz_archived_bitwarden/rootfs/etc/services.d/bitwarden/run @@ -1,7 +1,8 @@ #!/command/with-contenv bashio # shellcheck shell=bash +set -e # ============================================================================== -# Home Assistant Community Add-on: Vaultwarden +# Home Assistant Community Add-on: Bitwarden # Runs the Vaultwarden server # ============================================================================== declare admin_token @@ -21,19 +22,19 @@ export ROCKET_SECRET_KEY="${secret_key}" # Find the matching log level if bashio::config.has_value 'log_level'; then case "$(bashio::string.lower "$(bashio::config 'log_level')")" in - all|trace) + all | trace) log_level="trace" ;; debug) log_level="debug" ;; - info|notice) + info | notice) log_level="info" ;; warning) log_level="warn" ;; - error|fatal) + error | fatal) log_level="error" ;; off) @@ -45,7 +46,7 @@ if bashio::config.has_value 'log_level'; then fi # Show admin token in the log, if config does not exist. -if ! bashio::fs.file_exists '/data/config.json'; then +if ! bashio::fs.file_exists '/data/config.yaml'; then admin_token=$(openssl rand -base64 48) export ADMIN_TOKEN="${admin_token}" @@ -72,6 +73,10 @@ if bashio::config.has_value 'request_size_limit'; then export ROCKET_LIMITS="{json=${request_size_limit}}" fi +# Always enable Websockets +export WEBSOCKET_ENABLED=true +export WEBSOCKET_PORT=8080 + # Run the Bitwarden server bashio::log.info 'Starting the Vaultwarden server...' cd /opt || bashio::exit.nok diff --git a/zzz_archived_bitwarden/rootfs/etc/services.d/nginx/finish b/zzz_archived_bitwarden/rootfs/etc/services.d/nginx/finish new file mode 100644 index 000000000..23d85af4b --- /dev/null +++ b/zzz_archived_bitwarden/rootfs/etc/services.d/nginx/finish @@ -0,0 +1,9 @@ +#!/usr/bin/execlineb -S0 +# ============================================================================== +# Home Assistant Community Add-on: Bitwarden +# 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/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/run b/zzz_archived_bitwarden/rootfs/etc/services.d/nginx/run old mode 100644 new mode 100755 similarity index 70% rename from bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/run rename to zzz_archived_bitwarden/rootfs/etc/services.d/nginx/run index 1cb185ce4..17171a50c --- a/bitwarden/rootfs/etc/s6-overlay/s6-rc.d/nginx/run +++ b/zzz_archived_bitwarden/rootfs/etc/services.d/nginx/run @@ -1,6 +1,8 @@ -#!/command/with-contenv bashio +#!/usr/bin/with-contenv bashio +# shellcheck shell=bash +set -e # ============================================================================== -# Home Assistant Community Add-on: Vaultwarden +# Home Assistant Community Add-on: Bitwarden # Runs the Nginx daemon # ============================================================================== bashio::net.wait_for 80 diff --git a/bitwarden/stats.png b/zzz_archived_bitwarden/stats.png similarity index 100% rename from bitwarden/stats.png rename to zzz_archived_bitwarden/stats.png diff --git a/bitwarden/updater.json b/zzz_archived_bitwarden/updater.json similarity index 100% rename from bitwarden/updater.json rename to zzz_archived_bitwarden/updater.json