aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_external/tests/sso-setup
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_external/tests/sso-setup')
-rwxr-xr-xapps/files_external/tests/sso-setup/start-apache.sh3
-rwxr-xr-xapps/files_external/tests/sso-setup/test-sso-smb.sh2
2 files changed, 5 insertions, 0 deletions
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