mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-06-10 08:37:02 +00:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8941f364eb | |||
| f3abe7bc21 |
@@ -903,11 +903,24 @@ if [ "$EUROOFFICE_ENABLED" = 'yes' ]; then
|
||||
|
||||
# Adjust the EuroOffice host if using internal pattern
|
||||
if echo "$EUROOFFICE_HOST" | grep -q "nextcloud-.*-eurooffice"; then
|
||||
# Set internal URLs for server-to-server calls via Docker network,
|
||||
# bypassing the public domain which may not resolve inside containers.
|
||||
# DocumentServerInternalUrl: NC -> EuroOffice (direct container port)
|
||||
# StorageUrl: EuroOffice -> NC (via port 23973 which has a matching Caddy server-block)
|
||||
APACHE_CONTAINER_HOST="${EUROOFFICE_HOST%-eurooffice}-apache"
|
||||
php /var/www/html/occ config:app:set eurooffice DocumentServerInternalUrl --value="http://$EUROOFFICE_HOST:80/"
|
||||
php /var/www/html/occ config:app:set eurooffice StorageUrl --value="http://$APACHE_CONTAINER_HOST.nextcloud-aio:23973/"
|
||||
EUROOFFICE_HOST="$NC_DOMAIN/eurooffice"
|
||||
export EUROOFFICE_HOST
|
||||
fi
|
||||
|
||||
php /var/www/html/occ config:app:set eurooffice DocumentServerUrl --value="https://$EUROOFFICE_HOST"
|
||||
|
||||
# Register EuroOffice preview provider in the explicit allowlist.
|
||||
# Use a high fixed index (50) to avoid colliding with AIO's seeded indices (1-7, 23).
|
||||
if ! php /var/www/html/occ config:system:get enabledPreviewProviders | grep -q "Eurooffice"; then
|
||||
php /var/www/html/occ config:system:set enabledPreviewProviders 50 --value="OCA\Eurooffice\Preview"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# Remove EuroOffice app if disabled and removal is requested
|
||||
|
||||
@@ -25,7 +25,6 @@ use Psr\Http\Message\ServerRequestInterface as Request;
|
||||
require __DIR__ . '/../vendor/autoload.php';
|
||||
|
||||
$container = \AIO\DependencyInjection::GetContainer();
|
||||
$container->get(\AIO\Data\ConfigurationManager::class)->performMigrations();
|
||||
$dataConst = $container->get(\AIO\Data\DataConst::class);
|
||||
|
||||
// Create app
|
||||
|
||||
@@ -100,14 +100,13 @@ class ConfigurationManager
|
||||
}
|
||||
|
||||
public bool $isEuroofficeEnabled {
|
||||
// Type-cast because old configs could have 1/0 for this key.
|
||||
get => (bool) $this->get('isEuroofficeEnabled', true);
|
||||
get => $this->get('isEuroofficeEnabled', false);
|
||||
set { $this->set('isEuroofficeEnabled', $value); }
|
||||
}
|
||||
|
||||
public bool $isCollaboraEnabled {
|
||||
// Type-cast because old configs could have 1/0 for this key.
|
||||
get => (bool) $this->get('isCollaboraEnabled', false);
|
||||
get => (bool) $this->get('isCollaboraEnabled', true);
|
||||
set { $this->set('isCollaboraEnabled', $value); }
|
||||
}
|
||||
|
||||
@@ -928,16 +927,7 @@ class ConfigurationManager
|
||||
if (is_string($apps)) {
|
||||
return trim($apps);
|
||||
}
|
||||
return 'deck twofactor_totp tasks calendar contacts notes eurooffice';
|
||||
}
|
||||
|
||||
public function performMigrations(): void {
|
||||
if (!$this->get('eurooffice_default_migration_v1', false)) {
|
||||
$this->isCollaboraEnabled = false;
|
||||
$this->isOnlyofficeEnabled = false;
|
||||
$this->isEuroofficeEnabled = true;
|
||||
$this->set('eurooffice_default_migration_v1', true);
|
||||
}
|
||||
return 'deck twofactor_totp tasks calendar contacts notes';
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -10,7 +10,7 @@ Included are:
|
||||
- High performance backend for Nextcloud Files (Client Push)
|
||||
- Redis & APCU for performant caching
|
||||
- PostgreSQL as database
|
||||
- EuroOffice Document Server (default) or Nextcloud Office / OnlyOffice (optional)
|
||||
- Nextcloud Office (optional)
|
||||
- High performance backend for Nextcloud Talk and TURN-server (optional)
|
||||
- Nextcloud Talk Recording-server (optional)
|
||||
- Backup solution (optional, based on [BorgBackup](https://github.com/borgbackup/borg#what-is-borgbackup))
|
||||
|
||||
Reference in New Issue
Block a user