Merge pull request #59 from redBorder/development

Release 2.2.1

CHANGELOG.md

@@ -1,6 +1,11 @@
 cookbook-rb-ips CHANGELOG
 ===============
 
+## 2.2.1
+
+  - Miguel Negrón
+    - [4879977] Create redborder user and key in cloud mode
+
 ## 2.2.0
 
   - Luis Blanco

resources/metadata.rb

@@ -5,7 +5,7 @@
 maintainer_email '[email protected]'
 license          'AGPL-3.0'
 description      'Installs/Configures redborder ips'
-version          '2.2.0'
+version          '2.2.1'
 
 depends 'rb-common'
 depends 'geoip'

resources/recipes/configure.rb

@@ -160,33 +160,32 @@
   ssh_secrets = {}
 end
 
-unless node['redborder']['cloud']
-  # ssh user for webui execute commands on
-  execute 'create_user_redBorder' do
-    command 'sudo useradd -m -s /bin/bash redborder'
-    not_if 'getent passwd redborder'
-  end
+# ssh user for webui execute commands on
+execute 'create_user_redBorder' do
+  command 'sudo useradd -m -s /bin/bash redborder'
+  not_if 'getent passwd redborder'
+end
+
+directory '/home/redborder/.ssh' do
+  owner 'redborder'
+  group 'redborder'
+  mode '0755'
+  action :create
+end
 
-  directory '/home/redborder/.ssh' do
+unless ssh_secrets.empty? || ssh_secrets['public_rsa'].nil?
+  template '/home/redborder/.ssh/authorized_keys' do
+    source 'rsa.pub.erb'
     owner 'redborder'
     group 'redborder'
-    mode '0755'
+    mode '0600'
+    variables(
+      public_rsa: ssh_secrets['public_rsa']
+    )
     action :create
   end
-
-  unless ssh_secrets.empty? || ssh_secrets['public_rsa'].nil?
-    template '/home/redborder/.ssh/authorized_keys' do
-      source 'rsa.pub.erb'
-      owner 'redborder'
-      group 'redborder'
-      mode '0600'
-      variables(
-        public_rsa: ssh_secrets['public_rsa']
-      )
-      action :create
-    end
-  end
 end
+
 # template "/opt/rb/etc/sysconfig/iptables" do
 #   source "iptables.erb"
 #   owner "root"