Compare commits
No commits in common. "fef99021b9b6ac08f7a3d3caab10c3fa861a8bbb" and "2cb1599acc2b71006813ed16824ec5a5d6a2c471" have entirely different histories.
fef99021b9
...
2cb1599acc
|
@ -9,7 +9,6 @@ in {
|
|||
webdav_public = webdav + 3;
|
||||
webdav_uploads = webdav + 4;
|
||||
webdav_gaming = webdav + 5;
|
||||
webdav_notes = webdav + 6;
|
||||
|
||||
restic_music = restic + 0;
|
||||
restic_vault = restic + 1;
|
||||
|
|
|
@ -82,16 +82,6 @@ hard_delete = true
|
|||
type = alias
|
||||
remote = B2-Chaos-Public-Source:Chaos-Public
|
||||
|
||||
[B2-Chaos-Notes-Source]
|
||||
type = b2
|
||||
account = B2_CHAOS_NOTES_ACCOUNT
|
||||
key = B2_CHAOS_NOTES_KEY
|
||||
hard_delete = true
|
||||
|
||||
[B2-Chaos-Notes]
|
||||
type = alias
|
||||
remote = B2-Chaos-Notes-Source:Chaos-Notes
|
||||
|
||||
[B2-Phoenix-Cryptidz-Storage-Source]
|
||||
type = b2
|
||||
account = B2_PHOENIX_CRYPTIDZ_STORAGE_ACCOUNT
|
||||
|
@ -154,9 +144,3 @@ password2 = STORAGE_GAMING_CRYPT_SALT
|
|||
type = chunker
|
||||
remote = Gaming-Source:
|
||||
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}";
|
||||
"/Uploads/".proxyPass = "http://${containerIP}:${toString ports.webdav_uploads}";
|
||||
"/Gaming/".proxyPass = "http://${containerIP}:${toString ports.webdav_gaming}";
|
||||
"/Notes/".proxyPass = "http://${containerIP}:${toString ports.webdav_notes}";
|
||||
};
|
||||
extraConfig = ''
|
||||
client_max_body_size ${clientMaxBodySize};
|
||||
|
|
|
@ -91,16 +91,6 @@ in {
|
|||
"--vfs-cache-max-age=5m"
|
||||
"--vfs-cache-max-size=1g"
|
||||
"--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/"
|
||||
];
|
||||
}
|
||||
{
|
||||
|
|
|
@ -47,11 +47,6 @@ in {
|
|||
dest = "B2-Chaos-Public:";
|
||||
id = "chaos_b2_public";
|
||||
}
|
||||
{
|
||||
source = "StorageBox:Notes";
|
||||
dest = "B2-Chaos-Notes:";
|
||||
id = "chaos_notes_public";
|
||||
}
|
||||
# Pheonix System's B2
|
||||
{
|
||||
source = "StorageBox:Backups";
|
||||
|
@ -78,11 +73,6 @@ in {
|
|||
dest = "B2-Phoenix-Cryptidz-Storage:Public";
|
||||
id = "phoenix_b2_public";
|
||||
}
|
||||
{
|
||||
source = "StorageBox:Notes";
|
||||
dest = "B2-Phoenix-Cryptidz-Storage:Notes";
|
||||
id = "phoenix_b2_notes";
|
||||
}
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
"api-keys/data/backblaze/Chaos-Public"
|
||||
"api-keys/data/backblaze/Chaos-Media"
|
||||
"api-keys/data/backblaze/Chaos-Gaming"
|
||||
"api-keys/data/backblaze/Chaos-Notes"
|
||||
"api-keys/data/backblaze/Phoenix-Cryptidz-Storage"
|
||||
|
||||
"api-keys/data/storage/restic/Music"
|
||||
|
@ -44,11 +43,9 @@
|
|||
"api-keys/data/storage/webdav/Public"
|
||||
"api-keys/data/storage/webdav/Uploads"
|
||||
"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-Gaming-Crypt"
|
||||
"private-public-keys/data/rclone/Chaos-Notes-Crypt"
|
||||
];
|
||||
|
||||
packages = with pkgs; [
|
||||
|
@ -238,13 +235,6 @@
|
|||
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 = {
|
||||
user = "storage";
|
||||
|
@ -262,7 +252,6 @@
|
|||
simple_get_replace_b2 "/api-keys/backblaze/Chaos-Music" "B2_CHAOS_MUSIC" "$secretFile"
|
||||
simple_get_replace_b2 "/api-keys/backblaze/Chaos-Personal" "B2_CHAOS_PERSONAL" "$secretFile"
|
||||
simple_get_replace_b2 "/api-keys/backblaze/Chaos-Public" "B2_CHAOS_PUBLIC" "$secretFile"
|
||||
simple_get_replace_b2 "/api-keys/backblaze/Chaos-Notes" "B2_CHAOS_NOTES" "$secretFile"
|
||||
simple_get_replace_b2 "/api-keys/backblaze/Phoenix-Cryptidz-Storage" "B2_PHOENIX_CRYPTIDZ_STORAGE" "$secretFile"
|
||||
|
||||
PUTIO_PASSWORD="token/$(simple_get /api-keys/putio .oauth_token)"
|
||||
|
@ -271,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-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