Compare commits
No commits in common. "f0bc4e058f657de257205e08c6acd73152937fc1" and "60e00f5a760014856f3c07fe201ff5e303b957da" have entirely different histories.
f0bc4e058f
...
60e00f5a76
|
@ -143,10 +143,4 @@ password2 = STORAGE_GAMING_CRYPT_SALT
|
||||||
[Gaming]
|
[Gaming]
|
||||||
type = chunker
|
type = chunker
|
||||||
remote = Gaming-Source:
|
remote = Gaming-Source:
|
||||||
chunk_size = 128Mi
|
chunk_size = 128Mi
|
||||||
|
|
||||||
[Notes]
|
|
||||||
type = crypt
|
|
||||||
remote = StorageBox:Notes
|
|
||||||
password = STORAGE_NOTES_CRYPT_PASSWORD
|
|
||||||
password2 = STORAGE_NOTES_CRYPT_SALT
|
|
|
@ -91,7 +91,6 @@ in {
|
||||||
"/Public/".proxyPass = "http://${containerIP}:${toString ports.webdav_public}";
|
"/Public/".proxyPass = "http://${containerIP}:${toString ports.webdav_public}";
|
||||||
"/Uploads/".proxyPass = "http://${containerIP}:${toString ports.webdav_uploads}";
|
"/Uploads/".proxyPass = "http://${containerIP}:${toString ports.webdav_uploads}";
|
||||||
"/Gaming/".proxyPass = "http://${containerIP}:${toString ports.webdav_gaming}";
|
"/Gaming/".proxyPass = "http://${containerIP}:${toString ports.webdav_gaming}";
|
||||||
"/Notes/".proxyPass = "http://${containerIP}:${toString ports.webdav_notes}";
|
|
||||||
};
|
};
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
client_max_body_size ${clientMaxBodySize};
|
client_max_body_size ${clientMaxBodySize};
|
||||||
|
|
|
@ -91,16 +91,6 @@ in {
|
||||||
"--vfs-cache-max-age=5m"
|
"--vfs-cache-max-age=5m"
|
||||||
"--vfs-cache-max-size=1g"
|
"--vfs-cache-max-size=1g"
|
||||||
"--vfs-cache-mode=full"
|
"--vfs-cache-mode=full"
|
||||||
];
|
|
||||||
}
|
|
||||||
{
|
|
||||||
id = "notes";
|
|
||||||
remote = "Notes:";
|
|
||||||
type = "webdav";
|
|
||||||
extraArgs = [
|
|
||||||
"--addr=0.0.0.0:${toString ports.webdav_notes}"
|
|
||||||
"--htpasswd=${secrets.webdav_notes_htpasswd.path}"
|
|
||||||
"--baseurl=/Notes/"
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
{
|
{
|
||||||
|
|
|
@ -43,11 +43,9 @@
|
||||||
"api-keys/data/storage/webdav/Public"
|
"api-keys/data/storage/webdav/Public"
|
||||||
"api-keys/data/storage/webdav/Uploads"
|
"api-keys/data/storage/webdav/Uploads"
|
||||||
"api-keys/data/storage/webdav/Gaming"
|
"api-keys/data/storage/webdav/Gaming"
|
||||||
"api-keys/data/storage/webdav/Notes"
|
|
||||||
|
|
||||||
"private-public-keys/data/rclone/Chaos-Media-Crypt"
|
"private-public-keys/data/rclone/Chaos-Media-Crypt"
|
||||||
"private-public-keys/data/rclone/Chaos-Gaming-Crypt"
|
"private-public-keys/data/rclone/Chaos-Gaming-Crypt"
|
||||||
"private-public-keys/data/rclone/Chaos-Notes-Crypt"
|
|
||||||
];
|
];
|
||||||
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
|
@ -237,14 +235,7 @@
|
||||||
simple_get_htpasswd "/api-keys/storage/webdav/Gaming" "$secretFile"
|
simple_get_htpasswd "/api-keys/storage/webdav/Gaming" "$secretFile"
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
webdav_notes_htpasswd = {
|
|
||||||
user = "storage";
|
|
||||||
group = "storage";
|
|
||||||
fetchScript = ''
|
|
||||||
simple_get_htpasswd "/api-keys/storage/webdav/Notes" "$secretFile"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
rclone_config = {
|
rclone_config = {
|
||||||
user = "storage";
|
user = "storage";
|
||||||
group = "storage";
|
group = "storage";
|
||||||
|
@ -269,7 +260,6 @@
|
||||||
|
|
||||||
simple_get_replace_crypt "/private-public-keys/rclone/Chaos-Media-Crypt" "STORAGE_MEDIA_CRYPT" "$secretFile"
|
simple_get_replace_crypt "/private-public-keys/rclone/Chaos-Media-Crypt" "STORAGE_MEDIA_CRYPT" "$secretFile"
|
||||||
simple_get_replace_crypt "/private-public-keys/rclone/Chaos-Gaming-Crypt" "STORAGE_GAMING_CRYPT" "$secretFile"
|
simple_get_replace_crypt "/private-public-keys/rclone/Chaos-Gaming-Crypt" "STORAGE_GAMING_CRYPT" "$secretFile"
|
||||||
simple_get_replace_crypt "/private-public-keys/rclone/Chaos-Notes-Crypt" "STORAGE_NOTES_CRYPT" "$secretFile"
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue