[tyrion/f14/master] * Sat Sep 04 2010 Silas Sewell <silas at sewell.ch> - 0.1.0-1 - Remove Tyrion client - Obsolete node pa
Silas Sewell
silas at fedoraproject.org
Sat Sep 4 17:16:23 UTC 2010
commit 37a0c7462dc84cd240d68826e0e333de9dde5364
Author: Silas Sewell <silas at sewell.ch>
Date: Sat Sep 4 13:16:06 2010 -0400
* Sat Sep 04 2010 Silas Sewell <silas at sewell.ch> - 0.1.0-1
- Remove Tyrion client
- Obsolete node packages
- Add check section
.gitignore | 1 +
sources | 2 +-
tyrion-node.acl => tyrion.acl | 3 +
tyrion-node.init => tyrion.init | 30 +++---
tyrion-node.logrotate => tyrion.logrotate | 2 +-
tyrion.spec | 177 +++++++++++++++--------------
6 files changed, 113 insertions(+), 102 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7f980a2..6de3a5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
tyrion-0.0.1.tar.bz2
+/tyrion-0.1.0.tar.bz2
diff --git a/sources b/sources
index 82a5c42..d184b1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c606f5116ed9497a4db3d8822264b0ed tyrion-0.0.1.tar.bz2
+041b6566553dc6064195e984c4acdcd7 tyrion-0.1.0.tar.bz2
diff --git a/tyrion-node.acl b/tyrion.acl
similarity index 75%
rename from tyrion-node.acl
rename to tyrion.acl
index e37804f..7c25e4e 100644
--- a/tyrion-node.acl
+++ b/tyrion.acl
@@ -1,6 +1,9 @@
;[org.tyrion.service.bash]
;test.client at example.org = true
+;[org.tyrion.service.perl]
+;test.client at example.org = true
+
;[org.tyrion.service.python]
;test.client at example.org = true
diff --git a/tyrion-node.init b/tyrion.init
similarity index 61%
rename from tyrion-node.init
rename to tyrion.init
index d0f2a35..6235454 100644
--- a/tyrion-node.init
+++ b/tyrion.init
@@ -1,27 +1,27 @@
#!/bin/sh
#
-# tyrion-node init file for starting up the Tyrion node
+# tyrion- init file for starting Tyrion
#
# chkconfig: - 20 80
-# description: Starts and stops the Tyrion node daemon that handles all \
+# description: Starts and stops the Tyrion daemon that handles all \
# service requests.
# Source function library.
. /etc/rc.d/init.d/functions
-exec="/usr/sbin/tyrion-node"
-config="/etc/tyrion/node.conf"
-logfile="/var/log/tyrion-node/node.out.log"
-pidfile="/var/run/tyrion-node.pid"
+exec="/usr/sbin/tyrion"
+config="/etc/tyrion/tyrion.conf"
+logfile="/var/log/tyrion/stdout.log"
+pidfile="/var/run/tyrion.pid"
-[ -e /etc/sysconfig/tyrion-node ] && . /etc/sysconfig/tyrion-node
+[ -e /etc/sysconfig/tyrion ] && . /etc/sysconfig/tyrion
-lockfile=/var/lock/subsys/tyrion-node
+lockfile=/var/lock/subsys/tyrion
start() {
[ -x $exec ] || exit 5
- echo -n $"Starting tyrion-node: "
- daemon --user ${TYRION_NODE_USER-root} --pidfile $pidfile \
+ echo -n $"Starting tyrion: "
+ daemon --user ${TYRION_USER-root} --pidfile $pidfile \
"$exec -c $config >> $logfile 2>&1 & echo \$! > $pidfile"
retval=$?
echo
@@ -30,8 +30,8 @@ start() {
}
stop() {
- echo -n $"Stopping tyrion-node: "
- killproc -p $pidfile tyrion-node
+ echo -n $"Stopping tyrion: "
+ killproc -p $pidfile tyrion
retval=$?
echo
[ $retval -eq 0 ] && rm -f $lockfile
@@ -44,15 +44,15 @@ restart() {
}
reload() {
- echo -n $"Reloading tyrion-node: "
- killproc -p $pidfile tyrion-node -HUP
+ echo -n $"Reloading tyrion: "
+ killproc -p $pidfile tyrion -HUP
retval=$?
echo
return $retval
}
rh_status() {
- status -p $pidfile tyrion-node
+ status -p $pidfile tyrion
}
rh_status_q() {
diff --git a/tyrion-node.logrotate b/tyrion.logrotate
similarity index 78%
rename from tyrion-node.logrotate
rename to tyrion.logrotate
index 76ce5ee..3eea173 100644
--- a/tyrion-node.logrotate
+++ b/tyrion.logrotate
@@ -1,4 +1,4 @@
-/var/log/tyrion-node/*.log {
+/var/log/tyrion/*.log {
weekly
rotate 10
copytruncate
diff --git a/tyrion.spec b/tyrion.spec
index 345cd7d..c8d5b22 100644
--- a/tyrion.spec
+++ b/tyrion.spec
@@ -1,16 +1,18 @@
Name: tyrion
-Version: 0.0.1
+Version: 0.1.0
Release: 1%{?dist}
-Summary: A framework for systems automation
-Group: Applications/System
+Summary: A daemon that allows for the asynchronous running of remote processes
+Group: System Environment/Daemons
License: BSD
URL: http://www.tidg.org/tyrion
Source0: http://github.com/downloads/tidg/tyrion/tyrion-%{version}.tar.bz2
-Source1: tyrion-node.logrotate
-Source2: tyrion-node.init
-Source3: tyrion-node.acl
+Source1: tyrion.logrotate
+Source2: tyrion.init
+Source3: tyrion.acl
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: bc
+BuildRequires: gtest-devel
BuildRequires: txmpp-devel
BuildRequires: scons
@@ -20,134 +22,139 @@ Requires(post): chkconfig
Requires(postun): initscripts
Requires(preun): chkconfig
-%description
-Tyrion is a framework for systems automation.
-
-This package contains the client application for interacting with a Tyrion
-node.
-
-%package libs
-Summary: Run-time library files for %{name}
-Group: System Environment/Libraries
+Provides: tyrion-node = %{version}
+Obsoletes: tyrion-node < 0.1.0
-%description libs
-Tyrion is a framework for systems automation.
+Provides: tyrion-libs = %{version}
+Obsoletes: tyrion-libs < 0.1.0
-The %{name}-libs package contains libraries for running %{name} applications.
+%description
+Tyrion is a lightweight daemon that allows for the asynchronous running of
+remote processes. It provides basic access controls, process timeouts and a
+communication protocol (XMPP) that integrates nicely into both corporate and
+cloud environments.
-%package node
-Summary: A Tyrion node daemon
+%package service-perl
+Summary: A Tyrion Perl service
Group: Applications/System
-Requires: %{name}-libs = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: perl
-%description node
-Tyrion is a framework for systems automation.
+%description service-perl
+Tyrion is a lightweight daemon that allows for the asynchronous running of
+remote processes.
-The %{name}-node package contains the daemon for running a Tyrion node.
+The %{name}-service-perl package contains a service that allows for the
+running of arbitrary Perl code.
-%package node-service-python
-Summary: A Tyrion node Python service
+%package service-python
+Summary: A Tyrion Python service
Group: Applications/System
-Requires: %{name}-node = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: python
-%description node-service-python
-Tyrion is a framework for systems automation.
+Provides: tyrion-node-service-python = %{version}
+Obsoletes: tyrion-node-service-python < 0.1.0
-The %{name}-node-service-python package contains the node Python service.
+%description service-python
+Tyrion is a lightweight daemon that allows for the asynchronous running of
+remote processes.
-%package node-service-ruby
-Summary: A Tyrion node Ruby service
+The %{name}-service-python package contains a service that allows for the
+running of arbitrary Python code.
+
+%package service-ruby
+Summary: A Tyrion Ruby service
Group: Applications/System
-Requires: %{name}-node = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
Requires: ruby
-%description node-service-ruby
-Tyrion is a framework for systems automation.
+Provides: tyrion-node-service-ruby = %{version}
+Obsoletes: tyrion-node-service-ruby < 0.1.0
+
+%description service-ruby
+Tyrion is a lightweight daemon that allows for the asynchronous running of
+remote processes.
-The %{name}-node-service-ruby package contains the node Ruby service.
+The %{name}-service-ruby package contains a service that allows for the
+running of arbitrary Ruby code.
%prep
%setup -q
%build
scons %{?_smp_mflags} --flags="%{optflags}"
-# Build man pages
-pushd doc; gzip *; popd
+
+%check
+./test
%install
rm -rf %{buildroot}
scons %{?_smp_mflags} --flags="%{optflags}" --install \
- --bindir=%{buildroot}/%{_bindir} \
- --libdir=%{buildroot}/%{_libdir} \
- --sbindir=%{buildroot}/%{_sbindir}
-%{__mkdir} -p %{buildroot}%{_localstatedir}/log/%{name}-node
-%{__mkdir} -p %{buildroot}%{_datarootdir}/%{name}
-%{__cp} -rp service %{buildroot}%{_datarootdir}/%{name}
-install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}-node
-install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initrddir}/%{name}-node
+ --sbindir=%{buildroot}/%{_sbindir}
+mkdir -p %{buildroot}%{_datadir}/%{name}
+mkdir -p %{buildroot}%{_localstatedir}/log/%{name}
+cp -rp service %{buildroot}%{_datadir}/%{name}
+install -p -D -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+install -p -D -m 755 %{SOURCE2} %{buildroot}%{_initddir}/%{name}
install -p -D -m 600 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/acl.conf
-install -p -D -m 600 config/node.conf %{buildroot}%{_sysconfdir}/%{name}/node.conf
-install -p -D -m 644 doc/tyrion.1.gz %{buildroot}%{_mandir}/man1/tyrion.1.gz
-install -p -D -m 644 doc/tyrion-node.8.gz %{buildroot}%{_mandir}/man8/tyrion-node.8.gz
+install -p -D -m 600 config/%{name}.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
+install -p -D -m 644 doc/%{name}.8 %{buildroot}%{_mandir}/man8/%{name}.8
%clean
rm -rf %{buildroot}
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post node
-/sbin/chkconfig --add %{name}-node
+%post
+/sbin/chkconfig --add %{name}
-%preun node
+%preun
if [ $1 = 0 ] ; then
- /sbin/service %{name}-node stop >/dev/null 2>&1
- /sbin/chkconfig --del %{name}-node
+ /sbin/service %{name} stop >/dev/null 2>&1
+ /sbin/chkconfig --del %{name}
fi
-%postun node
+%postun
if [ "$1" -ge "1" ] ; then
- /sbin/service %{name}-node condrestart >/dev/null 2>&1 || :
+ /sbin/service %{name} condrestart >/dev/null 2>&1 || :
fi
%files
%defattr(-,root,root,-)
-%doc config/client.conf
-%{_bindir}/tyrion
-%{_mandir}/man1/tyrion.1.gz
-
-%files libs
+%doc CONTRIBUTORS LICENSE NOTICE README.md config/acl.conf config/tyrion.conf
+%config(noreplace) %{_sysconfdir}/%{name}/acl.conf
+%config(noreplace) %{_sysconfdir}/%{name}/tyrion.conf
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+%dir %{_datadir}/%{name}
+%dir %{_localstatedir}/log/%{name}
+%{_datadir}/%{name}/service/org.tyrion.service.bash
+%{_initddir}/%{name}
+%{_mandir}/man8/tyrion.8.*
+%{_sbindir}/tyrion
+
+%files service-perl
%defattr(-,root,root,-)
-%doc CONTRIBUTORS LICENSE NOTICE README.md
-%{_libdir}/libtyrion.so.*
+%{_datadir}/%{name}/service/org.tyrion.service.perl
-%files node
+%files service-python
%defattr(-,root,root,-)
-%doc config/acl.conf config/node.conf
-%config(noreplace) %{_sysconfdir}/%{name}/acl.conf
-%config(noreplace) %{_sysconfdir}/%{name}/node.conf
-%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-node
-%dir %{_localstatedir}/log/%{name}-node
-%dir %{_datarootdir}/%{name}
-%{_datarootdir}/%{name}/service/org.tyrion.service.bash
-%{_initrddir}/%{name}-node
-%{_mandir}/man8/tyrion-node.8.gz
-%{_sbindir}/tyrion-node
-
-%files node-service-python
-%defattr(-,root,root,-)
-%doc README.md
-%{_datarootdir}/%{name}/service/org.tyrion.service.python
+%{_datadir}/%{name}/service/org.tyrion.service.python
-%files node-service-ruby
+%files service-ruby
%defattr(-,root,root,-)
-%doc README.md
-%{_datarootdir}/%{name}/service/org.tyrion.service.ruby
+%{_datadir}/%{name}/service/org.tyrion.service.ruby
%changelog
+* Sat Sep 04 2010 Silas Sewell <silas at sewell.ch> - 0.1.0-1
+- Remove Tyrion client
+- Obsolete node packages
+- Add check section
+
+* Thu Aug 12 2010 Silas Sewell <silas at sewell.ch> - 0.0.1-2
+- Don't gzip man pages
+- Remove useless documentation from node-service subpackages
+
* Thu Jul 29 2010 Silas Sewell <silas at sewell.ch> - 0.0.1-1
- Initial build
More information about the scm-commits
mailing list