Merge pull request #357 from mezuro/configure_kalibro

Load Kalibro service addresses from file

Merge pull request #357 from mezuro/configure_kalibro
Load Kalibro service addresses from file
Daniel
2 parents 019699d2 0f08dc20
Showing 6 changed files with 14 additions and 0 deletions Show diff stats
.travis.yml
CHANGELOG.md
bin/setup
config/environments/development.rb
config/environments/test.rb
config/kalibro.yml.sample
@@ -26,6 +26,7 @@ before_script:
   - bash install.sh
   - popd
   - cp config/database.yml.sample config/database.yml
+  - cp config/kalibro.yml.sample config/kalibro.yml
   # Do not run setup as the Kalibro services are up and this is not even necessary!
   - bundle exec rake db:create
   - bundle exec rake db:migrate
@@ -4,6 +4,10 @@ Prezento is the web interface for Mezuro.
  
 The version numbers below try to follow the conventions at http://semver.org/.
  
+## Unreleased
+
+- Always load Kalibro service addresses from file
+
 ## v1.0.1 - 11/05/2016
  
 - Fix kalibro services address init under production
@@ -25,6 +25,7 @@ Dir.chdir APP_ROOT do
   unless File.exist?("config/database.yml")
     run "cp config/database.yml.sample config/database.yml"
     run "cp features/support/kalibro_cucumber_helpers.yml.sample features/support/kalibro_cucumber_helpers.yml"
+    run "cp config/kalibro.yml.sample config/kalibro.yml"
   end
  
   puts "\n== Preparing database ==".green
@@ -44,4 +44,7 @@ Rails.application.configure do
  
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Kalibro URL
+  Likeno.configure_with(Rails.root.join('config', 'kalibro.yml'))
 end
@@ -45,4 +45,7 @@ Rails.application.configure do
  
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
+
+  # Kalibro URL
+  Likeno.configure_with(Rails.root.join('config', 'kalibro.yml'))
 end
@@ -0,0 +1,2 @@
+processor_address: "http://localhost:8082"
+configurations_address: "http://localhost:8083"
...	...	@@ -26,6 +26,7 @@ before_script:
26	26	- bash install.sh
27	27	- popd
28	28	- cp config/database.yml.sample config/database.yml
	29	+ - cp config/kalibro.yml.sample config/kalibro.yml
29	30	# Do not run setup as the Kalibro services are up and this is not even necessary!
30	31	- bundle exec rake db:create
31	32	- bundle exec rake db:migrate
...	...
...	...	@@ -4,6 +4,10 @@ Prezento is the web interface for Mezuro.
4	4
5	5	The version numbers below try to follow the conventions at http://semver.org/.
6	6
	7	+## Unreleased
	8	+
	9	+- Always load Kalibro service addresses from file
	10	+
7	11	## v1.0.1 - 11/05/2016
8	12
9	13	- Fix kalibro services address init under production
...	...
...	...	@@ -25,6 +25,7 @@ Dir.chdir APP_ROOT do
25	25	unless File.exist?("config/database.yml")
26	26	run "cp config/database.yml.sample config/database.yml"
27	27	run "cp features/support/kalibro_cucumber_helpers.yml.sample features/support/kalibro_cucumber_helpers.yml"
	28	+ run "cp config/kalibro.yml.sample config/kalibro.yml"
28	29	end
29	30
30	31	puts "\n== Preparing database ==".green
...	...
...	...	@@ -44,4 +44,7 @@ Rails.application.configure do
44	44
45	45	# Raises error for missing translations
46	46	# config.action_view.raise_on_missing_translations = true
	47	+
	48	+ # Kalibro URL
	49	+ Likeno.configure_with(Rails.root.join('config', 'kalibro.yml'))
47	50	end
...	...
...	...	@@ -45,4 +45,7 @@ Rails.application.configure do
45	45
46	46	# Raises error for missing translations
47	47	# config.action_view.raise_on_missing_translations = true
	48	+
	49	+ # Kalibro URL
	50	+ Likeno.configure_with(Rails.root.join('config', 'kalibro.yml'))
48	51	end
...	...
...	...	@@ -0,0 +1,2 @@
	1	+processor_address: "http://localhost:8082"
	2	+configurations_address: "http://localhost:8083"
...	...