From 2c5938437d325c17f605fb869b247dc3b9b7c84e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 1 Sep 2025 09:42:47 +0100 Subject: [PATCH 01/36] feat: packaged up the main application --- applications/itd/splunk/package.nix | 43 +++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 applications/itd/splunk/package.nix diff --git a/applications/itd/splunk/package.nix b/applications/itd/splunk/package.nix new file mode 100644 index 0000000..aa5db9c --- /dev/null +++ b/applications/itd/splunk/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + fetchurl, + #, alsa-lib + openssl, + zlib, + autoPatchelfHook, +}: +stdenv.mkDerivation rec { + pname = "splunk-forwarder"; + version = "9.1.7"; + version_long = "${version}-e17104057ef0"; + + src = fetchurl { + url = "https://download.splunk.com/products/universalforwarder/releases/${version}/linux/splunkforwarder-${version_long}-Linux-x86_64.tgz"; + hash = "sha256-EWpfenEhExe5qDscqb7ZQUwahYgAgPQ+APLlweRQAoc="; + }; + + nativeBuildInputs = [autoPatchelfHook]; + + buildInputs = [ + # alsaLib + openssl + zlib + ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + # gets unzipped and we just pop it all into teh output + # might add the patching of the path vars in the scripts to be here + cp -R ./splunkforwarder $out + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://splunk.com"; + description = "Logging Service"; + platforms = platforms.linux; + }; +} From d2712117e5656ab78b830e47a247631da90bd049 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 1 Sep 2025 09:43:41 +0100 Subject: [PATCH 02/36] feat: module in current state, not fully complete yet but working well enough --- applications/itd/splunk/module.nix | 165 +++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 applications/itd/splunk/module.nix diff --git a/applications/itd/splunk/module.nix b/applications/itd/splunk/module.nix new file mode 100644 index 0000000..e186929 --- /dev/null +++ b/applications/itd/splunk/module.nix @@ -0,0 +1,165 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; let + name = "splunk"; + cfg = config.services.itd."${name}"; + + package = pkgs.callPackage ./package.nix {}; +in { + imports = []; + + options.services.itd."${name}" = { + enable = mkEnableOption "ITD Splunk"; + + user = { + user = mkOption { + type = types.str; + default = "splunk"; + }; + group = mkOption { + type = types.str; + default = "splunk"; + }; + + home = mkOption { + type = types.str; + default = "/etc/itd/splunk"; + }; + }; + }; + + config = mkIf cfg.enable { + # create user and group for the program + users.groups."${cfg.user.group}" = {}; + users.users."${cfg.user.user}" = { + createHome = true; + isNormalUser = true; + home = cfg.user.home; + group = cfg.user.group; + # X11 is to ensure the directory can be traversed + homeMode = "711"; + }; + + # might not be required + # networking.firewall.allowedTCPPorts = [8089]; + + # set up the core files + systemd.services."${name}_prestart" = { + wantedBy = [ + # "gitlab.target" + ]; + partOf = [ + # "gitlab.target" + ]; + path = with pkgs; [util-linux]; + serviceConfig = { + Type = "oneshot"; + User = "root"; + Group = "root"; + # User = cfg.user.user; + # Group = cfg.user.group; + # TimeoutSec = "infinity"; + # Restart = "on-failure"; + # WorkingDirectory = "${cfg.package}/share/gitlab"; + # Slice = "system-gitlab.slice"; + RemainAfterExit = true; + ExecStart = let + # from $SPLUNK_HOME/etc/splunk-launch.conf.default + splunk_launch = pkgs.writeText "splunk-launch" '' + SPLUNK_HOME=${cfg.user.home} + SPLUNK_SERVER_NAME=SplunkForwarder + PYTHONHTTPSVERIFY=0 + PYTHONUTF8=1 + ''; + + etc_passwd = pkgs.writeText "passwd" '' + :admin:$6$XOFhpq0Y1Ul1pejO$DUkXU6xSAKYrl3nLTPFS7LJqlnWC4r97SSikjCzv7XNEG6lgP32TZHyLDY/aJs8ZYyblZ5spfmnlMvh8Lxndi/::Administrator:admin:changeme@example.com:::20329 + ''; + + deployment_client = pkgs.writeText "deploymentclient" '' + [deployment-client] + clientName = UL_client + [target-broker:deploymentServer] + targetUri = soc-deployment.heanet.ie:8089 + ''; + in + pkgs.writeShellScript "splunk-config" '' + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit + + umask u=rwx,g=rx,o= + + # start with a clean slate, it yells at ye if ye try to boot it up without doing this + rm -rf ${cfg.user.home}/* + + chmod 771 -R ${cfg.user.home} + + # pull in all relevent files + cp -f -R ${package}/* ${cfg.user.home} + + chmod 771 -R ${cfg.user.home} + chown ${cfg.user.user}:${cfg.user.group} -R ${cfg.user.home} + + # if [ ! -f ${cfg.user.home}/etc/splunk-launch.conf ]; then + export SPLUNK_HOME=${cfg.user.home} + + cp ${splunk_launch} $SPLUNK_HOME/etc/splunk-launch.conf + + cp ${etc_passwd} $SPLUNK_HOME/etc/passwd + + # ensure the dir exists + mkdir -p $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/ + cp ${deployment_client} $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/deploymentclient.conf + + + # Splunk is doing a crime by deciding what teh path is, need to comment out this line + # in /bin/pid_check.sh + # PATH=/usr/xpg4/bin:/usr/bin:/bin + # PATH= + sed -i -e 's/PATH=/#PATH=/g' ${cfg.user.home}/bin/pid_check.sh + + # make sure user permissions are correct + chmod 771 -R ${cfg.user.home} + chown ${cfg.user.user}:${cfg.user.group} -R ${cfg.user.home} + + # run it to see if that works + runuser -u ${cfg.user.user} -- $SPLUNK_HOME/bin/splunk start --accept-license + + # $SPLUNK_HOME/bin/splunk enable boot-start + # /etc/systemd/system/multi-user.target.wants/SplunkForwarder.service + # fi + ''; + }; + }; + + systemd.services."${name}" = { + wantedBy = [ + ]; + requires = [ + "${name}_prestart.service" + ]; + path = with pkgs; [util-linux toybox]; + serviceConfig = { + Type = "oneshot"; + User = cfg.user.user; + Group = cfg.user.group; + TimeoutSec = "infinity"; + Restart = "on-failure"; + # WorkingDirectory = "${cfg.package}/share/gitlab"; + # Slice = "system-gitlab.slice"; + RemainAfterExit = true; + + Environment = "SPLUNK_HOME=${cfg.user.home}"; + ExecStart = "${package}/bin/splunk _internal_launch_under_systemd"; + + # no so sure about these + NoNewPrivileges = "yes"; + AmbientCapabilities = "CAP_DAC_READ_SEARCH"; + }; + }; + }; +} From f8826c5d2f60fa98a8ca8a15608ea0fdab6cb114 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 1 Sep 2025 09:44:40 +0100 Subject: [PATCH 03/36] dbg: using marvin to test out teh new logging (slightly depressing) --- machines/marvin.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/machines/marvin.nix b/machines/marvin.nix index 175d61d..abb15d1 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -30,6 +30,7 @@ Notes: groups_trusted = map (x: "@${x}") groups; in { imports = [ + ../applications/itd/splunk/module.nix ]; deployment = { @@ -58,4 +59,8 @@ in { host = host; backup.enable = true; }; + + services.itd.splunk = { + enable = true; + }; } From b742a09c439ec76ab99a2a709eccca6895fe028b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 2 Sep 2025 10:38:54 +0100 Subject: [PATCH 04/36] fix: move the fixing of the path to the package and not teh module --- applications/itd/splunk/module.nix | 7 ------- applications/itd/splunk/package.nix | 9 +++++++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/applications/itd/splunk/module.nix b/applications/itd/splunk/module.nix index e186929..3c841fb 100644 --- a/applications/itd/splunk/module.nix +++ b/applications/itd/splunk/module.nix @@ -115,13 +115,6 @@ in { mkdir -p $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/ cp ${deployment_client} $SPLUNK_HOME/etc/apps/000_ul_umbrio_essentials/local/deploymentclient.conf - - # Splunk is doing a crime by deciding what teh path is, need to comment out this line - # in /bin/pid_check.sh - # PATH=/usr/xpg4/bin:/usr/bin:/bin - # PATH= - sed -i -e 's/PATH=/#PATH=/g' ${cfg.user.home}/bin/pid_check.sh - # make sure user permissions are correct chmod 771 -R ${cfg.user.home} chown ${cfg.user.user}:${cfg.user.group} -R ${cfg.user.home} diff --git a/applications/itd/splunk/package.nix b/applications/itd/splunk/package.nix index aa5db9c..c5a21ef 100644 --- a/applications/itd/splunk/package.nix +++ b/applications/itd/splunk/package.nix @@ -2,7 +2,7 @@ stdenv, lib, fetchurl, - #, alsa-lib + gnused, openssl, zlib, autoPatchelfHook, @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { # alsaLib openssl zlib + gnused ]; sourceRoot = "."; @@ -30,8 +31,12 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall # gets unzipped and we just pop it all into teh output - # might add the patching of the path vars in the scripts to be here cp -R ./splunkforwarder $out + + # Splunk is doing a crime by deciding what teh path is, need to comment out this line in /bin/pid_check.sh + # PATH=/usr/xpg4/bin:/usr/bin:/bin + find $out -type f -name "*.sh" -print0 | xargs -0 sed -i -e 's/PATH=/#PATH=/g' + runHook postInstall ''; From f47e95c61de10eefdc195ee07c0e3308baa9f02c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 5 Sep 2025 21:35:37 +0100 Subject: [PATCH 05/36] fix: service no longer stalling CPUShares and MemoryLimit are depricated Sep 05 20:30:42 marvin systemd[1]: /etc/systemd/system/splunk.service:9: Unit uses CPUShares=; please use CPUWeight= instead. Support for CPUShares= will be removed soon. Sep 05 20:30:42 marvin systemd[1]: /etc/systemd/system/splunk.service:18: Unit uses MemoryLimit=; please use MemoryMax= instead. Support for MemoryLimit= will be removed soon. --- applications/itd/splunk/module.nix | 34 +++++++++++++++++++----------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/applications/itd/splunk/module.nix b/applications/itd/splunk/module.nix index 3c841fb..30dcb19 100644 --- a/applications/itd/splunk/module.nix +++ b/applications/itd/splunk/module.nix @@ -45,7 +45,7 @@ in { }; # might not be required - # networking.firewall.allowedTCPPorts = [8089]; + networking.firewall.allowedTCPPorts = [8089]; # set up the core files systemd.services."${name}_prestart" = { @@ -137,21 +137,31 @@ in { ]; path = with pkgs; [util-linux toybox]; serviceConfig = { - Type = "oneshot"; - User = cfg.user.user; - Group = cfg.user.group; - TimeoutSec = "infinity"; - Restart = "on-failure"; - # WorkingDirectory = "${cfg.package}/share/gitlab"; - # Slice = "system-gitlab.slice"; - RemainAfterExit = true; - + Type = "simple"; + Restart="always"; Environment = "SPLUNK_HOME=${cfg.user.home}"; ExecStart = "${package}/bin/splunk _internal_launch_under_systemd"; - - # no so sure about these + KillMode="mixed"; + KillSignal="SIGINT"; + TimeoutStopSec=360; + LimitNOFILE=65536; + LimitRTPRIO=99; + SuccessExitStatus="51 52"; + RestartPreventExitStatus=51; + RestartForceExitStatus=52; + User = cfg.user.user; + Group = cfg.user.group; NoNewPrivileges = "yes"; AmbientCapabilities = "CAP_DAC_READ_SEARCH"; + + # ExecStartPre=-/bin/bash -c "chown -R splunk:splunk /opt/splunkforwarder" + Delegate="true"; +# CPUShares=1024; +# MemoryLimit=3973632000; + PermissionsStartOnly="true"; + # ExecStartPost=-/bin/bash -c "chown -R splunk:splunk /sys/fs/cgroup/cpu/system.slice/%n" + # ExecStartPost=-/bin/bash -c "chown -R splunk:splunk /sys/fs/cgroup/memory/system.slice/%n" + }; }; }; From 534dabca19804f05944222b10b4d32018cd62bbf Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 5 Sep 2025 22:11:46 +0100 Subject: [PATCH 06/36] feat: set ACL's --- applications/itd/splunk/module.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/applications/itd/splunk/module.nix b/applications/itd/splunk/module.nix index 30dcb19..8500a41 100644 --- a/applications/itd/splunk/module.nix +++ b/applications/itd/splunk/module.nix @@ -47,6 +47,21 @@ in { # might not be required networking.firewall.allowedTCPPorts = [8089]; + # need to set access controls + systemd.tmpfiles.rules = [ + "a /var/log - - - - u:splunk:rx" + "a /var/log/auth.log - - - - splunk:r" + "a /var/log/messages - - - - u:splunk:r" + "a /var/log/secure - - - - u:splunk:r" + "a /var/log/audit - - - - u:splunk:rx" + "a /var/log/audit.log - - - - u:splunk:r" + "a /var/log/audit/audit.log - - - - u:splunk:r" + "a /root - - - - u:splunk:rx" + "a /root/.bash_history - - - - u:splunk:r" + "a /home/* - - - - u:splunk:rx" + "a /home/*/.bash_history - - - - u:splunk:r" + ]; + # set up the core files systemd.services."${name}_prestart" = { wantedBy = [ From 0075fca9860a357857b5ca11907d6efb32b7b1da Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 5 Sep 2025 22:30:33 +0100 Subject: [PATCH 07/36] feat: needed to update nixpkgs to gain access to ``security.auditd.settings``. --- applications/acme.nix | 1 - flake.lock | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/applications/acme.nix b/applications/acme.nix index 1031cf5..97aff51 100644 --- a/applications/acme.nix +++ b/applications/acme.nix @@ -27,7 +27,6 @@ in { age.secrets.acme.file = ../secrets/dns_certs.secret.age; security.acme = { - preliminarySelfsigned = false; acceptTerms = true; defaults = { diff --git a/flake.lock b/flake.lock index 81c5faa..285b680 100644 --- a/flake.lock +++ b/flake.lock @@ -910,11 +910,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1751271578, - "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { From 1fa89834d03983b416fee719d5686f3c8feaff77 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 5 Sep 2025 22:35:09 +0100 Subject: [PATCH 08/36] feat: enabled auditd --- applications/itd/splunk/module.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/applications/itd/splunk/module.nix b/applications/itd/splunk/module.nix index 8500a41..52d0e4b 100644 --- a/applications/itd/splunk/module.nix +++ b/applications/itd/splunk/module.nix @@ -62,6 +62,13 @@ in { "a /home/*/.bash_history - - - - u:splunk:r" ]; + security.auditd = { + enable = true; + settings = { + log_group = cfg.user.group; + }; + }; + # set up the core files systemd.services."${name}_prestart" = { wantedBy = [ From a3b9d89b1a10b245417487adf25ce8701e503281 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 5 Sep 2025 22:45:32 +0100 Subject: [PATCH 09/36] fmt: formatted --- applications/itd/splunk/module.nix | 57 +++++++++++++++--------------- 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/applications/itd/splunk/module.nix b/applications/itd/splunk/module.nix index 52d0e4b..304d29e 100644 --- a/applications/itd/splunk/module.nix +++ b/applications/itd/splunk/module.nix @@ -49,24 +49,24 @@ in { # need to set access controls systemd.tmpfiles.rules = [ - "a /var/log - - - - u:splunk:rx" - "a /var/log/auth.log - - - - splunk:r" - "a /var/log/messages - - - - u:splunk:r" - "a /var/log/secure - - - - u:splunk:r" - "a /var/log/audit - - - - u:splunk:rx" - "a /var/log/audit.log - - - - u:splunk:r" - "a /var/log/audit/audit.log - - - - u:splunk:r" - "a /root - - - - u:splunk:rx" - "a /root/.bash_history - - - - u:splunk:r" - "a /home/* - - - - u:splunk:rx" - "a /home/*/.bash_history - - - - u:splunk:r" + "a /var/log - - - - u:splunk:rx" + "a /var/log/auth.log - - - - u:splunk:r " + "a /var/log/messages - - - - u:splunk:r " + "a /var/log/secure - - - - u:splunk:r " + "a /var/log/audit - - - - u:splunk:rx" + "a /var/log/audit.log - - - - u:splunk:r " + "a /var/log/audit/audit.log - - - - u:splunk:r " + "a /root - - - - u:splunk:rx" + "a /root/.bash_history - - - - u:splunk:r " + "a /home/* - - - - u:splunk:rx" + "a /home/*/.bash_history - - - - u:splunk:r " ]; security.auditd = { - enable = true; - settings = { - log_group = cfg.user.group; - }; + enable = true; + settings = { + log_group = cfg.user.group; + }; }; # set up the core files @@ -160,30 +160,29 @@ in { path = with pkgs; [util-linux toybox]; serviceConfig = { Type = "simple"; - Restart="always"; + Restart = "always"; Environment = "SPLUNK_HOME=${cfg.user.home}"; ExecStart = "${package}/bin/splunk _internal_launch_under_systemd"; - KillMode="mixed"; - KillSignal="SIGINT"; - TimeoutStopSec=360; - LimitNOFILE=65536; - LimitRTPRIO=99; - SuccessExitStatus="51 52"; - RestartPreventExitStatus=51; - RestartForceExitStatus=52; + KillMode = "mixed"; + KillSignal = "SIGINT"; + TimeoutStopSec = 360; + LimitNOFILE = 65536; + LimitRTPRIO = 99; + SuccessExitStatus = "51 52"; + RestartPreventExitStatus = 51; + RestartForceExitStatus = 52; User = cfg.user.user; Group = cfg.user.group; NoNewPrivileges = "yes"; AmbientCapabilities = "CAP_DAC_READ_SEARCH"; # ExecStartPre=-/bin/bash -c "chown -R splunk:splunk /opt/splunkforwarder" - Delegate="true"; -# CPUShares=1024; -# MemoryLimit=3973632000; - PermissionsStartOnly="true"; + Delegate = "true"; + # CPUShares=1024; + # MemoryLimit=3973632000; + PermissionsStartOnly = "true"; # ExecStartPost=-/bin/bash -c "chown -R splunk:splunk /sys/fs/cgroup/cpu/system.slice/%n" # ExecStartPost=-/bin/bash -c "chown -R splunk:splunk /sys/fs/cgroup/memory/system.slice/%n" - }; }; }; From 64ece3c0fda7f3175c0f885ebb0fcacabc4c5d51 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 7 Sep 2025 17:29:47 +0000 Subject: [PATCH 10/36] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 81c5faa..45e958b 100644 --- a/flake.lock +++ b/flake.lock @@ -1086,11 +1086,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1751234352, - "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", + "lastModified": 1757266039, + "narHash": "sha256-EAXz2LRlVMEN5RA/TmhSNaF/ox34cVmdayJj+rlU8lg=", "ref": "refs/heads/main", - "rev": "1dae2ecb2623d55c88a237d55198efd51e0fd8fe", - "revCount": 249, + "rev": "0a21ac2f5d99ac846d8dbfb91444ce2e3b0cf075", + "revCount": 250, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 30c2ee5349cbd6c6d35fa5e94e9b516857dca2f0 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 7 Sep 2025 17:59:56 +0000 Subject: [PATCH 11/36] Updated flake for skynet_ldap_backend --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 45e958b..64079b6 100644 --- a/flake.lock +++ b/flake.lock @@ -1086,11 +1086,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1757266039, - "narHash": "sha256-EAXz2LRlVMEN5RA/TmhSNaF/ox34cVmdayJj+rlU8lg=", + "lastModified": 1757267915, + "narHash": "sha256-cJA/dTc+VCjODKu5WEycBrEZRxd4STzxhpfUK2kIS4g=", "ref": "refs/heads/main", - "rev": "0a21ac2f5d99ac846d8dbfb91444ce2e3b0cf075", - "revCount": 250, + "rev": "3d882056bc78707ff57321862522ca8d1fc2a3c1", + "revCount": 252, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From b56bfecd4edafd9feb4221fdc564417d4f41e68f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 8 Sep 2025 00:36:22 +0000 Subject: [PATCH 12/36] Updated flake for compsoc_public --- flake.lock | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 64079b6..3420bf5 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1723391194, - "narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=", + "lastModified": 1723500950, + "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=", "owner": "silver_rust", "repo": "bfom", - "rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c", + "rev": "7f339f28442758ecc3f1697e3f70d441973664b9", "type": "gitlab" }, "original": { @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1741131635, - "narHash": "sha256-W65UdgryecEzfS6myQ+1Sj5P3yBCJRlGRf+fU78Ei2g=", + "lastModified": 1757291639, + "narHash": "sha256-lRv6lixWuFF9gEyriNRRveWq+AIhLDmy2n7Dfee5r2U=", "ref": "refs/heads/main", - "rev": "b5089910d0d0b303b634c7e125ac0b9ba8728bd9", - "revCount": 111, + "rev": "72d9f4cc7f59b832c0831af043943b072ce92da4", + "revCount": 118, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, @@ -896,15 +896,16 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1715413075, - "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", + "lastModified": 1756787288, + "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", + "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1", "type": "github" }, "original": { "id": "nixpkgs", + "ref": "nixos-unstable", "type": "indirect" } }, From 53afebb619c78863d4b47fb885d21d564ae3235b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 11 Sep 2025 10:39:43 +0100 Subject: [PATCH 13/36] feat: add a wolves subdomain --- applications/skynet.ie/skynet.ie.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index fb1bf69..b387468 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -80,6 +80,12 @@ in { "www.skynet.ie" = main_site; "skynet.ie" = main_site; + "wolves.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://ulwolves.ie/society/computer"; + }; + # a custom discord url, because we are too cheap otehrwise "discord.skynet.ie" = { forceSSL = true; From fb9eef1adf1492c40be55465ba60161e9032f88b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 11 Sep 2025 12:13:27 +0100 Subject: [PATCH 14/36] fix: forgot to actually set a DNS record for wolves --- applications/skynet.ie/skynet.ie.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index b387468..99cc46d 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -48,6 +48,11 @@ in { r_type = "CNAME"; value = config.services.skynet.host.name; } + { + record = "wolves"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } { record = "public"; r_type = "CNAME"; From d21d7b25b964d24ae66ab39ac3f5209bb3432253 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:39:34 +0000 Subject: [PATCH 15/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3420bf5..a1f507a 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1757291639, - "narHash": "sha256-lRv6lixWuFF9gEyriNRRveWq+AIhLDmy2n7Dfee5r2U=", + "lastModified": 1757590727, + "narHash": "sha256-ahg2fT8Ez1T0rLthHwcLUV+x3JOdr6pGbqI9dfOWapM=", "ref": "refs/heads/main", - "rev": "72d9f4cc7f59b832c0831af043943b072ce92da4", - "revCount": 118, + "rev": "6fd88f9064082ed7a1fe43d925c4995ba58418b8", + "revCount": 120, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 4555186ba06d4ce67bd9470765ac28c2cbcd79ad Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 11 Sep 2025 11:51:17 +0000 Subject: [PATCH 16/36] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a1f507a..13c84d1 100644 --- a/flake.lock +++ b/flake.lock @@ -1045,11 +1045,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1757023884, - "narHash": "sha256-E+lp2PyQo9vakrwAjcB+krIGPi095CaAbZ/49tWvCtw=", + "lastModified": 1757591343, + "narHash": "sha256-Inqutuj6WsLq5dht13AATbM/4S+Pnu0cgMq7VVeGWWQ=", "ref": "refs/heads/main", - "rev": "7526a82bb7c384c16a09992458868b2f669ed279", - "revCount": 320, + "rev": "d8f785b0db241c677b2eadec6e12d23b84d7e99b", + "revCount": 323, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 494d9bdf38eed509487d37c8076fd1756dee531b Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 11 Sep 2025 12:03:07 +0000 Subject: [PATCH 17/36] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 13c84d1..a5a5364 100644 --- a/flake.lock +++ b/flake.lock @@ -1045,11 +1045,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1757591343, - "narHash": "sha256-Inqutuj6WsLq5dht13AATbM/4S+Pnu0cgMq7VVeGWWQ=", + "lastModified": 1757592151, + "narHash": "sha256-CumEGWBqR+91Rk7FCCcS9AfLQpJfYwqn8QSGwOAOT7c=", "ref": "refs/heads/main", - "rev": "d8f785b0db241c677b2eadec6e12d23b84d7e99b", - "revCount": 323, + "rev": "6353d77360c7949a62ada56729b53be106b81a47", + "revCount": 325, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 6af7acaac36d9e91eb188d60e1421862316e6200 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 13 Sep 2025 23:44:23 +0000 Subject: [PATCH 18/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a5a5364..30b6328 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1757590727, - "narHash": "sha256-ahg2fT8Ez1T0rLthHwcLUV+x3JOdr6pGbqI9dfOWapM=", + "lastModified": 1757807029, + "narHash": "sha256-nRhdi1spkA235OsZC1oesR+YeUyOoD86ZSRJ2rZ9krU=", "ref": "refs/heads/main", - "rev": "6fd88f9064082ed7a1fe43d925c4995ba58418b8", - "revCount": 120, + "rev": "03201efe407571d17602937157f6e885e7615cbf", + "revCount": 122, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 6c6068bf8974a48207732d4df338cb6e21cf3b52 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 14 Sep 2025 00:00:25 +0000 Subject: [PATCH 19/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 30b6328..7e9da39 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1757807029, - "narHash": "sha256-nRhdi1spkA235OsZC1oesR+YeUyOoD86ZSRJ2rZ9krU=", + "lastModified": 1757807975, + "narHash": "sha256-tCdOzMu1C21iUbqfTmEl3Wq7HWii6NGLFRUsJjf5kSc=", "ref": "refs/heads/main", - "rev": "03201efe407571d17602937157f6e885e7615cbf", - "revCount": 122, + "rev": "bd5ff0579ebaa44d4ebecb10cf2d85942c230e84", + "revCount": 123, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 6788ca566a8613ceac04d671a721c9e51ec325eb Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 16 Sep 2025 20:31:42 +0000 Subject: [PATCH 20/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 7e9da39..494eca2 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1757807975, - "narHash": "sha256-tCdOzMu1C21iUbqfTmEl3Wq7HWii6NGLFRUsJjf5kSc=", + "lastModified": 1758054586, + "narHash": "sha256-YULa+rQnCSIt0yLLVVdMdxL1P2TQZ3VaMXtmtRz3Jic=", "ref": "refs/heads/main", - "rev": "bd5ff0579ebaa44d4ebecb10cf2d85942c230e84", - "revCount": 123, + "rev": "4a687d3f1060a50968cf06ca86e4dd4f1cccb444", + "revCount": 124, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 84cd3538fd9c652a1266b2cf3d0e64058f58d49d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 16 Sep 2025 22:33:02 +0000 Subject: [PATCH 21/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 494eca2..683f3f3 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758054586, - "narHash": "sha256-YULa+rQnCSIt0yLLVVdMdxL1P2TQZ3VaMXtmtRz3Jic=", + "lastModified": 1758061944, + "narHash": "sha256-41pCkNuk3HnMvtgmdpYw++VOSjOOcXAecaxcnSAVQz0=", "ref": "refs/heads/main", - "rev": "4a687d3f1060a50968cf06ca86e4dd4f1cccb444", - "revCount": 124, + "rev": "e5d5f7401fba81b758dc7b24ffe92eb9814e8490", + "revCount": 126, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 8f45538316bcd9c0f8c7bd2f2b1074c304263328 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 17 Sep 2025 14:23:16 +0000 Subject: [PATCH 22/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 683f3f3..9181c32 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758061944, - "narHash": "sha256-41pCkNuk3HnMvtgmdpYw++VOSjOOcXAecaxcnSAVQz0=", + "lastModified": 1758118941, + "narHash": "sha256-OWPKyL2GNTCbRVpPadtYrluhBJJNkM57fqaEiDSZ/bc=", "ref": "refs/heads/main", - "rev": "e5d5f7401fba81b758dc7b24ffe92eb9814e8490", - "revCount": 126, + "rev": "7fa129fac4b4b464b2c41454408040d66f43d095", + "revCount": 127, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 3629567abc4c85205c28b72cfcd1d6a7adc1be4b Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 18 Sep 2025 11:43:29 +0000 Subject: [PATCH 23/36] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 9181c32..4f6ddfa 100644 --- a/flake.lock +++ b/flake.lock @@ -1125,11 +1125,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1732375016, - "narHash": "sha256-Y+bJw85TNOp8N369OV0VrDdm3oDy8CXG+GUuG6pZjbo=", + "lastModified": 1758195787, + "narHash": "sha256-YK5rEiaPqH19PPwMO/smF3SJDdEosGyqUQ8pDEmnfK8=", "ref": "refs/heads/main", - "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", - "revCount": 29, + "rev": "afd55717913278d4541ae0d21ca915a045423574", + "revCount": 31, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, From f99c50a039fe4d3a3064470f72a06ab1b53aed74 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 18 Sep 2025 19:04:33 +0000 Subject: [PATCH 24/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 4f6ddfa..02a1dac 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758118941, - "narHash": "sha256-OWPKyL2GNTCbRVpPadtYrluhBJJNkM57fqaEiDSZ/bc=", + "lastModified": 1758222226, + "narHash": "sha256-/PkJgIquoXAnh7LgiYp41XGkg3s8ET+TMJELtYrMNVg=", "ref": "refs/heads/main", - "rev": "7fa129fac4b4b464b2c41454408040d66f43d095", - "revCount": 127, + "rev": "a4213f2d3ae4558270fc01090715e3b11ca37f94", + "revCount": 128, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From cc49e0da6d58d6ae8744e768960ccb50bcd75684 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 19 Sep 2025 15:21:10 +0000 Subject: [PATCH 25/36] Updated flake for skynet_discord_bot --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 02a1dac..47c810b 100644 --- a/flake.lock +++ b/flake.lock @@ -1045,11 +1045,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1757592151, - "narHash": "sha256-CumEGWBqR+91Rk7FCCcS9AfLQpJfYwqn8QSGwOAOT7c=", + "lastModified": 1758295049, + "narHash": "sha256-h14Vl/OVguj5jD54xf+3w3DBIloQkoFBH86/xJ35jV8=", "ref": "refs/heads/main", - "rev": "6353d77360c7949a62ada56729b53be106b81a47", - "revCount": 325, + "rev": "313be247d96131fbea418b826d7b68521c48bd8a", + "revCount": 326, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f33e14d8d1bb869c8f125153a763fae5b3990fa3 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 20 Sep 2025 11:27:40 +0000 Subject: [PATCH 26/36] Updated flake for simple-nixos-mailserver --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 47c810b..3083a51 100644 --- a/flake.lock +++ b/flake.lock @@ -359,11 +359,11 @@ ] }, "locked": { - "lastModified": 1749636823, - "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "lastModified": 1750779888, + "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "type": "github" }, "original": { @@ -542,11 +542,11 @@ }, "nixpkgs-25_05": { "locked": { - "lastModified": 1749727998, - "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", + "lastModified": 1753749649, + "narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", + "rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a", "type": "github" }, "original": { @@ -1024,11 +1024,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1750183846, - "narHash": "sha256-owKJ2rsa/0WVZQAprlbqgVAAGlz3MFuvgNea3+ic4fs=", + "lastModified": 1758367587, + "narHash": "sha256-crj6Ps1BwNbmsk7I7v6K2Dw55vczuQRtTklYiFiQ0Jw=", "ref": "refs/heads/master", - "rev": "c097bd662c9e1aea8c1fca10d57188e81c5574a0", - "revCount": 743, + "rev": "8bca7ebf09d3eb2bfcafe41b9133ee262f09558d", + "revCount": 794, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" }, From 48b7cd2e547b07dd72aed44831f910b0286c621a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Sep 2025 17:33:30 +0100 Subject: [PATCH 27/36] nix: bump nixpkgs and mailserver --- applications/acme.nix | 1 - applications/email.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/acme.nix b/applications/acme.nix index 1031cf5..97aff51 100644 --- a/applications/acme.nix +++ b/applications/acme.nix @@ -27,7 +27,6 @@ in { age.secrets.acme.file = ../secrets/dns_certs.secret.age; security.acme = { - preliminarySelfsigned = false; acceptTerms = true; defaults = { diff --git a/applications/email.nix b/applications/email.nix index d7a6381..97b2362 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -470,7 +470,7 @@ in { mailserver = { enable = true; - stateVersion = 1; + stateVersion = 3; fqdn = "${cfg.sub}.${cfg.domain}"; domains = [ From 8ae0d53932ca8f172be6a7ebde8f58caef935f95 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 22 Sep 2025 21:44:55 +0000 Subject: [PATCH 28/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3083a51..34445f1 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758222226, - "narHash": "sha256-/PkJgIquoXAnh7LgiYp41XGkg3s8ET+TMJELtYrMNVg=", + "lastModified": 1758577443, + "narHash": "sha256-tNUJw0LV+kiVg0JOkRkWIul589ecWezOA/67dZo1S1g=", "ref": "refs/heads/main", - "rev": "a4213f2d3ae4558270fc01090715e3b11ca37f94", - "revCount": 128, + "rev": "f21056566c8304d20aa6065fbb88d480f5e7e9ea", + "revCount": 129, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 85fe376560261dc7508a96fb4dbfac554264b18a Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 22 Sep 2025 23:01:41 +0000 Subject: [PATCH 29/36] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 34445f1..8144a6c 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1758577443, - "narHash": "sha256-tNUJw0LV+kiVg0JOkRkWIul589ecWezOA/67dZo1S1g=", + "lastModified": 1758582048, + "narHash": "sha256-SIt6rPXx7O3YMrEw8YrwHNMjOrrJLu/Tf1sMll1Qp9A=", "ref": "refs/heads/main", - "rev": "f21056566c8304d20aa6065fbb88d480f5e7e9ea", - "revCount": 129, + "rev": "4d825caf25cb966ddb5ce33a0e9b2aa73b0262c6", + "revCount": 130, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 5e40212eccfe9be158accc1753a71fd4bc782e5d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 23 Sep 2025 13:59:36 +0000 Subject: [PATCH 30/36] Updated flake for skynet_website_wiki --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8144a6c..6f89ba0 100644 --- a/flake.lock +++ b/flake.lock @@ -1303,11 +1303,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1752925027, - "narHash": "sha256-APuWWdod4L3mgSBXJTukfbB8s37NvzUkju+lELUD7PI=", + "lastModified": 1758635905, + "narHash": "sha256-PPqhD2RHUOwJrbey72H1wnmdpeELilwKlND4TR5qo2k=", "ref": "refs/heads/main", - "rev": "917c316e7606995362b436f5c6248f058c762176", - "revCount": 166, + "rev": "eb1fc042b5d410b17dd63c492c03be78443ed07f", + "revCount": 167, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 5577446d6c9a8a5ae81831a5dd701ac01b6fd99f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Sep 2025 14:46:16 +0100 Subject: [PATCH 31/36] feat: remove non committee and reorganise based on who was already on committee. Also added labels for Core --- config/users.nix | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/config/users.nix b/config/users.nix index f7c3f84..f2ccef4 100644 --- a/config/users.nix +++ b/config/users.nix @@ -52,24 +52,25 @@ in { committee = lib.lists.unique ( # Committee - Core [ + # President "silver" - "eoghanconlon73" - "nanda" + # Secretary + "kaiden" + # Treasurer + "peace" + # PRO + "amymucko" + # HSO "skyapples" - "generically" ] # Committee - OCM ++ [ "eliza" - "amymucko" - "archiedms" - "kaiden" + "generically" + "nanda" ] # Committee - SISTEM - ++ [ - "peace" - "milan" - ] + ++ [] # Admins are part of Committee as well ++ cfg.admin ); @@ -78,8 +79,6 @@ in { "evanc" "eliza" "esy" - # for temp reasons - "peace" ]; trainee = []; lifetime = []; From e0957270ae459411ac81c60f9f0132bd257af488 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Sep 2025 15:00:57 +0100 Subject: [PATCH 32/36] feat: initial batch of new committee --- config/users.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/users.nix b/config/users.nix index f2ccef4..8d6b611 100644 --- a/config/users.nix +++ b/config/users.nix @@ -65,9 +65,13 @@ in { ] # Committee - OCM ++ [ + "connormc" + "cordlesscoder" "eliza" "generically" + "mysticwolf" "nanda" + "sunny" ] # Committee - SISTEM ++ [] From 90f8ed3af24e8b2c7891397354a3e0bee0f6771b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Sep 2025 11:35:54 +0100 Subject: [PATCH 33/36] feat: second batch of new committee --- config/users.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/users.nix b/config/users.nix index 8d6b611..7ab18bf 100644 --- a/config/users.nix +++ b/config/users.nix @@ -67,11 +67,14 @@ in { ++ [ "connormc" "cordlesscoder" + "dca_" "eliza" + "emilyrutai" "generically" "mysticwolf" "nanda" "sunny" + "tatabbyi" ] # Committee - SISTEM ++ [] From 42be2a0efce31fb22d1b5125058c4aaf4c43b205 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Sep 2025 18:38:53 +0100 Subject: [PATCH 34/36] feat: third batch of new committee --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index 7ab18bf..f4758b2 100644 --- a/config/users.nix +++ b/config/users.nix @@ -73,6 +73,7 @@ in { "generically" "mysticwolf" "nanda" + "rituk_0817" "sunny" "tatabbyi" ] From b5b6c67ea94dd6a0b9434985c252326c0dab24ea Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 23 Sep 2025 15:15:45 +0100 Subject: [PATCH 35/36] feat: final batch of new committee --- config/users.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/users.nix b/config/users.nix index f4758b2..f88db70 100644 --- a/config/users.nix +++ b/config/users.nix @@ -74,8 +74,10 @@ in { "mysticwolf" "nanda" "rituk_0817" + "shourjyo24_" "sunny" "tatabbyi" + "wormyworm5" ] # Committee - SISTEM ++ [] From 94a5fb65746519c71d2ff899634bb3c7225586d4 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 23 Sep 2025 15:43:48 +0100 Subject: [PATCH 36/36] fix: had forgotten someone --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index f88db70..d49d998 100644 --- a/config/users.nix +++ b/config/users.nix @@ -74,6 +74,7 @@ in { "mysticwolf" "nanda" "rituk_0817" + "sania_m" "shourjyo24_" "sunny" "tatabbyi"