steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'pr/bump-vmd32387' into 'master'

Browse source 
Pr/bump vmd32387

See merge request steveeJ/infra!57
This commit is contained in:
steveej 2020-10-16 22:15:15 +00:00
commit 8afc9ca159
3 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
nix/os/containers/backup.nix
View file

@ -46,7 +46,7 @@ let
script = '' script = ''
export PATH="$PATH:/run/wrappers/bin" export PATH="$PATH:/run/wrappers/bin"
exec rclone --config ${wasabiRc pkgs} mount wasabi-${bucket}:${bucket} ${bkpDestination} \ exec rclone --config ${wasabiRc pkgs} mount wasabi-${bucket}:${bucket} ${bkpDestination} \
--stats=1m --stats-log-level=NOTICE \ --stats=50m --stats-log-level=NOTICE \
--cache-dir=${cacheDir} \ --cache-dir=${cacheDir} \
--vfs-cache-mode=full --vfs-cache-mode=full
@ -105,7 +105,7 @@ in {
echo Starting rclone sync... echo Starting rclone sync...
rclone --config ${wasabiRc pkgs} sync \ rclone --config ${wasabiRc pkgs} sync \
${bkpDestination}/rdedup/ wasabi-${bucket}:${bucket}/rdedup/ \ ${bkpDestination}/rdedup/ wasabi-${bucket}:${bucket}/rdedup/ \
--stats=1m --stats-log-level=NOTICE --stats=50m --stats-log-level=WARNING
echo Finished rclone sync... echo Finished rclone sync...
''; '';
}; };
@ -162,11 +162,12 @@ in {
enable = true; enable = true;
wantedBy = [ "timer.target" "multi-user.target" ]; wantedBy = [ "timer.target" "multi-user.target" ];
timerConfig = { timerConfig = {
OnCalendar = "23:00"; # Obtained using `systemd-analyze calendar "Wed 23:00"`
# OnCalendar = "Wed *-*-* 23:00:00";
OnStartupSec="2d";
Unit = "bkp-sync-rclone.service"; Unit = "bkp-sync-rclone.service";
# OnActiveSec="1s"; OnUnitInactiveSec="2d";
# OnUnitInactiveSec="12h"; Persistent="true";
# AccuracySec="5s";
}; };
}; };
}; };

4
nix/os/devices/vmd32387.contaboserver.net/system.nix
View file

@ -77,6 +77,10 @@ in {
}; };
}; };
nix.gc = {
automatic = true;
};
boot.initrd.network = { boot.initrd.network = {
enable = true; enable = true;
udhcpc.extraArgs = [ "-x hostname:${config.networking.hostName}" ]; udhcpc.extraArgs = [ "-x hostname:${config.networking.hostName}" ];

8
nix/os/devices/vmd32387.contaboserver.net/versions.nix
View file

@ -1,20 +1,20 @@
{ {
channelsNixosStable = { channelsNixosStable = {
ref = "nixos-20.03"; ref = "nixos-20.03";
rev = "252bfe0107587d40092057f338e9ffcf7bbd90cb"; rev = "ff6fda61600cc60404bab5cb6b18b8636785b7bc";
}; };
channelsNixosUnstable = { channelsNixosUnstable = {
ref = "nixos-unstable"; ref = "nixos-unstable";
rev = "e0759a49733dfc3aa225b8a7423c00da6e1ecb67"; rev = "84d74ae9c9cbed73274b8e4e00be14688ffc93fe";
}; };
nixpkgsMaster = { nixpkgsMaster = {
url = "https://github.com/NixOS/nixpkgs/"; url = "https://github.com/NixOS/nixpkgs/";
ref = "master"; ref = "master";
rev = "00bf6abad17bd07c29576f382d77797a973f3be1"; rev = "50e986ba967811afdb5edb3b6eda4369059e4238";
}; };
homeManagerModule = { homeManagerModule = {
url = "https://github.com/rycee/home-manager"; url = "https://github.com/rycee/home-manager";
ref = "release-20.03"; ref = "release-20.03";
rev = "4a8d6280544d9b061c0b785d2470ad6eeda47b02"; rev = "e6f96b6aa3e99495f9f6f3488ecf78dd316e5bec";
}; };
} }