From 0fe85c67d9357e3f94205c03baa97a59e9f17a0e Mon Sep 17 00:00:00 2001 From: yukkop Date: Sat, 26 Sep 2026 13:59:59 +0000 Subject: [PATCH] ci: staging server --- nixos/system/hectic-lab/experimental-sshd.nix | 2 +- nixos/system/hectic-lab/hectic-lab.nix | 8 ++++---- overlay/default.nix | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/nixos/system/hectic-lab/experimental-sshd.nix b/nixos/system/hectic-lab/experimental-sshd.nix index 07744893..7a7577aa 100644 --- a/nixos/system/hectic-lab/experimental-sshd.nix +++ b/nixos/system/hectic-lab/experimental-sshd.nix @@ -17,7 +17,7 @@ let UsePAM yes AuthenticationMethods publickey AuthorizedKeysFile %h/.ssh/authorized_keys /etc/ssh/authorized_keys.d/%u - LogLevel DEBUG3 + LogLevel INFO VersionAddendum none HostKeyAlgorithms rsa-sha2-512,rsa-sha2-256,ssh-ed25519 diff --git a/nixos/system/hectic-lab/hectic-lab.nix b/nixos/system/hectic-lab/hectic-lab.nix index 106b76f1..7b000819 100644 --- a/nixos/system/hectic-lab/hectic-lab.nix +++ b/nixos/system/hectic-lab/hectic-lab.nix @@ -14,7 +14,7 @@ with builtins; with lib; let domain = "hectic-lab.com"; - sshPort = 22; + giteaSshPort = 22223; mailUserNames = [ "security" "founders" @@ -342,7 +342,7 @@ in { ]; }; - services.openssh.ports = [ sshPort ]; + services.openssh.ports = [ giteaSshPort ]; services.mailserver = { enable = true; @@ -364,7 +364,7 @@ in { networking.firewall = { allowedTCPPorts = [ - sshPort # ssh + giteaSshPort # gitea ssh 80 443 3306 # mysql @@ -556,7 +556,7 @@ in { HTTP_ADDR = "127.0.0.1"; HTTP_PORT = 11011; ROOT_URL = "https://gitea.${domain}/"; - SSH_PORT = sshPort; + SSH_PORT = giteaSshPort; SSH_DOMAIN = "hectic-lab.com"; }; lfs.enable = true; diff --git a/overlay/default.nix b/overlay/default.nix index ea572ccd..8427c70f 100644 --- a/overlay/default.nix +++ b/overlay/default.nix @@ -6,6 +6,20 @@ in final: prev: ( legacyPackages = self.legacyPackages.${prev.stdenv.hostPlatform.system}; in { hectic = packages // legacyPackages; + p4d = if final.stdenv.hostPlatform.system == "x86_64-linux" then prev.p4d.overrideAttrs (_: { + version = "2023.1/2797325"; + src = final.fetchurl { + url = "https://ftp.perforce.com/pub/perforce/r23.1/bin.linux26x86_64/helix-core-server.tgz"; + hash = "sha256-O8znAlq2XjrixG0FA4cfkgcI9t/w9QMHV0spUjYKl48="; + }; + }) else prev.p4d; + p4 = prev.p4.overrideAttrs (_: { + version = "2024.1/3006289"; + src = final.fetchurl { + url = "https://ftp.perforce.com/pub/perforce/r24.1/bin.tools/p4source.tgz"; + hash = "sha256-z3I3cikbbSrmS7dUMMKi6edPnZk2BYAmdO+pfYRJUVQ="; + }; + }); postgresql_17 = prev.postgresql_17 // {pkgs = prev.postgresql_17.pkgs // { http = packages.pg-17-ext-http; pg_smtp_client = packages.pg-17-ext-smtp-client;