mirror of
https://github.com/alexbelgium/hassio-addons.git
synced 2026-05-30 12:24:04 +02:00
Compare commits
23 Commits
28b5aed6a4
...
560e1a105f
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
560e1a105f | ||
|
|
ee44f1b872 | ||
|
|
ad33686402 | ||
|
|
6b262c085c | ||
|
|
f51529f322 | ||
|
|
40a5c0dd21 | ||
|
|
1275197caa | ||
|
|
1cf03dd6cf | ||
|
|
8e3b3787af | ||
|
|
fd8d040165 | ||
|
|
59ca5254c2 | ||
|
|
d331f552da | ||
|
|
2cb46de892 | ||
|
|
75775524da | ||
|
|
307330683d | ||
|
|
3d604d4809 | ||
|
|
96c1ceb41b | ||
|
|
4e16f8da5c | ||
|
|
bf6be70610 | ||
|
|
6014220e82 | ||
|
|
81143a561e | ||
|
|
9ac5e99225 | ||
|
|
3a9e612217 |
12
.github/stargazer_countries.csv
vendored
12
.github/stargazer_countries.csv
vendored
@@ -2,6 +2,7 @@ username,country
|
||||
0ln,
|
||||
0xf3f,
|
||||
1333481,United Kingdom
|
||||
13r1ckz,Netherlands
|
||||
13shaneo,
|
||||
1aranzant,Belgium
|
||||
245123,
|
||||
@@ -240,6 +241,7 @@ GrumpyMeow,
|
||||
Guddie01,
|
||||
GuiltyFox,Japan
|
||||
Gulz21,
|
||||
Guruleenyc,
|
||||
GyHUN95,Hungary
|
||||
HACS-bank,United Kingdom
|
||||
HASSPROJ,
|
||||
@@ -698,6 +700,7 @@ Ziron,Sweden
|
||||
Zocker1012,
|
||||
Zuz666,
|
||||
aLTeReGo-SWI,
|
||||
aabdelhakim2,
|
||||
aadfPT,
|
||||
aaronntw,
|
||||
abc14514,
|
||||
@@ -932,6 +935,7 @@ cecilchurms,
|
||||
celynw,United Kingdom
|
||||
ch4d1,Germany
|
||||
charithmadhuranga,Sri Lanka
|
||||
charl3y15,United States
|
||||
charlestephen,United States
|
||||
chbmuc,
|
||||
chen-ye,United States
|
||||
@@ -1003,6 +1007,7 @@ cyberjohn60,
|
||||
cyda,Denmark
|
||||
cyiooi,
|
||||
cyrinux,United States
|
||||
d1erro,
|
||||
d4rwin,
|
||||
dadge,
|
||||
dadler,United States
|
||||
@@ -1111,6 +1116,7 @@ dutzi88,
|
||||
duydo,Viet Nam
|
||||
dwainegallimore,United Kingdom
|
||||
dwinkler1,Australia
|
||||
dxa-zz,
|
||||
dykandDK,
|
||||
dylankrish,United States
|
||||
dzidza,
|
||||
@@ -1356,6 +1362,7 @@ itsRealMarshall,
|
||||
ivaschru,
|
||||
ivonulens,
|
||||
ivuorinen,Finland
|
||||
j0hnhurl3y,Canada
|
||||
j0nl1,United States
|
||||
jTd7bPLFb,
|
||||
jabastien,United States
|
||||
@@ -1437,6 +1444,7 @@ jordanwalk193,
|
||||
jorgoncalves,Portugal
|
||||
jorkdekok,
|
||||
josh-green,United Kingdom
|
||||
joshcliffejones,United Kingdom
|
||||
joshmeads,Canada
|
||||
josiah-eichelman,
|
||||
jpaulomt,
|
||||
@@ -1562,6 +1570,7 @@ lt-laser,
|
||||
luca-mancini,Czechia
|
||||
luccajan,
|
||||
lucidiousgibs,
|
||||
luckylinux,
|
||||
lujia-gospel,
|
||||
lukasMega,Slovakia
|
||||
lukescarr,Australia
|
||||
@@ -1846,6 +1855,7 @@ pjolivon,
|
||||
pjosalgado,Brazil
|
||||
pkawalec91,
|
||||
pkejval,Czechia
|
||||
placidlyUnsalted,
|
||||
pldmgg,United States
|
||||
pleaseproject,Canada
|
||||
pmazz,Italy
|
||||
@@ -2118,10 +2128,12 @@ thalesgmartins,Brazil
|
||||
tharple,
|
||||
thatsthat,Spain
|
||||
the-MetalBox,
|
||||
the5evansfamily,
|
||||
theg1nger,
|
||||
theoneandonly-zh,
|
||||
therinz,
|
||||
thesnake210,
|
||||
thetestgame,United States
|
||||
thetitox,
|
||||
thewolfman56,
|
||||
thibaultmol,Belgium
|
||||
|
||||
|
BIN
.github/stargazer_map.png
vendored
BIN
.github/stargazer_map.png
vendored
Binary file not shown.
|
Before Width: | Height: | Size: 60 KiB After Width: | Height: | Size: 331 KiB |
@@ -301,11 +301,14 @@ done
|
||||
update_scripts_with_block
|
||||
|
||||
# --- MINIMAL CHANGE: also inject into /etc/bash.bashrc (for interactive bash shells)
|
||||
mkdir -p /etc "$HOME"
|
||||
mkdir -p /etc
|
||||
touch "/etc/bash.bashrc"
|
||||
touch "$HOME/bash.bashrc"
|
||||
inject_block_into_file "/etc/bash.bashrc"
|
||||
inject_block_into_file "$HOME/bash.bashrc"
|
||||
if [[ -n "${HOME:-}" ]]; then
|
||||
mkdir -p "$HOME"
|
||||
touch "$HOME/bash.bashrc"
|
||||
inject_block_into_file "$HOME/bash.bashrc"
|
||||
fi
|
||||
|
||||
################
|
||||
# Set timezone #
|
||||
|
||||
@@ -205,7 +205,10 @@ while IFS= read -r line; do
|
||||
if [ -d /var/run/s6/container_environment ]; then printf "%s" "${VALUE}" > /var/run/s6/container_environment/"${KEYS}"; fi
|
||||
|
||||
# Persist for interactive shells
|
||||
append_unique_line "$HOME/.bashrc" "export $line"
|
||||
if [[ -n "${HOME:-}" ]]; then
|
||||
mkdir -p "$HOME"
|
||||
append_unique_line "$HOME/.bashrc" "export $line"
|
||||
fi
|
||||
append_unique_line "/etc/bash.bashrc" "export $line"
|
||||
|
||||
# Show in log
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
## 25.11.29-7 (11-01-2026)
|
||||
- Minor bugs fixed
|
||||
## 25.10.1-2 (2026-01-06)
|
||||
- Minor bugs fixed
|
||||
## 25.5.24 (2025-12-01)
|
||||
|
||||
@@ -51,4 +51,4 @@ slug: netalertx_fa
|
||||
tmpfs: true
|
||||
udev: true
|
||||
url: https://github.com/alexbelgium/hassio-addons
|
||||
version: 25.10.1-7
|
||||
version: 25.11.29-7
|
||||
|
||||
@@ -1,3 +1,12 @@
|
||||
## v2-4 (11-01-2026)
|
||||
- Minor bugs fixed
|
||||
## v2-3 (11-01-2026)
|
||||
- Minor bugs fixed
|
||||
## v2-2 (18-03-2026)
|
||||
- Ensure folder permissions use configured PUID/PGID values
|
||||
|
||||
## v2 (11-01-2026)
|
||||
- Minor bugs fixed
|
||||
|
||||
## 1.601 (2025-12-27)
|
||||
- Update to latest version from causefx/organizr (changelog : https://github.com/causefx/organizr/releases)
|
||||
|
||||
@@ -28,7 +28,7 @@ ENV S6_CMD_WAIT_FOR_SERVICES=1 \
|
||||
|
||||
# Global LSIO modifications
|
||||
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_lsio.sh" "/ha_lsio.sh"
|
||||
ARG CONFIGLOCATION="/data/organizr"
|
||||
ARG CONFIGLOCATION="/config"
|
||||
RUN chmod 744 /ha_lsio.sh && if grep -qr "lsio" /etc; then /ha_lsio.sh "$CONFIGLOCATION"; fi && rm /ha_lsio.sh
|
||||
|
||||
##################
|
||||
@@ -51,8 +51,7 @@ ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templat
|
||||
RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
|
||||
|
||||
# Manual apps
|
||||
ENV PACKAGES="curl \
|
||||
jq"
|
||||
ENV PACKAGES="curl jq"
|
||||
|
||||
# Automatic apps & bashio
|
||||
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
|
||||
@@ -74,6 +73,11 @@ RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.
|
||||
ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/bashio-standalone.sh" "/.bashio-standalone.sh"
|
||||
RUN chmod 777 /.bashio-standalone.sh
|
||||
|
||||
RUN sed -i "s|/usr/bin/env|/usr/bin/with-contenv|g" /etc/cont-init.d/*
|
||||
|
||||
#ENTRYPOINT [ "/usr/bin/env" ]
|
||||
#CMD [ "/ha_entrypoint.sh" ]
|
||||
|
||||
############
|
||||
# 5 Labels #
|
||||
############
|
||||
|
||||
@@ -66,13 +66,14 @@ devices:
|
||||
- /dev/nvme2
|
||||
image: ghcr.io/alexbelgium/organizr-{arch}
|
||||
map:
|
||||
- config:rw
|
||||
- addon_config:rw:rw
|
||||
- ssl
|
||||
name: Organizr
|
||||
options:
|
||||
env_vars: []
|
||||
PGID: "0"
|
||||
PUID: "0"
|
||||
branch: "v2-master"
|
||||
PGID: "1000"
|
||||
PUID: "1000"
|
||||
ports:
|
||||
80/tcp: 88
|
||||
ports_description:
|
||||
@@ -81,10 +82,11 @@ schema:
|
||||
env_vars:
|
||||
- name: match(^[A-Za-z0-9_]+$)
|
||||
value: str?
|
||||
branch: list(v2-master|v2-develop)
|
||||
PGID: int
|
||||
PUID: int
|
||||
slug: organizr
|
||||
udev: true
|
||||
url: https://github.com/alexbelgium/hassio-addons
|
||||
version: "1.90-bugfix2"
|
||||
version: "v2-4"
|
||||
webui: "[PROTO:ssl]://[HOST]:[PORT:80]"
|
||||
|
||||
@@ -2,8 +2,22 @@
|
||||
# shellcheck shell=bash
|
||||
set -e
|
||||
|
||||
if [ ! -d /data/organizr ]; then
|
||||
echo "Creating /data/organizr"
|
||||
mkdir -p /data/organizr
|
||||
PUID="$(bashio::config 'PUID' || echo 1000)"
|
||||
PGID="$(bashio::config 'PGID' || echo 1000)"
|
||||
|
||||
echo "Creating /data/organizr"
|
||||
mkdir -p /data/organizr
|
||||
chown "$PUID:$PGID" /data/organizr
|
||||
|
||||
# Only act if the symlink target does not exist
|
||||
if [[ ! -f /data/organizr/www/organizr/api/data/organizr/default.php ]]; then
|
||||
echo "Fix issues in upstream"
|
||||
mkdir -p /data/organizr/www/organizr/api/data/organizr
|
||||
if [[ -f /data/organizr/www/organizr/api/config/default.php ]]; then
|
||||
ln -sf /data/organizr/www/organizr/api/config/default.php /data/organizr/www/organizr/api/data/organizr/default.php
|
||||
else
|
||||
echo "WARNING: /data/organizr/www/organizr/api/config/default.php does not exist, cannot create symlink"
|
||||
fi
|
||||
|
||||
chown -R "$PUID:$PGID" /data/organizr
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user