Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

bla

  • Loading branch information...
commit debb17f0aac58d026a006a25a50bee31a15c9a8e 1 parent a3a5484
@pghodgman authored
Showing with 14 additions and 16 deletions.
  1. +1 −1  .idea/osprey-model.iml
  2. +9 −9 .idea/workspace.xml
  3. +4 −6 config/deploy.rb
View
2  .idea/osprey-model.iml
@@ -58,7 +58,7 @@
<orderEntry type="library" scope="PROVIDED" name="sprockets (v2.10.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sprockets-rails (v2.0.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="sqlite3 (v1.3.8, RVM: ruby-2.0.0-p0) [gem]" level="application" />
- <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.11.4, RVM: ruby-2.0.0-p0) [gem]" level="application" />
+ <orderEntry type="library" scope="PROVIDED" name="therubyracer (v0.12.0, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thor (v0.18.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="thread_safe (v0.1.3, RVM: ruby-2.0.0-p0) [gem]" level="application" />
<orderEntry type="library" scope="PROVIDED" name="tilt (v1.4.1, RVM: ruby-2.0.0-p0) [gem]" level="application" />
View
18 .idea/workspace.xml
@@ -41,7 +41,7 @@
<file path="/items_controller.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379206729755" ignored="false" />
<file path="/20130915140035_add_preview_to_model.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379253680249" ignored="false" />
<file path="/20130915143011_add_model_meta_data.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379255570038" ignored="false" />
- <file path="/deploy.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379291045179" ignored="false" />
+ <file path="/deploy.rb" changelist="f70c7895-ddb5-4f25-9d45-626a9ff47b6b" time="1379291360948" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -99,19 +99,19 @@
</provider>
</entry>
</file>
- <file leaf-file-name="deploy.rb" pinned="false" current="false" current-in-tab="false">
+ <file leaf-file-name="deploy.rb" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="60" selection-start="1410" selection-end="1410" vertical-scroll-proportion="0.0">
+ <state line="12" column="57" selection-start="378" selection-end="378" vertical-scroll-proportion="-1.462203">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="Gemfile" pinned="false" current="true" current-in-tab="true">
+ <file leaf-file-name="Gemfile" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="11" selection-start="830" selection-end="830" vertical-scroll-proportion="0.71638656">
+ <state line="39" column="126" selection-start="833" selection-end="833" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@@ -843,16 +843,16 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/config/deploy.rb">
+ <entry file="file://$PROJECT_DIR$/Gemfile">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="60" selection-start="1410" selection-end="1410" vertical-scroll-proportion="0.0">
+ <state line="39" column="126" selection-start="833" selection-end="833" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/Gemfile">
+ <entry file="file://$PROJECT_DIR$/config/deploy.rb">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="11" selection-start="830" selection-end="830" vertical-scroll-proportion="0.71638656">
+ <state line="12" column="57" selection-start="378" selection-end="378" vertical-scroll-proportion="-1.462203">
<folding />
</state>
</provider>
View
10 config/deploy.rb
@@ -10,7 +10,7 @@
# The address of the remote host on EC2 (the Public DNS address)
-set :location, "ec2-54-211-181-43.compute-1.amazonaws.com"
+set :location, "ec2-54-211-224-42.compute-1.amazonaws.com"
# setup some Capistrano roles
role :app, location
role :web, location
@@ -49,14 +49,12 @@
task :install do
run "cd #{current_path} && bundle install"
end
-
+ task :update do
+ run "cd #{current_path} && bundle update"
+ end
end
-before 'deploy:assets:precompile', 'bundle:install'
before "deploy:restart", "bundle:install"
-
-after 'deploy:update_code', 'bundle:install'
-after 'deploy:update_code', 'deploy:migrate'
set :keep_releases, 10
after "deploy:restart", "deploy:cleanup"
Please sign in to comment.
Something went wrong with that request. Please try again.