Merge pull request #11 from fd6130/patch

Add deploy_dir option by server
fd6130 · Nov 12, 2021 · c7d8d1b · c7d8d1b
2 parents edb8bd4 + e51399c
commit c7d8d1b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/doc/default-deployer.md b/doc/default-deployer.md
@@ -37,6 +37,19 @@ public function configure()
 }
 ```
 
+You can optionaly define the root directory per server:
+```php
+public function configure()
+{
+    return $this->getConfigBuilder()
+        ->server('user@hostname', ['app'], [
+            'deploy_dir' => '/var/www/my-project',
+        ])
+        // ...
+    ;
+}
+```
+
 Then, the following directory structure is created on each remote server:
 
 ```

diff --git a/src/Configuration/DefaultConfiguration.php b/src/Configuration/DefaultConfiguration.php
@@ -375,7 +375,7 @@ public function resetOpCacheFor(string $homepageUrl): self
 
     protected function getReservedServerProperties(): array
     {
-        return [Property::bin_dir, Property::config_dir, Property::console_bin, Property::cache_dir, Property::deploy_dir, Property::log_dir, Property::src_dir, Property::templates_dir, Property::web_dir];
+        return [Property::bin_dir, Property::config_dir, Property::console_bin, Property::cache_dir, Property::log_dir, Property::src_dir, Property::templates_dir, Property::web_dir];
     }
 
     /**

diff --git a/src/Deployer/DefaultDeployer.php b/src/Deployer/DefaultDeployer.php
@@ -194,7 +194,7 @@ private function initializeServerOptions(): void
         $appServers = $this->getServers()->findByRoles([Server::ROLE_APP]);
         foreach ($appServers as $server) {
             $this->log(sprintf('<h3>Setting the %s property for <server>%s</> server</>', Property::deploy_dir, $server));
-            $server->set(Property::deploy_dir, $this->getConfig(Option::deployDir));
+            $server->set(Property::deploy_dir, $server->get(Property::deploy_dir, $this->getConfig(Option::deployDir)));
         }
     }