sokai/mynixos-config
1
1
Fork 0
forked from mirrors_public/oddlama_nix-config
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: add blog and fix double redirect real ip

Browse source
This commit is contained in:
oddlama 2024-09-22 01:57:37 +02:00
parent c30ec709a7
commit 4cbbd2f871
No known key found for this signature in database
GPG key ID: 14EFE510775FE39A
2 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

41
hosts/sentinel/blog.nix
View file

@ -1,33 +1,38 @@
{ {globals, ...}: {
globals, environment.persistence."/persist".directories = [
pkgs, {
... directory = "/var/lib/blog";
}: { mode = "0750";
user = "nginx";
group = "nginx";
}
];
services.nginx.virtualHosts.${globals.domains.me} = { services.nginx.virtualHosts.${globals.domains.me} = {
forceSSL = true; forceSSL = true;
useACMEWildcardHost = true; useACMEWildcardHost = true;
locations."/".root = pkgs.runCommand "index.html" {} '' locations."/".root = "/var/lib/blog";
mkdir -p $out
cat > $out/index.html <<EOF
<html>
<head>
<script defer data-api="/api/event" data-domain="oddlama.org" src="/js/script.js"></script>
</head>
<body>Not empty soon TM. Until then please go here: <a href="https://github.com/oddlama">oddlama</a></body>
</html>
EOF
'';
# Don't use the proxyPass option because we don't want the recommended proxy headers # Don't use the proxyPass option because we don't want the recommended proxy headers
locations."= /js/script.js".extraConfig = '' locations."= /js/script.js".extraConfig = ''
proxy_pass https://${globals.services.plausible.domain}/js/script.js; proxy_pass https://${globals.services.plausible.domain}/js/script.js;
proxy_set_header Host ${globals.services.plausible.domain};
proxy_ssl_server_name on; proxy_ssl_server_name on;
proxy_set_header Host ${globals.services.plausible.domain};
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
''; '';
locations."= /api/event".extraConfig = '' locations."= /api/event".extraConfig = ''
proxy_pass https://${globals.services.plausible.domain}/api/event; proxy_pass https://${globals.services.plausible.domain}/api/event;
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Host ${globals.services.plausible.domain};
proxy_ssl_server_name on; proxy_ssl_server_name on;
proxy_set_header Host ${globals.services.plausible.domain};
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Host $host;
proxy_set_header X-Forwarded-Server $host;
''; '';
}; };
} }

10
nix/rage-decrypt-and-cache.sh
View file

@ -31,10 +31,14 @@ mkdir -p "$(dirname "$out")"
if [[ ! -e "$out" ]]; then if [[ ! -e "$out" ]]; then
args=() args=()
for i in "${identities[@]}"; do for i in "${identities[@]}"; do
args+=("-i" "$i") args+=("--identity" "$i")
done done
rage -d "${args[@]}" -o "$out" "$file" rage --decrypt "${args[@]}" --output "$out" "$file"
fi fi
# Print out path or decrypted content # Print out path or decrypted content
[[ "$print_out_path" == true ]] && echo "$out" || cat "$out" if [[ "$print_out_path" == true ]]; then
echo "$out"
else
cat "$out"
fi