Skip to content

Enhances provisioning for sudo-only hosts #4242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexstewartja wants to merge 2 commits into
base: master
Choose a base branch
from
+29 −10
Open

Enhances provisioning for sudo-only hosts #4242

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08eb7c7
provision: support sudo-only VPS (no direct root) hosts
alexstewartja Jun 26, 2026
f44f2a3
provision:website: Set log directory group-writable for Caddy
alexstewartja Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions recipe/provision/user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,25 @@
$password = run("mkpasswd -m sha-512 '%password%'", secrets: ['password' => get('sudo_password')]);
run("usermod --password '%password%' deployer", secrets: ['password' => $password]);

// Copy root public key to deployer user so user can login without password.
run('cp /root/.ssh/authorized_keys /home/deployer/.ssh/authorized_keys');
$authorizedKeys = '/root/.ssh/authorized_keys';
if (!test("[ -f $authorizedKeys ]")) {
$provisionHome = run('getent passwd ' . get('provision_user') . ' | cut -d: -f6');
$authorizedKeys = "$provisionHome/.ssh/authorized_keys";
}

try {
// Copy the public key to the deployer user so it can login without password.
run("cp $authorizedKeys /home/deployer/.ssh/authorized_keys");

// Create ssh key if not already exists.
run('ssh-keygen -f /home/deployer/.ssh/id_ed25519 -t ed25519 -N ""');
// Create ssh key if not already exists.
run('ssh-keygen -f /home/deployer/.ssh/id_ed25519 -t ed25519 -N ""');
} catch (\Throwable $e) {
// Copy the public key to the deployer user so it can login without password.
run("sudo cp $authorizedKeys /home/deployer/.ssh/authorized_keys");

// Create ssh key if not already exists.
run('sudo ssh-keygen -f /home/deployer/.ssh/id_ed25519 -t ed25519 -N ""');
}

try {
run('chown -R deployer:deployer /home/deployer');
Expand All @@ -54,6 +68,9 @@
run('usermod -a -G www-data deployer');
run('usermod -a -G caddy deployer');
}

run("[ -d {{deploy_path}} ] || mkdir -p {{deploy_path}}");
run("chown -R deployer:deployer {{deploy_path}}");
})->oncePerNode();


Expand Down
14 changes: 8 additions & 6 deletions recipe/provision/website.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,19 @@

desc('Provision website');
task('provision:website', function () {
$restoreBecome = become('deployer');
set('remote_user', get('provision_user'));

run("[ -d {{deploy_path}} ] || mkdir -p {{deploy_path}}");
run("chown -R deployer:deployer {{deploy_path}}");
run("[ -d {{deploy_path}}/log ] || mkdir -p {{deploy_path}}/log");
run("chown deployer:caddy {{deploy_path}}/log");
// Group-writable so the caddy daemon (group caddy) can create access.log;
// otherwise `service caddy reload` fails to open the log writer.
run("chmod 775 {{deploy_path}}/log");

$restoreBecome = become('deployer');

set('deploy_path', run("realpath {{deploy_path}}"));
cd('{{deploy_path}}');

run("[ -d log ] || mkdir log");
run("chgrp caddy log");

$caddyfile = parse(file_get_contents(__DIR__ . '/Caddyfile'));

if (test('[ -f Caddyfile ]')) {
Expand Down