Merge pull request #68 from redBorder/development

Release 4.1.0

Author: manegron

CHANGELOG.md

@@ -1,6 +1,14 @@
 cookbook-rb-proxy CHANGELOG
 ===============
 
+## 4.1.0
+
+  - nilsver
+    - [c5eeda1] add check for file
+    - [b670e2e] add cdomain to nodes
+    - [ce0ba40] fix bug when registering with domain name (#66)
+    - [a4a0af5] fix rbcli service command
+
 ## 4.0.1
 
   - nilsver

resources/metadata.rb

@@ -3,7 +3,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder proxy'
-version          '4.0.1'
+version          '4.1.0'
 
 depends 'rb-common'
 depends 'rb-selinux'

resources/recipes/prepare_system.rb

@@ -50,9 +50,8 @@
   end
 end
 
-cdomain = 'redborder.cluster'
-# File.open('/etc/redborder/cdomain') {|f| cdomain = f.readline.chomp}
-node.default['redborder']['cdomain'] = cdomain
+# get cdomain
+node.default['redborder']['cdomain'] = File.exist?('/etc/redborder/cdomain') ? File.read('/etc/redborder/cdomain').chomp : node['redborder']['cdomain']
 
 # get sensors info
 node.run_state['sensors_info'] = get_sensors_info()