containers/vsftpd.nix

@@ -0,0 +1,77 @@
+{ config, pkgs, ... }:
+{
+  containers.vsftpd = {
+    autoStart = true;
+    config =
+      { config, pkgs, ... }:
+      {
+        services.vsftpd = {
+          enable = true;
+          forceLocalLoginsSSL = true;
+          forceLocalDataSSL = true;
+          userlistDeny = false;
+          localUsers = true;
+          userlist = ["claire" "manu" "lakeu" "fusil" "stryxion" "nico"];
+          rsaCertFile = "/var/lib/acme/nyanlout.re/full.pem";
+          localRoot = "/mnt/medias";
+          extraConfig = ''
+            pasv_min_port=64000
+            pasv_max_port=65535
+            pam_service_name=vsftpd
+          '';
+        };
+
+        users.extraUsers = {
+          claire = {
+            isNormalUser = true;
+            hashedPassword = "$6$DjEjaibh$cRoOEHH.CjUgXXwyVphgnOGMhD3AVjPtawQb9BxvNSmWNqfcxoNH.6HhdxYa7PM0y0yctYXjsAc.vnkIov/NA/";
+            description = "Claire TREHIOU";
+          };
+
+          manu = {
+            isNormalUser = true;
+            hashedPassword = "$6$YGNIdGEclo$JcUotBS6hqlpENjjUeYhDjtrwxu10oARF4Nq4tEo072Sumr3Rl/w3ZXSHI5/3RxfvUMmJ4ulUVctBLhwrqP.g0";
+            description = "Emmanuel ZENNER";
+          };
+
+          lakeu = {
+            isNormalUser = true;
+            hashedPassword = "$6$Y7Rohw3xMzCGp$DVTZVAQccBeM/iVUH1IOgkXUohWjTvujNuvekezWS3vdEm1BUxkYZqH2ECHj5DN.ZiGFjJHhBh7PpbE8GDxSz.";
+            description = "Lakeu";
+          };
+
+          fusil = {
+            isNormalUser = true;
+            hashedPassword = "$6$HndxtEEO1w4$FC6rXf1h98tyt0Ay670iz1jbaNj8vKwH8BHYf3vsbSennA63r94x67I5KxmVOxOIEbIf55zIWFsM8GpyJ9K6Y/";
+            description = "Fusil";
+          };
+
+          stryxion = {
+            isNormalUser = true;
+            hashedPassword = "$6$KZKwBLI6yGuvFg2Q$VCfSnhAacgxlxybTyuCDyNQ2InM8ppG3aa3Bw176TiNAX8tHWUpKesfI9YfcCoGAi1zSzA7b6uC8BmmfrQwg1.";
+            description = "Stryxion";
+          };
+
+          nico = {
+            isNormalUser = true;
+            hashedPassword = "$6$.sMznhhJ0fG2qx$XevsEqsjlLAnu/VMgeA6B5YfWY36dUZXtUGiEgPueHzRcfAEi2UXLWRHqcN6AsW1AozepeAP6/lZW3fDAyULA1";
+            description = "MAGENI";
+          };
+
+          sli = {
+            isNormalUser = true;
+            hashedPassword = "$6$ewTJHnkTpnw56$askXnJP9iX6.S5IgsSXvlcJA7ncLosPYVIw3TcOlRuK/z8UcFYqVlLX5uDJ.W6DiJ1Uk6FVfbL0jDL2ac22Mx0";
+            description = "Sli";
+          };
+        };
+      };
+    bindMounts = {
+      "/var/lib/acme/nyanlout.re" = {
+        hostPath = "/var/lib/acme/nyanlout.re";
+      };
+      "/mnt/medias" = {
+        hostPath = "/mnt/medias";
+      };
+    };
+  };
+}

flake.lock

@@ -1,31 +1,12 @@
 {
   "nodes": {
-    "dogetipbot-telegram": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1634893013,
-        "narHash": "sha256-6vcnuqNvg49PN+4FePU50CQpdy5dPbj7+58wD7duRlw=",
-        "owner": "nyanloutre",
-        "repo": "dogetipbot-telegram",
-        "rev": "8807fb1a2a8f2d965618e72daf300eba0233327b",
-        "type": "gitlab"
-      },
-      "original": {
-        "owner": "nyanloutre",
-        "ref": "master",
-        "repo": "dogetipbot-telegram",
-        "type": "gitlab"
-      }
-    },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1627805549,
+        "lastModified": 1634758644,
-        "narHash": "sha256-+LHhcpzw6vAxF6q0VSLkZSEGpDC02JN21KM8eUWz+is=",
+        "narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16bf3980bfa0d8929639be93fa8491ebad9d61ec",
+        "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3",
         "type": "github"
       },
       "original": {
@@ -66,21 +47,6 @@
       }
     },
     "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1634758644,
-        "narHash": "sha256-H3UW/msC6wadg28lcgZv2Ge/P7dWxesL6i37a0GOeyM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "70904d4a9927a4d6e05c72c4aaac4370e05107f3",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-21.05",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_3": {
       "locked": {
         "lastModified": 1607522989,
         "narHash": "sha256-o/jWhOSAlaK7y2M57OIriRt6whuVVocS/T0mG7fd1TI=",
@@ -97,8 +63,7 @@
     },
     "root": {
       "inputs": {
-        "dogetipbot-telegram": "dogetipbot-telegram",
+        "nixpkgs": "nixpkgs",
-        "nixpkgs": "nixpkgs_2",
         "nixpkgs-nyanloutre-pysmart": "nixpkgs-nyanloutre-pysmart",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "simple-nixos-mailserver": "simple-nixos-mailserver"
@@ -106,7 +71,7 @@
     },
     "simple-nixos-mailserver": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_2",
         "utils": "utils"
       },
       "locked": {

flake.nix

@@ -4,10 +4,9 @@
     nixpkgs-unstable.url = "flake:nixpkgs/nixos-unstable";
     nixpkgs-nyanloutre-pysmart.url = "github:nyanloutre/nixpkgs/pysmart-init";
     simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-21.05";
-    dogetipbot-telegram.url = "gitlab:nyanloutre/dogetipbot-telegram/master";
   };
 
-  outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, dogetipbot-telegram, nixpkgs-nyanloutre-pysmart }: {
+  outputs = { self, nixpkgs, nixpkgs-unstable, simple-nixos-mailserver, nixpkgs-nyanloutre-pysmart }: {
     nixosConfigurations.loutreos = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
@@ -19,7 +18,6 @@
         nixpkgs.nixosModules.notDetected
         "${nixpkgs-unstable}/nixos/modules/services/audio/navidrome.nix"
         simple-nixos-mailserver.nixosModule
-        dogetipbot-telegram.nixosModule
         ./systems/LoutreOS/configuration.nix
         ({ pkgs, ... }: {
           systemd.services.ipmihddtemp = {

pkgs/site-max/default.nix

@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchFromGitHub, sassc }:
+
+stdenv.mkDerivation rec {
+  name= "site-max-${version}";
+  version = "1.0.1";
+
+  src = fetchFromGitHub {
+    owner = "nyanloutre";
+    repo = "site-max";
+    rev = "85e30457291e6a1dfe85a5d7a78f226657bad279";
+    sha256 = "0fj5w43gcvp0gq0xlknrf6yp0b48wg01686wp02fjc9npm424g0v";
+  };
+
+  buildPhase = ''
+    ${sassc}/bin/sassc -m auto -t compressed scss/creative.scss css/creative.css
+  '';
+
+  installPhase = ''
+    mkdir -p $out/
+    cp -R . $out/
+  '';
+
+  meta = {
+    description = "Site de présentation de Max Spiegel";
+    homepage = https://maxspiegel.fr/;
+    maintainers = with stdenv.lib.maintainers; [ nyanloutre ];
+    license = stdenv.lib.licenses.cc-by-nc-sa-40;
+    platforms = stdenv.lib.platforms.all;
+  };
+}

systems/LoutreOS/services.nix

@@ -28,6 +28,7 @@ in
   imports = [
     ../../services/python-ci.nix
     ../../services/sdtdserver.nix
+    # ../../containers/vsftpd.nix
     # /mnt/secrets/factorio_secrets.nix
     ./monitoring.nix
     ./medias.nix
@@ -674,7 +675,23 @@ in
     };
   };
 
-  dogetipbot-telegram.enable = true;
+  systemd.services.dogetipbot-telegram = let
+    dogetipbot-telegram = pkgs.callPackage (pkgs.fetchgit {
+      url = "https://gitlab.com/nyanloutre/dogetipbot-telegram.git";
+      rev = "18c875a2e4b98221523818515a1eecb9c5aeb093";
+      sha256 = "0mhv00y1c2py425wxl13if6nlv97xk5k6flf772jj1yaxipjdmpn";
+    }) { inherit pkgs; };
+  in {
+    after = [ "network.target" ];
+    wantedBy = [ "multi-user.target" ];
+    script = "${dogetipbot-telegram}/bin/dogetipbot-telegram --db-path $STATE_DIRECTORY/users.db";
+    enable = true;
+    serviceConfig = {
+      EnvironmentFile = "/mnt/secrets/dogetipbot-telegram_env";
+      DynamicUser = true;
+      StateDirectory = "dogetipbot";
+    };
+  };
 
   # systemd.services.minecraft-overviewer =
   # let