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

chore: allow usage of https in URL for distro tree #219

Draft
wants to merge 1 commit into
base: python-3
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Server/bkr/server/distrotrees.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def yum_config(self, distro_tree_id, *args, **kwargs):
except NoResultFound:
raise cherrypy.HTTPError(status=400,
message='No such lab controller %r' % kwargs['lab'])
base = distro_tree.url_in_lab(lc, scheme='http')
base = distro_tree.url_in_lab(lc, scheme=['https', 'http'])
if not base:
raise cherrypy.HTTPError(status=404,
message='%s is not present in lab %s' % (distro_tree, lc))
Expand Down
2 changes: 1 addition & 1 deletion Server/bkr/server/model/distrolibrary.py
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ def url_in_lab(self, lab_controller, scheme=None, required=False):
if s in urls:
return urls[s]
else:
for s in ['nfs', 'http', 'ftp']:
for s in ['nfs', 'https', 'http', 'ftp']:
if s in urls:
return urls[s]
# caller didn't specify any schemes, so pick anything if we have it
Expand Down
Loading