[copr] master: move log file to /var/log (d79c71a)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit d79c71a9295354dcb3f3ae13c625b820fdf8d4d3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Aug 19 14:58:59 2013 +0200
move log file to /var/log
>---------------------------------------------------------------
copr-be.conf.example | 4 ++--
copr.spec | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/copr-be.conf.example b/copr-be.conf.example
index 9d44d5e..f68dcae 100644
--- a/copr-be.conf.example
+++ b/copr-be.conf.example
@@ -8,8 +8,8 @@ jobsdir=/srv/copr-work/jobs
destdir=/var/lib/copr/results
sleeptime=30
num_workers=5
-logfile=/srv/copr-work/logs/copr.log
-worker_logdir=/srv/copr-work/logs/workers/
+logfile=/var/log/copr/copr.log
+worker_logdir=/var/log/copr/workers/
[builder]
diff --git a/copr.spec b/copr.spec
index 86ba7c6..639bb8d 100644
--- a/copr.spec
+++ b/copr.spec
@@ -94,6 +94,13 @@ a2x -d manpage -f manpage man/copr-cli.1.asciidoc
#backend
install -d %{buildroot}%{_sharedstatedir}/copr
install -d %{buildroot}%{_sharedstatedir}/copr/results
+install -d %{buildroot}%{_var}/log/copr
+install -d %{buildroot}%{_var}/log/copr/workers/
+# for ghost files
+touch %{buildroot}%{_var}/log/copr/copr.log
+for i in `seq 7`; do
+ touch %{buildroot}%{_var}/log/copr/workers/worker-$i.log
+done
#frontend
install -d %{buildroot}%{_sysconfdir}
@@ -136,6 +143,10 @@ service httpd condrestart
%dir %{_datadir}/copr
%dir %{_sharedstatedir}/copr
%dir %attr(0755, copr, copr) %{_sharedstatedir}/copr/results
+%dir %attr(0755, copr, copr) %{_var}/log/copr
+%dir %attr(0755, copr, copr) %{_var}/log/copr/workers
+%ghost %{_var}/log/copr/copr.log
+%ghost %{_var}/log/copr/workers/worker-*.log
%files frontend
%doc LICENSE coprs.conf.example copr-setup.txt
10 years, 7 months
[copr] master: change destdir in copr-be.conf.example (c963179)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit c963179d49a07ec8c1cdcc96f1ea37c58ee2bfb5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Jun 28 20:41:34 2013 +0200
change destdir in copr-be.conf.example
to follow up change in d19435a
>---------------------------------------------------------------
copr-be.conf.example | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/copr-be.conf.example b/copr-be.conf.example
index ffeb235..9d44d5e 100644
--- a/copr-be.conf.example
+++ b/copr-be.conf.example
@@ -5,7 +5,7 @@ frontend_auth=backend_password_from_fe_config
spawn_playbook=/srv/copr-work/provision/builderpb.yml
terminate_playbook=/srv/copr-work/provision/terminatepb.yml
jobsdir=/srv/copr-work/jobs
-destdir=/srv/copr-repo/results
+destdir=/var/lib/copr/results
sleeptime=30
num_workers=5
logfile=/srv/copr-work/logs/copr.log
10 years, 7 months
[copr] master: add support for libravatar (ea241bb)
by Miroslav Suchý
Repository : http://git.fedorahosted.org/cgit/copr.git
On branch : master
>---------------------------------------------------------------
commit ea241bb765ae8ff03d9aa1b262439daf5e41eb18
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Sep 4 13:11:18 2013 +0200
add support for libravatar
>---------------------------------------------------------------
copr.spec | 1 +
coprs_frontend/coprs/models.py | 6 ++++++
coprs_frontend/coprs/templates/coprs/show.html | 2 +-
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/copr.spec b/copr.spec
index 0a5bfd0..03d282e 100644
--- a/copr.spec
+++ b/copr.spec
@@ -55,6 +55,7 @@ Requires: python-flask-whooshee
#Requires: python-virtualenv
Requires: python-blinker
Requires: python-psycopg2
+Requires: python-pylibravatar
Requires: python-whoosh
# for tests:
Requires: pytest
diff --git a/coprs_frontend/coprs/models.py b/coprs_frontend/coprs/models.py
index b1c684e..002ebcb 100644
--- a/coprs_frontend/coprs/models.py
+++ b/coprs_frontend/coprs/models.py
@@ -3,6 +3,7 @@ import time
import sqlalchemy
from sqlalchemy.ext.associationproxy import association_proxy
+from libravatar import libravatar_url
from coprs import constants
from coprs import db
@@ -126,6 +127,11 @@ class User(db.Model, Serializer):
filter_by(deleted=False).\
count()
+ @property
+ def gravatar_url(self):
+ """Return url to libravatar image."""
+ return libravatar_url(email = self.mail)
+
class Copr(db.Model, Serializer):
"""Represents a single copr (private repo with builds, mock chroots, etc.)."""
diff --git a/coprs_frontend/coprs/templates/coprs/show.html b/coprs_frontend/coprs/templates/coprs/show.html
index 5ccde32..3df2771 100644
--- a/coprs_frontend/coprs/templates/coprs/show.html
+++ b/coprs_frontend/coprs/templates/coprs/show.html
@@ -6,7 +6,7 @@
{% if g.user %}
<div class="user-info">
<a href="{{ url_for('coprs_ns.coprs_by_owner', username=g.user.name) }}" title="My Coprs">
- <img src="{{ url_for('static', filename='default_user.png') }}" alt="User Image">
+ <img src="{{ g.user.gravatar_url }}" alt="User Image">
</a>
<p>{{ g.user.name }}</p>
<p class="coprs-count">{{ g.user.coprs_count }}</p>
10 years, 7 months
added F20, remove F16,17
by Miroslav Suchý
I added Fedora 20 to build targets in Copr.
On the other hands I made inactive F16 and F17.
--
Miroslav Suchy, RHCE, RHCDS
Red Hat, Software Engineer, #brno, #devexp, #fedora-buildsys
10 years, 7 months
