WIP: Add https support to apache2 on ICF-CI #22

Draft

christian-monch wants to merge 17 commits from christian-monch/enh-ci-https into main

christian-monch commented

2023-05-30 13:28:47 +00:00

(Migrated from github.com)

This PR enables SSL on the test-HTTP server. It installs all necessary certificates to enable requests and git-annex to establish connections to the server.

The PR changes the data_webserver-fixture to return an https:-URL on an appveyor-VM. So all tests should run against an https:-endpoint.

Fixes #17

BEFORE this PR can be merged, the following tasks have to be completed:

merge #36
modify ./singularity/icf.def:27 according to the comment after #36 was merged.
remove the certificates in .appveyor/data from this branch (optional)

To indicate that the previous tasks should be completed before the merge, this PR is put into draft mode

This PR enables SSL on the test-HTTP server. It installs all necessary certificates to enable `requests` and `git-annex` to establish connections to the server. The PR changes the `data_webserver`-fixture to return an `https:`-URL on an appveyor-VM. So all tests should run against an https:-endpoint. Fixes #17 BEFORE this PR can be merged, the following tasks have to be completed: - [ ] merge #36 - [ ] modify `./singularity/icf.def:27` according to the comment after #36 was merged. - [ ] remove the certificates in `.appveyor/data` from this branch (optional) To indicate that the previous tasks should be completed before the merge, this PR is put into draft mode

mih (Migrated from github.com) reviewed

2023-05-30 13:28:47 +00:00

christian-monch commented

2023-05-31 11:06:58 +00:00

(Migrated from github.com)

The remaining errors are not related to https (datalad get fails)

christian-monch commented

2023-05-31 20:18:36 +00:00

(Migrated from github.com)

Remaining get-errors where fixed by merging the latest changes from main into the branch.

This pull request has changes conflicting with the target branch.

singularity/icf.def

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Add https support to apache2 on ICF-CI' (#22) from christian-monch/enh-ci-https into main

Merge commit body

Reviewed-on: https://cerebra.fz-juelich.de/inm7/inm-icf-utilities/pulls/22

Merge pull request 'WIP: Add https support to apache2 on ICF-CI' (#22) from christian-monch/enh-ci-https into main

Reviewed-on: https://cerebra.fz-juelich.de/inm7/inm-icf-utilities/pulls/22

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin christian-monch/enh-ci-https:christian-monch/enh-ci-https

git switch christian-monch/enh-ci-https

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff christian-monch/enh-ci-https

git switch christian-monch/enh-ci-https

git rebase main

git switch main

git merge --ff-only christian-monch/enh-ci-https

git switch christian-monch/enh-ci-https

git rebase main

git switch main

git merge --no-ff christian-monch/enh-ci-https

git switch main

git merge --squash christian-monch/enh-ci-https