Merge branch 'fc-24.05-dev' into fc-24.05-staging

flyingcircusio · Aug 14, 2024 · c447159 · c447159
2 parents 88533c1 + d6697ca
commit c447159
Show file tree

Hide file tree

Showing 11 changed files with 55 additions and 47 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nixos/platform/firewall.nix b/nixos/platform/firewall.nix
@@ -74,7 +74,7 @@ in
       - nixos-nat-pre: prerouting rules, e.g. port redirects (-t nat)
       - nixos-nat-post: postrouting rules, e.g. masquerading (-t nat)
 
-      See also https://doc.flyingcircus.io/roles/fc-23.11-production/firewall.html
+      See also ${fclib.roleDocUrl "firewall"}
     '';
 
     flyingcircus.services.sensu-client.checks = {

diff --git a/nixos/roles/mysql.nix b/nixos/roles/mysql.nix
@@ -323,7 +323,7 @@ in
       `sudo systemctl restart mysql`
 
       For more information, see our documentation at
-      https://doc.flyingcircus.io/roles/fc-23.11-production/mysql.html
+      ${fclib.roleDocUrl "mysql"}
     '';
 
     systemd.services.fc-mysql-post-init = {

diff --git a/nixos/services/mail/README b/nixos/services/mail/README
@@ -7,7 +7,7 @@ It uses Postfix for mail delivery, Dovecot as IMAP access server, and Roundcube
 
 Refer to the platform documentation for detailed information on how to configure this:
 
-https://doc.flyingcircus.io/roles/fc-23.11-production/mailserver.html
+https://doc.flyingcircus.io/roles/fc-24.05-production/mailserver.html
 
 
 Role Settings

diff --git a/nixos/services/mail/stub.nix b/nixos/services/mail/stub.nix
@@ -39,7 +39,7 @@ let
 
     This role shares some configuration options which the 'mailserver' role:
     mailHost, rootAlias, smtpBind[46], explicitSmtpBind. Refer to
-    https://doc.flyingcircus.io/roles/fc-23.11-production/mailserver.html for
+    ${fclib.roleDocUrl "mailserver"} for
     explanation.
   '';
 

diff --git a/nixos/services/nginx/README.txt b/nixos/services/nginx/README.txt
@@ -3,7 +3,7 @@ Nginx is enabled on this machine.
 The recommended method is structured configuration via Nix code in `/etc/local/nixos`.
 You can also find an example at `/etc/local/nixos/nginx.nix.example`.
 Refer to the webgateway role documentation at
-https://doc.flyingcircus.io/roles/fc-23.11-production/webgateway.html for more info.
+https://doc.flyingcircus.io/roles/fc-24.05-production/webgateway.html for more info.
 
 
 Old configuration methods

diff --git a/nixos/services/postgresql/default.nix b/nixos/services/postgresql/default.nix
@@ -54,7 +54,7 @@ let
   legacyConfigWarning =
     ''Plain PostgreSQL configuration found in ${toString localConfigPath}.
     This does not work properly anymore and must be migrated to NixOS configuration.
-    See https://doc.flyingcircus.io/roles/fc-23.11-production/postgresql.html for details.'';
+    See ${fclib.roleDocUrl "postgresql"} for details.'';
 
   localConfig =
     if legacyConfigFiles != []
@@ -204,7 +204,7 @@ in {
 
         See the platform documentation for more details:
 
-        https://doc.flyingcircus.io/roles/fc-23.11-production/postgresql.html
+        ${fclib.roleDocUrl "postgresql"}
       '';
 
       flyingcircus.infrastructure.preferNoneSchedulerOnSsd = true;

diff --git a/nixpkgs-config.nix b/nixpkgs-config.nix
@@ -13,5 +13,6 @@
     "openssl-1.1.1w" # EOL 2023-09-11, needed for Percona and older PHP versions.
     "python-2.7.18.8" # Needed for some legacy customer applications.
     "ruby-2.7.8" # EOL 2023-03-31, needed for Sensu checks
+    "docker-24.0.9" # Old installs still use storage driver removed in 25.x.
   ];
 }
diff --git a/pkgs/overlay.nix b/pkgs/overlay.nix
@@ -84,6 +84,13 @@ builtins.mapAttrs (_: patchPhps phpLogPermissionPatch) {
 
   docsplit = super.callPackage ./docsplit { };
 
+  # Don't make docker 25.x the default yet, we still have old docker
+  # installs which use the devicemapper storage driver.
+  docker = super.docker_24.overrideAttrs (old: {
+    # Workaround for Hydra not reading nixpkgs-config.nix
+    meta = builtins.removeAttrs old.meta [ "knownVulnerabilites" ];
+  });
+
   innotop = super.callPackage ./percona/innotop.nix { };
 
   libmodsecurity = super.callPackage ./libmodsecurity { };

diff --git a/release/package-versions.json b/release/package-versions.json
@@ -10,9 +10,9 @@
     "version": "2.4.62"
   },
   "asterisk": {
-    "name": "asterisk-20.8.1",
+    "name": "asterisk-20.9.1",
     "pname": "asterisk",
-    "version": "20.8.1"
+    "version": "20.9.1"
   },
   "auditbeat7-oss": {
     "name": "auditbeat-oss-7.17.16",
@@ -70,14 +70,14 @@
     "version": "18.2.1"
   },
   "chromedriver": {
-    "name": "chromedriver-126.0.6478.182",
+    "name": "chromedriver-127.0.6533.99",
     "pname": "chromedriver",
-    "version": "126.0.6478.182"
+    "version": "127.0.6533.99"
   },
   "chromium": {
-    "name": "chromium-126.0.6478.182",
+    "name": "chromium-127.0.6533.99",
     "pname": "chromium",
-    "version": "126.0.6478.182"
+    "version": "127.0.6533.99"
   },
   "cifs-utils": {
     "name": "cifs-utils-7.0",
@@ -130,9 +130,9 @@
     "version": "5.3.28"
   },
   "discourse": {
-    "name": "discourse-3.2.4",
+    "name": "discourse-3.2.5",
     "pname": "discourse",
-    "version": "3.2.4"
+    "version": "3.2.5"
   },
   "dnsmasq": {
     "name": "dnsmasq-2.90",
@@ -155,9 +155,9 @@
     "version": "2.3.21"
   },
   "element-web": {
-    "name": "element-web-1.11.71",
+    "name": "element-web-1.11.73",
     "pname": "element-web",
-    "version": "1.11.71"
+    "version": "1.11.73"
   },
   "erlang": {
     "name": "erlang-25.3.2.12",
@@ -190,9 +190,9 @@
     "version": "7.17.16"
   },
   "firefox": {
-    "name": "firefox-128.0.3",
+    "name": "firefox-129.0",
     "pname": "firefox",
-    "version": "128.0.3"
+    "version": "129.0"
   },
   "gcc": {
     "name": "gcc-wrapper-13.2.0",
@@ -225,9 +225,9 @@
     "version": "17.1.3"
   },
   "github-runner": {
-    "name": "github-runner-2.317.0",
+    "name": "github-runner-2.319.0",
     "pname": "github-runner",
-    "version": "2.317.0"
+    "version": "2.319.0"
   },
   "gitlab": {
     "name": "gitlab-17.1.3",
@@ -297,19 +297,19 @@
     "version": "2.9.7"
   },
   "imagemagick": {
-    "name": "imagemagick-7.1.1-35",
+    "name": "imagemagick-7.1.1-36",
     "pname": "imagemagick",
-    "version": "7.1.1-35"
+    "version": "7.1.1-36"
   },
   "imagemagick6": {
     "name": "imagemagick-6.9.13-10",
     "pname": "imagemagick",
     "version": "6.9.13-10"
   },
   "imagemagick7": {
-    "name": "imagemagick-7.1.1-35",
+    "name": "imagemagick-7.1.1-36",
     "pname": "imagemagick",
-    "version": "7.1.1-35"
+    "version": "7.1.1-36"
   },
   "inetutils": {
     "name": "inetutils-2.5",
@@ -437,9 +437,9 @@
     "version": "0.2.5"
   },
   "linux_5_15": {
-    "name": "linux-5.15.163",
+    "name": "linux-5.15.164",
     "pname": "linux",
-    "version": "5.15.163"
+    "version": "5.15.164"
   },
   "logrotate": {
     "name": "logrotate-3.21.0",
@@ -482,9 +482,9 @@
     "version": "5.0.2"
   },
   "matrix-synapse": {
-    "name": "matrix-synapse-wrapped-1.111.0",
+    "name": "matrix-synapse-wrapped-1.112.0",
     "pname": "matrix-synapse-wrapped",
-    "version": "1.111.0"
+    "version": "1.112.0"
   },
   "mcpp": {
     "name": "mcpp-2.7.2.1",
@@ -933,9 +933,9 @@
     "version": "7.2.4"
   },
   "roundcube": {
-    "name": "roundcube-1.6.7",
+    "name": "roundcube-1.6.8",
     "pname": "roundcube",
-    "version": "1.6.7"
+    "version": "1.6.8"
   },
   "rsync": {
     "name": "rsync-3.3.0",
@@ -964,9 +964,9 @@
     "version": "4.9.1"
   },
   "slurm": {
-    "name": "slurm-23.11.7.1",
+    "name": "slurm-23.11.9.1",
     "pname": "slurm",
-    "version": "23.11.7.1"
+    "version": "23.11.9.1"
   },
   "solr": {
     "name": "solr-8.11.2",
@@ -999,9 +999,9 @@
     "version": "12.7.4"
   },
   "systemd": {
-    "name": "systemd-255.6",
+    "name": "systemd-255.9",
     "pname": "systemd",
-    "version": "255.6"
+    "version": "255.9"
   },
   "tcpdump": {
     "name": "tcpdump-4.99.4",

diff --git a/release/versions.json b/release/versions.json
@@ -8,9 +8,9 @@
     "url": "https://gitlab.flyingcircus.io/flyingcircus/nixos-mailserver.git/"
   },
   "nixpkgs": {
-    "hash": "sha256-D1/3SQdD9v1s9FpZ+2unu7U8SsZlInlPRjkXtVq8QLc=",
+    "hash": "sha256-tE+xUiePq4vT/XUVYyIHD/GLabdj6uSTZ8jwkgbCGUM=",
     "owner": "flyingcircusio",
     "repo": "nixpkgs",
-    "rev": "d589a8e686ecdb4080b78578348d2ddb95c9b344"
+    "rev": "67385d65beeb877876792d396dc979f132fb2fe1"
   }
 }