Compare commits

..

2 Commits

Author SHA1 Message Date
Raphaël Numbus 5220822812 Bunch of bugfixes. Made quirk and permissions fixing scripts more reliable. 2026-02-26 19:45:36 +01:00
Raphaël Numbus 1697952fc4 Bunch of bugfixes. Made quirk and permissions fixing scripts more reliable. 2026-02-26 19:40:31 +01:00
2 changed files with 8 additions and 5 deletions
+1 -2
View File
@@ -136,12 +136,10 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)}
RestartSec = "5m"; RestartSec = "5m";
}; };
script = '' script = ''
mkdir -p /var/lib/numbus-server/${name}
${concatStringsSep "\n" (map (perm: '' ${concatStringsSep "\n" (map (perm: ''
set -- ${perm} set -- ${perm}
WANTED_PERMISSIONS=$1 WANTED_PERMISSIONS=$1
FOLDER_PATH=$2 FOLDER_PATH=$2
ACTUAL_PERMISSIONS=$(stat -c '%u:%g' "$FOLDER_PATH")
if [[ ! -e "$FOLDER_PATH" ]]; then if [[ ! -e "$FOLDER_PATH" ]]; then
mkdir -p "$FOLDER_PATH" mkdir -p "$FOLDER_PATH"
@@ -150,6 +148,7 @@ ${concatStringsSep "\n" (map (m: " - ${m}") middlewares)}
mkdir -p "$FOLDER_PATH" mkdir -p "$FOLDER_PATH"
fi fi
ACTUAL_PERMISSIONS=$(stat -c '%u:%g' "$FOLDER_PATH")
if [[ "$ACTUAL_PERMISSIONS" != "$WANTED_PERMISSIONS" ]]; then if [[ "$ACTUAL_PERMISSIONS" != "$WANTED_PERMISSIONS" ]]; then
chown -R "$WANTED_PERMISSIONS" "$FOLDER_PATH" chown -R "$WANTED_PERMISSIONS" "$FOLDER_PATH"
fi fi
+7 -3
View File
@@ -210,9 +210,13 @@ helper.mkPodmanService {
}; };
script = '' script = ''
mkdir -p /var/lib/numbus-server/${name} mkdir -p /var/lib/numbus-server/${name}
if [[ -e /var/lib/numbus-server/${name}/quirk.true ]]; then [[ -e /var/lib/numbus-server/${name}/quirk.true ]] && exit 0
exit 0 [[ ! -e /var/lib/numbus-server/${name}/.env ]] && systemctl start ${name}-secrets.service
fi until [[ -e /var/lib/numbus-server/${name}/.env ]]; do
echo "Waiting for secrets generation..."
sleep 15
done
source /var/lib/numbus-server/${name}/.env source /var/lib/numbus-server/${name}/.env
sleep 300 sleep 300
sudo -u numbus-admin podman exec --user www-data nextcloud-server php occ background:cron sudo -u numbus-admin podman exec --user www-data nextcloud-server php occ background:cron