add adminarea pw and update site

This commit is contained in:
Kopatz
2024-08-02 09:25:40 +02:00
parent 1ce7519e74
commit ab7dc46b2f
4 changed files with 27 additions and 3 deletions

View File

@@ -6,9 +6,9 @@ buildNpmPackage rec {
src = fetchGit { src = fetchGit {
url = "git@github.com:oberprofis/adams.git"; url = "git@github.com:oberprofis/adams.git";
ref = "main"; ref = "main";
rev = "68fa8392335a462634d4bb886344762592c8d566"; rev = "95d7f5d21f129949c75bd23ee5edbf84595ceec3";
}; };
npmDepsHash="sha256-ULxOaEpa2+YS45kh+2xCZMqXQs5bMYhy7J08DsFYE+s="; npmDepsHash="sha256-PRFHBlVIdHfATAAKVKax+bY4o+9czdfl7HjFnKk4KtI=";
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
cp -r ./dist/adams-site/* $out cp -r ./dist/adams-site/* $out

8
secrets/adminarea.age Normal file
View File

@@ -0,0 +1,8 @@
age-encryption.org/v1
-> ssh-ed25519 bqM3xA Y42xefWKGT6S7hVhvXEVOygSFfJj2N+Hgq5C4w+YGgQ
DNOblrNet6mE+cYe6bCehdJB++t/yXn6i6PU9oMg8Y8
-> ssh-ed25519 DCzi1A jkOZ2PwpkqFpQwtEwIPU1N5jeUySAMVNc56a06CM+w0
LApR3u9D3+v5F6NHLVr8MSAM8aYSYMwOBlY8UXnyYfw
--- o3Gzah0R4s3bKF77NH2HbuePX6odQ4Tt1xXh4FM5lh8
°È{îûä¹D0Ç/s&iCMÈ®ˆç³îçÄ~àX¤ö¸
­Zh+™ g1ÄYÐ<59>6 kišËP¡m á…¦JV ò(Œ£]9;+Óü%‰µ‚ƒúüQDϦ*·²¬3ÍÎ7ô¡ºþÁŸ

View File

@@ -32,5 +32,6 @@ in
"stash-auth.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ]; "stash-auth.age".publicKeys = [ mini-pc mini-pc-proxmox server kop ];
"plausible-admin.age".publicKeys = [ adam-site kop ]; "plausible-admin.age".publicKeys = [ adam-site kop ];
"plausible-keybase.age".publicKeys = [ adam-site kop ]; "plausible-keybase.age".publicKeys = [ adam-site kop ];
"adminarea.age".publicKeys = [ adam-site kop ];
"radicale.age".publicKeys = [ mini-pc mini-pc-proxmox kop ]; "radicale.age".publicKeys = [ mini-pc mini-pc-proxmox kop ];
} }

View File

@@ -18,6 +18,11 @@
nix = { settings.enable = true; }; nix = { settings.enable = true; };
}; };
age.secrets.stash-auth = {
file = ../../secrets/adminarea.age;
owner = "nginx";
};
services.nginx = { services.nginx = {
enable = true; enable = true;
@@ -33,7 +38,17 @@
"imbissaggsbachdorf.at" = { "imbissaggsbachdorf.at" = {
forceSSL = true; forceSSL = true;
enableACME = true; enableACME = true;
locations."/".proxyPass = "http://127.0.0.1:4000"; locations = {
"/".proxyPass = "http://127.0.0.1:4000";
"/admin" = {
basicAuthFile = config.age.secrets.stash-auth.path;
proxyPass = "http://127.0.0.1:4000";
};
"/api/admin" = {
basicAuthFile = config.age.secrets.stash-auth.path;
proxyPass = "http://127.0.0.1:4000";
};
};
}; };
"plausible.imbissaggsbachdorf.at" = { "plausible.imbissaggsbachdorf.at" = {
forceSSL = true; forceSSL = true;