From a42f335c01c0158cfc54df9fa224bc8bd4a95f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=9D=99?= <lym125@gmail.com>
Date: Sun, 23 Jan 2022 13:10:48 +0800
Subject: [PATCH] Update deploy scripts

---
 deploy/config/deploy.rb                  | 12 +++++++++++-
 deploy/config/deploy/admin.rb            |  2 +-
 deploy/config/deploy/staging.rb          |  3 ++-
 deploy/lib/capistrano/tasks/laravel.rake |  1 -
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/deploy/config/deploy.rb b/deploy/config/deploy.rb
index 598e4df9..4638e34b 100644
--- a/deploy/config/deploy.rb
+++ b/deploy/config/deploy.rb
@@ -39,6 +39,16 @@ set :branch, "release"
 # Uncomment the following to require manually verifying the host key before first deploy.
 # set :ssh_options, verify_host_key: :secure
 
+namespace :laravel do
+  task "artisan:db:seed:admin" do
+    on release_roles :admin do
+      invoke "laravel:artisan", "db:seed", "--class=AdminSeeder", "--force"
+    end
+  end
+
+  after "deploy:vendors", "laravel:artisan:db:seed:admin"
+end
+
 namespace :php_fpm do
   desc "重启 PHP-FPM"
   task :restart do
@@ -53,7 +63,7 @@ end
 namespace :supervisor do
   desc "按最新的配置启动 Supervisor"
   task :reload do
-    on release_roles :task do
+    on release_roles :supervisor do
       execute :sudo, :supervisorctl, :reload
     end
   end
diff --git a/deploy/config/deploy/admin.rb b/deploy/config/deploy/admin.rb
index 8e016be3..f9ebcc79 100644
--- a/deploy/config/deploy/admin.rb
+++ b/deploy/config/deploy/admin.rb
@@ -7,7 +7,7 @@
 # server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
 # server "db.example.com", user: "deploy", roles: %w{db}
 
-server "47.108.202.152", user: "deployer"
+server "47.108.202.152", user: "deployer", roles: %w{admin supervisor}
 
 
 # role-based syntax
diff --git a/deploy/config/deploy/staging.rb b/deploy/config/deploy/staging.rb
index 4cd1f9d1..fcb531bf 100644
--- a/deploy/config/deploy/staging.rb
+++ b/deploy/config/deploy/staging.rb
@@ -6,7 +6,8 @@
 # server "example.com", user: "deploy", roles: %w{app db web}, my_property: :my_value
 # server "example.com", user: "deploy", roles: %w{app web}, other_property: :other_value
 # server "db.example.com", user: "deploy", roles: %w{db}
-server "47.108.227.246", user: "deployer", roles: %w{task}
+
+server "47.108.227.246", user: "deployer", roles: %w{admin supervisor}
 
 
 # role-based syntax
diff --git a/deploy/lib/capistrano/tasks/laravel.rake b/deploy/lib/capistrano/tasks/laravel.rake
index b9a513d2..4bd74439 100644
--- a/deploy/lib/capistrano/tasks/laravel.rake
+++ b/deploy/lib/capistrano/tasks/laravel.rake
@@ -160,7 +160,6 @@ namespace :deploy do
   after "deploy:updated", "laravel:writable"
   after 'deploy:updated', 'deploy:set_permissions:acl'
   after "deploy:updated", "deploy:vendors"
-  after "deploy:updated", "laravel:upload_dotenv_file"
   after "deploy:vendors", "laravel:artisan:config:cache"
   after "deploy:vendors", "laravel:artisan:route:cache"
   after "deploy:vendors", "laravel:artisan:view:cache"