Merge pull request #132 from appiphany/master

Some improvements

Merge pull request #132 from appiphany/master
Some improvements
Nathan B
2 parents cba81323 04640dbb
Showing 4 changed files with 16 additions and 10 deletions Show diff stats
app/views/apps/show.html.haml
app/views/errs/_list.atom.builder
app/views/errs/index.html.haml
config/deploy.example.rb
 - content_for :title, @app.name
 - content_for :head do
-  = auto_discovery_link_tag :atom, app_url(@app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{@app.name} at #{root_url}"
+  = auto_discovery_link_tag :atom, app_path(@app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{@app.name} at #{request.host}"
   = javascript_include_tag 'apps.show'
 - content_for :meta do
   %strong Errors Caught:
-feed.updated(@problems.first.created_at)
+feed.updated(@problems.first.try(:created_at) || Time.now)
 for problem in @problems
   notice = problem.notices.first
 - content_for :title, 'Unresolved Errors'
 - content_for :head do
-  = auto_discovery_link_tag :atom, errs_url(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{root_url}"
+  = auto_discovery_link_tag :atom, errs_path(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{request.host}"
 - content_for :action_bar do
   = link_to 'show resolved', all_errs_path, :class => 'button'
 = render 'table', :errs => @problems
@@ -6,21 +6,27 @@
 # `cap deploy` whenever you would like to deploy Errbit. Refer
 # to the Readme for more information.
+config = YAML.load_file('config/config.yml')['deployment'] || {}
+
 require 'bundler/capistrano'
 set :application, "errbit"
-set :repository,  "http://github.com/jdpace/errbit.git"
+set :repository,  config['repository'] || "http://github.com/errbit/errbit.git"
-role :web, "errbit.example.com"
-role :app, "errbit.example.com"
-role :db,  "errbit.example.com", :primary => true
+role :web, config['hosts']['web'] || "errbit.example.com"
+role :app, config['hosts']['app'] || "errbit.example.com"
+role :db,  config['hosts']['db']  || "errbit.example.com", :primary => true
-set :user, :deploy
+set :user, config['user'] || :deploy
 set :use_sudo, false
-set :ssh_options,      { :forward_agent => true }
+if config.has_key?('ssh_key')
+  set :ssh_options,      { :forward_agent => true, :keys => [ config['ssh_key'] ] }
+else
+  set :ssh_options,      { :forward_agent => true }
+end
 default_run_options[:pty] = true
-set :deploy_to, "/var/www/apps/#{application}"
+set :deploy_to, config['deploy_to'] || "/var/www/apps/#{application}"
 set :deploy_via, :remote_cache
 set :copy_cache, true
 set :copy_exclude, [".git"]
1	- content_for :title, @app.name	1	- content_for :title, @app.name
2	- content_for :head do	2	- content_for :head do
3	- = auto_discovery_link_tag :atom, app_url(@app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{@app.name} at #{root_url}"	3	+ = auto_discovery_link_tag :atom, app_path(@app, User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices for #{@app.name} at #{request.host}"
4	= javascript_include_tag 'apps.show'	4	= javascript_include_tag 'apps.show'
5	- content_for :meta do	5	- content_for :meta do
6	%strong Errors Caught:	6	%strong Errors Caught:
1	-feed.updated(@problems.first.created_at)	1	+feed.updated(@problems.first.try(:created_at) \|\| Time.now)
2		2
3	for problem in @problems	3	for problem in @problems
4	notice = problem.notices.first	4	notice = problem.notices.first
1	- content_for :title, 'Unresolved Errors'	1	- content_for :title, 'Unresolved Errors'
2	- content_for :head do	2	- content_for :head do
3	- = auto_discovery_link_tag :atom, errs_url(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{root_url}"	3	+ = auto_discovery_link_tag :atom, errs_path(User.token_authentication_key => current_user.authentication_token, :format => "atom"), :title => "Errbit notices at #{request.host}"
4	- content_for :action_bar do	4	- content_for :action_bar do
5	= link_to 'show resolved', all_errs_path, :class => 'button'	5	= link_to 'show resolved', all_errs_path, :class => 'button'
6	= render 'table', :errs => @problems	6	= render 'table', :errs => @problems