Improve provision

Author: antonmedv

docs/recipe/provision.md

@@ -22,14 +22,14 @@ As only Ubuntu 20.04 LTS is supported for provision should be the `focal`.
 
 
 ### sudo_password
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L156)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L157)
 
 
 
 
 
 ### ssh_copy_id
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L162)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L163)
 
 Specify which key to copy to server.
 Set to `false` to disable copy of key.
@@ -84,63 +84,63 @@ Collect required params.
 
 
 ### provision:update
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L79)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L80)
 
 Add repositories and update.
 
 
 
 
 ### provision:upgrade
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L101)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L102)
 
 Upgrade all packages.
 
 
 
 
 ### provision:install
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L108)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L109)
 
 Install packages.
 
 
 
 
 ### provision:server
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L141)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L142)
 
 Configure server.
 
 
 
 
 ### provision:ssh
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L146)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L147)
 
 Configure SSH.
 
 
 
 
 ### provision:deployer
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L165)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L166)
 
 Setup deployer user.
 
 
 
 
 ### provision:firewall
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L212)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L213)
 
 Setup firewall.
 
 
 
 
 ### provision:banner
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L220)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision.php#L221)
 
 Show banner.
 

docs/recipe/provision/website.md

@@ -26,23 +26,23 @@
 ## Tasks
 
 ### provision:website
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision/website.php#L14)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision/website.php#L13)
 
 Provision website.
 
 
 
 
 ### logs:caddy
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision/website.php#L70)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision/website.php#L69)
 
 Show caddy logs.
 
 
 
 
 ### logs:caddy:syslog
-[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision/website.php#L75)
+[Source](https://github.com/deployphp/deployer/blob/master/recipe/provision/website.php#L74)
 
 Show caddy syslog.
 

recipe/provision.php

@@ -59,6 +59,7 @@
     $params = [
         'sudo_password',
         'domain',
+        'public_path',
         'php_version',
         'db_user',
         'db_name',
@@ -219,18 +220,12 @@
 desc('Show banner');
 task('provision:banner', function () {
     output()->write(<<<EOF
-╭──────────────────────────────────────────────────╮
-│                                                  │
-│   Hello, my name is Anton Medvedev.              │
-│   I'm the creator of the Deployer. I maintain    │
-│   this open source project in my spare time.     │
-│   Supporters on GitHub gives me an extra         │
-│   motivation to work on the project.             │
-│                                                  │
-│   Consider supporting Deployer:                  │
-│                                                  │
-│   https://github.com/sponsors/antonmedv          │
-│                                                  │
-╰──────────────────────────────────────────────────╯
+╭──────────────────────────────────────╮
+│                                      │
+│   Supporting Deployer Development    │
+│                                      │
+│    https://ï.at/support-deployer     │
+│                                      │
+╰──────────────────────────────────────╯
 EOF);
 })->once();

recipe/provision/website.php

@@ -6,8 +6,7 @@
 });
 
 set('public_path', function () {
-    $path = run("realpath {{deploy_path}}");
-    return "$path/current/public";
+    return ask(' Public path: ', 'public');
 });
 
 desc('Provision website');
@@ -18,7 +17,7 @@
 
     $domain = get('domain');
     $phpVersion = get('php_version');
-    $deployPath = get('deploy_path');
+    $deployPath = run("realpath {{deploy_path}}");
     $publicPath = get('public_path');
 
     cd($deployPath);
@@ -29,7 +28,7 @@
     $caddyfile = <<<EOF
 $domain
 
-root * $publicPath
+root * $deployPath/current/$publicPath
 file_server
 php_fastcgi * unix/run/php/php$phpVersion-fpm.sock {
 \tresolve_root_symlink