2 Commits

Author SHA1 Message Date
raucao 4bcbeaf1a8 Remove newline from all node files
Was actually added by manually editing the files, but Chef writes them
without newline, so our sanitization script also does it that way
2026-07-05 14:28:04 +02:00
raucao 235dfba462 Add pre-commit hook for sanitizing node configs 2026-07-05 14:27:52 +02:00
25 changed files with 67 additions and 23 deletions
+40
View File
@@ -0,0 +1,40 @@
#!/usr/bin/env bash
set -euo pipefail
SCRIPT="$(git rev-parse --show-toplevel)/scripts/util/sanitize_node.sh"
FILES=$(git diff --cached --name-only --diff-filter=ACM -- 'nodes/*.json' || true)
[[ -z "$FILES" ]] && exit 0
DIRTY=0
while IFS= read -r file; do
staged_tmp=$(mktemp)
sanitized_tmp=$(mktemp)
# 1. get staged version
git show ":$file" > "$staged_tmp"
# 2. sanitize IN PLACE (on temp copy)
cp "$staged_tmp" "$sanitized_tmp"
"$SCRIPT" "$sanitized_tmp"
# 3. if sanitizer changed file, update working tree
if ! diff -q "$staged_tmp" "$sanitized_tmp" >/dev/null; then
cp "$sanitized_tmp" "$file"
echo "Sanitized: $file"
DIRTY=1
fi
rm -f "$staged_tmp" "$sanitized_tmp"
done <<< "$FILES"
if [[ "$DIRTY" -ne 0 ]]; then
echo ""
echo "Commit paused, sanitized files must be re-staged."
exit 1
fi
exit 0
+4
View File
@@ -28,6 +28,10 @@ Clone this repository, `cd` into it, and run:
bundle install
### Enable Git hooks
git config core.hooksPath .githooks
## Common tasks
### Bootstrap a new host server
+1 -1
View File
@@ -72,4 +72,4 @@
"role[ldap_client]",
"role[ejabberd]"
]
}
}
+1 -1
View File
@@ -72,4 +72,4 @@
"role[ldap_client]",
"role[ejabberd]"
]
}
}
+1 -1
View File
@@ -63,4 +63,4 @@
"role[kvm_guest]",
"role[garage_node]"
]
}
}
+1 -1
View File
@@ -63,4 +63,4 @@
"role[kvm_guest]",
"role[garage_node]"
]
}
}
+1 -1
View File
@@ -63,4 +63,4 @@
"role[kvm_guest]",
"role[garage_node]"
]
}
}
+1 -1
View File
@@ -61,4 +61,4 @@
"role[kvm_guest]",
"role[garage_node]"
]
}
}
+1 -1
View File
@@ -63,4 +63,4 @@
"role[kvm_guest]",
"role[garage_node]"
]
}
}
+1 -1
View File
@@ -63,4 +63,4 @@
"role[kvm_guest]",
"role[garage_node]"
]
}
}
+1 -1
View File
@@ -76,4 +76,4 @@
"role[gitea]",
"role[gitea_actions_runner]"
]
}
}
+1 -1
View File
@@ -55,4 +55,4 @@
"role[base]",
"role[kvm_host]"
]
}
}
+1 -1
View File
@@ -61,4 +61,4 @@
"role[kvm_guest]",
"role[dirsrv_supplier]"
]
}
}
+1 -1
View File
@@ -55,4 +55,4 @@
"role[kvm_guest]",
"role[dirsrv_supplier]"
]
}
}
+1 -1
View File
@@ -56,4 +56,4 @@
"role[base]",
"recipe[kosmos_kvm::host]"
]
}
}
+1 -1
View File
@@ -68,4 +68,4 @@
"role[kvm_guest]",
"role[email_server]"
]
}
}
+1 -1
View File
@@ -66,4 +66,4 @@
"role[kvm_guest]",
"role[postgresql_primary]"
]
}
}
+1 -1
View File
@@ -61,4 +61,4 @@
"role[kvm_guest]",
"role[postgresql_replica]"
]
}
}
+1 -1
View File
@@ -59,4 +59,4 @@
"role[kvm_guest]",
"role[prometheus_server]"
]
}
}
+1 -1
View File
@@ -59,4 +59,4 @@
"role[kvm_guest]",
"role[remotestorage_discourse]"
]
}
}
+1 -1
View File
@@ -58,4 +58,4 @@
"role[kvm_guest]",
"role[rskj_mainnet]"
]
}
}
+1 -1
View File
@@ -57,4 +57,4 @@
"role[base]",
"role[kvm_guest]"
]
}
}
+1 -1
View File
@@ -58,4 +58,4 @@
"role[kvm_guest]",
"role[rskj_testnet]"
]
}
}
+1 -1
View File
@@ -57,4 +57,4 @@
"role[kvm_guest]",
"role[rskj_testnet]"
]
}
}
+1 -1
View File
@@ -70,4 +70,4 @@
"role[strfry]",
"role[blossom]"
]
}
}