diff --git a/Makefile b/Makefile index 69b63fc..bfcca3a 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ build-pi-image: # Doest work yet rebuild-pi: - nixos-rebuild switch --flake .#pi --target-host pi --build-host server --use-remote-sudo + NIX_SSHOPTS="-o IdentitiesOnly=yes -i ~/.ssh/id_rsa" nixos-rebuild switch --flake .#pi --target-host pi --build-host server --use-remote-sudo deploy-server: nixos-rebuild switch --flake .#server --target-host server --build-host server --use-remote-sudo diff --git a/devices/pi/configuration.nix b/devices/pi/configuration.nix index 863d948..98ff71f 100644 --- a/devices/pi/configuration.nix +++ b/devices/pi/configuration.nix @@ -47,7 +47,7 @@ in { services.caddy = { enable = true; virtualHosts."mealie.polensky.me".extraConfig = '' - reverse_proxy http://localhost:9925 + reverse_proxy http://192.168.1.242:9000 ''; }; @@ -61,17 +61,13 @@ in { environment.systemPackages = with pkgs; [ htop-vim neovim - tmux curl wget - git ranger ]; services.openssh.enable = true; - virtualisation.docker.enable = true; - users = { mutableUsers = false; users."${user}" = { diff --git a/devices/server/configuration.nix b/devices/server/configuration.nix index 65e260a..8e94352 100644 --- a/devices/server/configuration.nix +++ b/devices/server/configuration.nix @@ -62,6 +62,18 @@ in { inherit user; enable = true; }; + mealie = { + enable = true; + settings = { + ALLOW_SIGNUP = "false"; + PUID = 1000; + PGID = 1000; + TZ = "Canada/Eastern"; + MAX_WORKERS = 1; + WEB_CONCURRENCY = 1; + #BASE_URL = "https://mealie.polensky.me"; + }; + }; }; networking = { @@ -70,15 +82,14 @@ in { 8096 # jellyfin 9091 # transmission 9090 # prometheus + 9000 # mealie 10222 # taskchampion-sync-server ]; }; time.timeZone = "America/Toronto"; - users.users.user = { - isNormalUser = true; - description = user; + users.users."${user}" = { extraGroups = ["wheel" "transmission" "jellyfin"]; shell = pkgs.zsh; openssh.authorizedKeys.keys = [