Fixes to database recipe and small improvements

cookbooks/altcointip/recipes/database.rb

@@ -19,7 +19,7 @@
 include_recipe "git"
 
 $altcointip_dir = node[:altcointip][:install_dir]
-unless File.directory?($altcointip_dir)
+unless File.directory?($altcointip_dir) and File.file?(File.join($altcointip_dir, 'mysql_db_created'))
 
   directory $altcointip_dir do
     action :create
@@ -31,14 +31,16 @@
 
   # Clone Git repository
 
-  script "git_clone" do
-    action :run
-    interpreter "bash"
-    cwd $altcointip_dir
-    user node[:altcointip][:user]
-    code <<-EOH
-    git clone #{node[:altcointip][:git_repos][:altcointip]} #{$altcointip_dir}/altcointip || exit 1
-    EOH
+  unless File.file?(File.join($altcointip_dir, 'altcointip/altcointip.sql'))
+    script "git_clone" do
+      action :run
+      interpreter "bash"
+      cwd $altcointip_dir
+      user node[:altcointip][:user]
+      code <<-EOH
+      git clone #{node[:altcointip][:git_repos][:altcointip]} #{$altcointip_dir}/altcointip || exit 1
+      EOH
+    end
   end
 
   # Set up database
@@ -75,4 +77,8 @@
     action :grant
   end
 
+  file ::File.join($altcointip_dir, 'mysql_db_created') do
+    action :create
+  end
+
 end

cookbooks/altcointip/recipes/default.rb

@@ -38,7 +38,7 @@
 
 # Install cryptocoins
 
-directory ::File.join(node[:altcointip][:install_dir], 'coins') do
+directory File.join(node[:altcointip][:install_dir], 'coins') do
   action :create
   mode '0755'
   user node[:altcointip][:user]
@@ -67,7 +67,7 @@
       port          coin[:rpcport]
       rpcpassword   node[:altcointip][:cryptocoins]["#{coin[:name]}"][:rpcpassword]
       group         node[:altcointip][:user_group]
-      home          ::File.join(node[:altcointip][:install_dir], 'coins', coin[:name])
+      home          File.join(node[:altcointip][:install_dir], 'coins', coin[:name])
     end
 
     service coin[:name] do
@@ -128,6 +128,7 @@
     user node[:altcointip][:user]
     code <<-EOH
     cp #{$altcointip_dir}/altcointip/src/sample-config.yml #{$altcointip_dir}/altcointip/src/config.yml
+    chmod 640 #{$altcointip_dir}/altcointip/src/config.yml
     sed -i 's mysqldb #{node[:altcointip][:mysql_db_name]} g' #{$altcointip_dir}/altcointip/src/config.yml
     sed -i 's mysqluser #{node[:altcointip][:mysql_username]} g' #{$altcointip_dir}/altcointip/src/config.yml
     sed -i 's mysqlpass #{node[:altcointip][:mysql_password]} g' #{$altcointip_dir}/altcointip/src/config.yml