public/malta-workshop
2
0
Fork 0
Code Pull Requests Activity

fix: remove invisible escape characters from common.nix

Browse Source 
- Fix bash completion function escape characters: $${...} -> $${...}
- Replace printf with \n escapes with proper heredoc in certificate generation
- Clean up invisible characters that could cause parsing issues
This commit is contained in:
Michael Czechowski
2025-09-17 17:31:12 +02:00
parent f70ba8ae25
commit 2dd66df5c4
1 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
common.nix
View File

@@ -620,11 +620,11 @@ isoConfig
echo "✅ Workshop ISO - NixOS $(nixos-version) - Built: $(cat /etc/workshop-build-info 2>/dev/null || echo 'unknown')" echo "✅ Workshop ISO - NixOS $(nixos-version) - Built: $(cat /etc/workshop-build-info 2>/dev/null || echo 'unknown')"
# Bash Completion Configuration # Bash Completion Configuration
_workshop_completion() { _workshop_completion() {
local cur prev local cur prev
COMPREPLY=() COMPREPLY=()
cur="''${COMP_WORDS[COMP_CWORD]}" cur="${COMP_WORDS[COMP_CWORD]}"
prev="''${COMP_WORDS[COMP_CWORD-1]}" prev="${COMP_WORDS[COMP_CWORD-1]}"
case "$prev" in case "$prev" in
deploy|browser) deploy|browser)
@@ -863,12 +863,22 @@ isoConfig
} }
fi fi
# Generate certificate following abra guidelines # Generate certificate following abra guidelines
echo " Generating RSA key and certificate (abra-compatible)..." echo " Generating RSA key and certificate (abra-compatible)..."
if openssl req -x509 -out "$CERT_FILE" -keyout "$KEY_FILE" \ if openssl req -x509 -out "$CERT_FILE" -keyout "$KEY_FILE" \
-newkey rsa:2048 -nodes -sha256 -days 365 \ -newkey rsa:2048 -nodes -sha256 -days 365 \
-subj "/CN=*.workshop.local" -extensions EXT -config <( \ -subj "/CN=*.workshop.local" -extensions EXT -config <( \
printf "[dn]\nCN=*.workshop.local\n[req]\ndistinguished_name = dn\n[EXT]\nsubjectAltName=DNS:*.workshop.local,DNS:workshop.local,DNS:localhost\nkeyUsage=digitalSignature\nextendedKeyUsage=serverAuth"); then cat <<EOF
[dn]
CN=*.workshop.local
[req]
distinguished_name = dn
[EXT]
subjectAltName=DNS:*.workshop.local,DNS:workshop.local,DNS:localhost
keyUsage=digitalSignature
extendedKeyUsage=serverAuth
EOF
); then
echo "✅ Certificate generation completed successfully (abra-compatible)" echo "✅ Certificate generation completed successfully (abra-compatible)"
else else