Add snippets.d auto-import for modular config
This commit is contained in:
@@ -25,11 +25,16 @@ install_caddy() {
|
||||
echo "Caddy installed: $(caddy version)"
|
||||
}
|
||||
|
||||
# Create data directory
|
||||
# Create data directory and snippets folder
|
||||
setup_dirs() {
|
||||
local data_dir="${CADDY_DATA_DIR:-/data/caddy}"
|
||||
local skill_dir="$(dirname "$(dirname "$0")")"
|
||||
|
||||
mkdir -p "$data_dir"
|
||||
mkdir -p "$skill_dir/snippets.d"
|
||||
|
||||
echo "Caddy data directory: $data_dir"
|
||||
echo "Caddy snippets directory: $skill_dir/snippets.d"
|
||||
}
|
||||
|
||||
install_caddy
|
||||
|
||||
@@ -1,13 +1,40 @@
|
||||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
CADDYFILE_PATH="${CADDYFILE_PATH:-/skills/caddy/Caddyfile}"
|
||||
SKILL_DIR="$(dirname "$(dirname "$0")")"
|
||||
CADDYFILE_PATH="${CADDYFILE_PATH:-$SKILL_DIR/Caddyfile}"
|
||||
CADDY_DATA_DIR="${CADDY_DATA_DIR:-/data/caddy}"
|
||||
SNIPPETS_DIR="$SKILL_DIR/snippets.d"
|
||||
MERGED_CONFIG="/tmp/Caddyfile.merged"
|
||||
|
||||
if [ ! -f "$CADDYFILE_PATH" ]; then
|
||||
echo "Error: Caddyfile not found at $CADDYFILE_PATH"
|
||||
exit 1
|
||||
fi
|
||||
# Merge base Caddyfile with snippets from other skills
|
||||
merge_config() {
|
||||
if [ ! -f "$CADDYFILE_PATH" ]; then
|
||||
echo "Error: Caddyfile not found at $CADDYFILE_PATH"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Starting Caddy with config: $CADDYFILE_PATH"
|
||||
exec caddy run --config "$CADDYFILE_PATH" --adapter caddyfile
|
||||
# Start with base config
|
||||
cat "$CADDYFILE_PATH" > "$MERGED_CONFIG"
|
||||
|
||||
# Append snippets from other skills
|
||||
if [ -d "$SNIPPETS_DIR" ] && [ "$(ls -A "$SNIPPETS_DIR" 2>/dev/null)" ]; then
|
||||
echo "" >> "$MERGED_CONFIG"
|
||||
echo "# === Auto-imported from skills ===" >> "$MERGED_CONFIG"
|
||||
|
||||
for snippet in "$SNIPPETS_DIR"/*.caddy; do
|
||||
if [ -f "$snippet" ]; then
|
||||
echo "" >> "$MERGED_CONFIG"
|
||||
cat "$snippet" >> "$MERGED_CONFIG"
|
||||
echo "Imported: $(basename "$snippet")"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
echo "Merged config written to: $MERGED_CONFIG"
|
||||
}
|
||||
|
||||
merge_config
|
||||
|
||||
echo "Starting Caddy..."
|
||||
exec caddy run --config "$MERGED_CONFIG" --adapter caddyfile
|
||||
|
||||
Reference in New Issue
Block a user