---
recipes/aeolus_recipe/files/iwhd-conf.js | 7 ---
recipes/aeolus_recipe/files/iwhd.init | 76 ------------------------------
recipes/aeolus_recipe/manifests/iwhd.pp | 12 +----
3 files changed, 1 insertions(+), 94 deletions(-)
delete mode 100644 recipes/aeolus_recipe/files/iwhd-conf.js
delete mode 100644 recipes/aeolus_recipe/files/iwhd.init
diff --git a/recipes/aeolus_recipe/files/iwhd-conf.js
b/recipes/aeolus_recipe/files/iwhd-conf.js
deleted file mode 100644
index 44516e0..0000000
--- a/recipes/aeolus_recipe/files/iwhd-conf.js
+++ /dev/null
@@ -1,7 +0,0 @@
-[
- {
- "name": "primary",
- "type": "fs",
- "path": "."
- }
-]
diff --git a/recipes/aeolus_recipe/files/iwhd.init
b/recipes/aeolus_recipe/files/iwhd.init
deleted file mode 100644
index 4695d73..0000000
--- a/recipes/aeolus_recipe/files/iwhd.init
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-#
-#
-# iwhd startup script for iwhd server
-#
-# chkconfig: - 40 60
-# description: iwhd is primary server process for the \
-# IWHD component.
-#
-
-[ -r /etc/sysconfig/iwhd ] && . /etc/sysconfig/iwhd
-
-LOCKFILE="${LOCKFILE:-/var/lock/subsys/iwhd}"
-
-PROG=/usr/bin/iwhd
-CONF=/etc/iwhd/conf.js
-
-. /etc/init.d/functions
-
-start() {
- echo -n "Starting iwhd: "
- # FIXME: we sleep 2 here to make sure that mongod has really come up.
- # Yes, it's a hack
- sleep 2
-
- $PROG -c $CONF >& /var/log/iwhd.log &
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && touch $LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-stop() {
- echo -n "Shutting down iwhd: "
- RETVAL=$?
- killall $PROG
- if [ $RETVAL -eq 0 ] && rm -f $LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- reload)
- ;;
- force-reload)
- restart
- ;;
- status)
- status $PROG
- RETVAL=$?
- ;;
- *)
- echo "Usage: iwhd {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/recipes/aeolus_recipe/manifests/iwhd.pp
b/recipes/aeolus_recipe/manifests/iwhd.pp
index 2acd0f8..0357a91 100644
--- a/recipes/aeolus_recipe/manifests/iwhd.pp
+++ b/recipes/aeolus_recipe/manifests/iwhd.pp
@@ -12,15 +12,6 @@ class aeolus::iwhd inherits aeolus {
### Start the aeolus services
file { "/data": ensure => 'directory' }
file { "/data/db": ensure => 'directory' }
- file { "/etc/iwhd": ensure => 'directory'}
- file { "/etc/iwhd/conf.js":
- source => "puppet:///modules/aeolus_recipe/iwhd-conf.js",
- mode => 755, require => File['/etc/iwhd'] }
-
- #TODO The service wrapper should probably be in the rpm itself
- file { "/etc/rc.d/init.d/iwhd":
- source => "puppet:///modules/aeolus_recipe/iwhd.init",
- mode => 755 }
service { 'mongod':
ensure => 'running',
@@ -31,8 +22,7 @@ class aeolus::iwhd inherits aeolus {
ensure => 'running',
enable => true,
hasstatus => true,
- require => [File['/etc/rc.d/init.d/iwhd', '/etc/iwhd/conf.js'],
- return_if($enable_packages, Package['iwhd']),
+ require => [return_if($enable_packages, Package['iwhd']),
Service[mongod]]}
# XXX ugly hack but iwhd might take some time to come up
--
1.7.2.3
Show replies by date