mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-06-12 17:38:18 +00:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 13e0842cff | |||
| c675b74efc | |||
| 1029ff139e | |||
| 37e934657a | |||
| e4e401a783 | |||
| dd8bd1d883 | |||
| 7bf9c913b8 | |||
| 0accbe8256 | |||
| 40ce65b6e0 | |||
| c3c6281443 | |||
| 2db926cd21 |
@@ -36,7 +36,7 @@ jobs:
|
||||
line-length: warning
|
||||
|
||||
- name: Install the latest version of uv
|
||||
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
|
||||
uses: astral-sh/setup-uv@fac544c07dec837d0ccb6301d7b5580bf5edae39 # v8.2.0
|
||||
|
||||
- name: Check GitHub actions
|
||||
run: uvx zizmor --min-severity medium .github/workflows/*.yml
|
||||
|
||||
@@ -908,6 +908,12 @@ if [ "$EUROOFFICE_ENABLED" = 'yes' ]; then
|
||||
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 24 --value="OCA\Eurooffice\Preview"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
# Remove EuroOffice app if disabled and removal is requested
|
||||
|
||||
@@ -100,13 +100,13 @@ class ConfigurationManager
|
||||
}
|
||||
|
||||
public bool $isEuroofficeEnabled {
|
||||
get => $this->get('isEuroofficeEnabled', false);
|
||||
get => $this->get('isEuroofficeEnabled', true);
|
||||
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', true);
|
||||
get => (bool) $this->get('isCollaboraEnabled', false);
|
||||
set { $this->set('isCollaboraEnabled', $value); }
|
||||
}
|
||||
|
||||
@@ -1115,7 +1115,7 @@ class ConfigurationManager
|
||||
'NEXTCLOUD_STARTUP_APPS' => $this->getNextcloudStartupApps(),
|
||||
'NEXTCLOUD_ADDITIONAL_APKS' => $this->nextcloudAdditionalApks,
|
||||
'NEXTCLOUD_ADDITIONAL_PHP_EXTENSIONS' => $this->nextcloudAdditionalPhpExtensions,
|
||||
'INSTALL_LATEST_MAJOR' => $this->installLatestMajor ? 'yes' : '',
|
||||
'INSTALL_LATEST_MAJOR' => ($this->installLatestMajor !== '' && $this->installLatestMajor !== 'no') ? 'yes' : '',
|
||||
'REMOVE_DISABLED_APPS' => $this->nextcloudKeepDisabledApps ? '' : 'yes',
|
||||
// Allow to get local ip-address of database container which allows to talk to it even in host mode (the container that requires this needs to be started first then)
|
||||
'AIO_DATABASE_HOST' => NetworkHelper::resolveHostname('nextcloud-aio-database'),
|
||||
|
||||
@@ -898,6 +898,8 @@ The examples below define the dynamic configuration in YAML files. If you rather
|
||||
hostsProxyHeaders:
|
||||
- "X-Forwarded-Host"
|
||||
referrerPolicy: "same-origin"
|
||||
customRequestHeaders:
|
||||
X-Forwarded-Proto: "https"
|
||||
|
||||
https-redirect:
|
||||
redirectscheme:
|
||||
@@ -993,6 +995,8 @@ The examples below define the dynamic configuration in YAML files. If you rather
|
||||
hostsProxyHeaders:
|
||||
- "X-Forwarded-Host"
|
||||
referrerPolicy: "same-origin"
|
||||
customRequestHeaders:
|
||||
X-Forwarded-Proto: "https"
|
||||
|
||||
https-redirect:
|
||||
redirectscheme:
|
||||
|
||||
Reference in New Issue
Block a user