Skip to content

Commit

Permalink
Revert "changed app dir from /var/www/ to /home/deploy, just testing"
Browse files Browse the repository at this point in the history
This reverts commit ff704fd.
  • Loading branch information
Kayla Ziegler committed Oct 30, 2017
1 parent ff704fd commit e9a70d0
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 11 deletions.
2 changes: 0 additions & 2 deletions config/deploy/virtualbox.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
# Roles are where the various servers live
server "localhost", user: "deploy", roles: %w{web}, port: 2222

set :deploy_to, '/home/deploy/signage'

# Rbenv is under user.
set :rbenv_type, :user
set :rbenv_ruby, '2.2.1'
Expand Down
14 changes: 7 additions & 7 deletions config/puma.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Use socket file rather port for reverse proxy.
bind 'unix:///home/deploy/signage/shared/tmp/sockets/puma.sock'
bind 'unix:///var/www/signage/shared/tmp/sockets/puma.sock'

# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
# Disabled since we're using bind socket above.
#port ENV.fetch("PORT") { 3000 }

# Config / Log Paths
directory '/home/deploy/signage/current'
rackup "/home/deploy/signage/current/config.ru"
pidfile "/home/deploy/signage/shared/tmp/pids/puma.pid"
state_path "/home/deploy/signage/shared/tmp/pids/puma.state"
stdout_redirect '/home/deploy/signage/current/log/puma.error.log', '/home/deploy/signage/current/log/puma.access.log', true
directory '/var/www/signage/current'
rackup "/var/www/signage/current/config.ru"
pidfile "/var/www/signage/shared/tmp/pids/puma.pid"
state_path "/var/www/signage/shared/tmp/pids/puma.state"
stdout_redirect '/var/www/signage/current/log/puma.error.log', '/var/www/signage/current/log/puma.access.log', true

# Specifies the `environment` that Puma will run in.
#
Expand All @@ -34,5 +34,5 @@

on_restart do
puts 'Refreshing Gemfile'
ENV["BUNDLE_GEMFILE"] = "/home/deploy/signage/current/Gemfile"
ENV["BUNDLE_GEMFILE"] = "/var/www/signage/current/Gemfile"
end
2 changes: 1 addition & 1 deletion devops/ansible/group_vars/webserver
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
app_name: signage
app_user: deploy
app_user_pw_path: "/tmp/ansible-{{ app_name }}-{{ app_user }}-{{inventory_hostname}}-pw.txt"
app_remote_path: "/home/{{ app_user }}/{{ app_name }}"
app_remote_path: "/var/www/{{ app_name }}"

#
# Role: ontic.account
Expand Down
2 changes: 1 addition & 1 deletion devops/ansible/vars/default.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# General app vars
app_name: "signage"
local_app_root_path: "{{ playbook_dir | dirname | dirname }}"
remote_app_root_path: "/home/deploy/{{ app_name }}"
remote_app_root_path: "/var/www/{{ app_name }}"
remote_app_root_dir: "{{ remote_app_root_path }}/current"
app_env_name: "{{ app_name }}-{{ env }}"
dev_usr: wimops
Expand Down

0 comments on commit e9a70d0

Please sign in to comment.