Skip to content
This repository

Replaced dead links on Dashboard view #41

Open
wants to merge 6 commits into from

1 participant

Brendon Rapp
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
22 app/views/projects/_welcome.html.erb
... ... @@ -0,0 +1,22 @@
  1 +<fieldset class="fieldset">
  2 + <legend>Introduction and help</legend>
  3 + <div style="float: right; padding: 10px 5px 5px 5px;">
  4 + <a href="https://github.com/peritor/webistrano" target="_blank"><%= image_tag('peritor_theme/webistrano_screenshot.png', :border => '0', :width => '200', :height => '151')%></a>
  5 + </div>
  6 + <div style="padding-top: 5px;">
  7 + Welcome to Webistrano. Your first steps should be to create a project with a stage.
  8 + This stage can then be deployed once you made at least one host known to Webistrano.
  9 + <br /><br />
  10 + For help and more documentation, see
  11 + <br />
  12 + <ul>
  13 + <li><a href="https://github.com/peritor/webistrano/wiki">Wiki</a></li>
  14 + <li><a href="https://github.com/peritor/webistrano/wiki/Configuration-Parameters">Configuration Parameters</a></li>
  15 + <li><a href="https://github.com/peritor/webistrano/wiki/FAQ---Frequently-Asked-Questions">FAQ</a></li>
  16 + </ul>
  17 + <br />
  18 + Webistrano is Open Source. Paid support is available by <a href="http://www.peritor.com">Peritor Consulting</a>.
  19 + </div>
  20 +</fieldset>
  21 +
  22 +<br />
23 app/views/projects/dashboard.html.erb
... ... @@ -1,25 +1,4 @@
1   -<fieldset class="fieldset">
2   - <legend>Introduction and help</legend>
3   - <div style="float: right; padding: 10px 5px 5px 5px;">
4   - <a href="http://labs.peritor.com/webistrano" target="_blank"><%= image_tag('peritor_theme/webistrano_screenshot.png', :border => '0', :width => '200', :height => '151')%></a>
5   - </div>
6   - <div style="padding-top: 5px;">
7   - Welcome to Webistrano. Your first steps should be to create a project with a stage.
8   - This stage can then be deployed once you made at least one host known to Webistrano.
9   - <br /><br />
10   - For help and more documentation, see
11   - <br />
12   - <ul>
13   - <li><a href="http://labs.peritor.com/webistrano/">Wiki</a></li>
14   - <li><a href="http://labs.peritor.com/webistrano/wiki/ConfigurationParameter">Configuration Parameter</a></li>
15   - <li><a href="http://labs.peritor.com/webistrano/wiki/FAQ">FAQ</a></li>
16   - </ul>
17   - <br />
18   - Webistrano is Open Source. Paid support is available by <a href="http://www.peritor.com">Peritor Consulting</a>.
19   - </div>
20   -</fieldset>
21   -
22   -<br />
  1 +<%= render :partial => 'projects/welcome' %>
23 2
24 3 <fieldset class="fieldset">
25 4 <legend>Recent deployments</legend>
2  lib/webistrano/template/base.rb
@@ -37,4 +37,4 @@ module Base
37 37 EOS
38 38 end
39 39 end
40   -end
  40 +end
37 lib/webistrano/template/jaguar.rb
... ... @@ -0,0 +1,37 @@
  1 +module Webistrano
  2 + module Template
  3 + module Jaguar
  4 + CONFIG = {
  5 + :application => 'your_app_name',
  6 + :branch => 'master',
  7 + :scm => 'git',
  8 + :deploy_via => ':remote_cache',
  9 + :user => 'deployer',
  10 + :use_sudo => 'false',
  11 + :deploy_to => '/srv/www',
  12 + :repository => 'bitbucket:jaguar/repo'
  13 + }.freeze
  14 +
  15 + DESC = <<-'EOS'
  16 + Base template that the other templates use to inherit from.
  17 + Defines basic Capistrano configuration parameters.
  18 + Overrides no default Capistrano tasks.
  19 + EOS
  20 +
  21 + TASKS = <<-'EOS'
  22 + # allocate a pty by default as some systems have problems without
  23 + default_run_options[:pty] = true
  24 +
  25 + # set Net::SSH ssh options through normal variables
  26 + # at the moment only one SSH key is supported as arrays are not
  27 + # parsed correctly by Webistrano::Deployer.type_cast (they end up as strings)
  28 + [:ssh_port, :ssh_keys].each do |ssh_opt|
  29 + if exists? ssh_opt
  30 + logger.important("SSH options: setting #{ssh_opt} to: #{fetch(ssh_opt)}")
  31 + ssh_options[ssh_opt.to_s.gsub(/ssh_/, '').to_sym] = fetch(ssh_opt)
  32 + end
  33 + end
  34 + EOS
  35 + end
  36 + end
  37 +end
19 lib/webistrano/template/unicorn.rb
@@ -2,15 +2,14 @@ module Webistrano
2 2 module Template
3 3 module Unicorn
4 4
5   - CONFIG = Webistrano::Template::Rails::CONFIG.dup.merge({
6   - :unicorn_workers => '8',
  5 + CONFIG = Webistrano::Template::Jaguar::CONFIG.dup.merge({
  6 + :rails_env => 'set-rails-env',
  7 + :unicorn_workers => '4',
7 8 :unicorn_workers_timeout => '30',
8   - :unicorn_user => 'user',
9   - :unicorn_group => 'group',
10   - :unicorn_bin => 'bundle exec unicorn',
11   - :unicorn_socket => 'Absolute path to Unicorn socket',
12   - :unicorn_config => "Absolute path to Unicorn configuration",
13   - :unicorn_pid => 'Absolute path to the pid of the Unicorn process'
  9 + :unicorn_user => 'deployer',
  10 + :unicorn_group => 'deployer',
  11 + :unicorn_bin => 'bundle exec unicorn_rails',
  12 + :unicorn_pid => '#{deploy_to}/current/tmp/pids/unicorn.pid'
14 13 }).freeze
15 14
16 15 DESC = <<-'EOS'
@@ -20,10 +19,10 @@ module Unicorn
20 19 unicorn signals instead.
21 20 EOS
22 21
23   - TASKS = Webistrano::Template::Base::TASKS + <<-'EOS'
  22 + TASKS = Webistrano::Template::Jaguar::TASKS + <<-'EOS'
24 23
25 24 def unicorn_start_cmd
26   - "cd #{current_path} && #{unicorn_bin} -c #{unicorn_config} -E #{rails_env} -D"
  25 + "cd #{current_path} && #{unicorn_bin} -E #{rails_env} -D"
27 26 end
28 27
29 28 def unicorn_stop_cmd

Tip: You can add notes to lines in a file. Hover to the left of a line to make a note

Something went wrong with that request. Please try again.