[copr] master: require python-alembic (ffcda89)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit ffcda89eb0b18efe6d0679846cca4037b35f4140
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 19 12:33:46 2013 +0200
require python-alembic
addressing:
Traceback (most recent call last):
File "./manage.py", line 190, in <module>
manager.run()
File "/usr/lib/python2.7/site-packages/flask_script/__init__.py", line 351, in run
result = self.handle(sys.argv[0], command, sys.argv[2:])
File "/usr/lib/python2.7/site-packages/flask_script/__init__.py", line 324, in handle
return command.handle(app, *positional_args, **command_namespace.__dict__)
File "/usr/lib/python2.7/site-packages/flask_script/commands.py", line 143, in handle
return self.run(*args, **kwargs)
File "./manage.py", line 45, in run
from alembic.config import Config
ImportError: No module named alembic.config
>---------------------------------------------------------------
copr.spec | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/copr.spec b/copr.spec
index eb67ba0..082c14b 100644
--- a/copr.spec
+++ b/copr.spec
@@ -43,6 +43,7 @@ Requires: mod_wsgi
Requires: postgresql-server
Requires: postgresql-devel
Requires: gcc
+Requires: python-alembic
Requires: python-flask
Requires: python-flask-openid
Requires: python-flask-wtf
10 years, 10 months
[copr] master: add python-flask-script and python-flask-whooshee to requirements (30a5b52)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 30a5b529b78b2689cf5181b6a77961871df0df6c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 19 09:41:23 2013 +0200
add python-flask-script and python-flask-whooshee to requirements
They are used in:
coprs_frontend/manage.py:from flask.ext.script import Manager, Command, Option, Group
coprs_frontend/coprs/__init__.py:from flask.ext.whooshee import Whooshee
coprs_frontend/coprs/whoosheers.py:from flask.ext.whooshee import AbstractWhoosheer
>---------------------------------------------------------------
copr.spec | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/copr.spec b/copr.spec
index aa192e2..eb67ba0 100644
--- a/copr.spec
+++ b/copr.spec
@@ -47,6 +47,8 @@ Requires: python-flask
Requires: python-flask-openid
Requires: python-flask-wtf
Requires: python-flask-sqlalchemy
+Requires: python-flask-script
+Requires: python-flask-whooshee
#Requires: python-virtualenv
Requires: python-blinker
Requires: python-whoosh
10 years, 10 months
[copr] master: change user in coprs.conf.example to copr-fe (4dd7bad)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 4dd7bad3e72c1b073e3497fa3163208af13383ee
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 19 09:00:50 2013 +0200
change user in coprs.conf.example to copr-fe
which is default user for frontend
>---------------------------------------------------------------
coprs_frontend/coprs.conf.example | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs.conf.example b/coprs_frontend/coprs.conf.example
index ea13226..ca49306 100644
--- a/coprs_frontend/coprs.conf.example
+++ b/coprs_frontend/coprs.conf.example
@@ -2,7 +2,7 @@
ServerName 127.0.0.1
#WSGIPassAuthorization On
- WSGIDaemonProcess 127.0.0.1 user=coprs group=coprs threads=5
+ WSGIDaemonProcess 127.0.0.1 user=copr-fe group=copr-fe threads=5
WSGIScriptAlias / /usr/share/copr/coprs_frontend/application
WSGIProcessGroup 127.0.0.1
10 years, 10 months
[copr] master: fix paths in coprs.conf.example (fa37973)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit fa3797315eddfefd43809f2377a4e95a14c70994
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 19 08:58:16 2013 +0200
fix paths in coprs.conf.example
To reflect change default location to /usr/share/copr/coprs_frontend
>---------------------------------------------------------------
coprs_frontend/coprs.conf.example | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/coprs_frontend/coprs.conf.example b/coprs_frontend/coprs.conf.example
index 3dddd10..ea13226 100644
--- a/coprs_frontend/coprs.conf.example
+++ b/coprs_frontend/coprs.conf.example
@@ -3,13 +3,13 @@
#WSGIPassAuthorization On
WSGIDaemonProcess 127.0.0.1 user=coprs group=coprs threads=5
- WSGIScriptAlias / /usr/share/coprs_frontend/application
+ WSGIScriptAlias / /usr/share/copr/coprs_frontend/application
WSGIProcessGroup 127.0.0.1
ErrorLog logs/error_coprs
CustomLog logs/access_coprs common
- <Directory /var/www/coprs_frontend>
+ <Directory /usr/share/copr/coprs_frontend>
WSGIApplicationGroup %{GLOBAL}
Order deny,allow
Allow from all
10 years, 10 months
[copr] master: copr is noarch package (f7f0344)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit f7f034466a809b307a848cc67131eb39f61fbb4d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jun 19 08:37:54 2013 +0200
copr is noarch package
>---------------------------------------------------------------
copr.spec | 1 +
coprs_frontend/coprs/config.py | 3 +++
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/copr.spec b/copr.spec
index 41788e1..aa192e2 100644
--- a/copr.spec
+++ b/copr.spec
@@ -8,6 +8,7 @@ License: GPLv2+
URL: https://fedorahosted.org/copr/
Source0: %{name}-%{version}.tar.gz
+BuildArch: noarch
BuildRequires: asciidoc
BuildRequires: libxslt
BuildRequires: util-linux
diff --git a/coprs_frontend/coprs/config.py b/coprs_frontend/coprs/config.py
index e6f3c78..1b735e4 100644
--- a/coprs_frontend/coprs/config.py
+++ b/coprs_frontend/coprs/config.py
@@ -19,6 +19,9 @@ class Config(object):
# Token length, defaults to 30, DB set to varchar 255
API_TOKEN_LENGTH = 30
+ # Expiration of API token in days
+ API_TOKEN_EXPIRATION = 180
+
# logging options
SEND_LOGS_TO = []
LOGGING_LEVEL = logging.ERROR
10 years, 10 months
[copr] master: add note where to configure frontend (93b97f3)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 93b97f3d9f1d7fa039eeaf690617cadf43efe3aa
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 18 13:55:52 2013 +0200
add note where to configure frontend
>---------------------------------------------------------------
copr-setup.txt | 1 +
copr.spec | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/copr-setup.txt b/copr-setup.txt
index 72305d4..7e34082 100644
--- a/copr-setup.txt
+++ b/copr-setup.txt
@@ -89,4 +89,5 @@ Required pkgs:
- pip install -I SQLAlchemy MarkupSafe
- pip install pytest
+- edit credentials in coprs_frontend/coprs/config.py
diff --git a/copr.spec b/copr.spec
index 238f7e8..41788e1 100644
--- a/copr.spec
+++ b/copr.spec
@@ -114,7 +114,7 @@ useradd -r -g copr-fe -G copr-fe -d %{_datadir}/copr/coprs_frontend -s /bin/bash
%dir %{_datadir}/copr
%files frontend
-%doc LICENSE coprs.conf.example
+%doc LICENSE coprs.conf.example copr-setup.txt
%defattr(-, copr-fe, copr-fe, -)
%dir %{_datadir}/copr
%dir %{_datadir}/copr/data
10 years, 10 months
[copr] master: move frontend to /usr/share/copr/coprs_frontend (c1540a0)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit c1540a07a3882af6ce519863c667e1209d2f8206
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 18 13:51:57 2013 +0200
move frontend to /usr/share/copr/coprs_frontend
move it from /usr/share/coprs_frontend to /usr/share/copr/coprs_frontend - this will
have two benefits
a) allow to install backend and frontend together if needed
b) data directory will be in /usr/share/copr/data instead of too general /usr/share/data
>---------------------------------------------------------------
copr.spec | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/copr.spec b/copr.spec
index 10c4c4f..238f7e8 100644
--- a/copr.spec
+++ b/copr.spec
@@ -84,10 +84,13 @@ a2x -d manpage -f manpage man/copr-cli.1.asciidoc
%install
#frontend
-install -d %{buildroot}%{_datadir}/coprs_frontend
-cp -a coprs_frontend/* %{buildroot}%{_datadir}/coprs_frontend
-mv %{buildroot}%{_datadir}/coprs_frontend/coprs.conf.example ./
-rm %{buildroot}%{_datadir}/coprs_frontend/CONTRIBUTION_GUIDELINES
+install -d %{buildroot}%{_datadir}/copr/coprs_frontend
+install -d %{buildroot}%{_datadir}/copr/data/openid_store
+install -d %{buildroot}%{_datadir}/copr/data/whooshee
+cp -a coprs_frontend/* %{buildroot}%{_datadir}/copr/coprs_frontend
+mv %{buildroot}%{_datadir}/copr/coprs_frontend/coprs.conf.example ./
+rm %{buildroot}%{_datadir}/copr/coprs_frontend/CONTRIBUTION_GUIDELINES
+touch %{buildroot}%{_datadir}/copr/data/copr.db
#copr-cli
%{__python} coprcli-setup.py install --root %{buildroot}
@@ -97,22 +100,28 @@ install -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
%pre backend
getent group copr >/dev/null || groupadd -r copr
getent passwd copr >/dev/null || \
-useradd -r -g copr -G apache -d %{_var}/lib/copr -s /bin/bash -c "COPR user" copr
+useradd -r -g copr -G apache -d %{_datadir}/copr -s /bin/bash -c "COPR user" copr
/usr/bin/passwd -l copr >/dev/null
%pre frontend
getent group copr-fe >/dev/null || groupadd -r copr-fe
getent passwd copr-fe >/dev/null || \
-useradd -r -g copr-fe -G copr-fe -d %{_datadir}/coprs_frontend -s /bin/bash -c "COPR frontend user" copr-fe
+useradd -r -g copr-fe -G copr-fe -d %{_datadir}/copr/coprs_frontend -s /bin/bash -c "COPR frontend user" copr-fe
/usr/bin/passwd -l copr-fe >/dev/null
%files backend
%doc LICENSE README
+%dir %{_datadir}/copr
%files frontend
%doc LICENSE coprs.conf.example
%defattr(-, copr-fe, copr-fe, -)
-%{_datadir}/coprs_frontend
+%dir %{_datadir}/copr
+%dir %{_datadir}/copr/data
+%dir %{_datadir}/copr/data/openid_store
+%dir %{_datadir}/copr/data/whooshee
+%{_datadir}/copr/coprs_frontend
+%ghost %{_datadir}/copr/data/copr.db
%files cli
%doc LICENSE README.rst
10 years, 10 months
[copr] master: put production placeholders in coprs_frontend/coprs/config.py (121f2e0)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 121f2e0761d49fc5a8156235c50d0a22c6f6539b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 18 11:44:55 2013 +0200
put production placeholders in coprs_frontend/coprs/config.py
>---------------------------------------------------------------
coprs_frontend/coprs/config.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/coprs_frontend/coprs/config.py b/coprs_frontend/coprs/config.py
index b5ee63e..e6f3c78 100644
--- a/coprs_frontend/coprs/config.py
+++ b/coprs_frontend/coprs/config.py
@@ -25,6 +25,9 @@ class Config(object):
class ProductionConfig(Config):
DEBUG = False
+ #SECRET_KEY = 'put_some_secret_here'
+ #BACKEND_PASSWORD = 'password_here'
+ #SQLALCHEMY_DATABASE_URI = 'postgresql+psycopg2://login:password@/db_name'
class DevelopmentConfig(Config):
DEBUG = True
10 years, 10 months
[copr] master: web application should be put in /usr/share/%{name} (2cc886f)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit 2cc886f52a80a3611d67e8ca46836a109fd79150
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 18 09:43:59 2013 +0200
web application should be put in /usr/share/%{name}
see http://fedoraproject.org/wiki/Packaging:Guidelines#Web_Applications
>---------------------------------------------------------------
coprs_frontend/coprs.conf.example | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/coprs_frontend/coprs.conf.example b/coprs_frontend/coprs.conf.example
index 98bf98b..3dddd10 100644
--- a/coprs_frontend/coprs.conf.example
+++ b/coprs_frontend/coprs.conf.example
@@ -1,8 +1,9 @@
<VirtualHost 127.0.0.1:8000>
ServerName 127.0.0.1
+ #WSGIPassAuthorization On
WSGIDaemonProcess 127.0.0.1 user=coprs group=coprs threads=5
- WSGIScriptAlias / /var/www/coprs_frontend/application
+ WSGIScriptAlias / /usr/share/coprs_frontend/application
WSGIProcessGroup 127.0.0.1
ErrorLog logs/error_coprs
10 years, 10 months
[copr] master: put frontend into copr.spec (e3db200)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit e3db200bcf51a869b25c3032b136e3244727c967
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jun 18 10:01:22 2013 +0200
put frontend into copr.spec
>---------------------------------------------------------------
copr.spec | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/copr.spec b/copr.spec
index 90714e4..10c4c4f 100644
--- a/copr.spec
+++ b/copr.spec
@@ -82,8 +82,15 @@ mv copr_cli/README.rst ./
a2x -d manpage -f manpage man/copr-cli.1.asciidoc
%install
-%{__python} coprcli-setup.py install --root %{buildroot}
+#frontend
+install -d %{buildroot}%{_datadir}/coprs_frontend
+cp -a coprs_frontend/* %{buildroot}%{_datadir}/coprs_frontend
+mv %{buildroot}%{_datadir}/coprs_frontend/coprs.conf.example ./
+rm %{buildroot}%{_datadir}/coprs_frontend/CONTRIBUTION_GUIDELINES
+
+#copr-cli
+%{__python} coprcli-setup.py install --root %{buildroot}
install -d %{buildroot}%{_mandir}/man1
install -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/
@@ -93,11 +100,19 @@ getent passwd copr >/dev/null || \
useradd -r -g copr -G apache -d %{_var}/lib/copr -s /bin/bash -c "COPR user" copr
/usr/bin/passwd -l copr >/dev/null
+%pre frontend
+getent group copr-fe >/dev/null || groupadd -r copr-fe
+getent passwd copr-fe >/dev/null || \
+useradd -r -g copr-fe -G copr-fe -d %{_datadir}/coprs_frontend -s /bin/bash -c "COPR frontend user" copr-fe
+/usr/bin/passwd -l copr-fe >/dev/null
+
%files backend
%doc LICENSE README
%files frontend
-%doc LICENSE
+%doc LICENSE coprs.conf.example
+%defattr(-, copr-fe, copr-fe, -)
+%{_datadir}/coprs_frontend
%files cli
%doc LICENSE README.rst
10 years, 10 months