Removing solr server from scripts

Rodrigo Souto
1 parent be3839f9
Showing 6 changed files with 55 additions and 31 deletions Show diff stats
config/solr.yml.dist
plugins/solr/after_enable.rb
plugins/solr/config/solr.yml
plugins/solr/config/solr.yml.dist
script/development
script/production
@@ -1,25 +0,0 @@
-# Config file for the acts_as_solr plugin.
-#
-# If you change the host or port number here, make sure you update
-# them in your Solr config file
-
-# No change is needed to support multitenancy. Only one solr environment will be used.
-# Just remember to use 'rake multitenancy:reindex' for reindexation.
-
-production:
-  url: http://127.0.0.1:8983/solr
-  jvm_options: -server -Xmx192M -Xms64M
-  timeout: 0
-
-development:
-  url: http://0.0.0.0:8982/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-test: &TEST
-  url: http://0.0.0.0:8981/solr
-  jvm_options: -server -Xmx128M -Xms16M
-  timeout: 0
-
-cucumber:
-  <<: *TEST
-puts "\nI: \e[33mAfter enabling solr you might want to run: $rake solr:reindex\e[0m\n\n"
+puts "\n"
+puts "I: \e[33mTo reindex your contents run: $ rake solr:reindex\e[0m"
+puts "I: \e[33mIf you want to run solr server on this machine you can download it running: $ rake solr:download\e[0m"
+puts "I: \e[33mMake sure your solr server is running!\e[0m"
+puts "\n"
@@ -0,0 +1,25 @@
+# Config file for the acts_as_solr plugin.
+#
+# If you change the host or port number here, make sure you update
+# them in your Solr config file
+
+# No change is needed to support multitenancy. Only one solr environment will be used.
+# Just remember to use 'rake multitenancy:reindex' for reindexation.
+
+production:
+  url: http://127.0.0.1:8983/solr
+  jvm_options: -server -Xmx192M -Xms64M
+  timeout: 0
+
+development:
+  url: http://0.0.0.0:8982/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+test: &TEST
+  url: http://0.0.0.0:8981/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+cucumber:
+  <<: *TEST
@@ -0,0 +1,25 @@
+# Config file for the acts_as_solr plugin.
+#
+# If you change the host or port number here, make sure you update
+# them in your Solr config file
+
+# No change is needed to support multitenancy. Only one solr environment will be used.
+# Just remember to use 'rake multitenancy:reindex' for reindexation.
+
+production:
+  url: http://127.0.0.1:8983/solr
+  jvm_options: -server -Xmx192M -Xms64M
+  timeout: 0
+
+development:
+  url: http://0.0.0.0:8982/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+test: &TEST
+  url: http://0.0.0.0:8981/solr
+  jvm_options: -server -Xmx128M -Xms16M
+  timeout: 0
+
+cucumber:
+  <<: *TEST
@@ -5,13 +5,11 @@ export RAILS_ENV=development
 stop() {
   ./script/delayed_job stop
   ./script/feed-updater stop
-  rake -s solr:stop
   exit
 }
 start() {
   ./script/feed-updater start
-  rake -s solr:start
   ./script/delayed_job start
   trap stop INT TERM
   ./script/server $@
@@ -28,7 +28,6 @@ clear_cache() {
 do_start() {
   rake db:migrate SCHEMA=/dev/null
   clear_cache
-  rake -s solr:start
   environments_loop start
   ruby -S thin -C config/thin.yml start
 }
@@ -44,8 +43,6 @@ do_stop() {
   environments_loop stop ||
     stop_via_pid_file tmp/pids/delayed_job.pid tmp/pids/delayed_job.*.pid tmp/pids/feed-updater.*.pid
-
-  rake -s solr:stop || stop_via_pid_file tmp/pids/solr.*.pid
 }
 stop_via_pid_file() {
	@@ -1,25 +0,0 @@	@@ -1,25 +0,0 @@
1	-# Config file for the acts_as_solr plugin.
2	-#
3	-# If you change the host or port number here, make sure you update
4	-# them in your Solr config file
5	-
6	-# No change is needed to support multitenancy. Only one solr environment will be used.
7	-# Just remember to use 'rake multitenancy:reindex' for reindexation.
8	-
9	-production:
10	- url: http://127.0.0.1:8983/solr
11	- jvm_options: -server -Xmx192M -Xms64M
12	- timeout: 0
13	-
14	-development:
15	- url: http://0.0.0.0:8982/solr
16	- jvm_options: -server -Xmx128M -Xms16M
17	- timeout: 0
18	-
19	-test: &TEST
20	- url: http://0.0.0.0:8981/solr
21	- jvm_options: -server -Xmx128M -Xms16M
22	- timeout: 0
23	-
24	-cucumber:
25	- <<: *TEST
1	-puts "\nI: \e[33mAfter enabling solr you might want to run: $rake solr:reindex\e[0m\n\n"	1	+puts "\n"
		2	+puts "I: \e[33mTo reindex your contents run: $ rake solr:reindex\e[0m"
		3	+puts "I: \e[33mIf you want to run solr server on this machine you can download it running: $ rake solr:download\e[0m"
		4	+puts "I: \e[33mMake sure your solr server is running!\e[0m"
		5	+puts "\n"
@@ -0,0 +1,25 @@		@@ -0,0 +1,25 @@
	1	+# Config file for the acts_as_solr plugin.
	2	+#
	3	+# If you change the host or port number here, make sure you update
	4	+# them in your Solr config file
	5	+
	6	+# No change is needed to support multitenancy. Only one solr environment will be used.
	7	+# Just remember to use 'rake multitenancy:reindex' for reindexation.
	8	+
	9	+production:
	10	+ url: http://127.0.0.1:8983/solr
	11	+ jvm_options: -server -Xmx192M -Xms64M
	12	+ timeout: 0
	13	+
	14	+development:
	15	+ url: http://0.0.0.0:8982/solr
	16	+ jvm_options: -server -Xmx128M -Xms16M
	17	+ timeout: 0
	18	+
	19	+test: &TEST
	20	+ url: http://0.0.0.0:8981/solr
	21	+ jvm_options: -server -Xmx128M -Xms16M
	22	+ timeout: 0
	23	+
	24	+cucumber:
	25	+ <<: *TEST