Updated git checkout path for controller.

Author: mboersma

chef/cookbooks/deis/attributes/default.rb

@@ -41,7 +41,7 @@
 
 # server/api
 default.deis.controller.dir = '/opt/deis/controller'
-default.deis.controller.repository = 'git@github.com:opdemand/deis-controller.git'
+default.deis.controller.repository = 'https://github.com/opdemand/deis.git'
 default.deis.controller.secret_key = 'atotallysecretkey9876543210!'
 default.deis.controller.debug = 'False'
 default.deis.controller.workers = 4
@@ -51,4 +51,4 @@
 
 # client
 default.deis.client.dir = '/opt/deis/client'
-default.deis.client.repository = 'git@github.com:opdemand/deis-cli.git'
+default.deis.client.repository = 'https://github.com/opdemand/deis.git'

chef/cookbooks/deis/recipes/server.rb

@@ -28,12 +28,12 @@
 
 # write out local settings for db access, etc.
 
-template "#{controller_dir}/deis/local_settings.py" do
+template "#{controller_dir}/controller/deis/local_settings.py" do
   user username
   group group
   mode 0644
   source 'local_settings.py.erb'
-  variables :debug => node.deis.controller.debug, 
+  variables :debug => node.deis.controller.debug,
             :secret_key => node.deis.controller.secret_key,
             :db_name => node.deis.database.name,
             :db_user => node.deis.database.user
@@ -51,7 +51,7 @@
   code "virtualenv --distribute venv"
   creates "#{controller_dir}/venv"
   action :nothing
-  subscribes :run, "git[#{controller_dir}]", :immediately 
+  subscribes :run, "git[#{controller_dir}]", :immediately
 end
 
 bash 'deis-controller-pip-install' do
@@ -60,7 +60,7 @@
   cwd controller_dir
   code "source venv/bin/activate && pip install -r requirements.txt"
   action :nothing
-  subscribes :run, "git[#{controller_dir}]", :immediately 
+  subscribes :run, "git[#{controller_dir}]", :immediately
 end
 
 # NOTE: collectstatic and other subcommands must be run after local_settings
@@ -71,7 +71,7 @@
   cwd controller_dir
   code "source venv/bin/activate && ./manage.py collectstatic --noinput"
   action :nothing
-  subscribes :run, "git[#{controller_dir}]", :immediately 
+  subscribes :run, "git[#{controller_dir}]", :immediately
 end
 
 # write out upstart daemon
@@ -100,7 +100,7 @@
   mode 0644
   source 'deis-worker.conf.erb'
   variables :home => node.deis.controller.dir
-  notifies :restart, "service[deis-worker]", :delayed            
+  notifies :restart, "service[deis-worker]", :delayed
 end
 
 service 'deis-worker' do