diff options
Diffstat (limited to 'Biz')
-rw-r--r-- | Biz/Dragons.nix | 15 | ||||
-rw-r--r-- | Biz/Dragons/Analysis.nix | 8 | ||||
-rw-r--r-- | Biz/Que/Host.nix | 16 | ||||
-rw-r--r-- | Biz/Que/Site.nix | 14 | ||||
-rw-r--r-- | Biz/Storybook.nix | 19 |
5 files changed, 43 insertions, 29 deletions
diff --git a/Biz/Dragons.nix b/Biz/Dragons.nix index 2530572..bd3be93 100644 --- a/Biz/Dragons.nix +++ b/Biz/Dragons.nix @@ -1,6 +1,11 @@ -{ options, lib, config, pkgs, ... }: - -let cfg = config.services.dragons; +{ + options, + lib, + config, + pkgs, + ... +}: let + cfg = config.services.dragons; in { options.services.dragons = { enable = lib.mkEnableOption "Enable the dragons service"; @@ -29,8 +34,8 @@ in { }; config = lib.mkIf cfg.enable { systemd.services.dragons = { - path = [ cfg.package pkgs.git ]; - wantedBy = [ "multi-user.target" ]; + path = [cfg.package pkgs.git]; + wantedBy = ["multi-user.target"]; preStart = '' mkdir -p ${cfg.keep} mkdir -p ${cfg.depo} diff --git a/Biz/Dragons/Analysis.nix b/Biz/Dragons/Analysis.nix index 9e59dee..1715610 100644 --- a/Biz/Dragons/Analysis.nix +++ b/Biz/Dragons/Analysis.nix @@ -1,17 +1,15 @@ -{ bild }: - +{bild}: # Run this like so: # # bild Biz/Dragons/Analysis.nix # docker load < _/nix/Biz/Dragons/Analysis.nix # docker run --volume $PWD:/src dragons-analyze dragons-analyze /src/.git - bild.image { name = "dragons-analyze"; tag = "latest"; fromImage = null; fromImageName = null; fromImageTag = "latest"; - contents = [ bild.pkgs.git (bild.run ./Analysis.hs) ]; - config.Cmd = [ "/bin/dragons-analyze" ]; + contents = [bild.pkgs.git (bild.run ./Analysis.hs)]; + config.Cmd = ["/bin/dragons-analyze"]; } diff --git a/Biz/Que/Host.nix b/Biz/Que/Host.nix index b6b533e..5de94f5 100644 --- a/Biz/Que/Host.nix +++ b/Biz/Que/Host.nix @@ -1,6 +1,10 @@ -{ options, lib, config, ... }: - -let cfg = config.services.que-server; +{ + options, + lib, + config, + ... +}: let + cfg = config.services.que-server; in { options.services.que-server = { enable = lib.mkEnableOption "Enable the que-server service"; @@ -19,8 +23,8 @@ in { }; config = lib.mkIf cfg.enable { systemd.services.que-server = { - path = [ cfg.package ]; - wantedBy = [ "multi-user.target" ]; + path = [cfg.package]; + wantedBy = ["multi-user.target"]; script = '' ${cfg.package}/bin/que-server ''; @@ -28,7 +32,7 @@ in { Que server ''; serviceConfig = { - Environment = [ "QUE_PORT=${toString cfg.port}" ]; + Environment = ["QUE_PORT=${toString cfg.port}"]; EnvironmentFile = "/run/que/env"; KillSignal = "INT"; Type = "simple"; diff --git a/Biz/Que/Site.nix b/Biz/Que/Site.nix index da51032..0c7da0c 100644 --- a/Biz/Que/Site.nix +++ b/Biz/Que/Site.nix @@ -1,6 +1,10 @@ -{ options, lib, config, pkgs, ... }: - -let +{ + options, + lib, + config, + pkgs, + ... +}: let cfg = config.services.que-website; static = pkgs.stdenv.mkDerivation { src = ./.; @@ -31,8 +35,8 @@ in { }; config = lib.mkIf cfg.enable { systemd.services.que-website = { - path = [ cfg.package pkgs.pandoc ]; - wantedBy = [ "multi-user.target" ]; + path = [cfg.package pkgs.pandoc]; + wantedBy = ["multi-user.target"]; script = '' ${cfg.package}/bin/que-website ${static} ${cfg.namespace} ''; diff --git a/Biz/Storybook.nix b/Biz/Storybook.nix index 692b4e9..147b789 100644 --- a/Biz/Storybook.nix +++ b/Biz/Storybook.nix @@ -1,6 +1,10 @@ -{ options, lib, config, pkgs, ... }: - -let +{ + options, + lib, + config, + pkgs, + ... +}: let cfg = config.services.storybook; rootDomain = "bensima.com"; ports = import ../Omni/Cloud/Ports.nix; @@ -27,8 +31,8 @@ in { }; config = lib.mkIf cfg.enable { systemd.services.storybook = { - path = [ cfg.package pkgs.git ]; - wantedBy = [ "multi-user.target" ]; + path = [cfg.package pkgs.git]; + wantedBy = ["multi-user.target"]; preStart = '' # these must be manually created test -d /run/storybook @@ -43,8 +47,7 @@ in { Storybook ''; serviceConfig = { - Environment = - [ "PORT=${toString cfg.port}" "AREA=Live" "DATA_DIR=${cfg.dataDir}" ]; + Environment = ["PORT=${toString cfg.port}" "AREA=Live" "DATA_DIR=${cfg.dataDir}"]; EnvironmentFile = "/run/storybook/env"; KillSignal = "INT"; Type = "simple"; @@ -73,6 +76,6 @@ in { }; }; - networking.firewall.allowedTCPPorts = [ ports.ssh ports.http ports.https ]; + networking.firewall.allowedTCPPorts = [ports.ssh ports.http ports.https]; }; } |