git.iko.soy/vibebox
on main help sign in
fix: now fixed ssh problem
27e5733robcholz
src/instance.rs+1−1
compare with main
unifiedsplit
@@ -31,7 +31,7 @@ const SSH_KEY_NAME: &str = "ssh_key";
31const SERIAL_LOG_NAME: &str = "serial.log";
31const SERIAL_LOG_NAME: &str = "serial.log";
32const SSH_GUEST_DIR: &str = "/root/.vibebox";
32const SSH_GUEST_DIR: &str = "/root/.vibebox";
33const DEFAULT_SSH_USER: &str = "vibebox";
33const DEFAULT_SSH_USER: &str = "vibebox";
34−const SSH_CONNECT_RETRIES: usize = 20;
34+const SSH_CONNECT_RETRIES: usize = 30;
35const SSH_CONNECT_DELAY_MS: u64 = 500;
35const SSH_CONNECT_DELAY_MS: u64 = 500;
36const SSH_SETUP_SCRIPT: &str = include_str!("ssh.sh");
36const SSH_SETUP_SCRIPT: &str = include_str!("ssh.sh");
37
37
src/provision.sh+23−1
@@ -15,13 +15,35 @@ apt-get install -y --no-install-recommends \
15 git \
15 git \
16 ripgrep \
16 ripgrep \
17 openssh-server \
17 openssh-server \
18+ locales \
18 sudo
19 sudo
19
20
20# Set hostname to "vibe" so it's clear that you're inside the VM.
21# Set hostname to "vibe" so it's clear that you're inside the VM.
21hostnamectl set-hostname vibe
22hostnamectl set-hostname vibe
22
23
23−# Enable SSH server so instances can use key-based auth.
24+# Locale (fix: setlocale: LC_CTYPE ... UTF-8)
25+sed -i 's/^# *en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
26+locale-gen
27+update-locale LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8
28+
29+# SSH: host keys + base config (doesn't depend on runtime user)
30+ssh-keygen -A
31+mkdir -p /etc/ssh/sshd_config.d
32+cat >/etc/ssh/sshd_config.d/10-vibebox-base.conf <<'EOF'
33+PasswordAuthentication no
34+KbdInteractiveAuthentication no
35+ChallengeResponseAuthentication no
36+PubkeyAuthentication yes
37+PermitRootLogin no
38+
39+# Speed up logins / avoid DNS delays
40+UseDNS no
41+GSSAPIAuthentication no
42+EOF
43+
44+sshd -t
24systemctl enable ssh
45systemctl enable ssh
46+systemctl restart ssh
25
47
26# Set this env var so claude doesn't complain about running as root.'
48# Set this env var so claude doesn't complain about running as root.'
27echo "export IS_SANDBOX=1" >> .bashrc
49echo "export IS_SANDBOX=1" >> .bashrc
src/ssh.sh+42−28
@@ -1,46 +1,60 @@
1#!/bin/sh
1#!/bin/sh
2+set -eu
2
3
3SSH_USER="__SSH_USER__"
4SSH_USER="__SSH_USER__"
4−SUDO_PASSWORD="__SUDO_PASSWORD__"
5PROJECT_NAME="__PROJECT_NAME__"
5PROJECT_NAME="__PROJECT_NAME__"
6KEY_PATH="__KEY_PATH__"
6KEY_PATH="__KEY_PATH__"
7
7
8−if [ -d /root/${PROJECT_NAME}/.vibebox ]; then
8+# 1) tmpfs mount
9+TARGET="/root/${PROJECT_NAME}/.vibebox"
10+if [ -d "$TARGET" ] && ! mountpoint -q "$TARGET"; then
9− mount -t tmpfs tmpfs /root/${PROJECT_NAME}/.vibebox
11+ mount -t tmpfs tmpfs "$TARGET"
10fi
12fi
11
13
14+# 2)
12−if ! command -v sshd >/dev/null 2>&1; then
15+if ! id -u "$SSH_USER" >/dev/null 2>&1; then
13− apt-get update && apt-get install -y openssh-server sudo
16+ useradd -m -s /bin/bash -U "$SSH_USER"
17+ usermod -aG sudo "$SSH_USER" || true
14fi
18fi
15
19
16−systemctl enable ssh >/dev/null 2>&1 || true
17−id -u ${SSH_USER} >/dev/null 2>&1 || useradd -m -s /bin/bash ${SSH_USER}
18−echo "${SSH_USER}:${SUDO_PASSWORD}" | chpasswd
19−usermod -aG sudo ${SSH_USER}
20−install -d -m 700 /home/${SSH_USER}/.ssh
20+install -d -m 700 -o "$SSH_USER" -g "$SSH_USER" "/home/${SSH_USER}/.ssh"
21−install -m 600 ${KEY_PATH} /home/${SSH_USER}/.ssh/authorized_keys
21+install -m 600 -o "$SSH_USER" -g "$SSH_USER" "$KEY_PATH" "/home/${SSH_USER}/.ssh/authorized_keys"
22−chown -R ${SSH_USER}:${SSH_USER} /home/${SSH_USER}/.ssh
22+
23−rm -f /home/${SSH_USER}/.bash_logout
23+# 3)
24−mkdir -p /etc/ssh/sshd_config.d
24+systemctl start ssh >/dev/null 2>&1 || true
25−cat >/etc/ssh/sshd_config.d/vibebox.conf <<'VIBEBOX_SSHD'
25+
26−PasswordAuthentication no
26+# 4)
27−KbdInteractiveAuthentication no
27+i=0
28−ChallengeResponseAuthentication no
28+while :; do
29−PubkeyAuthentication yes
29+ if ss -lnt 2>/dev/null | awk '{print $4}' | grep -qE '(:22)$'; then
30−PermitRootLogin no
30+ break
31−AllowUsers __SSH_USER__
31+ fi
32−VIBEBOX_SSHD
32+ i=$((i+1))
33−systemctl restart ssh
33+ [ "$i" -ge 40 ] && break # ~4s
34+ sleep 0.1
35+done
36+
34echo VIBEBOX_SSH_READY
37echo VIBEBOX_SSH_READY
35
38
36−echo "=== generated network file ==="
39+find_ip() {
37−sed -n '1,200p' /run/systemd/network/10-netplan-all-en.network || true
40+ if command -v ip >/dev/null 2>&1; then
41+ ip -4 -o addr show scope global 2>/dev/null | awk '{print $4}' | cut -d/ -f1 | head -n 1
42+ return
43+ fi
44+ if command -v hostname >/dev/null 2>&1; then
45+ hostname -I 2>/dev/null | awk '{print $1}'
46+ return
47+ fi
48+}
38
49
50+i=0
39−while true; do
51+while :; do
40− ip=$(ip -4 -o addr show scope global | awk '{print $4}' | cut -d/ -f1 | head -n 1)
52+ ip="$(find_ip || true)"
41 if [ -n "$ip" ]; then
53 if [ -n "$ip" ]; then
42 echo VIBEBOX_IPV4=$ip
54 echo VIBEBOX_IPV4=$ip
43 break
55 break
44 fi
56 fi
57+ i=$((i+1))
58+ [ "$i" -ge 60 ] && break
45− sleep 1
59+ sleep 0.5
46done
60done