Removed unused celeryd files, fixed setup.

4 files changed, 5 insertions, 49 deletions

diff --git a/scripts/celeryd-start.conf b/scripts/celeryd-start.conf
deleted file mode 100644
index 72f060d..0000000
--- a/scripts/celeryd-start.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# Taks to start celery based on the INI files in the RhodeCode user home
-# directory. Multiple instances of RhodeCode need their own celery daemon.
-# To start, just run:
-# service celeryd-start start
-
-description "Celery Start Task"
-author "Milo Casagrande <milo.casagrande@linaro.org>"
-
-start on starting rhodecode
-
-task
-
-env HOME="/home/rhodecode"
-
-script
-    for conf in `ls $HOME/production-*.ini` ; do
-        start celeryd APPINI=`basename $conf`
-    done
-end script
diff --git a/scripts/celeryd-stop.conf b/scripts/celeryd-stop.conf
deleted file mode 100644
index 40a543c..0000000
--- a/scripts/celeryd-stop.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# Stops celeryd instances running based on the INI file used to start them.
-# To stop, just run:
-# service celeryd-stop start
-
-description "Celeryd Stop Task"
-author "Milo Casagrande <milo.casagrande@linaro.org>"
-
-start on stopped rhodecode
-
-task
-
-env HOME="/home/rhodecode"
-
-script
-    for conf in `ls $HOME/production-*.ini` ; do
-        stop celeryd APPINI=`basename $conf`
-    done
-end script
diff --git a/scripts/celeryd.conf b/scripts/celeryd.conf
index 15069f7..72fb148 100644
--- a/scripts/celeryd.conf
+++ b/scripts/celeryd.conf
@@ -9,16 +9,18 @@
 description "Celery Upstart Job"
 author "Milo Casagrande <milo.casagrande@linaro.org>"
 
+start on starting rhodecode
+stop on stopping rhodecode
+
 respawn
 respawn limit 10 5
 
-instance $APPINI
-
 umask 0022
 
 env HOME="/home/rhodecode"
 env USER="rhodecode"
 env GROUP="rhodecode"
+env APPINI="production-0.ini"
 
 limit nofile 4096 65536
 
diff --git a/scripts/rhodecode-setup b/scripts/rhodecode-setup
index e270016..e805f8c 100755
--- a/scripts/rhodecode-setup
+++ b/scripts/rhodecode-setup
@@ -873,7 +873,6 @@ if __name__ == '__main__':
         # This is a job that actually stops RhodeCode and celeryd.
         # It is an upstart task.
         start_service("rhodecode-stop")
-        start_service("celeryd-stop")
         stop_service("apache2")
 
         backup_installation(home_dir)
@@ -910,12 +909,8 @@ if __name__ == '__main__':
         copy_file(args.rhodecode_config, home_dir)
         set_owners(rhodecode_conf, args.rhodecode_usr)
 
-        # Start rhodecode and celery.
+        # Start rhodecode.
         start_service("rhodecode-start")
-
-        if not args.no_celery:
-            start_service("celeryd-start")
-
         start_service("apache2")
         # TODO: start some tests when we implement those.
     else:
@@ -997,8 +992,4 @@ if __name__ == '__main__':
         install_upstart_conf(args.no_celery)
         start_service("rhodecode-start")
 
-        if not args.no_celery:
-            start_service("celeryd")
-
         print_install_report(args, home_dir, rhodecode_conf)
-        # save_install_args(args, home_dir, rhodecode_conf)