Browse Source
Merge pull request #52572 from nextcloud/fix/noid/flaky-sso-tests
pull/52581/head
John Molakvoæ
7 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
15 additions and
0 deletions
-
.github/workflows/files-external-smb-kerberos.yml
-
apps/files_external/tests/sso-setup/start-apache.sh
|
|
|
@ -83,6 +83,18 @@ jobs: |
|
|
|
run: | |
|
|
|
apps/files_external/tests/sso-setup/test-sso-smb.sh ${{ env.DC_IP }} |
|
|
|
|
|
|
|
- name: Show logs DC |
|
|
|
if: always() |
|
|
|
run: | |
|
|
|
docker logs dc |
|
|
|
echo "------------" |
|
|
|
docker exec dc cat /var/log/samba/log.samba |
|
|
|
|
|
|
|
- name: Show logs Apache |
|
|
|
if: always() |
|
|
|
run: | |
|
|
|
docker logs apache |
|
|
|
|
|
|
|
- name: Show logs |
|
|
|
if: always() |
|
|
|
run: | |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
|
