Skip to content

Commit 94a79e4

Browse files
committed
chore: fallback to rsa keytype for ssh generation
1 parent da08719 commit 94a79e4

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

cli/app/commands/install/command.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def main_install_callback(value: bool):
4646

4747
@install_app.command(name="ssh")
4848
def ssh(
49-
path: str = typer.Option("~/.ssh/nixopus_ed25519", "--path", "-p", help="The SSH key path to generate"),
50-
key_type: str = typer.Option("ed25519", "--key-type", "-t", help="The SSH key type (rsa, ed25519, ecdsa)"),
49+
path: str = typer.Option("~/.ssh/nixopus_rsa", "--path", "-p", help="The SSH key path to generate"),
50+
key_type: str = typer.Option("rsa", "--key-type", "-t", help="The SSH key type (rsa, ed25519, ecdsa)"),
5151
key_size: int = typer.Option(4096, "--key-size", "-s", help="The SSH key size"),
5252
passphrase: str = typer.Option(None, "--passphrase", "-P", help="The passphrase to use for the SSH key"),
5353
verbose: bool = typer.Option(False, "--verbose", "-v", help="Verbose output"),

docs/cli/cli-reference.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@ $ nixopus install ssh [OPTIONS]
437437

438438
**Options**:
439439

440-
* `-p, --path TEXT`: The SSH key path to generate [default: ~/.ssh/nixopus_ed25519]
441-
* `-t, --key-type TEXT`: The SSH key type (rsa, ed25519, ecdsa) [default: ed25519]
440+
* `-p, --path TEXT`: The SSH key path to generate [default: ~/.ssh/nixopus_rsa]
441+
* `-t, --key-type TEXT`: The SSH key type (rsa, ed25519, ecdsa) [default: rsa]
442442
* `-s, --key-size INTEGER`: The SSH key size [default: 4096]
443443
* `-P, --passphrase TEXT`: The passphrase to use for the SSH key
444444
* `-v, --verbose`: Verbose output

docs/cli/commands/install.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ nixopus install ssh [OPTIONS]
6262

6363
| Option | Short | Description | Default |
6464
|--------|-------|-------------|---------|
65-
| `--path` | `-p` | SSH key file path | `~/.ssh/nixopus_ed25519` |
66-
| `--key-type` | `-t` | Key type (rsa, ed25519, ecdsa) | `ed25519` |
65+
| `--path` | `-p` | SSH key file path | `~/.ssh/nixopus_rsa` |
66+
| `--key-type` | `-t` | Key type (rsa, ed25519, ecdsa) | `rsa` |
6767
| `--key-size` | `-s` | Key size in bits | `4096` |
6868
| `--passphrase` | `-P` | Passphrase for key encryption | None |
6969
| `--force` | `-f` | Overwrite existing SSH keys | `false` |
@@ -78,7 +78,7 @@ nixopus install ssh [OPTIONS]
7878
**Examples:**
7979

8080
```bash
81-
# Generate default Ed25519 key
81+
# Generate default RSA key
8282
nixopus install ssh
8383

8484
# Generate RSA key with custom path and size
@@ -125,8 +125,8 @@ The install command reads configuration values from the built-in `config.prod.ya
125125
| Setting | Default Value | Description |
126126
|---------|---------------|-------------|
127127
| Timeout | `300` seconds | Maximum time to wait for installation steps |
128-
| SSH Key Path | `~/.ssh/nixopus_ed25519` | Default SSH key location |
129-
| SSH Key Type | `ed25519` | Default SSH key algorithm |
128+
| SSH Key Path | `~/.ssh/nixopus_rsa` | Default SSH key location |
129+
| SSH Key Type | `rsa` | Default SSH key algorithm |
130130
| SSH Key Size | `4096` bits | Default key size for RSA keys |
131131

132132
### Configuration Source

docs/cli/config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ clone:
6565
### SSH Configuration
6666
```yaml
6767
ssh_key_size: 4096
68-
ssh_key_type: ed25519
68+
ssh_key_type: rsa
6969
ssh_file_path: ssh/id_rsa
7070
```
7171

helpers/config.dev.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ services:
1313
SSH_HOST: ${SSH_HOST:-localhost}
1414
SSH_PORT: ${SSH_PORT:-22}
1515
SSH_USER: ${SSH_USER:-$USER}
16-
SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY:-~/.ssh/id_ed25519_nixopus}
16+
SSH_PRIVATE_KEY: ${SSH_PRIVATE_KEY:-~/.ssh/id_rsa_nixopus}
1717
SSH_PASSWORD: ${SSH_PASSWORD:-}
1818
DOCKER_HOST: ${DOCKER_HOST:-unix:///var/run/docker.sock}
1919
REDIS_URL: ${REDIS_URL:-redis://localhost:6379}
@@ -152,6 +152,6 @@ clone:
152152

153153
ports: [8080, 7443, 6379, 5432, 22]
154154
ssh_key_size: 4096
155-
ssh_key_type: ed25519
155+
ssh_key_type: rsa
156156
ssh_passphrase:
157-
ssh_file_path: ~/.ssh/id_ed25519_nixopus
157+
ssh_file_path: ~/.ssh/id_rsa_nixopus

helpers/config.prod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,6 @@ clone:
139139

140140
ports: [2019, 80, 443, 7443, 8443, 6379, 5432]
141141
ssh_key_size: 4096
142-
ssh_key_type: ed25519
142+
ssh_key_type: rsa
143143
ssh_passphrase:
144144
ssh_file_path: ssh/id_rsa

0 commit comments

Comments
 (0)