remove hetznervm restic from storage, fix git name
This commit is contained in:
parent
d58fa2e1bb
commit
d707766e0b
|
@ -3,7 +3,7 @@
|
||||||
enable = true;
|
enable = true;
|
||||||
lfs.enable = true;
|
lfs.enable = true;
|
||||||
package = pkgs.gitAndTools.gitFull;
|
package = pkgs.gitAndTools.gitFull;
|
||||||
userName = "Chaos";
|
userName = "chaos";
|
||||||
userEmail = "chaoticryptidz@owo.monster";
|
userEmail = "chaoticryptidz@owo.monster";
|
||||||
extraConfig = {credential = {helper = "store";};};
|
extraConfig = {credential = {helper = "store";};};
|
||||||
};
|
};
|
||||||
|
|
|
@ -3,13 +3,12 @@
|
||||||
rclone_serve_webdav_media = 4201;
|
rclone_serve_webdav_media = 4201;
|
||||||
rclone_serve_webdav_music_ro = 4202;
|
rclone_serve_webdav_music_ro = 4202;
|
||||||
|
|
||||||
rclone_serve_restic_hvm = 4210;
|
rclone_serve_restic_music = 4210;
|
||||||
rclone_serve_restic_music = 4211;
|
rclone_serve_restic_vault = 4211;
|
||||||
rclone_serve_restic_vault = 4212;
|
rclone_serve_restic_social = 4212;
|
||||||
rclone_serve_restic_social = 4213;
|
rclone_serve_restic_quassel = 4213;
|
||||||
rclone_serve_restic_quassel = 4214;
|
rclone_serve_restic_piped = 4214;
|
||||||
rclone_serve_restic_piped = 4215;
|
rclone_serve_restic_mail = 4215;
|
||||||
rclone_serve_restic_mail = 4216;
|
|
||||||
|
|
||||||
rclone_serve_http_music = 4220;
|
rclone_serve_http_music = 4220;
|
||||||
rclone_serve_http_public = 4221;
|
rclone_serve_http_public = 4221;
|
||||||
|
|
|
@ -77,17 +77,6 @@ in {
|
||||||
];
|
];
|
||||||
inherit serviceConfig;
|
inherit serviceConfig;
|
||||||
}
|
}
|
||||||
{
|
|
||||||
user = "storage";
|
|
||||||
remote = "StorageBox:Backups/Restic/HetznerVM";
|
|
||||||
type = "restic";
|
|
||||||
extraArgs = [
|
|
||||||
"--addr=0.0.0.0:${toString ports.rclone_serve_restic_hvm}"
|
|
||||||
"--htpasswd=${secrets.restic_hetznervm_htpasswd.path}"
|
|
||||||
"--baseurl=/HetznerVM/"
|
|
||||||
];
|
|
||||||
inherit serviceConfig;
|
|
||||||
}
|
|
||||||
{
|
{
|
||||||
user = "storage";
|
user = "storage";
|
||||||
remote = "StorageBox:Backups/Restic/Music";
|
remote = "StorageBox:Backups/Restic/Music";
|
||||||
|
|
|
@ -44,15 +44,6 @@
|
||||||
secrets = {
|
secrets = {
|
||||||
vault_password = {manual = true;};
|
vault_password = {manual = true;};
|
||||||
|
|
||||||
restic_hetznervm_htpasswd = {
|
|
||||||
user = "storage";
|
|
||||||
group = "storage";
|
|
||||||
fetchScript = ''
|
|
||||||
username=$(simple_get "/api-keys/storage/restic/HetznerVM" .username)
|
|
||||||
password=$(simple_get "/api-keys/storage/restic/HetznerVM" .password)
|
|
||||||
htpasswd -bc "$secretFile" "$username" "$password" 2>/dev/null
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
restic_music_htpasswd = {
|
restic_music_htpasswd = {
|
||||||
user = "storage";
|
user = "storage";
|
||||||
group = "storage";
|
group = "storage";
|
||||||
|
|
|
@ -95,7 +95,6 @@ in {
|
||||||
forceSSL = true;
|
forceSSL = true;
|
||||||
enableACME = true;
|
enableACME = true;
|
||||||
locations = {
|
locations = {
|
||||||
"/HetznerVM/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_hvm}";
|
|
||||||
"/Music/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_music}";
|
"/Music/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_music}";
|
||||||
"/Vault/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_vault}";
|
"/Vault/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_vault}";
|
||||||
"/Social/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_social}";
|
"/Social/".proxyPass = "http://${containerIP}:${toString ports.rclone_serve_restic_social}";
|
||||||
|
|
|
@ -13,7 +13,7 @@ in {
|
||||||
OnCalendar = "daily";
|
OnCalendar = "daily";
|
||||||
};
|
};
|
||||||
# env contains fixed repository with auth
|
# env contains fixed repository with auth
|
||||||
repository = "rest:https://storage-restic.owo.monster/HetznerVM";
|
repository = "rest:https://storage-restic.owo.monster/Vault";
|
||||||
passwordFile = "${secrets.restic_password.path}";
|
passwordFile = "${secrets.restic_password.path}";
|
||||||
environmentFile = "${secrets.restic_env.path}";
|
environmentFile = "${secrets.restic_env.path}";
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue