From 20c587bb5e40d0175c5c057eca09fd8776b4f8c0 Mon Sep 17 00:00:00 2001 From: GHOSCHT <31184695+GHOSCHT@users.noreply.github.com> Date: Thu, 13 Jun 2024 23:19:26 +0200 Subject: [PATCH] Arion: Remove docker samba prepares conversion to natively installed samba --- hosts/franz/arion/default.nix | 1 - hosts/franz/arion/nas/arion-compose.nix | 34 ------------------------- hosts/franz/arion/nas/arion-pkgs.nix | 6 ----- hosts/franz/arion/nas/default.nix | 12 --------- 4 files changed, 53 deletions(-) delete mode 100644 hosts/franz/arion/nas/arion-compose.nix delete mode 100644 hosts/franz/arion/nas/arion-pkgs.nix delete mode 100644 hosts/franz/arion/nas/default.nix diff --git a/hosts/franz/arion/default.nix b/hosts/franz/arion/default.nix index 999f309..856b13e 100644 --- a/hosts/franz/arion/default.nix +++ b/hosts/franz/arion/default.nix @@ -8,7 +8,6 @@ inputs.arion.nixosModules.arion ./dns ./infrastructure - ./nas ./nextcloud ./push ./git diff --git a/hosts/franz/arion/nas/arion-compose.nix b/hosts/franz/arion/nas/arion-compose.nix deleted file mode 100644 index 523401c..0000000 --- a/hosts/franz/arion/nas/arion-compose.nix +++ /dev/null @@ -1,34 +0,0 @@ -{pkgs, ...}: { - project.name = "nas"; - - networks.dmz = { - name = "dmz"; - external = true; - }; - - services = { - samba.service = { - image = "dperson/samba"; - container_name = "samba"; - ports = [ - "137:137/udp" - "138:138/udp" - "139:139/tcp" - "445:445/tcp" - ]; - environment = { - USERID = 1000; - GROUPID = 1000; - TZ = "Europe/Berlin"; - }; - command = "-s 'public;/mount;yes;no;yes' -p"; - volumes = [ - "/storage/dataset/nas:/mount" - ]; - restart = "always"; - networks = [ - "dmz" - ]; - }; - }; -} diff --git a/hosts/franz/arion/nas/arion-pkgs.nix b/hosts/franz/arion/nas/arion-pkgs.nix deleted file mode 100644 index 69aad13..0000000 --- a/hosts/franz/arion/nas/arion-pkgs.nix +++ /dev/null @@ -1,6 +0,0 @@ -# Instead of pinning Nixpkgs, we can opt to use the one in NIX_PATH -import { - # We specify the architecture explicitly. Use a Linux remote builder when - # calling arion from other platforms. - system = "x86_64-linux"; -} diff --git a/hosts/franz/arion/nas/default.nix b/hosts/franz/arion/nas/default.nix deleted file mode 100644 index f533dd5..0000000 --- a/hosts/franz/arion/nas/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - networking.firewall = { - allowedUDPPorts = [137 138]; - allowedTCPPorts = [139 445]; - }; - - virtualisation.arion = { - projects.nas.settings = { - imports = [./arion-compose.nix]; - }; - }; -}