aki/docker-compose-nas
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: aki:f9531228d67872f4e2cfcfdfb1e71f2373a35159
Branches Tags
aki:main
aki:feature/traefik-authelia-integration
..
compare: aki:4b519610af932737a844a5e3f42eb03e5b86c35a
Branches Tags
aki:feature/traefik-authelia-integration
aki:main

No commits in common. "f9531228d67872f4e2cfcfdfb1e71f2373a35159" and "4b519610af932737a844a5e3f42eb03e5b86c35a" have entirely different histories.
f9531228d6 ... 4b519610af

1 changed files with 36 additions and 27 deletions
Show Stats Expand all files Collapse all files

29
update-setup.sh
View File

@ -302,14 +302,22 @@ update_authelia_config() {
# Update domain settings from .env # Update domain settings from .env
echo -e "${BLUE}Applying Tailscale domain settings...${NC}" echo -e "${BLUE}Applying Tailscale domain settings...${NC}"
if command -v yq &> /dev/null; then # Update domain in session section
# Replace placeholder full hostname yq e -i ".session.cookies[0].domain = \"${TAILNET_DOMAIN}\"" "$TEMP_CONFIG"
yq e -i "walk(if type == \"string\" and . == \"tailscale-nas.your-tailnet.ts.net\" then \"${FULL_HOSTNAME}\" else . end)" "$TEMP_CONFIG"
# Replace placeholder tailnet domain # Update domain in access_control (find wildcard domain rule and update it)
yq e -i "walk(if type == \"string\" and . == \"your-tailnet.ts.net\" then \"${TAILNET_DOMAIN}\" else . end)" "$TEMP_CONFIG" # This assumes there's a rule with a wildcard domain like "*.example.com"
local domain_rule_index=$(yq e ".access_control.rules | map(.domain) | map(select(. == \"*.*\")) | indices" "$TEMP_CONFIG" | head -n 1 | tr -d '[]')
if [[ -n "$domain_rule_index" && "$domain_rule_index" != "null" ]]; then
yq e -i ".access_control.rules[$domain_rule_index].domain = \"${WILDCARD_DOMAIN}\"" "$TEMP_CONFIG"
fi
# Move temp file to final location # Update authelia_url if it exists (it's a URL that must match cookie scope)
if yq e -e '.identity_validation.reset_password.authelia_url' "$TEMP_CONFIG" &>/dev/null; then
yq e -i ".identity_validation.reset_password.authelia_url = \"https://${FULL_HOSTNAME}\"" "$TEMP_CONFIG"
fi
# Move the temp file to the final location
mv "$TEMP_CONFIG" "$AUTHELIA_CONFIG" mv "$TEMP_CONFIG" "$AUTHELIA_CONFIG"
echo -e "${GREEN}Authelia configuration updated successfully!${NC}" echo -e "${GREEN}Authelia configuration updated successfully!${NC}"
@ -320,14 +328,15 @@ update_authelia_config() {
# Create a new file from the example # Create a new file from the example
cp "$AUTHELIA_CONFIG_EXAMPLE" "$AUTHELIA_CONFIG.new" cp "$AUTHELIA_CONFIG_EXAMPLE" "$AUTHELIA_CONFIG.new"
# Replace placeholders manually # Update domain settings with sed (more fragile)
sed -i "s|tailscale-nas\.your-tailnet\.ts\.net|${FULL_HOSTNAME}|g" "$AUTHELIA_CONFIG.new" sed -i "s/domain: \".*\"/domain: \"${TAILNET_DOMAIN}\"/" "$AUTHELIA_CONFIG.new"
sed -i "s|your-tailnet\.ts\.net|${TAILNET_DOMAIN}|g" "$AUTHELIA_CONFIG.new" sed -i "s/domain: \"\\*\\..*\"/domain: \"${WILDCARD_DOMAIN}\"/" "$AUTHELIA_CONFIG.new"
sed -i "s|authelia_url: \"https://.*\"|authelia_url: \"https://${FULL_HOSTNAME}\"|" "$AUTHELIA_CONFIG.new"
# Move the new file to the final location # Move the new file to the final location
mv "$AUTHELIA_CONFIG.new" "$AUTHELIA_CONFIG" mv "$AUTHELIA_CONFIG.new" "$AUTHELIA_CONFIG"
echo -e "${YELLOW}Authelia configuration updated with sed.${NC}" echo -e "${YELLOW}Authelia configuration updated with sed. Secret values might need to be manually transferred.${NC}"
fi fi
echo -e "${GREEN}Authelia configuration update completed.${NC}" echo -e "${GREEN}Authelia configuration update completed.${NC}"