chaos/nixfiles
1
0
Fork 0
Code Issues 2 Releases Activity

Compare commits

base: chaos:fef99021b9b6ac08f7a3d3caab10c3fa861a8bbb
Branches Tags
chaos:vixen
chaos:feature-notes-webdav
..
compare: chaos:2cb1599acc2b71006813ed16824ec5a5d6a2c471
Branches Tags
chaos:vixen
chaos:feature-notes-webdav

No commits in common. "fef99021b9b6ac08f7a3d3caab10c3fa861a8bbb" and "2cb1599acc2b71006813ed16824ec5a5d6a2c471" have entirely different histories.
fef99021b9 ... 2cb1599acc

6 changed files with 4 additions and 54 deletions
Show stats Expand all files Collapse all files

1
hosts/hetzner-arm/containers/storage/data/ports.nix
View file

@ -9,7 +9,6 @@ in {
webdav_public = webdav + 3; webdav_public = webdav + 3;
webdav_uploads = webdav + 4; webdav_uploads = webdav + 4;
webdav_gaming = webdav + 5; webdav_gaming = webdav + 5;
webdav_notes = webdav + 6;
restic_music = restic + 0; restic_music = restic + 0;
restic_vault = restic + 1; restic_vault = restic + 1;

16
hosts/hetzner-arm/containers/storage/data/rclone_config.template
View file

@ -82,16 +82,6 @@ hard_delete = true
type = alias type = alias
remote = B2-Chaos-Public-Source:Chaos-Public 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] [B2-Phoenix-Cryptidz-Storage-Source]
type = b2 type = b2
account = B2_PHOENIX_CRYPTIDZ_STORAGE_ACCOUNT account = B2_PHOENIX_CRYPTIDZ_STORAGE_ACCOUNT
@ -154,9 +144,3 @@ password2 = STORAGE_GAMING_CRYPT_SALT
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

1
hosts/hetzner-arm/containers/storage/default.nix
View file

@ -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};

10
hosts/hetzner-arm/containers/storage/profiles/rcloneServe.nix
View file

@ -93,16 +93,6 @@ in {
"--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/"
];
}
{ {
id = "music-ro"; id = "music-ro";
remote = "StorageBox:Music"; remote = "StorageBox:Music";

10
hosts/hetzner-arm/containers/storage/profiles/rcloneSync.nix
View file

@ -47,11 +47,6 @@ in {
dest = "B2-Chaos-Public:"; dest = "B2-Chaos-Public:";
id = "chaos_b2_public"; id = "chaos_b2_public";
} }
{
source = "StorageBox:Notes";
dest = "B2-Chaos-Notes:";
id = "chaos_notes_public";
}
# Pheonix System's B2 # Pheonix System's B2
{ {
source = "StorageBox:Backups"; source = "StorageBox:Backups";
@ -78,11 +73,6 @@ in {
dest = "B2-Phoenix-Cryptidz-Storage:Public"; dest = "B2-Phoenix-Cryptidz-Storage:Public";
id = "phoenix_b2_public"; id = "phoenix_b2_public";
} }
{
source = "StorageBox:Notes";
dest = "B2-Phoenix-Cryptidz-Storage:Notes";
id = "phoenix_b2_notes";
}
]; ];
}; };
} }

12
hosts/hetzner-arm/containers/storage/secrets.nix
View file

@ -23,7 +23,6 @@
"api-keys/data/backblaze/Chaos-Public" "api-keys/data/backblaze/Chaos-Public"
"api-keys/data/backblaze/Chaos-Media" "api-keys/data/backblaze/Chaos-Media"
"api-keys/data/backblaze/Chaos-Gaming" "api-keys/data/backblaze/Chaos-Gaming"
"api-keys/data/backblaze/Chaos-Notes"
"api-keys/data/backblaze/Phoenix-Cryptidz-Storage" "api-keys/data/backblaze/Phoenix-Cryptidz-Storage"
"api-keys/data/storage/restic/Music" "api-keys/data/storage/restic/Music"
@ -44,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; [
@ -238,13 +235,6 @@
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";
@ -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-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-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-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" 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)" 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-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"
''; '';
}; };
}; };