mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-02-04 04:56:52 +00:00
Compare commits
11 commits
f29caf99cd
...
2b6e18ded8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b6e18ded8 | ||
|
|
b8f594b09a | ||
|
|
9c0c55dc7e | ||
|
|
c84416df5d | ||
|
|
cfff44954b | ||
|
|
733330fd1d | ||
|
|
06090a2677 | ||
|
|
4eb45ebfdb | ||
|
|
82cbbe1829 | ||
|
|
cba66dec0b | ||
|
|
88b2121eaa |
5 changed files with 11 additions and 8 deletions
|
|
@ -4,7 +4,7 @@ echo "Daily backup script has started"
|
||||||
|
|
||||||
# Check if initial configuration has been done, otherwise this script should do nothing.
|
# Check if initial configuration has been done, otherwise this script should do nothing.
|
||||||
CONFIG_FILE=/mnt/docker-aio-config/data/configuration.json
|
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..."
|
echo "Initial configuration via AIO interface not done yet. Exiting..."
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
"nextcloud_exec_commands": [
|
"nextcloud_exec_commands": [
|
||||||
"php /var/www/html/occ app:install integration_openai",
|
"php /var/www/html/occ app:install integration_openai",
|
||||||
"php /var/www/html/occ app:enable 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 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:install assistant",
|
||||||
"php /var/www/html/occ app:enable assistant"
|
"php /var/www/html/occ app:enable assistant"
|
||||||
|
|
|
||||||
10
php/composer.lock
generated
10
php/composer.lock
generated
|
|
@ -4551,16 +4551,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "vimeo/psalm",
|
"name": "vimeo/psalm",
|
||||||
"version": "6.14.3",
|
"version": "6.15.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/vimeo/psalm.git",
|
"url": "https://github.com/vimeo/psalm.git",
|
||||||
"reference": "d0b040a91f280f071c1abcb1b77ce3822058725a"
|
"reference": "204d06619833a297b402cbc66be7f2df74437db4"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/vimeo/psalm/zipball/d0b040a91f280f071c1abcb1b77ce3822058725a",
|
"url": "https://api.github.com/repos/vimeo/psalm/zipball/204d06619833a297b402cbc66be7f2df74437db4",
|
||||||
"reference": "d0b040a91f280f071c1abcb1b77ce3822058725a",
|
"reference": "204d06619833a297b402cbc66be7f2df74437db4",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4665,7 +4665,7 @@
|
||||||
"issues": "https://github.com/vimeo/psalm/issues",
|
"issues": "https://github.com/vimeo/psalm/issues",
|
||||||
"source": "https://github.com/vimeo/psalm"
|
"source": "https://github.com/vimeo/psalm"
|
||||||
},
|
},
|
||||||
"time": "2025-12-23T15:36:48+00:00"
|
"time": "2026-01-30T13:53:17+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "wapmorgan/php-deprecation-detector",
|
"name": "wapmorgan/php-deprecation-detector",
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ readonly class ConfigurationController {
|
||||||
|
|
||||||
public function SetConfig(Request $request, Response $response, array $args): Response {
|
public function SetConfig(Request $request, Response $response, array $args): Response {
|
||||||
try {
|
try {
|
||||||
|
$this->configurationManager->startTransaction();
|
||||||
if (isset($request->getParsedBody()['domain'])) {
|
if (isset($request->getParsedBody()['domain'])) {
|
||||||
$domain = $request->getParsedBody()['domain'] ?? '';
|
$domain = $request->getParsedBody()['domain'] ?? '';
|
||||||
$skipDomainValidation = isset($request->getParsedBody()['skip_domain_validation']);
|
$skipDomainValidation = isset($request->getParsedBody()['skip_domain_validation']);
|
||||||
|
|
@ -137,6 +138,8 @@ readonly class ConfigurationController {
|
||||||
} catch (InvalidSettingConfigurationException $ex) {
|
} catch (InvalidSettingConfigurationException $ex) {
|
||||||
$response->getBody()->write($ex->getMessage());
|
$response->getBody()->write($ex->getMessage());
|
||||||
return $response->withStatus(422);
|
return $response->withStatus(422);
|
||||||
|
} finally {
|
||||||
|
$this->configurationManager->commitTransaction();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
12.6.0
|
12.6.1
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue