Merge pull request #1 from fontanon/master

Download and deploy directly from gitorious

Author: fontanon

Vagrantfile

@@ -61,8 +61,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     override.ssh.private_key_path = '~/.ssh/id_rsa'
     #override.vm.box = 'digital_ocean'
     #override.vm.box_url = "https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box"
-    provider.client_id = 'e2198de55f612d89a062b47145b1a7ea'
-    provider.api_key = '3e31f3349f03295ff863a1b649213f24'
+    provider.client_id = ''
+    provider.api_key = ''
   end
 
   # Enable provisioning with chef server:

cookbooks/ocax/attributes/default.rb

@@ -2,14 +2,14 @@
 # WARNING: Make sure this ip is correctly set on Vagrantfile private network param too!
 default[:ocax][:host_ip] = "192.168.56.101"
 
-# Default hostname. You should set this on your host machine /etc/hosts file
+# Default hostname. You should set this on your host machine /etc/hosts file too.
 default[:ocax][:host_name] = "ocax.dev"
 
-# OCAx source files, installation path, virtualhostname ...
+# OCAx virtualhostname.
 default[:ocax][:virtualhost_name] = "node"
-default[:ocax][:download_cache] = "/tmp/ocax-1.1.2.tar.gz"
-default[:ocax][:download_url] = "http://ocax.net/download/ocax-1.1.2.tar.gz"
-default[:ocax][:download_checksum] = "0f8f132fc274ccfe061ebd5796a094fed90456f1c954084aa022e6f4fc9d2eda" # SHA256
+
+# OCAx download and install paths
+default[:ocax][:gitrepo_uri] = "https://git.gitorious.org/ocax/ocax.git"
 default[:ocax][:installpath] = "/var/www/ocax"
 
 # Yii framework (OCAx dependency)
@@ -31,4 +31,4 @@
 # Default OCAx admin credentials
 default[:ocax][:adminaccount_username] = "admin"
 default[:ocax][:adminaccount_password] = "admin"
-default[:ocax][:adminaccount_email] = "[email protected]"
+default[:ocax][:adminaccount_email] = "[email protected]"

cookbooks/ocax/recipes/default.rb

@@ -40,28 +40,12 @@
 package("php5-gd")
 package("unzip")
 
-# Create installation directory
-directory node["ocax"]["installpath"] do
-  owner "root"
-  group "root"
-  mode "0755"
-  action :create
-  recursive true
-end
-
-# Download and call unpack, only on the first provision
-remote_file node[:ocax][:download_cache] do
-  source node[:ocax][:download_url]
-  mode 00644
-  checksum node[:ocax][:download_checksum]
-  notifies :run, "execute[Unpack ocax]", :immediately
-end
-
-# Unpack OCAx
-execute "Unpack ocax" do
-  cwd node["ocax"]["installpath"]
-  command "tar --strip-components 1 -xzf #{node[:ocax][:download_cache]}"
-  action :nothing
+# Download the project (or sync last changes)
+package('git-core')
+git "#{node[:ocax][:installpath]}" do
+  repository "#{node[:ocax][:gitrepo_uri]}"
+  reference "master"
+  action :sync
 end
 
 # Download Yii framework latest (ocax dependency)
@@ -131,11 +115,6 @@
   sql { ::File.open("#{node[:ocax][:spanishbudget_download_cache]}").read }
 end
 
-#execute "Import spanish budget" do
-#  command "mysql -u#{node[:ocax][:mysql_user]} -p#{node[:ocax][:mysql_password]} #{node[:ocax][:mysql_dbname]} < }"
-#  action :nothing
-#end
-
 # Create config file
 template "#{node[:ocax][:installpath]}/protected/config/main.php" do
   source "ocax_main.php"