aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Müller <marcel-mueller@gmx.de>2025-05-01 11:15:48 +0200
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2025-05-01 15:36:48 +0000
commit30626c908bb99d42bcf74d69eb41a6579b7ad5c7 (patch)
tree16e287c1cf042d7ef793df32837ade373c0041a3
parent8eb5b048f106d18d48a75a74d1ce946a23f71645 (diff)
downloadnextcloud-server-backport/52572/stable30.tar.gz
nextcloud-server-backport/52572/stable30.zip
fix: Ensure samba is started in kerberos testsbackport/52572/stable30
Signed-off-by: Marcel Müller <marcel-mueller@gmx.de>
-rwxr-xr-xapps/files_external/tests/sso-setup/start-apache.sh3
1 files changed, 3 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