diff options
| author | stuebinm | 2022-12-05 16:37:27 +0100 |
|---|---|---|
| committer | stuebinm | 2022-12-05 16:37:27 +0100 |
| commit | 8a10ea437cf74619865e0966f8be8f16e6cba938 (patch) | |
| tree | 3f6d07986d3eb2963114739ccfab6ad0756fa443 /flora | |
| parent | 64546ed6399d49ff125ee667b9632825eb3ccba5 (diff) | |
update to nixos22.11
Diffstat (limited to 'flora')
| -rw-r--r-- | flora/configuration.nix | 3 | ||||
| -rw-r--r-- | flora/hardware-configuration.nix | 2 | ||||
| -rw-r--r-- | flora/services/daemoniones.nix | 34 |
3 files changed, 1 insertions, 38 deletions
diff --git a/flora/configuration.nix b/flora/configuration.nix index 07d1049..7e733e2 100644 --- a/flora/configuration.nix +++ b/flora/configuration.nix @@ -3,12 +3,9 @@ { imports = [ ./hardware-configuration.nix - # ./services/hedgedoc.nix - #./services/daemoniones.nix ./services/nginx.nix ./services/pleroma.nix ./services/cgit.nix - # ./services/surveys.nix #./services/picarones.nix ./services/dockerhub.nix ./services/blog.nix diff --git a/flora/hardware-configuration.nix b/flora/hardware-configuration.nix index 2ce21f4..4dce1d1 100644 --- a/flora/hardware-configuration.nix +++ b/flora/hardware-configuration.nix @@ -20,6 +20,6 @@ swapDevices = [ ]; - nix.maxJobs = lib.mkDefault 1; + nix.settings.max-jobs = lib.mkDefault 1; } diff --git a/flora/services/daemoniones.nix b/flora/services/daemoniones.nix deleted file mode 100644 index ae9d3cb..0000000 --- a/flora/services/daemoniones.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, ...}: - -{ - systemd.services = - let simpledaemon = name: command: { - enable = true; - description = name; - wantedBy = [ "multi-user.target" ]; - serviceConfig.Type = "simple"; - script = command; - }; - in { - choclo = simpledaemon "choclo signalling server" "/root/simple-signalling/target/release/chaski -b 127.0.0.1:5000"; - wasi = simpledaemon "wasi backend" "/root/wasi-minimal/target/release/wasi"; -# picarones = simpledaemon "picarones backend" "/root/picarones-server/target/release/picarones -b 127.0.0.1:6000"; - }; - - services.nginx = { - virtualHosts = - let websocketproxy = addr: { - locations."/".proxyPass = addr; - forceSSL = true; - enableACME = true; - locations."/".proxyWebsockets = true; - }; - in { - "wasi.stuebinm.eu" = websocketproxy "http://127.0.0.1:9000"; - "choclo.stuebinm.eu" = websocketproxy "http://127.0.0.1:5000"; -# "picarones.stuebinm.eu" = websocketproxy "http://127.0.0.1:6000"; - }; - }; - - -} |