Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit 0250a0cb13aab8e543db5fddedd220bdf11ef77b Author: Valentin Gologuzov <vgologuz(a)redhat.com&gt; Date: Thu Oct 30 12:34:33 2014 +0100 [frontend] removed hardcoded frontend url from /api page. frontend/coprs_frontend/config/copr.conf | 2 ++ frontend/coprs_frontend/config/copr_devel.conf | 2 ++ frontend/coprs_frontend/config/copr_unit_test.conf | 2 ++ frontend/coprs_frontend/coprs/config.py | 7 ++++++- frontend/coprs_frontend/coprs/filters.py | 2 +- frontend/coprs_frontend/coprs/templates/api.html | 2 +- 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/frontend/coprs_frontend/config/copr.conf b/frontend/coprs_frontend/config/copr.conf index ffb0eac..3572b44 100644 --- a/frontend/coprs_frontend/config/copr.conf +++ b/frontend/coprs_frontend/config/copr.conf @@ -67,3 +67,5 @@ SEND_EMAILS = True # 'email_domain': "redhat.com", # } #} + +PUBLIC_COPR_HOSTNAME = "copr.fedoraproject.org" diff --git a/frontend/coprs_frontend/config/copr_devel.conf b/frontend/coprs_frontend/config/copr_devel.conf index f161ca1..182e105 100644 --- a/frontend/coprs_frontend/config/copr_devel.conf +++ b/frontend/coprs_frontend/config/copr_devel.conf @@ -40,3 +40,5 @@ SEND_EMAILS = True ENFORCE_PROTOCOL_FOR_BACKEND_URL = "http" ## post-process url leading to frontend ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "http" + +PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org" diff --git a/frontend/coprs_frontend/config/copr_unit_test.conf b/frontend/coprs_frontend/config/copr_unit_test.conf index ab6e1ab..e99f1c8 100644 --- a/frontend/coprs_frontend/config/copr_unit_test.conf +++ b/frontend/coprs_frontend/config/copr_unit_test.conf @@ -49,3 +49,5 @@ SEND_EMAILS = False ENFORCE_PROTOCOL_FOR_BACKEND_URL = "https" ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "https" + +PUBLIC_COPR_HOSTNAME = "localhost" diff --git a/frontend/coprs_frontend/coprs/config.py b/frontend/coprs_frontend/coprs/config.py index e5abfb9..45c9a8b 100644 --- a/frontend/coprs_frontend/coprs/config.py +++ b/frontend/coprs_frontend/coprs/config.py @@ -38,12 +38,15 @@ class Config(object): ## post-process url leading to frontend ENFORCE_PROTOCOL_FOR_FRONTEND_URL = None + PUBLIC_COPR_HOSTNAME = "copr-fe-dev.cloud.fedoraproject.org" + class ProductionConfig(Config): DEBUG = False #SECRET_KEY = "put_some_secret_here" #BACKEND_PASSWORD = "password_here" #SQLALCHEMY_DATABASE_URI = "postgresql+psycopg2://login:password@/db_name" + PUBLIC_COPR_HOSTNAME = "copr.fedoraproject.org" class DevelopmentConfig(Config): @@ -53,7 +56,7 @@ class DevelopmentConfig(Config): ENFORCE_PROTOCOL_FOR_BACKEND_URL = "http" ENFORCE_PROTOCOL_FOR_FRONTEND_URL = "http" - + PUBLIC_COPR_HOSTNAME = "localhost:5000" class UnitTestConfig(Config): CSRF_ENABLED = False @@ -63,3 +66,5 @@ class UnitTestConfig(Config): # SQLAlchemy SQLALCHEMY_DATABASE_URI = "sqlite:///" + os.path.abspath(DATABASE) + + PUBLIC_COPR_HOSTNAME = "localhost:5000" diff --git a/frontend/coprs_frontend/coprs/filters.py b/frontend/coprs_frontend/coprs/filters.py index a27ffa4..1554a88 100644 --- a/frontend/coprs_frontend/coprs/filters.py +++ b/frontend/coprs_frontend/coprs/filters.py @@ -138,5 +138,5 @@ def fix_url_https_backend(url): @app.template_filter("fix_url_https_frontend") -def fix_url_https_fronend(url): +def fix_url_https_frontend(url): return helpers.fix_protocol_for_frontend(url) diff --git a/frontend/coprs_frontend/coprs/templates/api.html b/frontend/coprs_frontend/coprs/templates/api.html index 16ae028..2157aa0 100644 --- a/frontend/coprs_frontend/coprs/templates/api.html +++ b/frontend/coprs_frontend/coprs/templates/api.html @@ -23,7 +23,7 @@ login = {{ g.user.api_login }} username = {{ g.user.name }} token = {{ g.user.api_token }} -copr_url = https://copr.fedoraproject.org +copr_url = {{ ('https://' + config['PUBLIC_COPR_HOSTNAME'])| fix_url_https_frontend}} # expiration date: {{ g.user.api_token_expiration }} </pre>