fix logic detail

Signed-off-by: Simon L. <szaimen@e.mail.de>
Merge pull request #7536 from nextcloud/enh/noid/fix-daily-backup
2026-02-04 04:56:52 +00:00 · 2026-02-02 11:22:43 +01:00 · 2026-02-02 11:07:13 +01:00 · 2026-02-02 11:06:08 +01:00 · 2026-02-02 10:28:57 +01:00 · 2026-02-02 10:28:07 +01:00
4 changed files with 6 additions and 3 deletions
--- a/Containers/mastercontainer/daily-backup.sh
+++ b/Containers/mastercontainer/daily-backup.sh
@ -4,7 +4,7 @@ echo "Daily backup script has started"

 # Check if initial configuration has been done, otherwise this script should do nothing.
 CONFIG_FILE=/mnt/docker-aio-config/data/configuration.json
-if ! [ -f "$CONFIG_FILE" ] || ! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE"; then
+if ! [ -f "$CONFIG_FILE" ] || (! grep -q "wasStartButtonClicked.*1" "$CONFIG_FILE" && ! grep -q "wasStartButtonClicked.*true" "$CONFIG_FILE"); then
    echo "Initial configuration via AIO interface not done yet. Exiting..."
    exit 0
 fi
--- a/community-containers/local-ai/local-ai.json
+++ b/community-containers/local-ai/local-ai.json
@ -50,7 +50,7 @@
            "nextcloud_exec_commands": [
                "php /var/www/html/occ app:install integration_openai",
                "php /var/www/html/occ app:enable integration_openai",
-                "php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:8080",
+                "php /var/www/html/occ config:app:set integration_openai url --value http://nextcloud-aio-local-ai:10078",
                "php /var/www/html/occ config:app:set integration_openai api_key --value %LOCALAI_API_KEY%",
                "php /var/www/html/occ app:install assistant",
                "php /var/www/html/occ app:enable assistant"
--- a/php/src/Controller/ConfigurationController.php
+++ b/php/src/Controller/ConfigurationController.php
@ -17,6 +17,7 @@ readonly class ConfigurationController {

    public function SetConfig(Request $request, Response $response, array $args): Response {
        try {
+            $this->configurationManager->startTransaction();
            if (isset($request->getParsedBody()['domain'])) {
                $domain = $request->getParsedBody()['domain'] ?? '';
                $skipDomainValidation = isset($request->getParsedBody()['skip_domain_validation']);
@ -137,6 +138,8 @@ readonly class ConfigurationController {
        } catch (InvalidSettingConfigurationException $ex) {
            $response->getBody()->write($ex->getMessage());
            return $response->withStatus(422);
+        } finally {
+            $this->configurationManager->commitTransaction();
        }
    }
 }
--- a/php/templates/includes/aio-version.twig
+++ b/php/templates/includes/aio-version.twig
@ -1 +1 @@
-12.6.0
+12.6.1
Author	SHA1	Message	Date
Simon L.	b8f594b09a	fix logic detail Some checks failed Codespell / Check spelling (push) Waiting to run Details Validate community containers / Validate community containers (push) Has been cancelled Details Docker Lint / docker-lint (push) Has been cancelled Details Json Validator / Json Validator (push) Has been cancelled Details Lint php / php-lint (push) Has been cancelled Details PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled Details Playwright Tests on push / test (push) Has been cancelled Details Static analysis / static-psalm-analysis (push) Has been cancelled Details Shellcheck / Check Shell (push) Has been cancelled Details Twig Lint / twig-lint (push) Has been cancelled Details Lint php / php-lint-summary (push) Has been cancelled Details Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-02-02 11:22:43 +01:00
Simon L.	9c0c55dc7e	Merge pull request #7536 from nextcloud/enh/noid/fix-daily-backup fix daily-backup.sh edge case	2026-02-02 11:07:13 +01:00
Simon L.	c84416df5d	fix daily-backup.sh edge case Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-02-02 11:06:08 +01:00
Simon L.	cfff44954b	increase version to 12.6.1 Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-02-02 10:28:57 +01:00
Simon L.	733330fd1d	Merge pull request #7531 from nextcloud/docjyJ-patch-1 fix Nextcloud integration URL for local AI	2026-02-02 10:28:07 +01:00
Simon L.	06090a2677	Merge pull request #7534 from nextcloud/enh/7533/fix-daily-backup-script daily-backup.sh: continue with script if `wasStartButtonClicked=true` was found	2026-02-02 10:27:38 +01:00
Simon L.	4eb45ebfdb	Merge pull request #7532 from nextcloud/wrap-setconfig-into-config-transaction Wrap ConfigurationController#SetConfig into a "transaction"	2026-02-02 10:27:17 +01:00
Pablo Zmdl	82cbbe1829	Wrap ConfigurationController#SetConfig into a "transaction" This avoids a lot of subsequent writes and reads from the file system, because now only commitTransaction() actually writes the config file. Signed-off-by: Pablo Zmdl <pablo@nextcloud.com> Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-02-02 10:17:57 +01:00
Simon L.	cba66dec0b	daily-backup.sh: continue with script if wasStartButtonClicked=true was found Signed-off-by: Simon L. <szaimen@e.mail.de>	2026-02-02 10:11:00 +01:00
Jean-Yves	88b2121eaa	hotfix: Update Nextcloud integration URL for local AI Signed-off-by: Jean-Yves <7360784+docjyJ@users.noreply.github.com>	2026-02-01 11:37:51 +01:00
 @ -1 +1 @@
 .6.0
 .6.1