From c6f1f73d2f30104252e9cccb5c602c04cb9d955b Mon Sep 17 00:00:00 2001 From: nomadics9 Date: Fri, 8 Nov 2024 10:57:47 +0300 Subject: [PATCH] home-manager backup and switch automatically in installer --- flake.lock | 8 ++-- hosts/vps/configuration.nix | 85 ++++++++++++++++++++----------------- install.sh | 3 +- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/flake.lock b/flake.lock index 13b555d..6aed820 100644 --- a/flake.lock +++ b/flake.lock @@ -44,11 +44,11 @@ "dotfiles": { "flake": false, "locked": { - "lastModified": 1730844540, - "narHash": "sha256-OL0TyXU/oYPplHg7t3OT/acL4oqhjmUJMgD+cX9CAlg=", + "lastModified": 1730924096, + "narHash": "sha256-dGmEcwL5L8X8lDNxDYkpIORTOI+H+bfz5tj992sIImc=", "ref": "refs/heads/main", - "rev": "efcb87e599560b6cd86cbfc861108528257bdcbc", - "revCount": 52, + "rev": "e52d84e1eaca3dc19827df84590af70d08afb1e0", + "revCount": 56, "type": "git", "url": "https://github.com/nomadics9/dotfiles.git" }, diff --git a/hosts/vps/configuration.nix b/hosts/vps/configuration.nix index adda4f1..1b03c56 100644 --- a/hosts/vps/configuration.nix +++ b/hosts/vps/configuration.nix @@ -47,51 +47,56 @@ # Reverse proxy configuration for each domain extraConfig = '' - (logging) { - log { - output file /var/log/caddy/{args[0]}.log { - roll_size 50mb - roll_keep 5 - roll_keep_for 720h - } + (logging) { + log { + output file /var/log/caddy/{args[0]}.log { + roll_size 50mb + roll_keep 5 + roll_keep_for 720h } - } - - fs.nmd.mov { - reverse_proxy localhost:5000 - import logging fs - } - - vpn.nmd.mov { - reverse_proxy localhost:51821 - import logging vpn - } - - s.nmd.mov { - reverse_proxy localhost:8384 - import logging s - } - - drop.nmd.mov { - reverse_proxy localhost:3000 - import logging drop - } - - dot.nmd.mov { - reverse_proxy localhost:19999 - - basic_auth /* { - nomad $2a$12$toBh5sfXyxigtHGNY4t8tO7YYQp6i3aZk/O0qd19lgk0LRz5eqDVi } + } + + fs.nmd.mov { + reverse_proxy localhost:5000 + import logging fs + } + + vpn.nmd.mov { + reverse_proxy localhost:51821 + import logging vpn + } + + s.nmd.mov { + reverse_proxy localhost:8384 + import logging s + } + + drop.nmd.mov { + reverse_proxy localhost:3000 + import logging drop + } + + dot.nmd.mov { + reverse_proxy localhost:19999 + + basic_auth /* { + nomad $2a$12$toBh5sfXyxigtHGNY4t8tO7YYQp6i3aZk/O0qd19lgk0LRz5eqDVi } + } - dash.nmd.mov { - reverse_proxy localhost:8080 - } + dash.nmd.mov { + reverse_proxy localhost:8080 + } - nmd.mov { - root * /var/www/goaccess + nmd.mov { + reverse_proxy localhost:3001 + } + + + www.nmd.mov { + root * /var/www/goaccess file_server @@ -99,7 +104,7 @@ reverse_proxy /ws_drop localhost:7891 reverse_proxy /ws_vpn localhost:7892 reverse_proxy /ws_sync localhost:7893 - + basic_auth /* { nomad $2a$12$toBh5sfXyxigtHGNY4t8tO7YYQp6i3aZk/O0qd19lgk0LRz5eqDVi } diff --git a/install.sh b/install.sh index 9a754e8..1cd3ad8 100755 --- a/install.sh +++ b/install.sh @@ -183,7 +183,8 @@ echo -e "$GREEN Configuration has been updated with your preferences $ENDCOLOR" sleep 2 git add . - nixos-rebuild boot --flake .#unkown + nixos-rebuild switch --flake .#unkown + home-manager switch -b --flake .#${new_user}@${new_hostname} echo -e "$GREEN Reboot after completion your initial password is 4321 $ENDCOLOR"