Add nice server roles (not ready yet)

README.md

@@ -64,6 +64,9 @@ curl https://iva.bz/nix | sh
 ## TODO
 
 - Setup services (which I host)
+  - [x] ivabus.dev
+  - [ ] iva.bz
+  - [ ] ивабус.рф
 - Setup "secret" roles (I need them)
 - Setup router
 

machines/celerrime/default.nix

@@ -27,6 +27,10 @@ in {
     torrent.enable = true;
     virtualisation.enable = false;
     yggdrasil-client.enable = true;
+
+    server = {
+      ivabus-dev.enable = true;
+    };
   };
 
   networking.useDHCP = true;
@@ -40,23 +44,5 @@ in {
     (retroarch.override { cores = with libretro; [ np2kai ];})
   ];
 
-  services.nginx = {
-    enable = true;
-    # Use recommended settings
-    recommendedGzipSettings = true;
-    recommendedOptimisation = true;
-    recommendedProxySettings = true;
-    recommendedTlsSettings = true;
-
-    virtualHosts."ivabus.dev" = {
-      # i don't want to call package like this
-      root = pkgs.callPackage ../../pkgs/ivabus-dev.nix {};
-
-      extraConfig = ''
-        error_page 404 /404.html;
-      '';
-    };
-  };
-
   system.stateVersion = "23.05";
 }

pkgs/ivabus-dev.nix

@@ -1,6 +1,6 @@
 { pkgs ? import <nixpkgs> {}, bundlerEnv, ... }:
 let
-  version = "025b56be08da939ad016dcacfb833b8652d2848e";
+  version = "130812885aee9f2e0a5f6a4b534a3b6b68431554";
   repo = builtins.fetchGit {
     url = "https://github.com/ivabus/website";
     rev = version;

roles/default.nix

@@ -10,5 +10,8 @@
     ./torrent.nix
     ./virtualisation.nix
     ./yggdrasil-client.nix
+
+    ./server/nginx.nix
+    ./server/ivabus-dev.nix
   ];
 }

roles/server/ivabus-dev.nix

@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.roles.server.ivabus-dev;
+in
+{
+	options.my.roles.server.ivabus-dev.enable = lib.mkEnableOption "Serve ivabus.dev";
+  config = lib.mkIf (cfg.enable) {
+    my.roles.server.nginx.enable = true;
+    services.nginx = {
+      virtualHosts."ivabus.dev" = {
+        # i don't want to call package like this
+        root = pkgs.callPackage ../../pkgs/ivabus-dev.nix {};
+
+        extraConfig = ''
+          error_page 404 /404.html;
+        '';
+      };
+    };
+  };
+}

roles/server/nginx.nix

@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.roles.server.nginx;
+in
+{
+  # Don't call from machine setup, services will enable it automatically
+	options.my.roles.server.nginx.enable = lib.mkEnableOption "Initial nginx setup";
+  config = lib.mkIf (cfg.enable) {
+    services.nginx = {
+      enable = true;
+      recommendedGzipSettings = true;
+      recommendedOptimisation = true;
+      recommendedProxySettings = true;
+      recommendedTlsSettings = true;
+    };
+  };
+}