diff options
| -rw-r--r-- | .github/workflows/s3-external.yml | 2 | ||||
| -rw-r--r-- | lib/private/legacy/OC_Util.php | 12 | ||||
| -rwxr-xr-x | tests/travis/install.sh | 4 |
3 files changed, 8 insertions, 10 deletions
diff --git a/.github/workflows/s3-external.yml b/.github/workflows/s3-external.yml index a1d4dcbda22..8c2cdd7cfd1 100644 --- a/.github/workflows/s3-external.yml +++ b/.github/workflows/s3-external.yml @@ -55,7 +55,7 @@ jobs: php -S localhost:8080 & - name: PHPUnit run: | - echo "<?php return ['run' => true, 'secret' => 'actually-not-secret', 'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php + echo "<?php return ['run' => true, 'secret' => 'actually-not-secret', 'passwordsalt' => 'actually-not-secret', 'hostname' => 'localhost','key' => 'minio','secret' => 'minio123', 'bucket' => 'bucket', 'port' => 9000, 'use_ssl' => false, 'autocreate' => true, 'use_path_style' => true];" > apps/${{ env.APP_NAME }}/tests/config.amazons3.php phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/Amazons3Test.php phpunit --configuration tests/phpunit-autotest-external.xml apps/files_external/tests/Storage/VersionedAmazonS3Test.php - name: S3 logs diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 5441d3a2864..d445afaa092 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -969,11 +969,13 @@ class OC_Util { ]; } - if ($config->getValue('secret', '') === '' && !\OC::$CLI) { - $errors[] = [ - 'error' => $l->t('The required \'secret\' config variable is not configued in the config.php file.'), - 'hint' => $l->t('Please ask your server administrator to check the Nextcloud configuration.') - ]; + foreach (['secret', 'instanceid', 'passwordsalt'] as $requiredConfig) { + if ($config->getValue($requiredConfig, '') === '' && !\OC::$CLI) { + $errors[] = [ + 'error' => $l->t('The required \'' . $requiredConfig . '\' config variable is not configued in the config.php file.'), + 'hint' => $l->t('Please ask your server administrator to check the Nextcloud configuration.') + ]; + } } $errors = array_merge($errors, self::checkDatabaseVersion()); diff --git a/tests/travis/install.sh b/tests/travis/install.sh index c0c850fe569..180e0c634da 100755 --- a/tests/travis/install.sh +++ b/tests/travis/install.sh @@ -44,7 +44,6 @@ echo "Using database $DATABASENAME" cat > ./tests/autoconfig-sqlite.php <<DELIM <?php \$AUTOCONFIG = array ( - 'secret' => 'actually-not-secret', 'installed' => false, 'dbtype' => 'sqlite', 'dbtableprefix' => 'oc_', @@ -57,7 +56,6 @@ DELIM cat > ./tests/autoconfig-mysql.php <<DELIM <?php \$AUTOCONFIG = array ( - 'secret' => 'actually-not-secret', 'installed' => false, 'dbtype' => 'mysql', 'dbtableprefix' => 'oc_', @@ -74,7 +72,6 @@ DELIM cat > ./tests/autoconfig-pgsql.php <<DELIM <?php \$AUTOCONFIG = array ( - 'secret' => 'actually-not-secret', 'installed' => false, 'dbtype' => 'pgsql', 'dbtableprefix' => 'oc_', @@ -91,7 +88,6 @@ DELIM cat > ./tests/autoconfig-oracle.php <<DELIM <?php \$AUTOCONFIG = array ( - 'secret' => 'actually-not-secret', 'installed' => false, 'dbtype' => 'oci', 'dbtableprefix' => 'oc_', |