[copr] master: [frontend] properly set repo rpm configuration (62fcc42)

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit 62fcc42c654bd2da882c99cdca8bc535888a9327 Author: Jakub Kadlčík <jkadlcik(a)redhat.com&gt; Date: Mon Oct 19 13:56:59 2015 +0200 [frontend] properly set repo rpm configuration .../coprs/views/coprs_ns/coprs_general.py | 4 ++-- .../coprs_frontend/run/generate_repo_packages.py | 11 +++-------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py index 67f9e90..73b2e6e 100644 --- a/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py +++ b/frontend/coprs_frontend/coprs/views/coprs_ns/coprs_general.py @@ -735,8 +735,8 @@ def render_generate_repo_file(copr, name_release, repofile): @coprs_ns.route("/<username>/<coprname>/rpm/<name_release>/<rpmfile>") def copr_repo_rpm_file(username, coprname, name_release, rpmfile): try: - PACKAGES_DIR = "/usr/share/copr/repo_rpm_storage" # @TODO Move to the config file - with open(os.path.join(PACKAGES_DIR, rpmfile), "rb") as rpm: + packages_dir = os.path.join(app.config["DATA_DIR"], "repo-rpm-packages") + with open(os.path.join(packages_dir, rpmfile), "rb") as rpm: response = flask.make_response(rpm.read()) response.mimetype = "application/x-rpm" response.headers["Content-Disposition"] = \ diff --git a/frontend/coprs_frontend/run/generate_repo_packages.py b/frontend/coprs_frontend/run/generate_repo_packages.py index b964f1f..97fcb70 100644 --- a/frontend/coprs_frontend/run/generate_repo_packages.py +++ b/frontend/coprs_frontend/run/generate_repo_packages.py @@ -28,18 +28,13 @@ from coprs.logic.coprs_logic import CoprsLogic # ---------------------------------------------------------------------------------------------------------------------- +hostname = app.config["PUBLIC_COPR_HOSTNAME"] +scheme = "https" if hostname == "copr.fedoraproject.org" else "http" # Workaround to broken enforce https on fe-dev -FRONTEND_URL = app.config["PUBLIC_COPR_HOSTNAME"] -FRONTEND_URL = "http://127.0.0.1:5000/" -FRONTEND_URL = "http://copr.fedoraproject.org/" -FRONTEND_URL = "http://copr-fe-dev.cloud.fedoraproject.org/" - +FRONTEND_URL = "{}://{}".format(scheme, hostname) FRONTEND_DIR = os.path.dirname(here) PACKAGES_DIR = os.path.join(app.config["DATA_DIR"], "repo-rpm-packages") -PACKAGES_DIR = "/usr/share/copr/repo_rpm_storage" # @TODO Move to the config file - RPMBUILD = os.path.join(os.path.expanduser("~"), "rpmbuild") -RPMBUILD = "/tmp/rpmbuild" LOG_FILE = "/var/log/copr/repo-packages.log" VERSION = 1