Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

directly include the sildisco module #197

Merged
merged 9 commits into from
May 24, 2024
Merged

Conversation

briskt
Copy link
Contributor

@briskt briskt commented May 20, 2024

Added

Changed

  • Changed the auth source on idp2 to exampleauth. The sildisco tests originally used admin but that conflicted with other tests that required the use of exampleauth.

Removed

  • Remove test code that was duplicated across multiple modules' tests.

Note: the first commit is mostly just copied files, and the remainder are the changes made to those files.

@briskt briskt requested a review from a team May 20, 2024 12:59
development/idp-local/config/authsources.php Show resolved Hide resolved
development/sp3-local/config/authsources.php Show resolved Hide resolved
development/sp3-local/config/config.php Show resolved Hide resolved
docker-compose.yml Outdated Show resolved Hide resolved
docs/development.md Outdated Show resolved Hide resolved
docs/overview.md Show resolved Hide resolved
docs/the_hub.md Outdated Show resolved Hide resolved
docs/the_hub.md Show resolved Hide resolved
features/Sp2Idp2Sp1Idp1Sp3.feature Show resolved Hide resolved
features/expirychecker.feature Show resolved Hide resolved
briskt added 3 commits May 22, 2024 10:55
was: ssp-sp3.local:8084 and pwmanager.local:8083
now: ssp-sp3.local:8083 and pwmanager.local:8084
The reason is twofold: (1) this makes the ssp-sp[n].local container ports contiguous: 8081, 8082, and 8083, and (2) some of the references to ssp-sp3.local still had 8083 as was assigned in the simplesamlphp-module-sildisco repo.
- add the port number to ssp-sp3.local in the authsources.php config
- remove reference to the "default-enable" file in the_hub.md
This makes local development more convenient so you don't have to rebuild the image every time you make a change. But we don't want this in actions-services.yml since it's meant to test the final image.
@briskt briskt requested a review from forevermatt May 22, 2024 21:58
docs/development.md Outdated Show resolved Hide resolved
docs/the_hub.md Show resolved Hide resolved
Dockerfile Show resolved Hide resolved
@briskt briskt merged commit af8912b into develop May 24, 2024
3 checks passed
@briskt briskt deleted the feature/sildisco-module branch May 24, 2024 00:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants