diff options
Diffstat (limited to 'apps/files_external/tests/sso-setup')
| -rw-r--r-- | apps/files_external/tests/sso-setup/apps.config.php | 14 | ||||
| -rwxr-xr-x | apps/files_external/tests/sso-setup/start-apache.sh | 3 | ||||
| -rwxr-xr-x | apps/files_external/tests/sso-setup/test-sso-smb.sh | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/apps/files_external/tests/sso-setup/apps.config.php b/apps/files_external/tests/sso-setup/apps.config.php index 71190f44291..b3889956a53 100644 --- a/apps/files_external/tests/sso-setup/apps.config.php +++ b/apps/files_external/tests/sso-setup/apps.config.php @@ -5,16 +5,16 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ $CONFIG = [ - "apps_paths" => [ + 'apps_paths' => [ [ - "path" => "/var/www/html/apps", - "url" => "/apps", - "writable" => false, + 'path' => '/var/www/html/apps', + 'url' => '/apps', + 'writable' => false, ], [ - "path" => "/var/www/html/extra-apps", - "url" => "/extra-apps", - "writable" => true, + 'path' => '/var/www/html/extra-apps', + 'url' => '/extra-apps', + 'writable' => true, ], ], ]; diff --git a/apps/files_external/tests/sso-setup/start-apache.sh b/apps/files_external/tests/sso-setup/start-apache.sh index eb2ff55b0e6..58ad71e3a3a 100755 --- a/apps/files_external/tests/sso-setup/start-apache.sh +++ b/apps/files_external/tests/sso-setup/start-apache.sh @@ -15,6 +15,9 @@ APACHE_IP=$(docker inspect apache --format '{{.NetworkSettings.IPAddress}}') docker exec apache chown 33 /var/www/html/config /var/www/html/data /var/www/html/extra-apps docker cp "$SCRIPT_DIR/apps.config.php" apache:/var/www/html/config/apps.config.php +# ensure that samba is started (see https://github.com/icewind1991/samba-krb-test/pull/8) +docker exec dc service samba-ad-dc status || docker exec dc service samba-ad-dc start + # add the dns record for apache docker exec dc samba-tool dns add krb.domain.test domain.test httpd A $APACHE_IP -U administrator --password=passwOrd1 1>&2 diff --git a/apps/files_external/tests/sso-setup/test-sso-smb.sh b/apps/files_external/tests/sso-setup/test-sso-smb.sh index d019ce728cd..46955ae0d3c 100755 --- a/apps/files_external/tests/sso-setup/test-sso-smb.sh +++ b/apps/files_external/tests/sso-setup/test-sso-smb.sh @@ -16,6 +16,7 @@ if [[ "$LOGIN_CONTENT" =~ "Location: http://localhost/success" ]]; then echo "✔️" else echo "❌" + echo "$CONTENT" exit 1 fi echo -n "Getting test file: " @@ -26,5 +27,6 @@ if [[ $CONTENT == "testfile" ]]; then echo "✔️" else echo "❌" + echo "$CONTENT" exit 1 fi |