diff --git a/ct/radicale.sh b/ct/radicale.sh index ffb0927fd..bc87e272e 100644 --- a/ct/radicale.sh +++ b/ct/radicale.sh @@ -41,7 +41,7 @@ function update_script() { if grep -q 'start.sh' /etc/systemd/system/radicale.service; then sed -i -e '/^Description/i[Unit]' \ -e '\|^ExecStart|iWorkingDirectory=/opt/radicale' \ - -e 's|^ExecStart=.*|ExecStart=/usr/local/bin/uv run -m radicale --config /etc/radicale/config|' /etc/systemd/system/radicale.service + -e 's|^ExecStart=.*|ExecStart=/usr/local/bin/uv run --extra bcrypt --extra argon2 -m radicale --config /etc/radicale/config|' /etc/systemd/system/radicale.service systemctl daemon-reload fi if [[ ! -f /etc/radicale/config ]]; then @@ -70,6 +70,14 @@ EOF msg_ok "Started service" msg_ok "Updated Successfully!" fi + + if grep -q 'uv run -m radicale' /etc/systemd/system/radicale.service && grep -q '^argon2 *=' /opt/radicale/pyproject.toml; then + msg_info "Enabling bcrypt/argon2 support" + sed -i 's|uv run -m radicale|uv run --extra bcrypt --extra argon2 -m radicale|' /etc/systemd/system/radicale.service + systemctl daemon-reload + systemctl restart radicale + msg_ok "Enabled bcrypt/argon2 support" + fi exit } diff --git a/install/radicale-install.sh b/install/radicale-install.sh index d16c19e41..7eab2e159 100644 --- a/install/radicale-install.sh +++ b/install/radicale-install.sh @@ -58,7 +58,7 @@ Requires=network.target [Service] WorkingDirectory=/opt/radicale -ExecStart=/usr/local/bin/uv run -m radicale --config /etc/radicale/config +ExecStart=/usr/local/bin/uv run --extra bcrypt --extra argon2 -m radicale --config /etc/radicale/config Restart=on-failure # User=radicale # Deny other users access to the calendar data