diff --git a/app/Console/Site/SiteAddCommand.php b/app/Console/Site/SiteAddCommand.php index f5bc31ad..bb6af390 100644 --- a/app/Console/Site/SiteAddCommand.php +++ b/app/Console/Site/SiteAddCommand.php @@ -71,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int /** @var string $permissions */ // - // Validate server is ready for site provisioning + // Validate server is ready to add site // ---- $validationResult = $this->validateServerReady($server->info); @@ -112,13 +112,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int $this->displaySiteDeets($site); // - // Provision site on server + // Add site on server // ---- $result = $this->executePlaybookSilently( $server, 'site-add', - 'Provisioning site...', + 'Adding site...', [ 'DEPLOYER_DISTRO' => $distro, 'DEPLOYER_PERMS' => $permissions, @@ -132,7 +132,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int return $result; } - $this->yay('Site provisioned successfully'); + $this->yay('Site added successfully'); // // Save to inventory @@ -188,7 +188,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int // ---- /** - * Validate that server is ready for site provisioning. + * Validate that server is ready to add site. * * Checks for: * - Caddy web server installed diff --git a/app/Console/Site/SiteDeployCommand.php b/app/Console/Site/SiteDeployCommand.php index 99d7d8d0..03cff975 100644 --- a/app/Console/Site/SiteDeployCommand.php +++ b/app/Console/Site/SiteDeployCommand.php @@ -134,10 +134,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int /** @var string $permissions */ // - // Validate site is provisioned on server + // Validate site is added on server // ---- - $validationResult = $this->validateSiteProvisioned($server, $site); + $validationResult = $this->validateSiteAdded($server, $site); if (is_int($validationResult)) { return $validationResult; diff --git a/app/Console/Site/SiteHttpsCommand.php b/app/Console/Site/SiteHttpsCommand.php index c3aa5537..ed9b4de8 100644 --- a/app/Console/Site/SiteHttpsCommand.php +++ b/app/Console/Site/SiteHttpsCommand.php @@ -93,8 +93,8 @@ protected function execute(InputInterface $input, OutputInterface $output): int $this->warn("Site '{$site->domain}' configuration not found on server"); $this->out([ '', - 'It looks like this site has not been provisioned yet.', - 'Run site:add to provision the site first.', + 'It looks like this site has not been added yet.', + 'Run site:add to add the site first.', '', ]); @@ -102,7 +102,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int } if ($config['php_version'] === 'unknown') { - $this->nay("Could not detect PHP version for '{$site->domain}' from server config; re-provision the site or run server:info to debug."); + $this->nay("Could not detect PHP version for '{$site->domain}' from server config; re-add the site or run server:info to debug."); return Command::FAILURE; } diff --git a/app/Console/Site/SiteSharedPullCommand.php b/app/Console/Site/SiteSharedPullCommand.php index c0e71135..1e042407 100644 --- a/app/Console/Site/SiteSharedPullCommand.php +++ b/app/Console/Site/SiteSharedPullCommand.php @@ -84,10 +84,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int } // - // Validate site is provisioned on server + // Validate site is added on server // ---- - $validationResult = $this->validateSiteProvisioned($server, $site); + $validationResult = $this->validateSiteAdded($server, $site); if (is_int($validationResult)) { return $validationResult; diff --git a/app/Console/Site/SiteSharedPushCommand.php b/app/Console/Site/SiteSharedPushCommand.php index ba17774f..d97c186b 100644 --- a/app/Console/Site/SiteSharedPushCommand.php +++ b/app/Console/Site/SiteSharedPushCommand.php @@ -92,10 +92,10 @@ protected function execute(InputInterface $input, OutputInterface $output): int /** @var string $permissions */ // - // Validate site is provisioned on server + // Validate site is added on server // ---- - $validationResult = $this->validateSiteProvisioned($server, $site); + $validationResult = $this->validateSiteAdded($server, $site); if (is_int($validationResult)) { return $validationResult; diff --git a/app/Traits/SitesTrait.php b/app/Traits/SitesTrait.php index c54483ac..12ea0a69 100644 --- a/app/Traits/SitesTrait.php +++ b/app/Traits/SitesTrait.php @@ -220,7 +220,7 @@ protected function validateSiteRepo(mixed $repo): ?string } /** - * Validate that site has been provisioned on the server. + * Validate that site has been added on the server. * * Checks for: * - Site directory structure exists at /home/deployer/sites/{domain} @@ -228,7 +228,7 @@ protected function validateSiteRepo(mixed $repo): ?string * * @return int|null Returns Command::FAILURE if validation fails, null if successful */ - protected function validateSiteProvisioned(ServerDTO $server, SiteDTO $site): ?int + protected function validateSiteAdded(ServerDTO $server, SiteDTO $site): ?int { try { $result = $this->ssh->executeCommand( @@ -241,9 +241,9 @@ protected function validateSiteProvisioned(ServerDTO $server, SiteDTO $site): ?i ); if ($result['exit_code'] !== 0) { - $this->nay("Site '{$site->domain}' has not been provisioned on the server"); + $this->nay("Site '{$site->domain}' has not been added on the server"); $this->out([ - 'Run site:add to provision the site first.', + 'Run site:add to add the site first.', '', ]); diff --git a/playbooks/site-add.sh b/playbooks/site-add.sh index c081f6c9..41b8c16b 100644 --- a/playbooks/site-add.sh +++ b/playbooks/site-add.sh @@ -3,7 +3,7 @@ # # Site Add Playbook - Ubuntu/Debian Only # -# Provision new site with atomic deployment directory structure +# Add new site with atomic deployment directory structure # ---- # # This playbook only supports Ubuntu and Debian distributions (debian family). diff --git a/playbooks/site-https.sh b/playbooks/site-https.sh index 46d559dd..33d521fc 100644 --- a/playbooks/site-https.sh +++ b/playbooks/site-https.sh @@ -7,7 +7,7 @@ # ---- # # This playbook only supports Ubuntu and Debian distributions (debian family). -# Requires site to be already provisioned. +# Requires site to be already added. # # Required Environment Variables: # DEPLOYER_OUTPUT_FILE - Output file path