Skip to content

Commit 96e6f0c

Browse files
committed
Clean up Capistrano config noise and stale webpacker linkage
1 parent 7c231a8 commit 96e6f0c

4 files changed

Lines changed: 1 addition & 12 deletions

File tree

config/deploy.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# frozen_string_literal: true
22

33
require "stringio"
4-
require "whenever/capistrano"
54

65
# config valid for current version and patch releases of Capistrano
76
lock "~> 3.17.1"
@@ -45,7 +44,7 @@
4544
append :linked_files, "config/blacklight.yml", "config/database.yml", "config/master.key", ".env.production"
4645

4746
# Default value for linked_dirs is []
48-
append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "tmp/webpacker", "public/system", "vendor",
47+
append :linked_dirs, "log", "tmp/pids", "tmp/cache", "tmp/sockets", "public/system", "vendor",
4948
"storage"
5049

5150
# tmp directory is user-specific

config/deploy/development.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
# frozen_string_literal: true
22

3-
require "stringio"
4-
53
# server-based syntax
64
# ======================
75
# Defines a single server with a list of roles and multiple properties.
86
# You can define all roles on a single server, or split them:
97

10-
set :application, "geodiscovery"
118
set :deploy_user, "geoblacklight"
129
set :app_user, "geoblacklight"
1310

1411
server "geodiscovery-dev.uwm.edu", user: fetch(:deploy_user), roles: %w[app db web]
1512
# server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
1613
# server "db.example.com", user: "deploy", roles: %w{db}
1714

18-
set :deploy_to, "/var/www/rubyapps/uwm-geoblacklight"
1915
set :rails_env, "production"
2016

2117
# role-based syntax

config/deploy/production.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
# frozen_string_literal: true
22

3-
require "stringio"
4-
53
# server-based syntax
64
# ======================
75
# Defines a single server with a list of roles and multiple properties.
86
# You can define all roles on a single server, or split them:
97

10-
set :application, "geodiscovery"
118
set :deploy_user, "geoblacklight"
129
set :app_user, "geoblacklight"
1310

1411
server "geodiscovery.uwm.edu", user: fetch(:deploy_user), roles: %w[app db web]
1512
# server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
1613
# server "db.example.com", user: "deploy", roles: %w{db}
1714

18-
set :deploy_to, "/var/www/rubyapps/uwm-geoblacklight"
1915
set :rails_env, "production"
2016

2117
# role-based syntax

lib/capistrano/tasks/bundler_recovery.rake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ namespace :bundler do
66
on fetch(:bundle_servers) do
77
within release_path do
88
with fetch(:bundle_env_variables) do
9-
invoke "bundler:config"
10-
119
check_output = capture(
1210
:bash,
1311
"-lc",

0 commit comments

Comments
 (0)