Commits

Anonymous committed e50566a

fixing references to resultsdb conf and env var, updating specfile for new version and new upstream. Fixes T147

Summary: simple fixes to incorrect variable lookups

Test Plan: this is all deployment related, so no new unit tests. tested in local env

Reviewers: ralph

CC: jskladan

Maniphest Tasks: T147

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D72

  • Participants
  • Parent commits 4e48908

Comments (0)

Files changed (3)

File conf/resultsdb_frontend.wsgi

 #sys.path.insert(0,"/var/www/resultsdb_frontend/")
 
 import os
-os.environ['RESULTSDB_FRONTEND_CONFIG'] = '/etc/resultsdb/settings.py'
+os.environ['RESULTSDB_FRONTEND_CONFIG'] = '/etc/resultsdb_frontend/settings.py'
 
 from resultsdb_frontend import app as application

File resultsdb_frontend.spec

 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
-%global pkgname resultsdb_frontend
-%global tarball_name resultsdb_frontend
-%global commitname 1de5b340e4c6
-%global bitbucket_username rajcze
-
 Name:           resultsdb_frontend
-Version:        1.0.0
+Version:        1.0.2
 Release:        1%{?dist}
 Summary:        Frontend for the ResultsDB
 
 License:        GPLv2+
-URL:            https://bitbucket.org/rajcze/resultsdb_frontend
-Source0:        https://bitbucket.org/rajcze/%{pkgname}/get/v1.0.tar.gz
+URL:            https://bitbucket.org/fedoraqa/resultsdb_frontend
+Source0:        https://qadevel.cloud.fedoraproject.org/releases/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
 Requires:       python-flask-restful
 Requires:       python-six
 Requires:       python-iso8601
-Requires:       python-resultsdb_api
+Requires:       resultsdb_api
 BuildRequires:  python2-devel python-setuptools
 
 %description
 allows browsing the data stored inside ResultsDB.
 
 %prep
-%setup -qn %{bitbucket_username}-%{pkgname}-%{commitname}
+%setup -q
 
 %build
 %{__python2} setup.py build
 %{python_sitelib}/resultsdb_frontend
 %{python_sitelib}/*.egg-info
 
-%attr(755,root,root) %{_bindir}/resultsdb_frontend
 %dir %{_sysconfdir}/resultsdb_frontend
 %{_sysconfdir}/resultsdb_frontend/*
 %dir %{_datadir}/resultsdb_frontend
 %{_datadir}/resultsdb_frontend/*
 
 %changelog
+* Fri Apr 25 2014 Tim Flink <tflink@fedoraproject.org> - 1.0.2-1
+- updating to new upstream, fixing some variable name errors
+
+* Fri Apr 25 2014 Tim Flink <tflink@fedoraproject.org> - 1.0.1-2
+- updating to new upstream, fixing resultsdb_api dep, removing resultsdb_frontend binary
+
 * Thu Feb 6 2014 Jan Sedlak <jsedlak@redhat.com> - 1.0.0-1
 - initial packaging

File resultsdb_frontend/__init__.py

 import os
 
 # the version as used in setup.py
-__version__ = "1.0.1"
+__version__ = "1.0.2"
 
 # Flask App
 app = Flask(__name__)
     default_config_obj = 'resultsdb_frontend.config.DevelopmentConfig'
     default_config_file = os.getcwd() + '/conf/settings.py'
 
-config_file = os.environ.get('RESULTSDB_CONFIG', default_config_file)
+config_file = os.environ.get('RESULTSDB_FRONTEND_CONFIG', default_config_file)
 
 if not os.path.exists(config_file):
     raise RuntimeError("config file %r does not exist" % config_file)