Allow connecting to local addresses
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Родитель
202ea76c71
Коммит
c691fd4a9d
|
@ -94,7 +94,6 @@ steps:
|
||||||
- bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
|
- bash ./tests/drone-server-setup.sh $APP_NAME $CORE_BRANCH $DB
|
||||||
- cd ../server
|
- cd ../server
|
||||||
- ./occ app:enable $APP_NAME
|
- ./occ app:enable $APP_NAME
|
||||||
- ./occ config:system:set allow_local_remote_servers --value 1
|
|
||||||
- cd apps/$APP_NAME
|
- cd apps/$APP_NAME
|
||||||
|
|
||||||
# Run integration tests
|
# Run integration tests
|
||||||
|
|
|
@ -112,7 +112,7 @@ class CapabilitiesService {
|
||||||
$capabilitiesEndpoint = $remoteHost . '/hosting/capabilities';
|
$capabilitiesEndpoint = $remoteHost . '/hosting/capabilities';
|
||||||
|
|
||||||
$client = $this->clientService->newClient();
|
$client = $this->clientService->newClient();
|
||||||
$options = ['timeout' => 10];
|
$options = ['timeout' => 10, 'nextcloud' => ['allow_local_address' => true]];
|
||||||
|
|
||||||
$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
|
$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
|
||||||
|
|
||||||
|
|
|
@ -96,7 +96,7 @@ class DiscoveryManager {
|
||||||
$wopiDiscovery = $remoteHost . '/hosting/discovery';
|
$wopiDiscovery = $remoteHost . '/hosting/discovery';
|
||||||
|
|
||||||
$client = $this->clientService->newClient();
|
$client = $this->clientService->newClient();
|
||||||
$options = ['timeout' => 5];
|
$options = ['timeout' => 5, 'nextcloud' => ['allow_local_address' => true]];
|
||||||
|
|
||||||
$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
|
$options['verify'] = $this->config->getAppValue('richdocuments', 'disable_certificate_verification', '') === '';
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче