[PATCH] Remove taskomatic from RPM packaging.

[Ian Main]

I think this is everything needed to remove taskomatic from RPM package.
I won't be around to push this so please review and push if it's ok.

Signed-off-by: Ian Main 
---
 conf/deltacloud-portal.logrotate |    6 ---
 conf/deltacloud-taskomatic       |   66 --------------------------------------
 deltacloud-aggregator.spec.in    |   10 ++----
 3 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100755 conf/deltacloud-taskomatic

diff --git a/conf/deltacloud-portal.logrotate b/conf/deltacloud-portal.logrotate
index 2269869..3d10fd9 100644
--- a/conf/deltacloud-portal.logrotate
+++ b/conf/deltacloud-portal.logrotate
@@ -4,12 +4,6 @@ compress
 missingok
 notifempty

-/var/log/deltacloud-aggregator/taskomatic.log {
-  postrotate
-      /etc/init.d/deltacloud-taskomatic restart
-  endscript
-}
-
 /var/log/deltacloud-aggregator/rails.log /var/log/deltacloud-aggregator/thin.log {
   sharedscripts
   postrotate
diff --git a/conf/deltacloud-taskomatic b/conf/deltacloud-taskomatic
deleted file mode 100755
index c9e2a72..0000000
--- a/conf/deltacloud-taskomatic
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-#
-# deltacloud-taskomatic       startup script for deltacloud-taskomatic
-#
-# chkconfig: - 97 03
-# description: deltacloud-taskomatic is an essential component of the \
-#    deltacloud aggregator.
-#
-
-[ -r /etc/sysconfig/deltacloud-rails ] && . /etc/sysconfig/deltacloud-rails
-
-export RAILS_ENV="${RAILS_ENV:-production}"
-export COBBLER_YML="${COBBLER_YML:-/usr/share/deltacloud-aggregator/config/cobbler.yml}"
-
-DAEMON=/usr/share/deltacloud-aggregator/task-omatic/taskomatic.rb
-TASKOMATIC_LOCKFILE="${TASKOMATIC_LOCKFILE:-/var/lock/subsys/deltacloud-taskomatic }"
-
-. /etc/init.d/functions
-
-start() {
-    echo -n "Starting deltacloud-taskomatic: "
-    daemon $DAEMON
-    RETVAL=$?
-    echo
-    if [ $RETVAL -eq 0 ]; then
-        touch  $TASKOMATIC_LOCKFILE
-    fi
-}
-
-stop() {
-    echo -n "Shutting down deltacloud-taskomatic: "
-    killproc taskomatic.rb
-    RETVAL=$?
-    echo
-    if [ $RETVAL -eq 0 ]; then
-        rm  $TASKOMATIC_LOCKFILE
-    fi
-}
-
-case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    restart)
-	stop
-	start
-	;;
-    reload)
-        ;;
-    force-reload)
-        restart
-        ;;
-    status)
-	status $DAEMON
-	RETVAL=$?
-	;;
-    *)
-      echo "Usage: deltacloud-taskomatic {start|stop|restart|status}"
-      exit 1
-  ;;
-esac
-exit $RETVAL
diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in
index ef0a505..7709b7b 100644
--- a/deltacloud-aggregator.spec.in
+++ b/deltacloud-aggregator.spec.in
@@ -79,7 +79,6 @@ Documentation and tests for the Deltacloud Aggregator
 mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root}

# copy over init scripts and various config
-%{__cp} conf/deltacloud-aggregator conf/deltacloud-taskomatic %{buildroot}%{_initrddir}
 %{__cp} conf/deltacloud-portal.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf
 %{__cp} conf/deltacloud-portal.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator
 %{__cp} conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator
@@ -101,10 +100,8 @@ mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc
 # these files will no longer be added explicitly here.
 touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log
 touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log
-touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log

# remove the files not needed for the installation
-%{__rm} -f  %{buildroot}%{app_root}/task-omatic/.gitignore
 %{__rm} -f  %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore
 %{__rm} -f  %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest

@@ -127,13 +124,10 @@ getent passwd dcloud >/dev/null || \

%post daemons
 # Register the httpd service
-/sbin/chkconfig --add deltacloud-taskomatic
 /sbin/chkconfig --add deltacloud-aggregator

%preun daemons
 if [ $1 = 0 ]; then
-/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1
-/sbin/chkconfig --del deltacloud-taskomatic
 /sbin/service deltacloud-aggregator stop > /dev/null 2>&1
 /sbin/chkconfig --del deltacloud-aggregator
 fi
@@ -151,7 +145,6 @@ fi
 %files daemons
 %defattr(-,root,root,-)
 %{_initrddir}/deltacloud-aggregator
-%{_initrddir}/deltacloud-taskomatic
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator
 %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails
@@ -167,6 +160,9 @@ fi
 %doc README AUTHORS COPYING

%changelog
+* Sat Mar 6 2010 Ian Main  - 0.0.2-2
+- removed taskomatic from packaging.
+
 * Wed Feb 18 2010 Mohammed Morsi  - 0.0.2-1
 - renamed portal to aggregator
 - updated / cleaned up package

[Scott Seago]

Ian Main wrote:
> I think this is everything needed to remove taskomatic from RPM package.
> I won't be around to push this so please review and push if it's ok.
>
> Signed-off-by: Ian Main

ACK and pushed after I fixed one minor problem.
> conf/deltacloud-portal.logrotate |    6 ---
>  conf/deltacloud-taskomatic       |   66 --------------------------------------
>  deltacloud-aggregator.spec.in    |   10 ++----
>  3 files changed, 3 insertions(+), 79 deletions(-)
>  delete mode 100755 conf/deltacloud-taskomatic
>
> diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in
> index ef0a505..7709b7b 100644
> --- a/deltacloud-aggregator.spec.in
> +++ b/deltacloud-aggregator.spec.in
> @@ -79,7 +79,6 @@ Documentation and tests for the Deltacloud Aggregator
>  mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc_root}
>
> # copy over init scripts and various config
> -%{__cp} conf/deltacloud-aggregator conf/deltacloud-taskomatic %{buildroot}%{_initrddir}

This removed the aggregator initscript too. I updated it to only remove 
the taskomatic one.
> %{__cp} conf/deltacloud-portal.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/deltacloud-aggregator.conf
>  %{__cp} conf/deltacloud-portal.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/deltacloud-aggregator
>  %{__cp} conf/deltacloud-aggregator.sysconf %{buildroot}%{_sysconfdir}/sysconfig/deltacloud-aggregator
> @@ -101,10 +100,8 @@ mv %{buildroot}/%{app_root}/doc %{buildroot}/%{app_root}/test %{buildroot}/%{doc
>  # these files will no longer be added explicitly here.
>  touch %{buildroot}%{_localstatedir}/log/%{name}/mongrel.log
>  touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log
> -touch %{buildroot}%{_localstatedir}/log/%{name}/taskomatic.log
>
> # remove the files not needed for the installation
> -%{__rm} -f  %{buildroot}%{app_root}/task-omatic/.gitignore
>  %{__rm} -f  %{buildroot}%{app_root}/vendor/plugins/will_paginate/.gitignore
>  %{__rm} -f  %{buildroot}%{app_root}/vendor/plugins/will_paginate/.manifest
>
> @@ -127,13 +124,10 @@ getent passwd dcloud >/dev/null || \
>
> %post daemons
>  # Register the httpd service
> -/sbin/chkconfig --add deltacloud-taskomatic
>  /sbin/chkconfig --add deltacloud-aggregator
>
> %preun daemons
>  if [ $1 = 0 ]; then
> -/sbin/service deltacloud-taskomatic stop > /dev/null 2>&1
> -/sbin/chkconfig --del deltacloud-taskomatic
>  /sbin/service deltacloud-aggregator stop > /dev/null 2>&1
>  /sbin/chkconfig --del deltacloud-aggregator
>  fi
> @@ -151,7 +145,6 @@ fi
>  %files daemons
>  %defattr(-,root,root,-)
>  %{_initrddir}/deltacloud-aggregator
> -%{_initrddir}/deltacloud-taskomatic
>  %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
>  %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-aggregator
>  %config(noreplace) %{_sysconfdir}/sysconfig/deltacloud-rails
> @@ -167,6 +160,9 @@ fi
>  %doc README AUTHORS COPYING
>
> %changelog
> +* Sat Mar 6 2010 Ian Main  - 0.0.2-2
> +- removed taskomatic from packaging.
> Wed Feb 18 2010 Mohammed Morsi  - 0.0.2-1
> renamed portal to aggregator
> updated / cleaned up package