Skip to content

Commit

Permalink
Still working on ssh username.
Browse files Browse the repository at this point in the history
  • Loading branch information
P. Barrett Little committed Jun 13, 2010
1 parent a968a7e commit 62b1050
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion site-cookbooks/github_keys/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
current_user = node[:current_user]
current_user = 'ubuntu'

directory '/home/#{current_user}/.ssh' do
owner "#{current_user}"
Expand Down
2 changes: 1 addition & 1 deletion site-cookbooks/hugo_deploy/recipes/default.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

current_user = node[:current_user]
current_user = 'ubuntu'
appname = node[:hugo][:app][:name]
app_branch = node[:hugo][:app][:branch] if node[:hugo][:app][:branch]
repo_url = (node[:hugo][:app][:repo] || "#{node[:github][:url]}/#{appname}.git")
Expand Down
4 changes: 2 additions & 2 deletions site-cookbooks/hugo_deploy/templates/default/vhost.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<VirtualHost *:<%= @node[:hugo][:app][:web][:port] %>>
DocumentRoot /home/<%= @node[:current_user] %>/apps/<%= @node[:hugo][:app][:name] %>/current/public
DocumentRoot /home/<%= @'ubuntu' %>/apps/<%= @node[:hugo][:app][:name] %>/current/public
<% if @node[:hugo][:app][:web][:server_name] %>
ServerName <%= @node[:hugo][:app][:web][:server_name] %>
<% end %>
Expand All @@ -8,7 +8,7 @@

<% if @node[:hugo][:app][:ssl] %>
<VirtualHost *:<%= @node[:hugo][:app][:web][:ssl] %>>
DocumentRoot /home/<%= @node[:current_user] %>/apps/<%= @node[:hugo][:app][:name] %>/current/public
DocumentRoot /home/<%= @'ubuntu' %>/apps/<%= @node[:hugo][:app][:name] %>/current/public
<% if @node[:hugo][:app][:ssl][:server_name] -%>
ServerName <%= @node[:hugo][:app][:ssl][:server_name] -%>
<% end -%>
Expand Down

0 comments on commit 62b1050

Please sign in to comment.