Allow nonfree packages (to keep being able to install nomad).

flake.lock

@@ -9,11 +9,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1704875591,
+        "lastModified": 1711973905,
-        "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=",
+        "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b",
+        "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b",
         "type": "github"
       },
       "original": {
@@ -40,11 +40,11 @@
     },
     "impermanence": {
       "locked": {
-        "lastModified": 1706639736,
+        "lastModified": 1708968331,
-        "narHash": "sha256-CaG4j9+UwBDfinxxvJMo6yOonSmSo0ZgnbD7aj2Put0=",
+        "narHash": "sha256-VUXLaPusCBvwM3zhGbRIJVeYluh2uWuqtj4WirQ1L9Y=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "cd13c2917eaa68e4c49fea0ff9cada45440d7045",
+        "rev": "a33ef102a02ce77d3e39c25197664b7a636f9c30",
         "type": "github"
       },
       "original": {
@@ -55,11 +55,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707091808,
+        "lastModified": 1712310679,
-        "narHash": "sha256-LahKBAfGbY836gtpVNnWwBTIzN7yf/uYM/S0g393r0Y=",
+        "narHash": "sha256-XgC/a/giEeNkhme/AV1ToipoZ/IVm1MV2ntiK4Tm+pw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9f2ee8c91ac42da3ae6c6a1d21555f283458247e",
+        "rev": "72da83d9515b43550436891f538ff41d68eecc7f",
         "type": "github"
       },
       "original": {
@@ -71,11 +71,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1706913249,
+        "lastModified": 1712163089,
-        "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=",
+        "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e92b6015881907e698782c77641aa49298330223",
+        "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
         "type": "github"
       },
       "original": {

flake.nix

@@ -20,7 +20,10 @@
       mkNixos = system: modules: nixpkgs.lib.nixosSystem {
         system = system;
         modules = [
-          ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
+          ({ config, pkgs, ... }: {
+             nixpkgs.overlays = [ overlay-unstable ];
+             nixpkgs.config.allowUnfree = true;
+           })
         ] ++ modules;
         specialArgs = { inherit inputs self; };
       };

services/farmos.hcl

@@ -16,7 +16,7 @@ job "farmos" {
       driver = "docker"
 
       config {
-        image = "farmos/farmos:3.0.1"
+        image = "farmos/farmos:3.1.2"
         ports = ["http"]
         volumes = [
           "/data/compute/appdata/farmos/sites:/opt/drupal/web/sites",

services/loki.hcl

@@ -25,7 +25,7 @@ job "loki" {
     task "loki" {
       driver = "docker"
       config {
-        image = "grafana/loki:2.8.2"
+        image = "grafana/loki:2.9.4"
         args = [
           "-config.file",
           "local/loki/local-config.yaml",
@@ -80,6 +80,11 @@ compactor:
 limits_config:
   reject_old_samples: true
   reject_old_samples_max_age: 168h
+  ingestion_rate_strategy: local
+  ingestion_rate_mb: 10
+  ingestion_burst_size_mb: 20
+  per_stream_rate_limit: 5MB
+  per_stream_rate_limit_burst: 10MB
 chunk_store_config:
   max_look_back_period: 0s
 table_manager:

services/vector.hcl

@@ -19,7 +19,7 @@ job "vector" {
       driver = "docker"
       config {
         # debian instead of alpine to get journalctl
-        image = "timberio/vector:0.31.X-debian"
+        image = "timberio/vector:0.36.X-debian"
         ports = ["api", "metrics"]
         volumes = [
           "/var/run/docker.sock:/var/run/docker.sock:ro",
@@ -72,6 +72,12 @@ job "vector" {
 
           [sources.vector_raw]
             type = "internal_logs"
+          [transforms.vector_transformed]
+            type = "remap"
+            inputs = [ "vector_raw" ]
+            source = '''
+.job_name = "vector"
+            '''
 
           [sources.docker_raw]
             type = "docker_logs"
@@ -95,17 +101,29 @@ if length(result) > 0 {
           [sources.glusterfs_raw]
             type = "file"
             include = [ "/var/log/glusterfs/**/*.log" ]
+          [transforms.glusterfs_transformed]
+            type = "remap"
+            inputs = [ "glusterfs_raw" ]
+            source = '''
+.job_name = .file
+            '''
 
           [sources.journald_raw]
             type = "journald"
+          [transforms.journald_transformed]
+            type = "remap"
+            inputs = [ "journald_raw" ]
+            source = '''
+.job_name = "journald"
+            '''
 
           [sinks.loki]
             type = "loki"
             inputs = [
-              "vector_raw",
+              "vector_transformed",
               "docker_transformed",
-              "glusterfs_raw",
+              "glusterfs_transformed",
-              "journald_raw",
+              "journald_transformed",
             ]
             endpoint = "http://[[ range service "loki" ]][[ .Address ]]:[[ .Port ]][[ end ]]"
             encoding.codec = "json"
@@ -116,6 +134,7 @@ if length(result) > 0 {
             healthcheck.enabled = true
               [sinks.loki.labels]
               host = "{{host}}"
+              job_name = "{{job_name}}"
 
           [sources.internal_metrics]
             type = "internal_metrics"

services/weewx.hcl

@@ -20,6 +20,8 @@ job "weewx" {
 
       config {
         image = "gitea.v.paler.net/ppetru/weewx:latest"
+        # to be able to receive UDP broadcast packets from the weatherlink
+        network_mode = "host"
         volumes = [
           "/data/compute/appdata/weewx/etc:/etc/weewx",
           "/data/compute/appdata/weewx/html:/var/www/html",

services/wordpress.hcl

@@ -21,6 +21,7 @@ job "wordpress" {
         ports = ["http"]
         volumes = [
           "/data/sync/wordpress:/var/www/html",
+          "local/php-custom.ini:/usr/local/etc/php/conf.d/php-custom.ini",
         ]
       }
 
@@ -44,6 +45,15 @@ job "wordpress" {
         EOH
       }
 
+      template {
+        destination = "local/php-custom.ini"
+        data = <<EOH
+          upload_max_filesize = 100M
+          post_max_size = 100M
+          max_execution_time = 600
+        EOH
+      }
+
       resources {
         cpu = 6000
         memory = 1024