Makefile | 1 +
mirrorlist-server/supervisor/mirrorlist-server.conf | 10 ++++++++++
mirrormanager.spec.in | 4 +++-
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit b23cc6f8d114381ca861f081735a4c0741e6a622
Author: Matt Domsch <Matt_Domsch(a)dell.com>
Date: Sun May 1 22:51:14 2011 -0500
Add dep on supervisor. Use supervisor to run mirrorlist_server.py
This is how Fedora has done it since the beginning. This change lets
us move that out of Fedora Infrastructure -specific code into MM mainline.
diff --git a/Makefile b/Makefile
index 48cb550..d4dce87 100644
--- a/Makefile
+++ b/Makefile
@@ -101,6 +101,7 @@ install-server:
install -m 0755 mirrorlist-server/mirrorlist_server.py
$(DESTDIR)/usr/share/mirrormanager/mirrorlist-server
install -m 0755 mirrorlist-server/mirrorlist_statistics.py
$(DESTDIR)/usr/share/mirrormanager/mirrorlist-server
install -m 0644 mirrorlist-server/apache/mirrorlist-server.conf
$(DESTDIR)/etc/httpd/conf.d
+ install -m 0644 mirrorlist-server/supervisor/mirrorlist-server.conf
$(DESTDIR)/etc/supervisord.d
# other junk
mkdir -p -m 0755 $(DESTDIR)/etc/logrotate.d
install -m 0644 server/logrotate.conf $(DESTDIR)/etc/logrotate.d/mirrormanager
diff --git a/mirrorlist-server/supervisor/mirrorlist-server.conf
b/mirrorlist-server/supervisor/mirrorlist-server.conf
new file mode 100644
index 0000000..c5aad22
--- /dev/null
+++ b/mirrorlist-server/supervisor/mirrorlist-server.conf
@@ -0,0 +1,10 @@
+[program:mirrorlist_server]
+command=/usr/share/mirrormanager/mirrorlist-server/mirrorlist_server.py
+priority=1
+autostart=true
+autorestart=true
+startsecs=10
+startretries=5
+stopsignal=TERM
+stopwaitsecs=10
+user=mirrormanager
diff --git a/mirrormanager.spec.in b/mirrormanager.spec.in
index 779d854..3791672 100644
--- a/mirrormanager.spec.in
+++ b/mirrormanager.spec.in
@@ -10,8 +10,9 @@ URL:
http://fedorahosted.org/mirrormanager
Source0:
https://fedorahosted.org/releases/m/i/%{name}/%{name}-%{version}.tar.bz2
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildRequires: python
-Requires: TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns,
python-fedora >= 0.3.14, py-radix, mod_wsgi
+Requires: TurboGears, python-IPy, python-GeoIP, wget, yum, psmisc, python-dns,
python-fedora >= 0.3.14, py-radix, mod_wsgi, python-TurboMail
Requires: python-basemap >= 0.99.4, python-basemap-data >= 0.99.4
+Requires: supervisor
Requires(pre): shadow-utils
%define py_ver %(echo `python -c "import sys; print sys.version[:3]"`)
@@ -71,6 +72,7 @@ exit 0
%attr(-,mirrormanager,mirrormanager) %config(noreplace)
%{_sysconfdir}/logrotate.d/%{name}
%attr(-,mirrormanager,mirrormanager) %config(noreplace)
%{_sysconfdir}/httpd/conf.d/mirrormanager.conf
%attr(-,mirrormanager,mirrormanager) %config(noreplace)
%{_sysconfdir}/httpd/conf.d/mirrorlist-server.conf
+%attr(-,mirrormanager,mirrormanager) %config(noreplace)
%{_sysconfdir}/supervisord.d/mirrorlist-server.conf
%dir /etc/rpmlint/
%config(noreplace) /etc/rpmlint/%{name}.config
%doc LICENSES LICENSE-MIT-X11 LICENSE-GPLv2