From 7c79899a43e2b4d98e61a94ce1b18a30a5ab6543 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 27 Jan 2024 21:30:43 +0000 Subject: [PATCH 001/563] fix: going back to our own module for bitwarden cli --- .../bitwarden-directory-connector-cli.nix | 324 ++++++++++++++++++ applications/bitwarden/bitwarden_sync.nix | 4 +- 2 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 applications/bitwarden/bitwarden-directory-connector-cli.nix diff --git a/applications/bitwarden/bitwarden-directory-connector-cli.nix b/applications/bitwarden/bitwarden-directory-connector-cli.nix new file mode 100644 index 0000000..80f8123 --- /dev/null +++ b/applications/bitwarden/bitwarden-directory-connector-cli.nix @@ -0,0 +1,324 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.services.bitwarden-directory-connector-cli; +in { + disabledModules = [ "services/security/bitwarden-directory-connector-cli.nix" ]; + + options.services.bitwarden-directory-connector-cli = { + enable = mkEnableOption "Bitwarden Directory Connector"; + + package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {}; + + domain = mkOption { + type = types.str; + description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on."; + example = "https://vaultwarden.example.com"; + }; + + user = mkOption { + type = types.str; + description = lib.mdDoc "User to run the program."; + default = "bwdc"; + }; + + interval = mkOption { + type = types.str; + default = "*:0,15,30,45"; + description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax."; + }; + + ldap = mkOption { + description = lib.mdDoc '' + Options to configure the LDAP connection. + If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. + ''; + default = {}; + type = types.submodule ({ + config, + options, + ... + }: { + freeformType = types.attrsOf (pkgs.formats.json {}).type; + + config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); + + options = { + finalJSON = mkOption { + type = (pkgs.formats.json {}).type; + internal = true; + readOnly = true; + visible = false; + }; + + ssl = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to use TLS."; + }; + startTls = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to use STARTTLS."; + }; + + hostname = mkOption { + type = types.str; + description = lib.mdDoc "The host the LDAP is accessible on."; + example = "ldap.example.com"; + }; + + port = mkOption { + type = types.port; + default = 389; + description = lib.mdDoc "Port LDAP is accessible on."; + }; + + ad = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether the LDAP Server is an Active Directory."; + }; + + pagedSearch = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether the LDAP server paginates search results."; + }; + + rootPath = mkOption { + type = types.str; + description = lib.mdDoc "Root path for LDAP."; + example = "dc=example,dc=com"; + }; + + username = mkOption { + type = types.str; + description = lib.mdDoc "The user to authenticate as."; + example = "cn=admin,dc=example,dc=com"; + }; + }; + }); + }; + + sync = mkOption { + description = lib.mdDoc '' + Options to configure what gets synced. + If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. + ''; + default = {}; + type = types.submodule ({ + config, + options, + ... + }: { + freeformType = types.attrsOf (pkgs.formats.json {}).type; + + config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); + + options = { + finalJSON = mkOption { + type = (pkgs.formats.json {}).type; + internal = true; + readOnly = true; + visible = false; + }; + + removeDisabled = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group."; + }; + + overwriteExisting = mkOption { + type = types.bool; + default = false; + description = + lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details."; + }; + + largeImport = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups."; + }; + + memberAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute that lists members in a LDAP group."; + example = "uniqueMember"; + }; + + creationDateAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute that lists a user's creation date."; + example = "whenCreated"; + }; + + useEmailPrefixSuffix = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email."; + }; + emailPrefixAttribute = mkOption { + type = types.str; + description = lib.mdDoc "The attribute that contains the users username."; + example = "accountName"; + }; + emailSuffix = mkOption { + type = types.str; + description = lib.mdDoc "Suffix for the email, normally @example.com."; + example = "@example.com"; + }; + + users = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Sync users."; + }; + userPath = mkOption { + type = types.str; + description = lib.mdDoc "User directory, relative to root."; + default = "ou=users"; + }; + userObjectClass = mkOption { + type = types.str; + description = lib.mdDoc "Class that users must have."; + default = "inetOrgPerson"; + }; + userEmailAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute for a users email."; + default = "mail"; + }; + userFilter = mkOption { + type = types.str; + description = lib.mdDoc "LDAP filter for users."; + example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)"; + default = ""; + }; + + groups = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to sync ldap groups into BitWarden."; + }; + groupPath = mkOption { + type = types.str; + description = lib.mdDoc "Group directory, relative to root."; + default = "ou=groups"; + }; + groupObjectClass = mkOption { + type = types.str; + description = lib.mdDoc "A class that groups will have."; + default = "groupOfNames"; + }; + groupNameAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute for a name of group."; + default = "cn"; + }; + groupFilter = mkOption { + type = types.str; + description = lib.mdDoc "LDAP filter for groups."; + example = "(cn=sales)"; + default = ""; + }; + }; + }); + }; + + secrets = { + ldap = mkOption { + type = types.str; + description = "Path to file that contains LDAP password for user in {option}`ldap.username"; + }; + + bitwarden = { + client_path_id = mkOption { + type = types.str; + description = "Path to file that contains Client ID."; + }; + client_path_secret = mkOption { + type = types.str; + description = "Path to file that contains Client Secret."; + }; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups."${cfg.user}" = {}; + users.users."${cfg.user}" = { + isSystemUser = true; + group = cfg.user; + }; + + systemd = { + timers.bitwarden-directory-connector-cli = { + description = "Sync timer for Bitwarden Directory Connector"; + wantedBy = ["timers.target"]; + after = ["network-online.target"]; + timerConfig = { + OnCalendar = cfg.interval; + Unit = "bitwarden-directory-connector-cli.service"; + Persistent = true; + }; + }; + + services.bitwarden-directory-connector-cli = { + description = "Main process for Bitwarden Directory Connector"; + + environment = { + BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp"; + BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true"; + }; + + serviceConfig = { + Type = "oneshot"; + User = "${cfg.user}"; + PrivateTmp = true; + ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" '' + set -eo pipefail + + # create the config file + ${lib.getExe cfg.package} data-file + touch /tmp/data.json.tmp + chmod 600 /tmp/data.json{,.tmp} + + ${lib.getExe cfg.package} config server ${cfg.domain} + + # now login to set credentials + export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})" + export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})" + ${lib.getExe cfg.package} login + + ${lib.getExe pkgs.jq} '.authenticatedAccounts[0] as $account + | .[$account].directoryConfigurations.ldap |= $ldap_data + | .[$account].directorySettings.organizationId |= $orgID + | .[$account].directorySettings.sync |= $sync_data' \ + --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \ + --arg orgID "''${BW_CLIENTID//organization.}" \ + --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \ + /tmp/data.json \ + > /tmp/data.json.tmp + + mv -f /tmp/data.json.tmp /tmp/data.json + + # final config + ${lib.getExe cfg.package} config directory 0 + ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap} + ''; + + ExecStart = "${lib.getExe cfg.package} sync"; + }; + }; + }; + }; + + meta.maintainers = with maintainers; [Silver-Golden]; +} diff --git a/applications/bitwarden/bitwarden_sync.nix b/applications/bitwarden/bitwarden_sync.nix index db8b970..88104d0 100644 --- a/applications/bitwarden/bitwarden_sync.nix +++ b/applications/bitwarden/bitwarden_sync.nix @@ -6,7 +6,9 @@ }: let user = "bwdc"; in { - imports = []; + imports = [ + ./bitwarden-directory-connector-cli.nix + ]; options = {}; From 6f9d30cb87132253ef355036654f69aaa905a8e7 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 27 Jan 2024 21:30:43 +0000 Subject: [PATCH 002/563] fix: going back to our own module for bitwarden cli --- .../bitwarden-directory-connector-cli.nix | 324 ++++++++++++++++++ applications/bitwarden/bitwarden_sync.nix | 4 +- 2 files changed, 327 insertions(+), 1 deletion(-) create mode 100644 applications/bitwarden/bitwarden-directory-connector-cli.nix diff --git a/applications/bitwarden/bitwarden-directory-connector-cli.nix b/applications/bitwarden/bitwarden-directory-connector-cli.nix new file mode 100644 index 0000000..80f8123 --- /dev/null +++ b/applications/bitwarden/bitwarden-directory-connector-cli.nix @@ -0,0 +1,324 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + cfg = config.services.bitwarden-directory-connector-cli; +in { + disabledModules = [ "services/security/bitwarden-directory-connector-cli.nix" ]; + + options.services.bitwarden-directory-connector-cli = { + enable = mkEnableOption "Bitwarden Directory Connector"; + + package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {}; + + domain = mkOption { + type = types.str; + description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on."; + example = "https://vaultwarden.example.com"; + }; + + user = mkOption { + type = types.str; + description = lib.mdDoc "User to run the program."; + default = "bwdc"; + }; + + interval = mkOption { + type = types.str; + default = "*:0,15,30,45"; + description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax."; + }; + + ldap = mkOption { + description = lib.mdDoc '' + Options to configure the LDAP connection. + If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. + ''; + default = {}; + type = types.submodule ({ + config, + options, + ... + }: { + freeformType = types.attrsOf (pkgs.formats.json {}).type; + + config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); + + options = { + finalJSON = mkOption { + type = (pkgs.formats.json {}).type; + internal = true; + readOnly = true; + visible = false; + }; + + ssl = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to use TLS."; + }; + startTls = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to use STARTTLS."; + }; + + hostname = mkOption { + type = types.str; + description = lib.mdDoc "The host the LDAP is accessible on."; + example = "ldap.example.com"; + }; + + port = mkOption { + type = types.port; + default = 389; + description = lib.mdDoc "Port LDAP is accessible on."; + }; + + ad = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether the LDAP Server is an Active Directory."; + }; + + pagedSearch = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether the LDAP server paginates search results."; + }; + + rootPath = mkOption { + type = types.str; + description = lib.mdDoc "Root path for LDAP."; + example = "dc=example,dc=com"; + }; + + username = mkOption { + type = types.str; + description = lib.mdDoc "The user to authenticate as."; + example = "cn=admin,dc=example,dc=com"; + }; + }; + }); + }; + + sync = mkOption { + description = lib.mdDoc '' + Options to configure what gets synced. + If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. + ''; + default = {}; + type = types.submodule ({ + config, + options, + ... + }: { + freeformType = types.attrsOf (pkgs.formats.json {}).type; + + config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); + + options = { + finalJSON = mkOption { + type = (pkgs.formats.json {}).type; + internal = true; + readOnly = true; + visible = false; + }; + + removeDisabled = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group."; + }; + + overwriteExisting = mkOption { + type = types.bool; + default = false; + description = + lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details."; + }; + + largeImport = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups."; + }; + + memberAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute that lists members in a LDAP group."; + example = "uniqueMember"; + }; + + creationDateAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute that lists a user's creation date."; + example = "whenCreated"; + }; + + useEmailPrefixSuffix = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email."; + }; + emailPrefixAttribute = mkOption { + type = types.str; + description = lib.mdDoc "The attribute that contains the users username."; + example = "accountName"; + }; + emailSuffix = mkOption { + type = types.str; + description = lib.mdDoc "Suffix for the email, normally @example.com."; + example = "@example.com"; + }; + + users = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Sync users."; + }; + userPath = mkOption { + type = types.str; + description = lib.mdDoc "User directory, relative to root."; + default = "ou=users"; + }; + userObjectClass = mkOption { + type = types.str; + description = lib.mdDoc "Class that users must have."; + default = "inetOrgPerson"; + }; + userEmailAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute for a users email."; + default = "mail"; + }; + userFilter = mkOption { + type = types.str; + description = lib.mdDoc "LDAP filter for users."; + example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)"; + default = ""; + }; + + groups = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc "Whether to sync ldap groups into BitWarden."; + }; + groupPath = mkOption { + type = types.str; + description = lib.mdDoc "Group directory, relative to root."; + default = "ou=groups"; + }; + groupObjectClass = mkOption { + type = types.str; + description = lib.mdDoc "A class that groups will have."; + default = "groupOfNames"; + }; + groupNameAttribute = mkOption { + type = types.str; + description = lib.mdDoc "Attribute for a name of group."; + default = "cn"; + }; + groupFilter = mkOption { + type = types.str; + description = lib.mdDoc "LDAP filter for groups."; + example = "(cn=sales)"; + default = ""; + }; + }; + }); + }; + + secrets = { + ldap = mkOption { + type = types.str; + description = "Path to file that contains LDAP password for user in {option}`ldap.username"; + }; + + bitwarden = { + client_path_id = mkOption { + type = types.str; + description = "Path to file that contains Client ID."; + }; + client_path_secret = mkOption { + type = types.str; + description = "Path to file that contains Client Secret."; + }; + }; + }; + }; + + config = mkIf cfg.enable { + users.groups."${cfg.user}" = {}; + users.users."${cfg.user}" = { + isSystemUser = true; + group = cfg.user; + }; + + systemd = { + timers.bitwarden-directory-connector-cli = { + description = "Sync timer for Bitwarden Directory Connector"; + wantedBy = ["timers.target"]; + after = ["network-online.target"]; + timerConfig = { + OnCalendar = cfg.interval; + Unit = "bitwarden-directory-connector-cli.service"; + Persistent = true; + }; + }; + + services.bitwarden-directory-connector-cli = { + description = "Main process for Bitwarden Directory Connector"; + + environment = { + BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp"; + BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true"; + }; + + serviceConfig = { + Type = "oneshot"; + User = "${cfg.user}"; + PrivateTmp = true; + ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" '' + set -eo pipefail + + # create the config file + ${lib.getExe cfg.package} data-file + touch /tmp/data.json.tmp + chmod 600 /tmp/data.json{,.tmp} + + ${lib.getExe cfg.package} config server ${cfg.domain} + + # now login to set credentials + export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})" + export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})" + ${lib.getExe cfg.package} login + + ${lib.getExe pkgs.jq} '.authenticatedAccounts[0] as $account + | .[$account].directoryConfigurations.ldap |= $ldap_data + | .[$account].directorySettings.organizationId |= $orgID + | .[$account].directorySettings.sync |= $sync_data' \ + --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \ + --arg orgID "''${BW_CLIENTID//organization.}" \ + --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \ + /tmp/data.json \ + > /tmp/data.json.tmp + + mv -f /tmp/data.json.tmp /tmp/data.json + + # final config + ${lib.getExe cfg.package} config directory 0 + ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap} + ''; + + ExecStart = "${lib.getExe cfg.package} sync"; + }; + }; + }; + }; + + meta.maintainers = with maintainers; [Silver-Golden]; +} diff --git a/applications/bitwarden/bitwarden_sync.nix b/applications/bitwarden/bitwarden_sync.nix index db8b970..88104d0 100644 --- a/applications/bitwarden/bitwarden_sync.nix +++ b/applications/bitwarden/bitwarden_sync.nix @@ -6,7 +6,9 @@ }: let user = "bwdc"; in { - imports = []; + imports = [ + ./bitwarden-directory-connector-cli.nix + ]; options = {}; From 46cae94f99d1bb08c39db67d7307590a61bde85c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 27 Jan 2024 21:38:30 +0000 Subject: [PATCH 003/563] fmt: forgot to format --- applications/bitwarden/bitwarden-directory-connector-cli.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/bitwarden/bitwarden-directory-connector-cli.nix b/applications/bitwarden/bitwarden-directory-connector-cli.nix index 80f8123..85ed64f 100644 --- a/applications/bitwarden/bitwarden-directory-connector-cli.nix +++ b/applications/bitwarden/bitwarden-directory-connector-cli.nix @@ -7,7 +7,7 @@ with lib; let cfg = config.services.bitwarden-directory-connector-cli; in { - disabledModules = [ "services/security/bitwarden-directory-connector-cli.nix" ]; + disabledModules = ["services/security/bitwarden-directory-connector-cli.nix"]; options.services.bitwarden-directory-connector-cli = { enable = mkEnableOption "Bitwarden Directory Connector"; From 39594e59730cbb21ac61829d41bb9fd991d6f158 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 27 Jan 2024 23:04:48 +0000 Subject: [PATCH 004/563] fix: the network issues --- machines/_base.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/machines/_base.nix b/machines/_base.nix index f0e5167..d83e75b 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -123,6 +123,9 @@ in { # use teh above nameservers as the fallback dns services.resolved.fallbackDns = config.networking.nameservers; + # https://discourse.nixos.org/t/systemd-networkd-wait-online-934764-timeout-occurred-while-waiting-for-network-connectivity/33656/9 + systemd.network.wait-online.enable = false; + environment.systemPackages = [ # for flakes pkgs.git From 6b0507a647cc55e3c492e7e8ccdd5d635c763d50 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 31 Jan 2024 15:43:18 +0000 Subject: [PATCH 005/563] fix: redirect root IP's in nginx to skynet.ie --- applications/bitwarden/vaultwarden.nix | 17 ++++++++++++----- applications/email.nix | 6 ++++++ applications/games.nix | 6 ++++++ applications/games/minecraft.nix | 6 ++++++ applications/gitlab.nix | 6 ++++++ applications/nextcloud.nix | 5 +++++ applications/skynet_users.nix | 6 ++++++ applications/ulfm.nix | 20 ++++++++++++++++---- 8 files changed, 63 insertions(+), 9 deletions(-) diff --git a/applications/bitwarden/vaultwarden.nix b/applications/bitwarden/vaultwarden.nix index 22808e9..3e0c84e 100644 --- a/applications/bitwarden/vaultwarden.nix +++ b/applications/bitwarden/vaultwarden.nix @@ -47,11 +47,18 @@ in { } ]; - services.nginx.virtualHosts."${domain}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}"; + services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + "${domain}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}"; + }; }; }; diff --git a/applications/email.nix b/applications/email.nix index 7a9a568..0e39139 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -245,6 +245,12 @@ in { # to provide the certs services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + "mail.skynet.ie" = { forceSSL = true; useACMEHost = "mail"; diff --git a/applications/games.nix b/applications/games.nix index 4959f25..1c35588 100644 --- a/applications/games.nix +++ b/applications/games.nix @@ -60,6 +60,12 @@ in { ]; services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + "${cfg.domain.sub}.skynet.ie" = { forceSSL = true; useACMEHost = "skynet"; diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index 5bd427a..5d51620 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -108,6 +108,12 @@ in { ]; services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + # https://config.minecraft.games.skynet.ie "config.${short_domain}" = { forceSSL = true; diff --git a/applications/gitlab.nix b/applications/gitlab.nix index d97b48e..36b2aae 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -150,6 +150,12 @@ in { services.openssh.ports = [22 2222]; services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + # main site "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { forceSSL = true; diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index 078408c..f177132 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -108,6 +108,11 @@ in { }; services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; ${domain} = { forceSSL = true; useACMEHost = "skynet"; diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 66c3386..cc0fd22 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -68,6 +68,12 @@ in { systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; services.nginx.virtualHosts = { + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + # main site "*.users.skynet.ie" = { forceSSL = true; diff --git a/applications/ulfm.nix b/applications/ulfm.nix index ede9a33..36329f9 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -93,10 +93,22 @@ in { }; }; - services.nginx.virtualHosts."${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".proxyPass = "http://localhost:8000"; + services.nginx = { + enable = true; + group = "acme"; + + virtualHosts = { + "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".proxyPass = "http://localhost:8000"; + }; + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + }; }; }; } From e8637b1f39e6da3092a90f08a7013a39b71f354a Mon Sep 17 00:00:00 2001 From: runner_nix Date: Fri, 2 Feb 2024 14:40:41 +0000 Subject: [PATCH 006/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6545503..2fdc821 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1698519699, - "narHash": "sha256-GK8NGWeG2gf3z/ktT0rzDVfj1UsaXxDLcSWCz6tsYSY=", + "lastModified": 1706884793, + "narHash": "sha256-74BI6bZcHeqXWDIdapBIPvJIYI51bLlMYbnkH2UxGDc=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "7f451b04c5cffda1558e58f65a53dbc89a678446", + "rev": "db3ed9b0bd31dc2e23c3726141e47a45053e4b0b", "type": "gitlab" }, "original": { From 3c6250f54be1f8fb06ed8583687fdcf36d9bb84a Mon Sep 17 00:00:00 2001 From: runner_nix Date: Fri, 2 Feb 2024 17:06:08 +0000 Subject: [PATCH 007/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2fdc821..8636ad2 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1706884793, - "narHash": "sha256-74BI6bZcHeqXWDIdapBIPvJIYI51bLlMYbnkH2UxGDc=", + "lastModified": 1706893483, + "narHash": "sha256-x9OWItfCPTQA9klaN2gpaNLdqUVS0beUMdxbjmc7WgE=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "db3ed9b0bd31dc2e23c3726141e47a45053e4b0b", + "rev": "54d1fd58213e087d63331a0d94ea723617207e20", "type": "gitlab" }, "original": { From 2acaf29f634aff2fb24ba5b5996eb97dc0a86ef8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 4 Feb 2024 20:17:46 +0000 Subject: [PATCH 008/563] [skip ci] fix: bump nixpkgs --- README.md | 2 ++ flake.lock | 83 +++++++++++++++++++++++------------------------------- flake.nix | 1 + 3 files changed, 38 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index e26bdc6..f98fd97 100644 --- a/README.md +++ b/README.md @@ -98,6 +98,8 @@ We should be updating ``nixpkgs`` at least once a semester, ideally to teh next ```shell nix flake lock --update-input nixpkgs +# newser versions +nix flake update nixpkgs ``` ### Formatting diff --git a/flake.lock b/flake.lock index 6545503..7b5edc8 100644 --- a/flake.lock +++ b/flake.lock @@ -293,7 +293,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1692351612, @@ -311,7 +311,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1686572087, @@ -374,20 +374,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1687011986, - "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1686921029, "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", @@ -402,7 +388,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -416,7 +402,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -430,7 +416,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -444,7 +430,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -458,7 +444,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -532,11 +518,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -546,21 +532,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1670751203, - "narHash": "sha256-XdoH1v3shKDGlrwjgrNX/EN8s3c+kQV7xY6cLCE8vcI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "64e0bf055f9d25928c31fb12924e59ff8ce71e60", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1693060755, "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", @@ -574,7 +545,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1693087214, "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", @@ -589,6 +560,20 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1687011986, + "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -628,7 +613,9 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat", - "nixpkgs": "nixpkgs_7", + "nixpkgs": [ + "nixpkgs" + ], "nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-23_05": "nixpkgs-23_05", "utils": "utils_3" @@ -652,7 +639,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_8", "utils": "utils_4" }, "locked": { @@ -674,7 +661,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_10", "utils": "utils_5" }, "locked": { @@ -695,7 +682,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "utils": "utils_6" }, "locked": { @@ -716,7 +703,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "utils": "utils_7" }, "locked": { @@ -737,7 +724,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "utils": "utils_8" }, "locked": { @@ -758,7 +745,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils_9" }, "locked": { @@ -779,7 +766,7 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "utils": "utils_10" }, "locked": { diff --git a/flake.nix b/flake.nix index b63aa6b..66eb62f 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ # email # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; simple-nixos-mailserver = { + inputs.nixpkgs.follows = "nixpkgs"; type = "gitlab"; host = "gitlab.skynet.ie"; owner = "compsoc1%2Fskynet"; From 6de8f1e9637be700a993196e5a0b9dbdf3614740 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 4 Feb 2024 21:39:57 +0000 Subject: [PATCH 009/563] fix: email how the sive was handled changed slighty, this is a temp fix Signed-off-by: Brendan Golden --- applications/email.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/email.nix b/applications/email.nix index 0e39139..6633970 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -410,6 +410,9 @@ in { ''; }; + # for https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/275 + services.dovecot2.sieve.extensions = ["fileinto"]; + mailserver = { enable = true; fqdn = "${cfg.sub}.${cfg.domain}"; From 7ccc78c5bdda8c56834698789c58a522fb1d4a01 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 5 Feb 2024 17:10:14 +0000 Subject: [PATCH 010/563] [skip ci] Updated flake for skynet_website_renew --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cedee81..bb61a3b 100644 --- a/flake.lock +++ b/flake.lock @@ -771,11 +771,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1696453842, - "narHash": "sha256-q33InJdgtxep17k5rXLNLunxC9Jdvv5nC0Hc+2NxMZA=", + "lastModified": 1707152932, + "narHash": "sha256-Dd4bvrWVoPME1OT998f3PBx/kDlC3spmr22snU0CRC0=", "owner": "compsoc1%2Fskynet", "repo": "website%2Falumni-renew", - "rev": "0e5ddb75723fc3baae19611114cb59b4673d48e0", + "rev": "43a17dd41708e6a3b0360f2f95a14c67560467c4", "type": "gitlab" }, "original": { From 2c3e87b4d84a17590849f3707deee1e5651e1cea Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 5 Feb 2024 17:30:53 +0000 Subject: [PATCH 011/563] [skip ci] Updated flake for skynet_website --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bb61a3b..2b56540 100644 --- a/flake.lock +++ b/flake.lock @@ -708,11 +708,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1696876711, - "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", + "lastModified": 1707154174, + "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", "owner": "compsoc1%2Fskynet", "repo": "website%2F2023", - "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "rev": "c81db388fac570a8cb646391ea461b9e60282043", "type": "gitlab" }, "original": { From 26e715b2f62e406deee5e773ebcc3e3c3d200186 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 9 Feb 2024 12:47:20 +0000 Subject: [PATCH 012/563] fix: some error warnings cleared --- applications/email.nix | 2 +- applications/nextcloud.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 6633970..82e9e7f 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -465,7 +465,7 @@ in { ]; }; - services.dovecot2.sieveScripts = { + services.dovecot2.sieve.scripts = { before = configFile; }; diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index f177132..a915980 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -91,10 +91,10 @@ in { appstoreEnable = true; extraApps = with config.services.nextcloud.package.packages.apps; { - inherit forms groupfolders mail maps notes onlyoffice polls; + inherit forms groupfolders maps notes onlyoffice polls; }; - extraOptions = { + settings = { trusted_proxies = ["193.1.99.65"]; default_phone_region = "IE"; mail_smtpmode = "sendmail"; From 8f60f9dea0429f81c69be3f7063b2d66a512bd47 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sat, 10 Feb 2024 18:26:11 +0000 Subject: [PATCH 013/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2b56540..55a987b 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1706893483, - "narHash": "sha256-x9OWItfCPTQA9klaN2gpaNLdqUVS0beUMdxbjmc7WgE=", + "lastModified": 1707589534, + "narHash": "sha256-PJyu+NQ2dAM13+9hdF88SPYizZ0h4L2QCNkHys4RFqw=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "54d1fd58213e087d63331a0d94ea723617207e20", + "rev": "58d49a20d7a13f74eedceccc68d4de9f1eae677e", "type": "gitlab" }, "original": { From 7ed840e20413defd59ac0c132b007864eb8652d3 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sat, 10 Feb 2024 20:06:07 +0000 Subject: [PATCH 014/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 55a987b..1f6cae6 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1707589534, - "narHash": "sha256-PJyu+NQ2dAM13+9hdF88SPYizZ0h4L2QCNkHys4RFqw=", + "lastModified": 1707595535, + "narHash": "sha256-L2NOgjl3aJcHk5vcQOzqJQAk6HBHsizgcWRJJf3BvPw=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "58d49a20d7a13f74eedceccc68d4de9f1eae677e", + "rev": "2c15b65dbf92719e207aa27493036b434f6bd9b8", "type": "gitlab" }, "original": { From 40f33f28aa752bad4c58fa7150f6698b71aa7004 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 00:08:57 +0000 Subject: [PATCH 015/563] Update file dns.nix --- config/dns.nix | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/config/dns.nix b/config/dns.nix index b64c2c3..672032b 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -41,17 +41,22 @@ r_type = "CNAME"; value = "optimus-reborn"; } - #{ - # record = "bumblebee"; - # r_type = "A"; - # value = "193.1.99.91"; - # server = true; - #} - #{ - # record = "testing"; - # r_type = "CNAME"; - # value = "bumblebee"; - #} + { + record = "bumblebee"; + r_type = "A"; + value = "193.1.99.91"; + server = true; + } + { + record = "minecraft.compsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft.compsoc.games"; + r_type = "SRV"; + value = "0 10 25518 bumblebee.skynet.ie"; + } ]; }; } From 8d94f0c965207663fe016c48dd57e9cd277a2e02 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 11:00:16 +0000 Subject: [PATCH 016/563] Update file dns.nix --- config/dns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/dns.nix b/config/dns.nix index 672032b..c6c66e7 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -53,9 +53,9 @@ value = "bumblebee"; } { - record = "_minecraft._tcp.minecraft.compsoc.games"; + record = "_minecraft._tcp"; r_type = "SRV"; - value = "0 10 25518 bumblebee.skynet.ie"; + value = "0 10 25518 minecraft.compsoc.games.skynet.ie"; } ]; }; From 5ced7f4fe4ad9e501df0e283534ebf22e5a9d123 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 12:27:47 +0000 Subject: [PATCH 017/563] Update file dns.nix --- config/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index c6c66e7..4b1b050 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -53,7 +53,7 @@ value = "bumblebee"; } { - record = "_minecraft._tcp"; + record = "_minecraft._tcp.minecraft.compsoc.games"; r_type = "SRV"; value = "0 10 25518 minecraft.compsoc.games.skynet.ie"; } From a0bb8b479e96582e5c49548faa928f6fdd93a19b Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 12:33:26 +0000 Subject: [PATCH 018/563] Update file dns.nix --- config/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index 4b1b050..fc6de78 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -55,7 +55,7 @@ { record = "_minecraft._tcp.minecraft.compsoc.games"; r_type = "SRV"; - value = "0 10 25518 minecraft.compsoc.games.skynet.ie"; + value = "0 10 25518 minecraft.compsoc.games"; } ]; }; From 9932efe593a7096cb386b69ce00488e744fcac32 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 12:40:43 +0000 Subject: [PATCH 019/563] Update Minecraft server DNS entry --- config/dns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/dns.nix b/config/dns.nix index fc6de78..59e1396 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -53,9 +53,9 @@ value = "bumblebee"; } { - record = "_minecraft._tcp.minecraft.compsoc.games"; + record = "_minecraft._tcp"; r_type = "SRV"; - value = "0 10 25518 minecraft.compsoc.games"; + value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; } ]; }; From 93211d09cc331c86b85417c173266f2bf0a032b6 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 12:59:51 +0000 Subject: [PATCH 020/563] Update dns.nix --- config/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index 59e1396..a77e37d 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -53,7 +53,7 @@ value = "bumblebee"; } { - record = "_minecraft._tcp"; + record = "_minecraft._tcp.minecraft.compsoc.games"; r_type = "SRV"; value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; } From 5aca8874b34674a6f3d8a085d475a50018967171 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 13:12:32 +0000 Subject: [PATCH 021/563] Update Minecraft server DNS entry --- config/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index a77e37d..991f058 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -53,7 +53,7 @@ value = "bumblebee"; } { - record = "_minecraft._tcp.minecraft.compsoc.games"; + record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie."; r_type = "SRV"; value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; } From 138fd31a6e200657c31affef7f8a73aeadfd806a Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Fri, 16 Feb 2024 15:05:29 +0000 Subject: [PATCH 022/563] Update file dns.nix --- applications/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/dns.nix b/applications/dns.nix index b912991..2937d60 100644 --- a/applications/dns.nix +++ b/applications/dns.nix @@ -96,7 +96,7 @@ ; ------------------------------------------ ; SRV ; ------------------------------------------ - ${format_records sort_records_srv 31} + ${format_records sort_records_srv 65} '' From 98886d724db619d7205a5f894e568778092ac81b Mon Sep 17 00:00:00 2001 From: runner_nix Date: Fri, 16 Feb 2024 16:49:24 +0000 Subject: [PATCH 023/563] [skip ci] Updated flake for skynet_website_games --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1f6cae6..7056573 100644 --- a/flake.lock +++ b/flake.lock @@ -750,11 +750,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1696129767, - "narHash": "sha256-cO9zQNOQKHcaepetJEmWTEM0DJLm+NLvAUpR05TEoqQ=", + "lastModified": 1708102137, + "narHash": "sha256-wRk2EevqffobmJr4E8jdasA3CxCDMzNLz6QFu0QlG/I=", "owner": "compsoc1%2Fskynet", "repo": "website%2Fgames.skynet.ie", - "rev": "d5b6a87df665c1ac0cb7ec39acc088a3de703c60", + "rev": "9d4f68463ede0764fb1d32e43716e8e7b9edcaf0", "type": "gitlab" }, "original": { From b526150547e5d960171a304c7c1409fd9ecdf7a3 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Fri, 16 Feb 2024 17:04:36 +0000 Subject: [PATCH 024/563] [skip ci] Updated flake for skynet_website_games --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7056573..1f6cae6 100644 --- a/flake.lock +++ b/flake.lock @@ -750,11 +750,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1708102137, - "narHash": "sha256-wRk2EevqffobmJr4E8jdasA3CxCDMzNLz6QFu0QlG/I=", + "lastModified": 1696129767, + "narHash": "sha256-cO9zQNOQKHcaepetJEmWTEM0DJLm+NLvAUpR05TEoqQ=", "owner": "compsoc1%2Fskynet", "repo": "website%2Fgames.skynet.ie", - "rev": "9d4f68463ede0764fb1d32e43716e8e7b9edcaf0", + "rev": "d5b6a87df665c1ac0cb7ec39acc088a3de703c60", "type": "gitlab" }, "original": { From ec254fd6fecd0b6193489b91a98dfb12f470f53d Mon Sep 17 00:00:00 2001 From: runner_nix Date: Fri, 16 Feb 2024 17:16:57 +0000 Subject: [PATCH 025/563] [skip ci] Updated flake for skynet_website_games --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 1f6cae6..c74a04a 100644 --- a/flake.lock +++ b/flake.lock @@ -750,11 +750,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1696129767, - "narHash": "sha256-cO9zQNOQKHcaepetJEmWTEM0DJLm+NLvAUpR05TEoqQ=", + "lastModified": 1708103254, + "narHash": "sha256-/1ElBw+oc1dzwgr7VVLkQFRITteckH1IwbZpgpz8Qvg=", "owner": "compsoc1%2Fskynet", "repo": "website%2Fgames.skynet.ie", - "rev": "d5b6a87df665c1ac0cb7ec39acc088a3de703c60", + "rev": "f43a01ef62494cef3e7f1e86d8169867e2df136b", "type": "gitlab" }, "original": { From fa7cbd420e61ecce5a8b3ef6a57d6857d1b1e6bb Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 18 Feb 2024 01:53:26 +0000 Subject: [PATCH 026/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c74a04a..42cd4b4 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1704885928, - "narHash": "sha256-HMe/o7/MAkyr3duMf1a52inOtJSJozH22b94w7TM9VY=", + "lastModified": 1708220771, + "narHash": "sha256-xjuu0FkheoEV5yShGMqtj+FjjwhnpiZvUeegjRTOvbM=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "96f86985eec772a835e7867852ee6452fd9548b6", + "rev": "100b0d6552e4b4f9fd7e61bdd41b9d1402c41b51", "type": "gitlab" }, "original": { From cde7f37455fa4762e72e1f3c8827cbdeb98193c2 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 18 Feb 2024 14:35:33 +0000 Subject: [PATCH 027/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 42cd4b4..23e7a38 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1708220771, - "narHash": "sha256-xjuu0FkheoEV5yShGMqtj+FjjwhnpiZvUeegjRTOvbM=", + "lastModified": 1708266543, + "narHash": "sha256-mP9e2OYSWpE6LN6UzawrWMOcV0VxCd4WbNAjfuVzeEg=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "100b0d6552e4b4f9fd7e61bdd41b9d1402c41b51", + "rev": "7576b954bb60b978722776b87dafb4b57f59bebe", "type": "gitlab" }, "original": { From 19d94808edadb7fff3fd1b162cf58877182952e7 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 18 Feb 2024 14:52:34 +0000 Subject: [PATCH 028/563] fix: cors is now being handled by the backend --- applications/ldap/backend.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index 3903198..929404e 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -72,9 +72,6 @@ in { forceSSL = true; useACMEHost = "skynet"; locations."/".proxyPass = "http://localhost:${port_backend}"; - extraConfig = '' - add_header Access-Control-Allow-Origin "*"; - ''; }; services.skynet_ldap_backend = { From b6ecd5255d1fb6eacf54bccf55dfa98ea1bde129 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 18 Feb 2024 17:29:51 +0000 Subject: [PATCH 029/563] [skip ci] Updated flake for skynet_ldap_frontend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 23e7a38..379bcbd 100644 --- a/flake.lock +++ b/flake.lock @@ -687,11 +687,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1704103861, - "narHash": "sha256-zVIClIEVaZFW2E0cs+sYe5A584dQB94H4nKuf0q+SMw=", + "lastModified": 1708277300, + "narHash": "sha256-Y8wKzGJQ69w375faAYGukvuTFez6YGeV+w4TOD4XosA=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Ffrontend", - "rev": "d3b4c822b9782b5c072269d18844ec6461c0fe86", + "rev": "36c5e5bbae7adcc404bec6d643cae5fd8a6c87bb", "type": "gitlab" }, "original": { From d3e635f2c118f73fa3e6da5a3c4d5389ee382e8d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Feb 2024 19:54:06 +0000 Subject: [PATCH 030/563] committee: Leo resigned from committee --- config/users.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/config/users.nix b/config/users.nix index c6e4f3c..0e5d042 100644 --- a/config/users.nix +++ b/config/users.nix @@ -40,7 +40,6 @@ in { config.skynet = { users = { committee = [ - "leo" "silver" "eoghanconlon73" "sidhiel" From 22cb1bcbd456a0b247d0836df32db9471ee3c10a Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 14:22:03 +0000 Subject: [PATCH 031/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 379bcbd..dd932cd 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1707595535, - "narHash": "sha256-L2NOgjl3aJcHk5vcQOzqJQAk6HBHsizgcWRJJf3BvPw=", + "lastModified": 1709043592, + "narHash": "sha256-lQ4/Cx2fBsySHoQ+rEkCcFEL7XrbOFsoiibb/BCRYhE=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "2c15b65dbf92719e207aa27493036b434f6bd9b8", + "rev": "54b62b4e69253314e6de04bc3d778b56c66ed178", "type": "gitlab" }, "original": { From e77d9e51e8428ced8e6aa5514b3bf865e88f5ce0 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 15:38:56 +0000 Subject: [PATCH 032/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index dd932cd..fd58969 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709043592, - "narHash": "sha256-lQ4/Cx2fBsySHoQ+rEkCcFEL7XrbOFsoiibb/BCRYhE=", + "lastModified": 1709048289, + "narHash": "sha256-5EEMRcmKA/e3l/CSLlaIGxedPSfyptXBG03rScjWHHY=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "54b62b4e69253314e6de04bc3d778b56c66ed178", + "rev": "52adfa26f7d61eb75da83d08bfda7c90c96f53f3", "type": "gitlab" }, "original": { From 2fcf1f19d8b871b073cb33536709fcaed1385a69 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 17:32:15 +0000 Subject: [PATCH 033/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index fd58969..ad1993e 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709048289, - "narHash": "sha256-5EEMRcmKA/e3l/CSLlaIGxedPSfyptXBG03rScjWHHY=", + "lastModified": 1709055104, + "narHash": "sha256-6LdIy+xaHJ7bmQIMmoOOiNIKU66zc9gJe03VPv//l0E=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "52adfa26f7d61eb75da83d08bfda7c90c96f53f3", + "rev": "d00717b11981de22518d98e9a2810402ede39905", "type": "gitlab" }, "original": { From 34156ba71fba0c4536e943b06d4fba155d1b0f0f Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 17:49:17 +0000 Subject: [PATCH 034/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ad1993e..c0836bd 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709055104, - "narHash": "sha256-6LdIy+xaHJ7bmQIMmoOOiNIKU66zc9gJe03VPv//l0E=", + "lastModified": 1709056119, + "narHash": "sha256-bJgPGusHddUcLXn9JGvlY9mjvvX/eO8ggmOAChZ2aD4=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "d00717b11981de22518d98e9a2810402ede39905", + "rev": "c56aeb611ce18b9e07bca0ebb3ed46e57447b7fe", "type": "gitlab" }, "original": { From d971c2e855ab866daee1c6a61e21a8cb68d70d9d Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 18:05:08 +0000 Subject: [PATCH 035/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index c0836bd..d04c5a6 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709056119, - "narHash": "sha256-bJgPGusHddUcLXn9JGvlY9mjvvX/eO8ggmOAChZ2aD4=", + "lastModified": 1709056952, + "narHash": "sha256-scoN39mUeCNZ9XNKJb4ITH8gCSn5OZ6QRctrw6zGw2Y=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "c56aeb611ce18b9e07bca0ebb3ed46e57447b7fe", + "rev": "20848e361eaaca45c34d7dd6ea8684db53cbb296", "type": "gitlab" }, "original": { From 90ac5f41ef89f90d51e721366e9218b4e6f18e1e Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 18:17:42 +0000 Subject: [PATCH 036/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d04c5a6..fcc2833 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709056952, - "narHash": "sha256-scoN39mUeCNZ9XNKJb4ITH8gCSn5OZ6QRctrw6zGw2Y=", + "lastModified": 1709057212, + "narHash": "sha256-02POtf0AvuTCb/LpyFHm0kmjDtIVAEASRol2O/BLuvQ=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "20848e361eaaca45c34d7dd6ea8684db53cbb296", + "rev": "cd3d0bbc8ed81ba89f41671dada0d2c39ea60103", "type": "gitlab" }, "original": { From 4314d00322d4c37216accf53c7d63cd3571ab9c6 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 18:30:51 +0000 Subject: [PATCH 037/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index fcc2833..bcbe490 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709057212, - "narHash": "sha256-02POtf0AvuTCb/LpyFHm0kmjDtIVAEASRol2O/BLuvQ=", + "lastModified": 1709058068, + "narHash": "sha256-dXLty1IueFg4DsBrTsdJVx3Yoggb4Il/pJqqm+mYUGA=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "cd3d0bbc8ed81ba89f41671dada0d2c39ea60103", + "rev": "0aad348a1fe25564564840d8e15c8ec3284aa659", "type": "gitlab" }, "original": { From 44f123289fb6e44e2d0b96197d243fd064057af8 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 27 Feb 2024 19:11:09 +0000 Subject: [PATCH 038/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bcbe490..7fce941 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709058068, - "narHash": "sha256-dXLty1IueFg4DsBrTsdJVx3Yoggb4Il/pJqqm+mYUGA=", + "lastModified": 1709060998, + "narHash": "sha256-0VGnRftMl8Iu7ffKRdYNlSqxlU9HSUw6g6xIZ9kIEoA=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "0aad348a1fe25564564840d8e15c8ec3284aa659", + "rev": "b78de3eeabbd20d99f9e3b03672bd9509c4c4f6c", "type": "gitlab" }, "original": { From a42ac52f9d5341af05fe91166f878985e7fcbab0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 28 Feb 2024 09:10:57 +0000 Subject: [PATCH 039/563] feat: add php to the skynet users server --- applications/skynet_users.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index cc0fd22..a364361 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -55,7 +55,10 @@ in { } ]; - environment.systemPackages = [pkgs.vim]; + environment.systemPackages = with pkgs; [ + vim + php + ]; networking = { defaultGateway = { From 90d8a105f7fc9a19968c96112af9a304c7e2d69f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 28 Feb 2024 14:12:05 +0000 Subject: [PATCH 040/563] feat: backup client will now only run if there are items to backup. Closes #54 --- applications/dns.nix | 2 + applications/restic.nix | 85 ++++++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 40 deletions(-) diff --git a/applications/dns.nix b/applications/dns.nix index 2937d60..6b7bc6b 100644 --- a/applications/dns.nix +++ b/applications/dns.nix @@ -343,6 +343,8 @@ in { }; config = lib.mkIf cfg.server.enable { + # services.skynet_backup.normal.backups = ["/etc/skynet/dns"]; + # open the firewall for this skynet_firewall.forward = [ "ip daddr ${cfg.server.ip} tcp dport 53 counter packets 0 bytes 0 accept" diff --git a/applications/restic.nix b/applications/restic.nix index 4ccf611..4d6a277 100644 --- a/applications/restic.nix +++ b/applications/restic.nix @@ -9,6 +9,8 @@ with lib; let cfg = config.services.skynet_backup; + enable_client = cfg.normal.backups != null && cfg.normal.backups != []; + # since they should all have the same config we can do this base = { paths = cfg.normal.backups; @@ -150,49 +152,52 @@ in { }; }; - config = { - # these values are anabled for every client + config = + { + # these values are anabled for every client + environment.systemPackages = with pkgs; [ + restic + ]; + } + // mkIf cfg.server.enable { + networking.firewall.allowedTCPPorts = [ + cfg.server.port + ]; - environment.systemPackages = [ - # for flakes - pkgs.restic - ]; - - # A list of all login accounts. To create the password hashes, use - # nix-shell -p apacheHttpd - # htpasswd -nbB "" "password" | cut -d: -f2 - - age.secrets.restic.file = ../secrets/backup/restic.age; - - networking.firewall.allowedTCPPorts = [ - cfg.server.port - ]; - - services.restic.backups = - ownServers - // { - # merge teh two configs together - # backblaze = base // { - # # backupos for each server are stored in a folder under their name - # repository = "b2:NixOS-Main2:/${cfg.host.name}"; - # #environmentFile = config.age.secrets.backblaze.path; - # }; + age.secrets.restic_pw = { + file = ../secrets/backup/restic_pw.age; + path = "${config.services.restic.server.dataDir}/.htpasswd"; + symlink = false; + mode = "770"; + owner = "restic"; + group = "restic"; }; - age.secrets.restic_pw = mkIf cfg.server.enable { - file = ../secrets/backup/restic_pw.age; - path = "${config.services.restic.server.dataDir}/.htpasswd"; - symlink = false; - mode = "770"; - owner = "restic"; - group = "restic"; - }; + services.restic.server = { + enable = true; + listenAddress = "${cfg.host.ip}:${toString cfg.server.port}"; + appendOnly = cfg.server.appendOnly; + privateRepos = true; + }; + } + // mkIf enable_client { + # client stuff here - services.restic.server = mkIf cfg.server.enable { - enable = true; - listenAddress = "${cfg.host.ip}:${toString cfg.server.port}"; - appendOnly = cfg.server.appendOnly; - privateRepos = true; + # A list of all login accounts. To create the password hashes, use + # nix-shell -p apacheHttpd + # htpasswd -nbB "" "password" | cut -d: -f2 + + age.secrets.restic.file = ../secrets/backup/restic.age; + + services.restic.backups = + ownServers + // { + # merge teh two configs together + # backblaze = base // { + # # backupos for each server are stored in a folder under their name + # repository = "b2:NixOS-Main2:/${cfg.host.name}"; + # #environmentFile = config.age.secrets.backblaze.path; + # }; + }; }; - }; } From 7031b495999d1d592f3d69b1a99ef2e08eb6db5b Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sat, 2 Mar 2024 21:59:34 +0000 Subject: [PATCH 041/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7fce941..38ed508 100644 --- a/flake.lock +++ b/flake.lock @@ -644,11 +644,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1704215184, - "narHash": "sha256-hbRTHQROAMVhZtjKfH6em1ckYqbWr5irXK58WnuSzVg=", + "lastModified": 1709415943, + "narHash": "sha256-hIiTckJr2Hp9FZ3rDySDW4uFdQrotrDxoUI9bi1VlgA=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "9dafba03b595b6aff68149e90ea82bcce3dfcdc2", + "rev": "480fc9b1a0fad81a68d774ac477985f98fd22315", "type": "gitlab" }, "original": { From 1790a12360b92ffada0fbeda229694ac9ac58c61 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 3 Mar 2024 12:48:48 +0000 Subject: [PATCH 042/563] [skip ci] feat: added the minecraft server key for the discord bot The key is tied to kitt --- secrets/discord/token.age | Bin 775 -> 867 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/discord/token.age b/secrets/discord/token.age index f50b0f761e4a09ece5ab3187a808a7afddb00a7d..c4969af77fa4ba8c503cb983ff0f250c10a3de5b 100644 GIT binary patch delta 779 zcmZo?d(1XLr{2;yz&x`!F(TNYG^sQt$V}h4%*8V(-y}3Lq`V;1*U%^`J-pb}*fr3_ zgv-6iIkGCsveGm>)yc!MxWqX#JuSR4Jlw~*DA~vp}06h zH#Nn`)YQ;Y!6cw6DnDHz#L^?ntI#YYG}*~S+s7y?-A%v3$Sg8AD7erp)w9STE8E9A zJrz}O^J4D;XE7vf4 z;z#jtH}gm%7VOtX?aALlAhmnh3h{anu?_sT%7@-z#l zMDq+!?_}S~#L95LY*(WU_oUopx2!5BuME$CwBYoVl#nQQ?+BC0@r>f(c|qBES%rrF z7QsGcsUAsYsfjs7=GuuVm7WEGSvN^L>Q$z z8m1YV7)JOPl=+zjr>2CZMtT}&<~TZXRXP@C_*6w%1Q@yadmESN8#rg0lvk9N8V5%D zN0b=`mlkGv1tu3c1)C*-R$Di{C^fM-RUwbdBRf3Ot)wtC+ezEa%+n__+0Z33 zJ*Ym+Jis!?$iU1@KfNkDvOKsX(lk&zg-cggS0TV4ASK5u+pVO^Im#)|%`w8a*sQXu z%qT0&BQmVQ)ZEC^Gd(BGuPRMDlqSXNS&|sCjR_;sK#inyv z=f#=4w*GiNt6$qkRrv>370+Sj^f(CHfwPL6xQ@ z##R2QCIM0IW&tJHL17_9p4#D+mO+_`j+TW^5mkkWAr*mK-Ug-VB~=#bK^Z|NMt&aY z9vP*^KIvK7X^DPO$)%NrWf@7~8KFjw7UrIl&oYYF`-OOvCr2hmI3|1grib|jmHD{) znk9Nvl^Pp4x_jvBYZq#l`Bj*Cc{urUh545Gg@hEkgj#DAXE}v}VxZE|E!12$y(l%YIF(D=%q_VzLO(UovDB}~%+o#4%{hrn zSGQhQA-FKCG^O0R$|5(}EypZBw74k9DBIjLH9xB&AT2S_#8^8dGO5%($FskZEmbKO&=lpbpWwP?jc^Xd`_HQraSR`{U$EPT8uM4v^*W_E>_ug*w z6p8Ix`s8 Date: Sun, 3 Mar 2024 15:15:04 +0000 Subject: [PATCH 043/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 38ed508..9452c85 100644 --- a/flake.lock +++ b/flake.lock @@ -644,11 +644,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709415943, - "narHash": "sha256-hIiTckJr2Hp9FZ3rDySDW4uFdQrotrDxoUI9bi1VlgA=", + "lastModified": 1709478342, + "narHash": "sha256-0b6Kx1q+dWWaX2SslfbQvnQd0l386m7f6oaU2slOrmY=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "480fc9b1a0fad81a68d774ac477985f98fd22315", + "rev": "bd74cdd09b189cc8a9abe008fcd915ddd0625d45", "type": "gitlab" }, "original": { From 7b3b3b290c36b90888cd555b498eb80f33b152de Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 3 Mar 2024 16:55:26 +0000 Subject: [PATCH 044/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9452c85..0400008 100644 --- a/flake.lock +++ b/flake.lock @@ -644,11 +644,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709478342, - "narHash": "sha256-0b6Kx1q+dWWaX2SslfbQvnQd0l386m7f6oaU2slOrmY=", + "lastModified": 1709484413, + "narHash": "sha256-dBdkzxcFBBAB49gC9UAuy3++hVu4dBVb2/e6Qgjvxmc=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "bd74cdd09b189cc8a9abe008fcd915ddd0625d45", + "rev": "bbd55202bd9740c579c80be30ce7bb4a7b770486", "type": "gitlab" }, "original": { From ac721c254068d31d712d22e85f79b70751a36901 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 4 Mar 2024 22:53:46 +0000 Subject: [PATCH 045/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0400008..251a756 100644 --- a/flake.lock +++ b/flake.lock @@ -644,11 +644,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709484413, - "narHash": "sha256-dBdkzxcFBBAB49gC9UAuy3++hVu4dBVb2/e6Qgjvxmc=", + "lastModified": 1709592232, + "narHash": "sha256-MLk2UhjbLGddzvDcfRw7uJjcpbuwDijVxs/E3qzRYg8=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "bbd55202bd9740c579c80be30ce7bb4a7b770486", + "rev": "7e6d892b67440d161f4d94ad3cd589fd79da90ea", "type": "gitlab" }, "original": { From 04a0a21ac7f1f32bb218bf1ca9cd66eedc68172a Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 5 Mar 2024 20:11:57 +0000 Subject: [PATCH 046/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 251a756..d1baf31 100644 --- a/flake.lock +++ b/flake.lock @@ -644,11 +644,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709592232, - "narHash": "sha256-MLk2UhjbLGddzvDcfRw7uJjcpbuwDijVxs/E3qzRYg8=", + "lastModified": 1709668538, + "narHash": "sha256-VMlqzxm10Vtx56eeIVxZRknAduhA/OvbwgHPB1xIMgs=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "7e6d892b67440d161f4d94ad3cd589fd79da90ea", + "rev": "cf2c7683d2319bb0d885b986521b03315ada4154", "type": "gitlab" }, "original": { From 54ef36023ae7db7e555aaa350e26a06453627921 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 7 Mar 2024 11:20:09 +0000 Subject: [PATCH 047/563] committee: new HSO --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index 0e5d042..430ec09 100644 --- a/config/users.nix +++ b/config/users.nix @@ -49,6 +49,7 @@ in { "nanda" "sourabh1805" "kronsy" + "skyapples" ]; admin = [ "silver" From 4575aabcb298795f11ed79dad8dcef8653813b32 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 11 Mar 2024 20:51:27 +0000 Subject: [PATCH 048/563] [skip ci] feat: added field to enable clubs/socs --- config/users.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/users.nix b/config/users.nix index 430ec09..d515325 100644 --- a/config/users.nix +++ b/config/users.nix @@ -64,6 +64,9 @@ in { ]; lifetime = []; banned = []; + + clubs_societies = []; + restricted = [ # usernames folks arent allowed to use From 9a4ea6b9fbe84c0fe35679aa4063b8ad9e77134f Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 11 Mar 2024 21:37:36 +0000 Subject: [PATCH 049/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d1baf31..e3a9508 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1708266543, - "narHash": "sha256-mP9e2OYSWpE6LN6UzawrWMOcV0VxCd4WbNAjfuVzeEg=", + "lastModified": 1710192627, + "narHash": "sha256-F8VVDw45+D+m+NyzokibvZ+vg1BpYGdR1kaT1doDVXk=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "7576b954bb60b978722776b87dafb4b57f59bebe", + "rev": "c85bd979675fc4fbb672b0ce637c7dcb85f1b020", "type": "gitlab" }, "original": { From f0661ba00f02b6f841b4977055a855207662c02d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 11 Mar 2024 22:06:10 +0000 Subject: [PATCH 050/563] fix: had forgotten to add the field ehre --- config/users.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/users.nix b/config/users.nix index d515325..d7da397 100644 --- a/config/users.nix +++ b/config/users.nix @@ -34,6 +34,11 @@ in { default = []; description = "array of restricted user accounts"; }; + clubs_societies = mkOption rec { + type = types.listOf types.str; + default = []; + description = "array of accounts for Clubs and Societies"; + }; }; }; From 1197c50962ada871ef24c27994288dfa7c5103c1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 11 Mar 2024 22:09:04 +0000 Subject: [PATCH 051/563] fix: danm formatting --- config/users.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/users.nix b/config/users.nix index d7da397..11e7278 100644 --- a/config/users.nix +++ b/config/users.nix @@ -35,8 +35,8 @@ in { description = "array of restricted user accounts"; }; clubs_societies = mkOption rec { - type = types.listOf types.str; - default = []; + type = types.listOf types.str; + default = []; description = "array of accounts for Clubs and Societies"; }; }; From 7e2abcae5b930bd7d3620ee4c6401e5ea234b0c2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 11 Mar 2024 22:30:48 +0000 Subject: [PATCH 052/563] feat: enabled out in UL as a soc on wolves --- config/users.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/config/users.nix b/config/users.nix index 11e7278..4367ded 100644 --- a/config/users.nix +++ b/config/users.nix @@ -70,7 +70,9 @@ in { lifetime = []; banned = []; - clubs_societies = []; + clubs_societies = [ + "outinul" + ]; restricted = [ From 106485a754c3e37a4f625e4d3e9a3912feec2d39 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 11 Mar 2024 22:49:14 +0000 Subject: [PATCH 053/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e3a9508..d3e0587 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1710192627, - "narHash": "sha256-F8VVDw45+D+m+NyzokibvZ+vg1BpYGdR1kaT1doDVXk=", + "lastModified": 1710196578, + "narHash": "sha256-WCqAdEeMUgEQmBR5QzARGlM+Ae6L7OdgzpZrDJdK1NQ=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "c85bd979675fc4fbb672b0ce637c7dcb85f1b020", + "rev": "44acc7378d1859e0d0d4327697e0c13350602f30", "type": "gitlab" }, "original": { From da721924e45e21914f7bc8429aee2d22550bb7a8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 12 Mar 2024 15:30:53 +0000 Subject: [PATCH 054/563] soc: enable games dev --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index 4367ded..3f4fd28 100644 --- a/config/users.nix +++ b/config/users.nix @@ -72,6 +72,7 @@ in { clubs_societies = [ "outinul" + "gamesdev" ]; restricted = From b34300968286eaa074db8a5edb6421d92576d9d2 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Thu, 28 Mar 2024 12:48:58 +0000 Subject: [PATCH 055/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d3e0587..36c4a91 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1710196578, - "narHash": "sha256-WCqAdEeMUgEQmBR5QzARGlM+Ae6L7OdgzpZrDJdK1NQ=", + "lastModified": 1711629668, + "narHash": "sha256-ZLnOj4YczToeIZ5k+E2qyfAa430urUnHmGC23cmQtqo=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "44acc7378d1859e0d0d4327697e0c13350602f30", + "rev": "c1b42a81320a7091e200e966354cf2c839c9f08e", "type": "gitlab" }, "original": { From 57a16a2c8f9bec5faf6f1d7cfc012684212b5550 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Thu, 28 Mar 2024 13:19:42 +0000 Subject: [PATCH 056/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 36c4a91..aa9dacc 100644 --- a/flake.lock +++ b/flake.lock @@ -644,11 +644,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709668538, - "narHash": "sha256-VMlqzxm10Vtx56eeIVxZRknAduhA/OvbwgHPB1xIMgs=", + "lastModified": 1711630308, + "narHash": "sha256-5MW4i4TVkJbpwGrzFrjci3xhdWLCUUrM7DSlQmKXA+s=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "cf2c7683d2319bb0d885b986521b03315ada4154", + "rev": "3d925fcffff22ecaf30bcc2cd0d01773d1480b04", "type": "gitlab" }, "original": { From 7cd4f9288b10a11277ba8d2c00aeda76441247ed Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 2 Apr 2024 05:14:50 +0000 Subject: [PATCH 057/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index aa9dacc..27ef67c 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1709060998, - "narHash": "sha256-0VGnRftMl8Iu7ffKRdYNlSqxlU9HSUw6g6xIZ9kIEoA=", + "lastModified": 1712034846, + "narHash": "sha256-Ph3ojOz6CMP7wZ4ydVhx64UggMTcWBoVhYZ8yHLMFqE=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "b78de3eeabbd20d99f9e3b03672bd9509c4c4f6c", + "rev": "ed866b74e3ed0d5213d46895158d89f43417f3fe", "type": "gitlab" }, "original": { From 05ab8b023808c17a14035b2974d5515ed9d96fe4 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 2 Apr 2024 22:40:27 +0000 Subject: [PATCH 058/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 27ef67c..f4edb27 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1712034846, - "narHash": "sha256-Ph3ojOz6CMP7wZ4ydVhx64UggMTcWBoVhYZ8yHLMFqE=", + "lastModified": 1712097585, + "narHash": "sha256-lrCe4Z6569yA8XoX4eMcDyAjfA/SgNrH4qVvxJzwLfk=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "ed866b74e3ed0d5213d46895158d89f43417f3fe", + "rev": "ceb346fe8e8dfc553fff520de7864e96236e887a", "type": "gitlab" }, "original": { From 25f687cacf126f26dd087052a3f1b0b7da4cfafb Mon Sep 17 00:00:00 2001 From: runner_nix Date: Wed, 3 Apr 2024 07:18:59 +0000 Subject: [PATCH 059/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index f4edb27..3d6bf2d 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1712097585, - "narHash": "sha256-lrCe4Z6569yA8XoX4eMcDyAjfA/SgNrH4qVvxJzwLfk=", + "lastModified": 1712128630, + "narHash": "sha256-/7KFOUlxd/pT8g7LHeerF7prg/m1AbRoH2n5zd+0b6g=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "ceb346fe8e8dfc553fff520de7864e96236e887a", + "rev": "5494271d84e3398831fc530f4f556cc9c442baaf", "type": "gitlab" }, "original": { From d73be0c8d3f7bda0d60fcaf709b105ff8a9341fc Mon Sep 17 00:00:00 2001 From: runner_nix Date: Wed, 3 Apr 2024 07:31:44 +0000 Subject: [PATCH 060/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3d6bf2d..7d453da 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1712128630, - "narHash": "sha256-/7KFOUlxd/pT8g7LHeerF7prg/m1AbRoH2n5zd+0b6g=", + "lastModified": 1712128733, + "narHash": "sha256-fZr9QOimJLbpsSm8fiXt+sPNl8QJ/SOn0pzC9ytxL9w=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "5494271d84e3398831fc530f4f556cc9c442baaf", + "rev": "2e8b22f8254dcd4e9c23455754ac30a1d8f7b584", "type": "gitlab" }, "original": { From d48e68d3b3e1b80d2ff45fc085ef7c19b69e53ac Mon Sep 17 00:00:00 2001 From: runner_nix Date: Wed, 3 Apr 2024 09:14:15 +0000 Subject: [PATCH 061/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7d453da..76c7917 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1712128733, - "narHash": "sha256-fZr9QOimJLbpsSm8fiXt+sPNl8QJ/SOn0pzC9ytxL9w=", + "lastModified": 1712135613, + "narHash": "sha256-Nejx9Fsylko46jcGBeT/gPesQOwZYjqW0oOLknNLip0=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "2e8b22f8254dcd4e9c23455754ac30a1d8f7b584", + "rev": "3de4184a9c08a565541bdc3f6a7eab56a0436f46", "type": "gitlab" }, "original": { From b1d7c15a4d9ccb1b7c7f42c6afc0ed5d39695cce Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sat, 13 Apr 2024 22:14:57 +0000 Subject: [PATCH 062/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 76c7917..3ddfeb5 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1712135613, - "narHash": "sha256-Nejx9Fsylko46jcGBeT/gPesQOwZYjqW0oOLknNLip0=", + "lastModified": 1713045978, + "narHash": "sha256-lFhGC4/cebx+nJyIKJV9G/+ldCQnkvVFW3vAuhpQW1M=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "3de4184a9c08a565541bdc3f6a7eab56a0436f46", + "rev": "55cdb7800727c25dbeeb6299f82d76acee5b3073", "type": "gitlab" }, "original": { From 2b09716c4d75de6e549e9768e435ff2f7541d2fb Mon Sep 17 00:00:00 2001 From: runner_nix Date: Wed, 17 Apr 2024 16:27:11 +0000 Subject: [PATCH 063/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3ddfeb5..cdae9bd 100644 --- a/flake.lock +++ b/flake.lock @@ -107,11 +107,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1713045978, - "narHash": "sha256-lFhGC4/cebx+nJyIKJV9G/+ldCQnkvVFW3vAuhpQW1M=", + "lastModified": 1713355612, + "narHash": "sha256-GXa8y/H4MtQSuuww6ioWhO1/gUjdw231tGCt5I/Dyi0=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "55cdb7800727c25dbeeb6299f82d76acee5b3073", + "rev": "a4482cc61893a42e2698eb66563ce03043aa4ddc", "type": "gitlab" }, "original": { From a4c52ea87c0e2d8e06183059c2adfced6a2b475b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Apr 2024 02:08:57 +0100 Subject: [PATCH 064/563] feat: use colmena repo --- flake.lock | 169 ++++++++++++++++++++++++++++++++++++++++------------- flake.nix | 4 +- 2 files changed, 130 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index cdae9bd..2b590d8 100644 --- a/flake.lock +++ b/flake.lock @@ -66,7 +66,7 @@ "bfom": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -99,10 +99,31 @@ "type": "gitlab" } }, + "colmena": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3", + "stable": "stable" + }, + "locked": { + "lastModified": 1711386353, + "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" + } + }, "compsoc_public": { "inputs": { "bfom": "bfom", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "utils": "utils_2" }, "locked": { @@ -166,6 +187,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1668681692, @@ -203,6 +240,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems_2" }, @@ -275,7 +327,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1652722411, @@ -293,7 +345,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1692351612, @@ -311,7 +363,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1686572087, @@ -374,6 +426,20 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1687011986, + "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1686921029, "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", @@ -388,7 +454,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -402,7 +468,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -416,7 +482,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -430,7 +496,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -444,7 +510,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -476,16 +542,18 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_4": { @@ -503,6 +571,20 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1691371061, "narHash": "sha256-BxPbPVlBIoneaXIBiHd0LVzA+L4nmvFCNBU6TmQAiMM=", @@ -516,7 +598,7 @@ "type": "indirect" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1706913249, "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", @@ -531,7 +613,7 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1693060755, "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", @@ -545,7 +627,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1693087214, "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", @@ -560,28 +642,15 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1687011986, - "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", "alejandra": "alejandra", "arion": "arion", + "colmena": "colmena", "compsoc_public": "compsoc_public", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_6", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", @@ -612,7 +681,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -639,7 +708,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "utils": "utils_4" }, "locked": { @@ -661,7 +730,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_11", "utils": "utils_5" }, "locked": { @@ -682,7 +751,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "utils": "utils_6" }, "locked": { @@ -703,7 +772,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "utils": "utils_7" }, "locked": { @@ -724,7 +793,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "utils": "utils_8" }, "locked": { @@ -745,7 +814,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "utils": "utils_9" }, "locked": { @@ -766,7 +835,7 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "utils": "utils_10" }, "locked": { @@ -785,6 +854,22 @@ "type": "gitlab" } }, + "stable": { + "locked": { + "lastModified": 1696039360, + "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 66eb62f..a1cbad4 100644 --- a/flake.nix +++ b/flake.nix @@ -15,6 +15,7 @@ url = "github:kamadorueda/alejandra/3.0.0"; inputs.nixpkgs.follows = "nixpkgs"; }; + colmena.url = "github:zhaofengli/colmena"; # email # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; @@ -84,6 +85,7 @@ nixpkgs, agenix, alejandra, + colmena, ... } @ inputs: let pkgs = nixpkgs.legacyPackages.x86_64-linux.pkgs; @@ -94,7 +96,7 @@ name = "Skynet build env"; nativeBuildInputs = [ pkgs.buildPackages.git - pkgs.buildPackages.colmena + colmena.defaultPackage."x86_64-linux" pkgs.buildPackages.nmap ]; buildInputs = [agenix.packages.x86_64-linux.default]; From 54606be0df48b57de4e18c9d2a3f4475255d4356 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Apr 2024 03:18:13 +0100 Subject: [PATCH 065/563] feat: got php working for the user server --- applications/skynet_users.nix | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index a364361..4620171 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -7,6 +7,7 @@ }: with lib; let cfg = config.services.skynet_users; + php_pool = "skynet_users"; in { imports = [ ./acme.nix @@ -69,6 +70,25 @@ in { # normally services cannot read home dirs systemd.services.nginx.serviceConfig.ProtectHome = "read-only"; + systemd.services."phpfpm-${php_pool}".serviceConfig.ProtectHome = lib.mkForce "read-only"; + + services.phpfpm.pools.${php_pool} = { + user = config.services.nginx.user; + group = config.services.nginx.group; + settings = { + "listen.owner" = config.services.nginx.user; + "pm" = "dynamic"; + "pm.max_children" = 32; + "pm.max_requests" = 500; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 2; + "pm.max_spare_servers" = 5; + "php_admin_value[error_log]" = "stderr"; + "php_admin_flag[log_errors]" = true; + "catch_workers_output" = true; + }; + phpEnv."PATH" = lib.makeBinPath [pkgs.php]; + }; services.nginx.virtualHosts = { "${cfg.host.ip}" = { @@ -90,9 +110,14 @@ in { locations."/" = { alias = "/home/$user/public_html/"; - index = "index.html"; - extraConfig = "autoindex on;"; - tryFiles = "$uri$args $uri$args/ /index.html"; + index = "index.html index.php"; + extraConfig = '' + autoindex on; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; + include ${pkgs.nginx}/conf/fastcgi.conf; + ''; + tryFiles = "$uri$args $uri$args/ /index.html /index.php"; }; }; }; From 48e48c43c73ec066633be64e721d53d143872602 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Apr 2024 04:55:07 +0100 Subject: [PATCH 066/563] feat: added a redirect for the old skynet format of user addresses --- applications/skynet.ie.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index b56a189..a691388 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -72,7 +72,17 @@ in { "skynet.ie" = { forceSSL = true; useACMEHost = "skynet"; - root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}"; + locations = { + "/" = { + root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}"; + }; + + # this redirects old links to new format + "~* ~(?[a-z_0-9]*)(?\\S+)$" = { + priority = 1; + return = "307 https://$username.users.skynet.ie$files"; + }; + }; }; # archive of teh site as it was ~2012 to 2016 From ebefd81defa0dfd229538fa2c1f9dd2d3b19536b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Apr 2024 04:55:47 +0100 Subject: [PATCH 067/563] fix: split out the php config so it can serve php and html together --- applications/skynet_users.nix | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 4620171..ac9112f 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -108,16 +108,27 @@ in { # chmod 711 ~ # chmod -R 755 ~/public_html - locations."/" = { - alias = "/home/$user/public_html/"; - index = "index.html index.php"; - extraConfig = '' - autoindex on; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; - include ${pkgs.nginx}/conf/fastcgi.conf; - ''; - tryFiles = "$uri$args $uri$args/ /index.html /index.php"; + locations = { + "/" = { + alias = "/home/$user/public_html/"; + index = "index.html"; + extraConfig = '' + autoindex on; + ''; + tryFiles = "$uri$args $uri$args/ /index.html"; + }; + + "~ ^(.+\\.php)(.*)$" = { + root = "/home/$user/public_html/"; + index = "index.php"; + extraConfig = '' + autoindex on; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; + include ${pkgs.nginx}/conf/fastcgi.conf; + ''; + tryFiles = "$uri$args $uri$args/ /index.php"; + }; }; }; }; From 210845d2cd6e22f4cf8a9dd9fd5c0e224ee28a5a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 3 May 2024 22:50:57 +0100 Subject: [PATCH 068/563] feat: create space for the open governance --- applications/open_goverance/README.md | 12 ++++ .../open_goverance/open_goverance.nix | 70 +++++++++++++++++++ applications/skynet.ie.nix | 3 + 3 files changed, 85 insertions(+) create mode 100644 applications/open_goverance/README.md create mode 100644 applications/open_goverance/open_goverance.nix diff --git a/applications/open_goverance/README.md b/applications/open_goverance/README.md new file mode 100644 index 0000000..2c9a6b3 --- /dev/null +++ b/applications/open_goverance/README.md @@ -0,0 +1,12 @@ +# Open Governance + +Started by DCU this is an initiative to make the running of (computer) societies more open and resilient. +The goal is to back these up in multiple locations. + + +| Uni | Tag | Repo | Notes | +|-----|----------|----------------------------------------------------------|-------| +| DCU | redbrick | https://github.com/redbrick/open-governance | | +| UL | skynet | https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance | | +| | | | | + diff --git a/applications/open_goverance/open_goverance.nix b/applications/open_goverance/open_goverance.nix new file mode 100644 index 0000000..544a503 --- /dev/null +++ b/applications/open_goverance/open_goverance.nix @@ -0,0 +1,70 @@ +/* +This file is for hosting teh open governance for other societies +*/ +{ + lib, + config, + pkgs, + ... +}: +with lib; let + # - instead of _ for dns reasons + name = "open-goverance"; + + cfg = config.services.skynet."${name}"; + folder = "/var/skynet/${name}"; +in { + imports = [ + ../acme.nix + ../dns.nix + ]; + + options.services.skynet."${name}" = { + host = { + ip = mkOption { + type = types.str; + }; + name = mkOption { + type = types.str; + }; + }; + }; + + config = { + skynet_acme.domains = [ + "${name}.skynet.ie" + ]; + + skynet_dns.records = [ + { + record = "${name}"; + r_type = "CNAME"; + value = cfg.host.name; + } + ]; + + # create a folder to store the archives + systemd.tmpfiles.rules = [ + "d ${folder} 0755 ${config.services.nginx.user} ${config.services.nginx.group}" + "L+ ${folder}/README.md - - - - ${./README.md}" + ]; + + services.nginx.virtualHosts = { + "${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + root = folder; + locations = { + "/".extraConfig = "autoindex on;"; + + # show md files as plain text + "~ \.md".extraConfig = '' + types { + text/plain md; + } + ''; + }; + }; + }; + }; +} diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index a691388..b1bed7a 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -11,6 +11,7 @@ in { imports = [ ./acme.nix ./dns.nix + ./open_goverance/open_goverance.nix ]; options.services.skynet = { @@ -62,6 +63,8 @@ in { } ]; + services.skynet.open-goverance.host = cfg.host; + networking.firewall.allowedTCPPorts = [80 443]; services.nginx = { enable = true; From aec580a93e199f3cf24866ab0adeafe31022dcfd Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 6 May 2024 01:33:12 +0000 Subject: [PATCH 069/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2b590d8..10be33e 100644 --- a/flake.lock +++ b/flake.lock @@ -713,11 +713,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1711630308, - "narHash": "sha256-5MW4i4TVkJbpwGrzFrjci3xhdWLCUUrM7DSlQmKXA+s=", + "lastModified": 1714957946, + "narHash": "sha256-Xo4VHqECFXEYQiqEFYMqiTzaYSBCbvhKGjvnZ5rNLSM=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "3d925fcffff22ecaf30bcc2cd0d01773d1480b04", + "rev": "6cbbab80bdffea76e3990948273e523c352dd727", "type": "gitlab" }, "original": { From cb6f9c2b8ef047a9160593d26ce2e7af62f09eee Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 4 May 2024 00:15:20 +0100 Subject: [PATCH 070/563] fix: feckin typos --- applications/{open_goverance => open_governance}/README.md | 0 .../open_governance.nix} | 2 +- applications/skynet.ie.nix | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename applications/{open_goverance => open_governance}/README.md (100%) rename applications/{open_goverance/open_goverance.nix => open_governance/open_governance.nix} (97%) diff --git a/applications/open_goverance/README.md b/applications/open_governance/README.md similarity index 100% rename from applications/open_goverance/README.md rename to applications/open_governance/README.md diff --git a/applications/open_goverance/open_goverance.nix b/applications/open_governance/open_governance.nix similarity index 97% rename from applications/open_goverance/open_goverance.nix rename to applications/open_governance/open_governance.nix index 544a503..263488c 100644 --- a/applications/open_goverance/open_goverance.nix +++ b/applications/open_governance/open_governance.nix @@ -9,7 +9,7 @@ This file is for hosting teh open governance for other societies }: with lib; let # - instead of _ for dns reasons - name = "open-goverance"; + name = "open-governance"; cfg = config.services.skynet."${name}"; folder = "/var/skynet/${name}"; diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index b1bed7a..a8cfa1d 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -11,7 +11,7 @@ in { imports = [ ./acme.nix ./dns.nix - ./open_goverance/open_goverance.nix + ./open_governance/open_governance.nix ]; options.services.skynet = { @@ -63,7 +63,7 @@ in { } ]; - services.skynet.open-goverance.host = cfg.host; + services.skynet.open-governance.host = cfg.host; networking.firewall.allowedTCPPorts = [80 443]; services.nginx = { From 6ae584c895a765b320548499575b4699188a5f67 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 7 May 2024 01:37:19 +0100 Subject: [PATCH 071/563] feat: add a keyserver --- applications/open_governance/README.md | 5 ++ applications/open_governance/keyserver.nix | 59 ++++++++++++++++++++++ applications/skynet.ie.nix | 2 + 3 files changed, 66 insertions(+) create mode 100644 applications/open_governance/keyserver.nix diff --git a/applications/open_governance/README.md b/applications/open_governance/README.md index 2c9a6b3..7ae398f 100644 --- a/applications/open_governance/README.md +++ b/applications/open_governance/README.md @@ -10,3 +10,8 @@ The goal is to back these up in multiple locations. | UL | skynet | https://gitlab.skynet.ie/compsoc1/compsoc/open-goverance | | | | | | | + +## Keys +We host our own keyserver: https://keyserver.skynet.ie +Use it in commands like so: +``gpg --keyserver hkp://keyserver.skynet.ie:80 --send-key KEY_ID`` diff --git a/applications/open_governance/keyserver.nix b/applications/open_governance/keyserver.nix new file mode 100644 index 0000000..8629e33 --- /dev/null +++ b/applications/open_governance/keyserver.nix @@ -0,0 +1,59 @@ +/* +This file is for hosting teh open governance for other societies +*/ +{ + lib, + config, + pkgs, + ... +}: +with lib; let + name = "keyserver"; + cfg = config.services.skynet."${name}"; + port = 11371; +in { + imports = [ + ../acme.nix + ../dns.nix + ]; + + options.services.skynet."${name}" = { + host = { + ip = mkOption { + type = types.str; + }; + name = mkOption { + type = types.str; + }; + }; + }; + + config = { + skynet_acme.domains = [ + "${name}.skynet.ie" + ]; + + skynet_dns.records = [ + { + record = "${name}"; + r_type = "CNAME"; + value = cfg.host.name; + } + ]; + + services.sks = { + enable = true; + hkpPort = port; + }; + + services.nginx.virtualHosts = { + "${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "http://localhost:${toString port}"; + }; + }; + }; + }; +} diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index a8cfa1d..02c2f7a 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -12,6 +12,7 @@ in { ./acme.nix ./dns.nix ./open_governance/open_governance.nix + ./open_governance/keyserver.nix ]; options.services.skynet = { @@ -64,6 +65,7 @@ in { ]; services.skynet.open-governance.host = cfg.host; + services.skynet.keyserver.host = cfg.host; networking.firewall.allowedTCPPorts = [80 443]; services.nginx = { From 7408873102b08e335a17fcecc0ec7029a7f64395 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 12 May 2024 03:47:20 +0100 Subject: [PATCH 072/563] feat: new server to work as a nix cache --- .gitlab-ci.yml | 7 + applications/nix_cache/nix_cache.nix | 108 ++++++++ flake.lock | 359 ++++++++++++++++++++------- flake.nix | 11 +- machines/calculon.nix | 53 ++++ secrets/backup/restic.age | Bin 2298 -> 2320 bytes secrets/backup/restic_pw.age | 28 +-- secrets/bitwarden/details.age | Bin 900 -> 825 bytes secrets/bitwarden/id.age | Bin 809 -> 701 bytes secrets/bitwarden/secret.age | 26 +- secrets/discord/ldap.age | 40 ++- secrets/discord/token.age | Bin 867 -> 805 bytes secrets/dns_certs.secret.age | 63 +++-- secrets/dns_dnskeys.conf.age | 33 ++- secrets/email/details.age | 39 ++- secrets/gitlab/db_pw.age | Bin 867 -> 781 bytes secrets/gitlab/ldap_pw.age | 28 +-- secrets/gitlab/pw.age | Bin 875 -> 781 bytes secrets/gitlab/runners/runner01.age | Bin 878 -> 735 bytes secrets/gitlab/runners/runner02.age | Bin 863 -> 735 bytes secrets/gitlab/secrets_db.age | Bin 819 -> 781 bytes secrets/gitlab/secrets_jws.age | Bin 2465 -> 2330 bytes secrets/gitlab/secrets_otp.age | Bin 825 -> 780 bytes secrets/gitlab/secrets_secret.age | Bin 858 -> 780 bytes secrets/ldap/details.age | Bin 1346 -> 1307 bytes secrets/ldap/pw.age | Bin 1194 -> 1110 bytes secrets/nextcloud/pw.age | 26 +- secrets/secrets.nix | 6 + secrets/stream_ulfm.age | Bin 2887 -> 2864 bytes secrets/wolves/details.age | 41 ++- 30 files changed, 598 insertions(+), 270 deletions(-) create mode 100644 applications/nix_cache/nix_cache.nix create mode 100644 machines/calculon.nix diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4d7684a..3ad4b00 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -65,12 +65,18 @@ sync_repos: - mkdir -p ~/.ssh - chmod 700 ~/.ssh +.scripts_cache: &scripts_cache + - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client + - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY + - attic use skynet-cache + # every commit on main will build and deploy .build_template: &builder tags: - nix before_script: - *scripts_base + - *scripts_cache rules: - changes: - applications/**/* @@ -105,6 +111,7 @@ build: <<: *builder stage: test script: + - attic watch-store skynet-cache & - colmena build -v --on @active-dns - colmena build -v --on @active-core - colmena build -v --on @active diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix new file mode 100644 index 0000000..25061d4 --- /dev/null +++ b/applications/nix_cache/nix_cache.nix @@ -0,0 +1,108 @@ +/* +A nix cache for our use + + +atticd-atticadm make-token --sub "admin_username" --validity "10y" --pull "*" --push "*" --create-cache "*" --delete "*" --configure-cache "*" --configure-cache-retention "*" --destroy-cache "*" + +# for the gitlab runner, done eyarly +atticd-atticadm make-token --sub "wheatly-runner" --validity "1y" --pull "skynet-cache" --push "skynet-cache" +*/ +{ + lib, + config, + pkgs, + inputs, + ... +}: +with lib; let + name = "nix-cache"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + inputs.attic.nixosModules.atticd + ../acme.nix + ../dns.nix + ]; + + options.services.skynet."${name}" = { + host = { + ip = mkOption { + type = types.str; + }; + name = mkOption { + type = types.str; + }; + }; + }; + + config = { + skynet_acme.domains = [ + "${name}.skynet.ie" + ]; + + skynet_dns.records = [ + { + record = "${name}"; + r_type = "CNAME"; + value = cfg.host.name; + } + ]; + + users.groups."nix-serve" = {}; + users.users."nix-serve" = { + isSystemUser = true; + group = "nix-serve"; + }; + + services.atticd = { + enable = true; + + # Replace with absolute path to your credentials file + credentialsFile = "/etc/atticd.env"; + + settings = { + listen = "127.0.0.1:8080"; + + # Data chunking + # + # Warning: If you change any of the values here, it will be + # difficult to reuse existing chunks for newly-uploaded NARs + # since the cutpoints will be different. As a result, the + # deduplication ratio will suffer for a while after the change. + chunking = { + # The minimum NAR size to trigger chunking + # + # If 0, chunking is disabled entirely for newly-uploaded NARs. + # If 1, all NARs are chunked. + nar-size-threshold = 64 * 1024; # 64 KiB + + # The preferred minimum size of a chunk, in bytes + min-size = 16 * 1024; # 16 KiB + + # The preferred average size of a chunk, in bytes + avg-size = 64 * 1024; # 64 KiB + + # The preferred maximum size of a chunk, in bytes + max-size = 256 * 1024; # 256 KiB + }; + }; + }; + + networking.firewall.allowedTCPPorts = [80 443]; + services.nginx = { + enable = true; + group = "acme"; + clientMaxBodySize = "100m"; + recommendedProxySettings = true; + virtualHosts = { + "${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "http://127.0.0.1:8080"; + }; + }; + }; + }; + }; +} diff --git a/flake.lock b/flake.lock index 10be33e..0385d34 100644 --- a/flake.lock +++ b/flake.lock @@ -4,14 +4,15 @@ "inputs": { "darwin": "darwin", "home-manager": "home-manager", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "systems": "systems" }, "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -29,11 +30,11 @@ ] }, "locked": { - "lastModified": 1660510326, + "lastModified": 1660592437, "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "ef03f7ef74ec97fd91a016a51c9c9667fb315652", + "rev": "e7eac49074b70814b542fee987af2987dd0520b5", "type": "github" }, "original": { @@ -47,14 +48,15 @@ "inputs": { "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", + "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1690376079, - "narHash": "sha256-IJiajoljCMUGlp1bwT/loXs1B3RH2FXpLepnqvcPNEY=", + "lastModified": 1714877287, + "narHash": "sha256-mf1/RfkyhzwLLeqU8AdosbBfRQuQzuVMX7XL7GejoRI=", "owner": "hercules-ci", "repo": "arion", - "rev": "f0436c8478d1b5530c115a6b1202c4478dfe2f81", + "rev": "e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd", "type": "github" }, "original": { @@ -63,10 +65,32 @@ "type": "github" } }, + "attic": { + "inputs": { + "crane": "crane", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1711742460, + "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "owner": "zhaofengli", + "repo": "attic", + "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "attic", + "type": "github" + } + }, "bfom": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "utils": "utils" }, "locked": { @@ -101,9 +125,9 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", "stable": "stable" }, "locked": { @@ -123,7 +147,7 @@ "compsoc_public": { "inputs": { "bfom": "bfom", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "utils": "utils_2" }, "locked": { @@ -142,6 +166,27 @@ "type": "gitlab" } }, + "crane": { + "inputs": { + "nixpkgs": [ + "attic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1702918879, + "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "owner": "ipetkov", + "repo": "crane", + "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -150,11 +195,11 @@ ] }, "locked": { - "lastModified": 1673295039, - "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", + "lastModified": 1700795494, + "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", + "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", "type": "github" }, "original": { @@ -187,6 +232,22 @@ } }, "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -202,7 +263,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1668681692, @@ -226,11 +287,11 @@ ] }, "locked": { - "lastModified": 1675933616, - "narHash": "sha256-/rczJkJHtx16IFxMmAWu5nNYcSXNg1YYXTHoGjLrLUA=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "47478a4a003e745402acf63be7f9a092d51b83d7", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -239,7 +300,43 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "arion", + "hercules-ci-effects", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "id": "flake-parts", + "type": "indirect" + } + }, "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -254,16 +351,16 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -304,6 +401,28 @@ "type": "github" } }, + "hercules-ci-effects": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "arion", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1713898448, + "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "hercules-ci-effects", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -312,11 +431,11 @@ ] }, "locked": { - "lastModified": 1682203081, - "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { @@ -327,7 +446,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1652722411, @@ -345,7 +464,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1692351612, @@ -363,7 +482,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1686572087, @@ -381,11 +500,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1677676435, - "narHash": "sha256-6FxdcmQr5JeZqsQvfinIMr0XcTyTuR7EXX0H3ANShpQ=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a08d6979dd7c82c4cef0dcc6ac45ab16051c1169", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -425,7 +544,38 @@ "type": "indirect" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1711460390, + "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_10": { + "locked": { + "lastModified": 1693087214, + "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-23.05", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1687011986, "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", @@ -439,7 +589,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1686921029, "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", @@ -454,7 +604,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -468,7 +618,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -482,7 +632,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_15": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -496,7 +646,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -510,7 +660,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -526,11 +676,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1676300157, - "narHash": "sha256-1HjRzfp6LOLfcj/HJHdVKWAkX9QRAouoh6AjzJiIerU=", + "lastModified": 1714635257, + "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "545c7a31e5dedea4a6d372712a18e00ce097d462", + "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", "type": "github" }, "original": { @@ -541,6 +691,22 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1711401922, + "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1696019113, "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", @@ -556,20 +722,6 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_5": { "locked": { "lastModified": 1652840887, @@ -585,6 +737,20 @@ } }, "nixpkgs_6": { + "locked": { + "lastModified": 1652840887, + "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_7": { "locked": { "lastModified": 1691371061, "narHash": "sha256-BxPbPVlBIoneaXIBiHd0LVzA+L4nmvFCNBU6TmQAiMM=", @@ -598,13 +764,13 @@ "type": "indirect" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1706913249, - "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e92b6015881907e698782c77641aa49298330223", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -613,7 +779,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1693060755, "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", @@ -627,30 +793,16 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1693087214, - "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", "alejandra": "alejandra", "arion": "arion", + "attic": "attic", "colmena": "colmena", "compsoc_public": "compsoc_public", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_7", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", @@ -681,7 +833,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "nixpkgs": [ "nixpkgs" ], @@ -708,7 +860,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "utils": "utils_4" }, "locked": { @@ -730,7 +882,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "utils": "utils_5" }, "locked": { @@ -751,7 +903,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "utils": "utils_6" }, "locked": { @@ -772,7 +924,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, "locked": { @@ -793,7 +945,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "utils": "utils_8" }, "locked": { @@ -814,7 +966,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "utils": "utils_9" }, "locked": { @@ -835,7 +987,7 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "utils": "utils_10" }, "locked": { @@ -885,6 +1037,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1022,7 +1189,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1694529238, @@ -1040,7 +1207,7 @@ }, "utils_2": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { "lastModified": 1689068808, @@ -1073,7 +1240,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1692799911, @@ -1091,7 +1258,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1685518550, @@ -1109,7 +1276,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1687171271, @@ -1127,7 +1294,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1689068808, @@ -1145,7 +1312,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -1163,7 +1330,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1694529238, diff --git a/flake.nix b/flake.nix index a1cbad4..714096b 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; colmena.url = "github:zhaofengli/colmena"; + attic.url = github:zhaofengli/attic; # email # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; @@ -78,7 +79,11 @@ }; }; - nixConfig.bash-prompt-suffix = "[Skynet Dev] "; + nixConfig = { + bash-prompt-suffix = "[Skynet Dev] "; + extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; + extra-trusted-public-keys = "skynet-cache:OdfA4Or0JcHiHf05fsiIR4nZT2z2yDEtkoLqhntGAz4="; + }; outputs = { self, @@ -97,6 +102,7 @@ nativeBuildInputs = [ pkgs.buildPackages.git colmena.defaultPackage."x86_64-linux" + pkgs.attic-client pkgs.buildPackages.nmap ]; buildInputs = [agenix.packages.x86_64-linux.default]; @@ -158,6 +164,9 @@ # trainee server marvin = import ./machines/marvin.nix; + + # nix cache server + calculon = import ./machines/calculon.nix; }; }; } diff --git a/machines/calculon.nix b/machines/calculon.nix new file mode 100644 index 0000000..c11bb38 --- /dev/null +++ b/machines/calculon.nix @@ -0,0 +1,53 @@ +/* + +Name: +Why: Speed everything up +Type: VM +Hardware: - +From: 2024 +Role: Nix Cache +Notes: +*/ +{ + pkgs, + lib, + nodes, + inputs, + ... +}: let + name = "calculon"; + ip_pub = "193.1.99.82"; + hostname = "${name}.skynet.ie"; +in { + imports = [ + ../applications/nix_cache/nix_cache.nix + ]; + + deployment = { + targetHost = ip_pub; + targetPort = 22; + targetUser = null; + + tags = []; + }; + + # it has two network devices so two + skynet_dns.records = [ + { + record = name; + r_type = "A"; + value = ip_pub; + server = true; + } + { + record = ip_pub; + r_type = "PTR"; + value = hostname; + } + ]; + + services.skynet.nix-cache.host = { + ip = ip_pub; + name = name; + }; +} diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 34e6e6422f8de1ab20a87e3e662e630066edbfc1..ee33aa47ccfd2eb07eba6e7de681eaf1e058afef 100644 GIT binary patch literal 2320 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t-0%QQ?Z z332sGD=^CR^LMu}GYK&>$uN#AFv;}y_A+zMOwM&FbImWzbma;OF3B&-E-Ug6&rC~6 z^eryWHuB9h&<^+VcQZCCDGjbDu+)xBPN^u!azwYyB%mrPKV3oFTi?|pq&%cBz@W6G zEG0C%B+b&o$T`q5D(|1oYO%GJ4C@Klcj;QjejBu~AEHDiBbT-WNaf>i3bPdc14XaAEFipuQ z%<(bJH;Cj4_sU8yFAjHeOf?S)@D7ct%FFgDNwm=S2@Fin3AIej4l+;4&h#kqNx}$8 zzmgn3eMbdO1er&e8@u_X86^2<7#5@377<+JXjZOZo*EvU5p0oD z<{R#&pX;AmYM7d2>Xq!2ogSE5oEhTi9Ta60YLs47o?gxs;gb|nmgDB^>su6PUY75X zQ($4}nj2PB7?vJnkeOfLk!5O9aY;Zx zUbeTFiKCZuNS=S1UqDrAW@NaTTUbO$pocG)VU6K&#npz^>?Z;O!AKmD)ToCFm&}PEUYY#OexGN zcg;q(&9lnUx6n}`x70Y_H@K|I)g?GJ+^i}qsU#=axwIrZ-_SKQsVvVY!@$JPtE4R7 zz$KC^IKVS7JuKO>GSKAU8X)P`@BM$|R+#z_rB9*ef$2EGN)8!_+OyG`SqzHjgBO z%z{9L)Q~*CEYA{Gmz1brZ*L#3iX!8j)PRVHQeXEfN7Eeril~T+tiTG7fbwE4uVg3F zAQLz3!o;f7q~xS@Ll;+*P^YReBUc~osLb35bJrl#+*0ktoHC4fGcL%{_byj(4Kpjs zbzQEqmGzE`$OVnkk` zU#fO)h(&m@yGM9MP>8=pUYKcBP)?)$P3gj$fEG|PU&2}Mma&@25!Z{8Rf>sfu<1wCawYbnMsa5QC>c!rjF$0q{w`^5C2raN!RD2wRjyptE4h1?mG9m&f9uYz zl1^8bZZUt>?733&`WrC$#sd`+Uvo>Zz4s>H2)HSDSaTo(W%?WwO_W zmF3r7`S?AlSup#+s{E78jCmPCt6x7pz|5+#DL!Y7f~(W%tLb*uPmgNMu(UgLA@WhC z+bR$CoZH3o7awYCpY!ZwM%B8{7N>%LdcXN;d^uFZJ$Twe-tQ9>uRXK4aB55RQmI-U E07$3-*Z=?k literal 2298 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t<)N~*{R zFwFCGO)qgSObjeA2z1N$EOhlvEhsb1h>G+ME%Pwf&na^ZvEWLo)Xpz72r)`BGAXz8 z^vNyp$})0`Dy#_i^2;%CHpsQe%JugPiAZw~F+sP@B%mrPKV88hAk{de&@8;bC^yH{ zt0Y`MGuul$DAicsE6mi>F)LR)#WmTlJjkRxC!H%Zve+jvFDuHmB(bVI*wv@Rz}d&K z($B-&Bhw_ZFg!80#M0fgBDK&lEfU=}Q@<2T<8p=2l-x8Q52LJzY#$^2{9^aA47X%2 zcNagmyzqeHWMjXw0GHe#{nUae!+fsf46~4cOcSr7++^+25`UxMoa~gKs#3E+Q?L92 zVJ0)5am`A#o z`Riu~xCiB#8Te+n<#PokdqtH+y80w%d#8lE=ap9#rdYV8yJkAM7$ujP8X6@Vh8B8< zgodSNW7wweo@AOHsE`?&5}X&Fnv@w8=;0k0oF7qGWRepUo)?srYY}E1pk1C)=u#As zpXMCu%H^A47~z;4m#H8|!=dMz|Jbn+6(il{#gc8+ux%`1?ng z1{Ve889O=^B1f}wg@ST@)55@XcVFYc za(CZglSI!FGyPXHW|G+R~$Nb!+sO&P& zw8X@y~76#@!dXz_HhL=~B<`kAy zxTSiyp%E>rgA;_mZI5)g7&CI+oH_16HQs2ecqRJ;Y*SW;P z(8t@tr_{(VGv7O0Kd;=EE6m*>$2rs_IME|FIKw|QxiT^_B+^CSLf^#Cz&SM8D>BKe zq%5a0*t^OV-L}fIV9TU(g>-XYe@}}b|AM@nY%{lTUuR$cO6Szb#G>LV?ZR~5l3*iq zZ?|Mmzx;F)u3Y^peZRt}OlN;>L*GRI)a>+vq;Lc6F#UpbN2etJ;0&iI?b2jpm)yWW zblW_u9DNHN70P@J{7Sui3<{I9eJni_vnrhYvO~Qi%=26g^!vjf#9NLz2QRjfyJM0<}ZjLkprjT_Y>=^1~wxoU{#$iVPDm{N|BlkXaC@ z;Arli;Th%`5N?o_Q(op|Y!K?MO^kXq{RU6q+r?vb9(6<%WEog8Tx znH1$#sqgHT=jWpDmhPPBQ{fq&o@H$29avUg;h$mQ|&%G}Jt416Ohi%aqY0xdI= z{0uBziw!(d9MjSgjnkrnO9TDN(kddej0(%qLo&F~#VOZOp(5DFE3hgkwItlsDAh|p z!qwO*tt{EJJjcf{*WW8N)Va#AEXOY~B|pfO%hcOAC?MCRP&>k-G$_K$AicuZ%ipEE zuspB8!Y$3;#30ZkH#phPEXX7o-L_Cyv$W(ug%abyh%)nt{2VhUr!Y&uz>q{=Lq|VP zLrZ;6_i%5s-16{n{j3VFVnerluBhVDh=QQZoB&H7j~wlc;vA<8{Q!@o?8x%qD*YTc zPfPEtY}Y_9M<2IzblW1`5-Xh370fJ+eFL04{fi8J_0tMXLsQFwBMOX7q5>0>98+?9 ziY@cKgZwLV@IB3p2`!N)0X35%LB?>jmyl#vjd_` z^!>{1hYq{6P2cfC`t=DsNY}WLI;iqDXJ=5-0b7 z%yjop~ z?`EKzUX+?xoT^YA=Az&poTSI)(qiq&hSyo_CTHxemo)#7np5qi&X;M^G?#QL9tE=D{UQyua>J@2HRp8@RQWPE# zlwqEd<7=63kWy}v>6h!`5>)1wtFNEtTh3MASinEy{Wa-&nK>InjrY%AyDac+?wz>H za(rCrs}p&v9avvqZ{`0X$@N>3T~Omo<`32r|I!)-OXh!`G4q*efZ~I{@4HHmHqP%8 zKA@AB_VO)P9{Y>v-`Aw>q^c#9-g0@gEOp<3ng*Aj8c~*Wma`P!(Nx!c)Uzox;N^n1 rpV@l$U+su${?zkdGCuo@*Hq)hyZ(Dk&%Y*dN@q5kjpdK%`}N`gdinN} diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index 16f230b..31474d1 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,17 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA LoF1ddALOVnrPikVoFfIO/Hrydrqoh/4W5DaSMZHkUs -Fla3oxohjlE6oUkx9tsroXcbDqQoQfi4qixrEqy2+/4 --> ssh-ed25519 4PzZog tojPturHggZ54bUlyCbr0hwLbhTPpBR/o90XT9DYf0Y -it+mlc2OKzxnEF08ao0J+aJezA20eAaRBW+ODgiX09k --> ssh-ed25519 5Nd93w W5FDJ7geDB27elGpL6SHBA54Al3uTU67FNsTt63E5H4 -1N3NVwEC3QqjpwdFk/SRWFpTUk1tTH7YPQdV2MmF/II --> ssh-ed25519 q8eJgg yJj2ImpyTpjLGiPqxQ/03tGFDnDN08Gr93rPRUYLLyk -PLSFba8JFM2na4h6XIzVeKKEw61/ZwlpQdesIHPtggY --> ssh-ed25519 3pl/Kw Zu5dWL1GkgL8ZhmFuTg56GRGTvTTDXYOXGN75/h37wQ -nvNXCSa/VsjchPWRMoFNCRLe6SK/trUrGgKa7iJkprA --> vZ[z@fHA-grease -mAV/h887fY2ispnlxuTZ+LR/EIYhV6LqbyuDpEc4p0jnwdpYhEAfU4KKZtnxae22 -q/IM3g ---- QXUMgsJS6LdbF4du60HslLfcBq5xNsazlzAHb7jSeDI -|á©eC Ÿ® ¶>,ÎVÄ•Ë3Mb$iœ¥IŽsÒ=qk܃œDi -ÖŸîè;S¸´)ßÄ<+€ÔÆìò)¨uRê²—eó‘[ÍðŒ4©}¢{61Wr ÈEíëPI \ No newline at end of file +-> ssh-ed25519 V1pwNA olslO4c+ZlJtfdnTvlUz/JToxVa4mKVMc2eImIb3R34 +xVWXF6S38aPtZnhVdJBFcNMLZbsXyfGOyP4xvVmcqwg +-> ssh-ed25519 4PzZog zmdNvTqZx9XNzXITLXZrIrtlKm1+r3BCthr5z3JNMDo +hGyzFvvPf/OpNwBKml3R7nas8n3KihaMtZipnbB6Hx4 +-> ssh-ed25519 5Nd93w FB2Q42uQesjMDfE0WpVAp/0bob/37k1BDBBH13ul5QM +tFrXKb372CcnEMaunjm9aJ6ZBEXLK/EvhAD0Lc5haqQ +-> ssh-ed25519 q8eJgg yzncjdMSAILkSPzccY9uq4yULhbVi447IkC2mk+b5GY +YdEh5Fbr4U1Jwr2r7tNDorzrxyRVy5n5Cb9hhQG+TPs +-> ssh-ed25519 3pl/Kw sZ0skpiwJWPoqGMIhIUonQkJ5Pa1i37X9OyJHVwRngs +FqHMytq+bYoQBI/BwQvmjR1hvInhltkcuV1H6mcolUY +--- 0MouBOwGiCtj1xzuEZNiu0v/1vsqrHX349hRrTADwZs +sÑÈå+7¾¸pëûÉÖõÀ`hâ*p¿¼Œ„B½N°îyb:4 TÛ°,ù"yæÚ«˜Î“@N€R]Ñжb uk/1ê߆jDn®È]À'Æz¶ ‡á¿éoG \ No newline at end of file diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 5e368464f18374210b846cf0705dcfb30aaad81d..80c4e9e837e44ded274f589e8b3d101c2439bfe1 100644 GIT binary patch delta 736 zcmZo+-^n&Xr(WOFBhAgzG114cs>(am%`3b(%{9<3+|9_$%{4qw-!I%W%{$1)(a_Dv zl`AhhvotZ>-^9_)*eJ*)uhJ;QJI%-^)!#J3F{i@ZH>fnf)IB^TIY&RBm`m4Ap}06h zH#Nn`)YQ;Y!6cw6DnDJpurRSa+$W&CDA6n{G%+;S$t|-;JE$ll(5osvD9S9%*Th%f z&^tLKqQE(uD=6G0EYi3z!_lK8sw6)*#V;s0pt!<2Bfu%#z0fqd(%nP5L^~tT!>QDB z;z#lDQkN<(r=(C%R|B7711BR3lkx!LWRHl#P#;roZEu$}%P7l8&#EvVr>uM~<8;qR zgS?br&*Icf(rg>q(VSdTl zNkMrjCSiW1xdz^8m6hIpCD}oN`MGYz;Sou0+Rixz9+`n$;oiyaMui#P!LCk;j=`4U z!6CW68GZ(CrP-zdh9QL+UYSnD`A+7>`gxv{&oYYF`-K)5l=uf1=^I6s2l#{;c^dc` zctmLjhFFG1rDx^^`#4$nhqzU^x&#(;xtsYIhJ_nj6d0uXI+d9Rdl`DB75E3|XM`lC zRc4q)8U~bCX8EOOC0aOg>FVk#q(&5ayQc>Dcp8~Ho4cn3M+RmY6#JE?`sD`}nHBn{ zxdyt|8~Nu3Il7c&bH!EH%gp(-_2^!MOUwfLBInkgynX6$uUvte*SYhm&Yt;)=PB|f z*MGWN9IX~uraxK!W7!ff8M~DFnvmF-?o}t&`aa;DRC(5DCexnt?%VrLY^*<3k)lw% ztM8M1>w4*3Eqjh|Z)svGesaP!=f%Ij&TSKwvK}RDdl=5{uJFYEPTjSG(GuEw7^}B$ zn0KsC_|WU=acxP+2 aLW#=VGY{^DI{D|^e;KT8tS%$y5CH&6Cl1R1 delta 812 zcmdnV*1|qPr#{&@#J4yqwW>rr-_6k6ry$ofz{M~z+c>i-C$KWRu*}>sF)hO-yu!Sq zoGVX1EX&8R%r_v*-PtL~&CMmO+%Mle*r3v+tAM-JIk`zz%9Jk%+Ei{x45*_J-;;2*t|5) zC&MBm)X^iG%S}7d#Uv=VOh3#m-NdmfH@Mg>wbDIUKQyP(DYV4P*)henINj7--y%13 z;z#lDv=CDxlYsKnP^avS0RK=!)6$I4RKvjH^pfJDqDn8*w8X%iqTn>MNLLfCJa^+n zA0zGJkO;$&kjPXg?Udy3Z1==S*HAAbBh$c8?Ef(g>DuVjs}6L z#vw+zLEdhLWg(k@vnNCR|!NxhsS;l!rRhfy&8C9WNm7%7F#7H;2C^fM-RiP-YNXthd+}ch-GmI-Tuq@EmI8@uQ zFr?nXATzVnx2hr_FwtE*z$4P#KQPokDm6T-xWduVGN`b`JDp2cS69I~)hRK|JH;q7 zr#!u~+%Y)JC&DMKz$>)WydbRHEYvB($vex`$lEL>Dw#`WNxgec>DHIW$_$tF=r7+q zxnO?g>UU{Lwf+0-ivISWbZ`3d{jT`d6CZf8>Q^25eyNt-{OSePiLbxa`xm%z|aY2-YTX2f zPl=mFv8ii0mv4}%n@^Zewp&h1nB_{ck;~B-nebd9uqSC!H z^7BfJ{nC8%jPfj!jFU4x@=PKNf;~(!oqWpDio=4<^urCf5)FI|TqAQlyds^-vs@D` zvdZ!;J$$45{ZdWx-LuToj4i98(vrf`sw{mcpJf!UHw!ZfG_fqu4=kxDEOiMtuJZB- z2rclgN;1r?Dh)|CE6cWUtkQQkb#n{l3Jmei4lVby%*?J#4)I7a&Tw;bbIvxdtaQq; z$Tsl|HZ)5r%8d#Rc6N2;($&>fu<-W^vIwb4N-T3pb}=^e*UrrJ^Dz%JNzL)}GAawO z)OU4?a>>s3^9~6OIZk y(6f{b=ID8^OO)7t>C3oSF)y2QC}&?>$gdsC8Z}!hAK99IRw@k1u&VdVoCyGM&Cgc= delta 720 zcmdnXx{_^zPJK>Jg_*OyK|y$dQ>9^0S!rUvS)yfXQnt6ZrLVqmdAUncVtPuHb8=O1 zK9`GGRJKQ|cd&;`xu0oRP_A2)m$zqNkgG>txLKHiK}MjvQ;}10xu;=}1(&X!LUD11 zZfc5=si~o*f=NJCRDQaGX;w&=xm%dAYzgd=-Yk_{Tc4?tydZDXRV1`RnS&3<|yKka}X`ZKLaj}1fr;&g0 z#E;_P?rDaFhGt>fmHI`w0r}|$29;SA#`)Tr{sk$KMFCaC&Ylq!6^8*7XpJf!UuL#cy49;|RN-ivm%#TcWb+dGH z&GPm#Fpe|~stj;<4$BP-%`Zst49hC#a!)R-DmHg6F82tJ%&qkBEVQhODy=d|HqR*u zhz!aJFf@!P3{FikDK!fO#XyX1dQoa(aVnR&nQ?JiX0d-+Xi08BrmvTFu5*-getNij zP-T5-m3DY>j(4t8ltG}8d8%2utG9cSd2xhMps%rIKyg`QlzxFPSCGE5dq%#uQMkT# zq_1~Qg;#22L1d19RZ6k8wwoiDuCA_viDi{fNs(WscA!~hVR3G ssh-ed25519 V1pwNA BxPb6d6nlJHiTkbcwOoPrvAPBuR1iJSFAXIp9n23Ix0 -hl0X3RjOEYp2G1QU4SC6CBF5YVlCWiakMsRbGTBYkzs --> ssh-ed25519 4PzZog Nf/tUysmhTfzaoHhubwdQ5NKZw5SBd3CEs129FGkuio -750oaBtfeBEpDuasZFr7RY5uBzFZZNMNGQkRyFfEGCo --> ssh-ed25519 5Nd93w fI9TNLWkDkvLCDA8eTMfVw7fRPylWHPGzPupya737xY -wQcz+yf+EqDNmRWqldNuQjjy9tKc1zN//yumtGpGbaM --> ssh-ed25519 q8eJgg T9Iv+fRwmOLYMXe3ur6dqudA1z2wQsKQX6ogkyQT3Fw -LBYKL2OtLiwq25FkvZjT4H3tu8fOA+KFmFp5vjbncLI --> ssh-ed25519 IzAMqA O9JfKAlOUao2S14iczlnTzT2sTSAM1vOR5KjO8eJMG0 -ioTSe6X4E6jE4c9Utl2d6EUHZYilnbtRnB5QJg3S3Q4 --> 6&-grease -BkWorA2LiphyWLmdV3AeKsI ---- +MO1wX7pJf7eq4MkiWSP+xyxThI5jnfseS8jd7LbFoY -¿ÕWV¥—>ådD­"ð`ûi+ €Ç¸ÃæÕ¬ãÂSмk°H¨Ojt±Ç*âòkßäŒØŒÔ¢9Ë×P \ No newline at end of file +-> ssh-ed25519 V1pwNA GVmv4CgKJ4b8Hv52C+1f/g58CbBLacpZ1CuyMrH+P3c +2JJ0TfpA4V+ZjbcbRxVN/NKPTm/KtKQ/A5fE33n0jAU +-> ssh-ed25519 4PzZog 8ZoG98iY1oUChmdWuRzxwAY0Lk88FVwMH6M5+HctGjg +TZ6bTswrAXji/YEaqUcZpxcqZnijvZBa3nq/rDorHkc +-> ssh-ed25519 5Nd93w 1QLznyfI5HuZiFOKlDJW/tw0tRiz/VADYJTfQVxzrRg +2n5f2UMzG7BFNV7zyPw4lleQdQJsRRG+0lcbuTvP1Pg +-> ssh-ed25519 q8eJgg 1ihAcMOK6p+chq0ivA0JY5QJrjhkGc9b1AxzWHFa3Xc +nfC3dXD6J4S18qjUO91hSNxOGnukFVFykq8HqntmKv8 +-> ssh-ed25519 IzAMqA wBM3jR8cmXa6yvNi1wTsdBX6qotosuBRu1rKYLJ/FCk +MUtMJjn+8Fbx9CjpUaciJPd8NOXxsJHGT/x60OF6O1U +--- d0tAB4cQva5jGPj8G8v5GrSFu0WfmjSYU+BmvDZsaLU +wÀ’'”Dzޞšjǵ‘«Ø$d-–µÊ¢¯…ÓC󣘽5îÝŸWª, íFjÓê¬Yî9çÂ[[´8à ¾ \ No newline at end of file diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index ab6803d..f036de1 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,22 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA icye7bxeLugaCuSwMYAZQOrI7tcG8uc9XR5lTYBkWQ4 -HRsRB0GVkMPS0afDz0ybcTZ/oexA7zV9U6hYyyVm/hQ --> ssh-ed25519 4PzZog ihJwwtlgiICUNgrpwVVKAAcDP9JxPgBmcruW1em8RU4 -/c6JJDzrHwyEelgMaoDeADVD/yL+ptrDdgSSMFceuXs --> ssh-ed25519 5Nd93w aLRd09zpjgCnj84pFFfPd9FrJGsnemOb99EG/TPe+UM -hEM/T5j4oZI05597dI148eRbRU0P/E02RAD5ypsl1eo --> ssh-ed25519 q8eJgg dwCo6ph1KTMDgFnJLrGFtzscrHxog6WGRUaPdBOuCSo -WCxgbOjZy9vkgcYTa4t/bgc5qfxlpFOiQ3vtCvb+uWM --> ssh-ed25519 IzAMqA Q+XUnmVUAstlxgZTiXXGZN7Nzo6G0zgS3jtil8MKd0w -1VFkeEGLZLh+j7e1RJW1iCx8ueLNTljTsxpujkhwBPI --> ssh-ed25519 uZzB3g FeuGUR8zcPUHkev9PVARM2ac4Ezk9EjO3gWL15kkjjM -W7DXwMWrIKEzs2IJ4MH/diaqkUK+lYE5ocJ3qD26NyU --> ssh-ed25519 Hb0ipQ +hueeoIxI4+E0bkElclszUoD4ftHLkiqe6XGcMNbAn4 -mS/SFhLfjQYa76qhDXvMijkvbWkGRGcv7HWlszArX14 --> ssh-ed25519 IzAMqA CLf1vDYSLjW2InHfHCEfq/b7j3zyRH0TTcLSQ0Evmn4 -tuq2+h0UVzt/lTFdpLn+fr5rIYdf8mgdDny8Cak+k3c --> x-grease -Eeo9UQ7LVOjORlpR2Jf7K6P2OEdc6HWWQ6/Yt//KHWxKStUtMv2fPIHu3A8h8mHl -iQT/Xmlg ---- 0/OGiJqIu2aFUO8vqJ936PvDDNiohDSVkqpsiCxzfiE -—Z ¥lŽ.§j‚¥õßZöE‡¤ääóÓ´ì€Fx®6Mœ!ã:øö‘×û¼ÁzbªùÎ.tDΊz#:xãc}?cF£/ÑÅÎ؉Õ;ˤ"´eJM_Gv·©e7ôck»\E9³à&öOúž+â< ÁÚ“+ýÕŠ 2«Hm½ \ No newline at end of file +-> ssh-ed25519 V1pwNA f6xGNtufcGjWlCNkhlF1YMNhwMIjpW0ojqD7fDhPjBE +fCVybFD61VIpm20zeVvKCsOclGhzN7RwRViw6EeWY8o +-> ssh-ed25519 4PzZog nHWP3E5ZNvSwTjeNWL5qqmPsnXBWUEs/e7trIQuT2CI +n9zztxz/XTIY5mPLSkFabYfsGugSrP7bdrXzf993MTo +-> ssh-ed25519 5Nd93w 1Nxqu7Lgv+KBNSoWMem3dBou4xrafQcE4XFlGCgwpCk +vZe2WYM+FfrNXog4iEKAwlAQsAuDEp2tdl/WzhRaju0 +-> ssh-ed25519 q8eJgg ywDORriWBqKl15CDZccFC0EbX8StgGYP3nbkOwKDbTU +ULGvROpIUv8GG/WdRIxpfovjl/08knlgQxpipUJe5vk +-> ssh-ed25519 IzAMqA RgipLXB0jBR4ghCrXXMx9/Pu03E4gBYow4gWYDPzHCc +gVAHf9H0fZrPL/8+NWx5Jlr/7UrvQdpLSGXEMiNdmrQ +-> ssh-ed25519 uZzB3g UbeXy7a4ZkdEjIIBCLD/zNKmlY2ooTO0CbGl1Y9lJRg +aajwx+NrY7iwOkT9hkk9ocdUlNm1f4epqXNosPxJpr0 +-> ssh-ed25519 Hb0ipQ 8sdgjex0JqgckMibuS1jdiJgkjvWGO8tUvlpWoYmxiM +CoUeJ+vEbBit9JZhvyz0dHX5IgNywGE4XfeCtVV94GI +-> ssh-ed25519 IzAMqA 41gq5+Itn20lMFlS7AnJ5JLl6OEbJ9Q32M/1TUDl0is +PFjQ3Gb4LajOxSjJgp6s2dkZrDFinniDGL8hXtlomqE +--- vxbU9/Jgdf0fkUD3hrdHUgPV3ipn9MazV54zlh4s4Yc ++I¾d®¤†/ìff£È›1˜/xOä®ã=÷"<›( £O‡ŸÇfsrh+=Eâ{Ø=è ² +šÙïÝîCõ&ØQûës¹‹ÒùÙüVùu}4Åéìä4¿U‰ëÙ½USj%ËiƒHXÚšõÈÌã7ÂF«Ù݆¦º4ý>ѨføÕ0ŠãÇƶ)ìDXÊ)À“Ï—‡°$2YXå×Ù®šÿ£%¸sÛ \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index c4969af77fa4ba8c503cb983ff0f250c10a3de5b..4e083cafce5c9139a4f5e427c3fa7c8cbbd3812a 100644 GIT binary patch delta 716 zcmaFNwv=sxPQ6L4p@mld*+geyWGRPojle zx}&yJx|d@)S4K!^h_Q*0k-m>{l2N9iw@HY8acG%~c}`|%vcG9*WL0=}PN;!blz&P7 z#E;_PE}_N-sfPL4ksgjN`TBWPW~P}&PA--%Dfup?mMJbJiN&U-!BL5p0dB=ymY$YL z$&UKzp{W(FX1>1Z8KrK)mVSk%$wd_r28r1g#)cVgNfxfA-eHcD;~B-noytu^^@|J2 zD@}YWGF&24JiQIV!n6F!E%kFuA|w4gjM9yh!@^SwgM$sYLW)f)vrRJ$3iB#MQ(ZHi zLL);1wf$X+ii>?hvMW6-!Xm=;Q-XuTT}mS-pJf!U56sL+G|&(7GO99kEiH64a}O!- zHVMxNjtnkH@p0AmbI!I%G4e7j3Jdn+GVwDvNRP_(NiH>Vbx$%3FDXdON%Tn#EDlc1 z&h>S542v`~4{%Ga$}K78($&>f$STb=@--|^b}h3Eb@nm#$cfDI@ybhec6WD5^eFO7 zN;fg8PmT1v4u)^x3vwF+XL!WQ``*68eSN#|Wzg(*hN0^wWo4C~gYFPVEU z*EM~{g$VD*E3OnXEN!l9@8(%ywW`E+b<@wiS57+U8@`k&vHGY`+_Bz#39DY-rMqpO E0CZsf2mk;8 delta 779 zcmZ3=_LyygPQ9gZfO%$dVnnb(X;NuQkeR-7nTuyozDa0gNO?i1uc1*?dU&y`v1_1< z37313b7WPNWu<9&s*{Ihafx$gdRlm8c({*qQL>R!Xj)2^MOJ8vzk9N`374*&LUD11 zZfc5=si~o*f=NJCRDQZbh^0rCSD{%*XtI-uwvSO(x|@E5ky&JLP;jAHs%McwR<@6K zdYD;3N|Bodm%nyYfPuGfp;<_IVx?zZVL_f@PGPdEX<=kurc+{$Pg#n-cZjx&SFU09 z#E;_PZsw6j##sTOo_^XTkrk0{spi>Ex!%E!nPw$V`1`njG(?v;UD%d(QWN?pq{9i8$r%1g4NDxI^_ zO$~D`vP_Z^lZ-4gN|Tc<^NX`mTto9LO)ASLpJf!UPj(5=Hz}(?E-lRT3QR6?3N}jy#Xyyvt+sA@QEFmwszM%@M|OCmTS;MPwv)D-nWs-=vY|_6 zdQg3sd4Oe(k%5_+etK1QWO;B&q-mgb3YV^~u0nu8KuV5Rwp&S+bCgq_n`4A;u~}tR znNe1lM`T!qskxD-XL?SWUsalRC|7cY_}SyVzKf*=`kp;1)XCVtp}{J5t=yNei%sXU z&Wkg7ZT<0lR=>87s`3x6DxSm4>%F!oXXYPot^aS?x<}|y%AVg7w}q@!UlFa>&@8{o z%YH|frPpt`Jy|KOJ`9d!$RzvA%cMqd(k9?SlbsXnx z&S{hEW*pG@CY7{ttK#!_v$xK_aJnOXv0d)m1B_f3*M!=JU3mQbzDTI>Ef$Ff PUc1-aF8o);bh;b>OY$6& diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index b0bbb73..7d1f348 100644 --- a/secrets/dns_certs.secret.age +++ b/secrets/dns_certs.secret.age @@ -1,34 +1,31 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 2QqdIJOBGkHQYLkNX0NRvazb6IBk4SYYps1lAC8N+WM -GkubePEafiWi3SfR8GXeXU8+HH4PxdwHPd9GOgvzhWw --> ssh-ed25519 4PzZog WEUGHm/9UeG0iFVKxFkaZYRtmqlVF3b3ikRQlA4Jgyw -yl/pe3c9C147jQj/uNIN5QMkFiVSAG9CQHMEOmK8UUQ --> ssh-ed25519 5Nd93w glFj1OmRcPMfXX8ZNklv3Lpoq27u9pK7LNtFWVUwjio -FeNTpW3aqxYE84kGRze9BMR2hDRsBj9a9+439fqp23A --> ssh-ed25519 q8eJgg 2GCD+0xk/pRUefV/qWv5GKsTS/vu5hGtr7lOPteWSS8 -M4Fsni71ockMvu669XMHM9++hXiz7TdFLf6o1izc0bc --> ssh-ed25519 XSrA6w yaCOzzT0GnCzdrARp2FQHV7npbD/JnuV4tSYwIprdXE -iEIgUn1+aDXN6+qDBNj4ltdCXYqxEmXXql645cGSyrE --> ssh-ed25519 DVzSig kQJIpvtSZSw1IUDIb3z7HNRz4dw5H3jb8ozcynSe5Bk -aHT8f8DncqP8pgE9oL70619xyNtDBzxB29Hq/ma2rt8 --> ssh-ed25519 SqDBmA QDrZMYCMSsqmhFIMaNi/keyPOry3YHwS0dMGGumJLzs -Tj0oKWFsU2aR7CQSyeDYWq7nY/vbcOkMD9JrLFaq2Uo --> ssh-ed25519 UE6fcQ Hb0Bp60va2pYytRaSaLbT9sKcosbcezSJs7DNiS7jgw -41IjrgNOPB69pabq3JRhdFNocy661JSCmXLdk988Hyw --> ssh-ed25519 IzAMqA 54sUUDUo1EurSpAIHhwUYWUF4jabHauQqzdaZv+q6WU -14C6ao5GUpicJrdIzP0YibKO0xoY3ehc1GDEWdWA3Mg --> ssh-ed25519 uZzB3g I/XkpzTDdYac5rJjElfNpD9gh70hnzImBBtBnEse5z8 -9SzTUatocYlqsyoNJ3oPaA6nZ4gZaRzUUs/zSXTPLM0 --> ssh-ed25519 Hb0ipQ h/VbRE/4QmlDmxl0nuzV828L75zK14FJTlxucIgw5Fc -EbTPH0ma+TA+tbfluXrvNU7mfqrK3Onn1riikEA3t08 --> ssh-ed25519 uZzB3g M0z7FxgMYUNi5CMRYnpTueyx5RwhJtArrv8o6pj+LEI -JjlkieTaJ+kz4CxdyPN4MDR1IUoWJf/uCGZj9jc+csY --> ssh-ed25519 YFaxCg 1C4qRq/rM5B36KZ3MkGl1wT9NwsSQBoefccxiBi3qVc -TKz4Ok/TVANl7cQ5sySccxWySWBXPtvJDM+eV1dsTz4 --> !s-grease j^W+6, Ab -Io86Mr5+tdtC+WUnf7YWjuOE9oHm2iLwyRRiEKgjxDIvNtDgdiZ+0nZ7yDRmuO48 -6OKmc9Wc2nsqknT6odS8hAgR2jIPXvg ---- 4YBEXs7Qucs2NbbyqhTgQrWZhejQa4XmK1mgd5eW4yc -ë~#ñ)¤Œ+s?ÐYy>Ï_b?ÝL+)cÙ(8õ$HmMâ`7'ö†cÿÐð¾&cO¯hõJs|xW6±kâHw7¾õ@4„N´P ¢zWm„  >"?JÿP 8Kaç—óU^±.×ô"Ì=¯gìµ6(j†AEîPÅàÁ.—yòWšŠl›¼ç ° —ÇÀò-£3¯ ¦aãã -M"lkÌûyº Ó¨ì 9#og`p÷unïÜÒ·™Ïý„C¯›Š \ No newline at end of file +-> ssh-ed25519 V1pwNA tzgPuOSktRbzGWk2BDFHmbr1Sm05qdYjyRz2/HTx6B4 +U81/Gr5l69wte3fAtN3nYfx5OAMu5x7WTS4gygHUucc +-> ssh-ed25519 4PzZog EPHeQJYsFoEHlgScAHEsu5qvylaTzvcPw3Y2CXOSuWQ +U2PGDUHKIAR/0qovVc7ovAT9dyn/fOTncfNWrKk8ljY +-> ssh-ed25519 5Nd93w 4CHAkRax2v275ksja2Pxw+5DoZXWNKd3lHZq8+Y1W0U +Br95FoQN2AZf2io3wFTX7SCHxGoGv2O/8/kbnu2bqvg +-> ssh-ed25519 q8eJgg zds5ccfqHdh67yLnN+33eXwHF5FFKVFAxW8Ecgk7ZHg +vDZ13K30m+rx+wyteX8SuA5uEI9dZMV/vRJSt9ydKMo +-> ssh-ed25519 XSrA6w 27EVcnWYtJnsl1EJtmbucY3pyXHRZKezi8KN30bK0Vc +y41vgV5yH3aZJUx0Wl/zP29466yOl2IGgl+6ti3pAVQ +-> ssh-ed25519 DVzSig XRuB0GkA1CFvcq7mc2Nod79+jYnN26dEOfCDcRoS+nc +Oy//M5W8tspc/YmQjYK8joYYpm3SoKfrKKmrLmSy7z0 +-> ssh-ed25519 SqDBmA cSiRVHtiZbLp/OFS+5tOgmf5msgfaTUW+6U9vC8Nj1s +8pymGU7WaIx3o0WkwqFXgM9lFjvablusQF/9O9xRrcQ +-> ssh-ed25519 UE6fcQ rl54j3p+k4eMCC63Hl2hKyWkKwWAS61iBdhGolnh7g0 +fqO/fSuwRyTAW49t0w/ffTMaIAvBnJrX94grAO2f0uI +-> ssh-ed25519 8vZ9CQ old/mJ0AN9vJmvbr1/0ELh02R8tGPys+rwSj6Tq2Sh8 +W+BcsKswtQv+e7kAjHn6vrdApawGuNwIAK2hNV3SJWo +-> ssh-ed25519 IzAMqA lotJU4JW3eHjdb+ZQ3s2XN7JmZz3FFBh7CJ1t+/+Ghc +wIJsNn4SUXjtobDz1xzLSe0oEqo3nRlWjJiLqDiHv6A +-> ssh-ed25519 uZzB3g eH+/Tew6AU7j95BBMcUtwnaoReZeFp6CaF1S+JdWUCQ +VjNNv+gd1JkUVFtJx4H7qDKpOPSkgRVcsJhYFhPxbWI +-> ssh-ed25519 Hb0ipQ k732pON+GqpltKfPmArf/d6wX0L5OLVh6l56M0Vf6UU +UdEG5xrFoFnjXAb47uPO0lC957yvocPgK7iRrxwBvg0 +-> ssh-ed25519 uZzB3g 0Q1BNGOJoH41b6z8YG/QOi8wshGJsPHN7XXMAyIVTwE +ecj8oOZyRSYCXPXEQXmM/KDZktEpsgyohQtK45Du1ow +-> ssh-ed25519 YFaxCg hHWU1ehve1zeDoilyZh1QjtSiGgii0i3ks7+DCXuPmI +krPnm4YCmcg98u735WdiwCeMLG/5Ie8rk0/AE7ZP+qk +--- 6aIkITPoSXpoPQB7IqEDvbC5SqQt+91+8SiNZbfrfwQ +0fÊd”ŽÁr«·CT ا‘w°êwŒ…«éÇýTSšÿ=‰M©(F ·“§Pº×Qжÿx*îæü TÒáÍaƒÉöd·]Dt>W0¦T²?¾ài‹}¬WŠ.“Ï…ñŠàìn0°ºjéS¶Ê«2\~ýÄ sòçnДläÀ³e¯$ 3Ô­ˆ쨋Ïï¸8…®{i–Y.¦uI•|€vâkÇáFv¿äOÛÏOc—sùÏA ]:ûÜÓ3p0Øý†¸\þÌç91( \ No newline at end of file diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index af886e5..54ede46 100644 --- a/secrets/dns_dnskeys.conf.age +++ b/secrets/dns_dnskeys.conf.age @@ -1,18 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 4DenEF3jiCxCBa/F8ehgk13NlKvLzEfIxeQVTlMvM3Y -czXCvVsOMZDmAzqxT6z0mCsGntVeLNAJX+IIz/5XS6Q --> ssh-ed25519 4PzZog 1fBsKWaKTGW1gioyrDoRsCqFhGfIThj1cq3GaPDlIjs -BFcSRxbrO3n91pEXNV7pInCRAH3W4NHFOYPDlvpPqkc --> ssh-ed25519 5Nd93w 4vy51/o4XExQqMRP3DyeVK0GJO71jYCm17qH5tC230k -UgDrJ2xPGL0O16g+BFOw/kEso19lB3QD35vLhxmQ2h4 --> ssh-ed25519 q8eJgg tAGYnvVu5NAlrs9UoEIUb6H898V5y/st/lnGm3w2o1Q -SYK1mWCClDoK3dj2KYmicOLRvgDC0qdOmhE/AFFWa+s --> ssh-ed25519 NtlN/A iXJJI8ILFcZvIPaHkWOYSUVwFJOEB5GPpZX/5EcWJlQ -XpiJUa+J2rjsAhhQT4szCwDMudGjuveslcsLs3wVSA4 --> ssh-ed25519 v2Y09A SkswYtVP5bn6FJZwL9AxxONpEyB44Oct+tz+eP4bUwE -0rDV7iOQI7GAJ0VkqozwgA3guoCRvCb5e3lgPAmhlXo --> ~=-grease -xBfYaHlWp09gHdR9CQ ---- wrlmOZpShrH1kgr4cDBNDjPk/zLA5Ro94cpUy06cH34 -hsõIC -€s‡1¶…ßø5k|`3rˆUŠV»öÚ‹Œ†`vó©”ÿ¬{×¢1Õ´€ù˜¶Ç‹Hï¿ùÔ¡Ó¥Y+N‰ÒªÃs浓ÏC+„±&0"VØìyíjVù¤â Ï¿ªÿ¯ã“pܽ$Ÿ¢-8$­@Õ¥á{‰«ˆÇTF›ºFî ñÒd|± \ No newline at end of file +-> ssh-ed25519 V1pwNA omE94iB1hTPkde6EfVej2cCtb8tCAczYOeHa9ZibcC8 +85+fPpShqO4OmETJ72eQlJmueOcof9nWOMW9B4Kd+Gw +-> ssh-ed25519 4PzZog gAreCKVlc+bRbbwbg706yWOeMJtbQNxNm5ZO35tETjg +XYn9InewtIZgp0hu/Z+HgU0qQLWuDtk9YH2rTG8Dy7E +-> ssh-ed25519 5Nd93w 8+RDdkA6k+L0B1FaajfF7gNKAVWi+jSOEu4qGYmrvTA +453wvNGH3ghMtQ5s69U2saSNVBxHya4h6AK73l7u7Mc +-> ssh-ed25519 q8eJgg igT5/6JbBdC5SNSSmB5c/Fe/hEbkJM7shzTa40hmKm8 +uWiet2aX+Jvhm64xEBajbvWODK2s974Qx6wGBDuTP80 +-> ssh-ed25519 NtlN/A 1c+c70Cl+2NxacvNdAQSV0APTtH99HN5iRTgN36vyV4 +rPhvangDj9jL/SFW/3ztNdXpQYQxKBQUB2uTbuS3bRY +-> ssh-ed25519 v2Y09A H0G9oRW2GOP3j8zqHSbFi+N0TaBGhMa432y1xiojdkg +5C8EzqYSUvJxn4ePw4XTIsWOuVEZCCj3e0Z5PvIwTPY +--- 4H+V7sfTROtlJ+eKrXYaKnCm7cSmnQjj39cQdY39PWI +Â.Jo<¾]W„ñ}HIß*4ݸžgïb¹{ETÑE#5bŸ÷z!?ÇoM&Lœ'ƒeó‡·´õϵb­° +­B‡6Néòcê¼”/Ù-æä9Ú¾Šõã`. ssh-ed25519 V1pwNA /YhGxaH+uVC4EXVNEpY6akQ3cyOFTCvbqnQDobPGbHE -pcRmdrS2h6GOmhiUQmbDncgAhfBMsI7pVc/8MrCQeiM --> ssh-ed25519 4PzZog dsRhlBiY7h+WrKqU7KlCYQ5Ypwz76uH9AjZlfLwf/3M -wNvcPHNISI5y0eGQpAv2jSZbTbA9C8LGzI8/dnMn3ZY --> ssh-ed25519 5Nd93w 5z8u2rWibJcfnkKJmtIv/toSUgkJdxk2HiBJ5yi1F34 -jXWyd2UcJgQLKHyl8/SbtR5uKEBPS1TWcSV+uQ6sudQ --> ssh-ed25519 q8eJgg puPp2e3TvJOmqF68x25NsZftZOjXoQRAfT3d6dulOwE -DMKRvgnqQKJbUcKlFvFPnIWQF48v/AhR0sRG7R01LMg --> ssh-ed25519 IzAMqA bkxqFYf3QFk4Bg+ax6l2B2/qEC1Sc2v1oNIXRxA942E -TYk7gMneWdKdx9PMJoROZy6k0A9smhQGoenypCiSSjE --> ssh-ed25519 uZzB3g ouKif0gJlk8Ijg4htLxS6V9kDm1oO10pgoIDGHlnKg0 -TtChPqbY4BWc6320hBVsdjOYsN8FZ7+kK+gAa8cPrXU --> ssh-ed25519 Hb0ipQ GQu3BHKFNOffCTgN6v/9dciTpSDOPHSD9L1R6OG74Hw -j9r+idSNJR0w6XgVZCGOdVsvsFPVbyc1/Nno4uqBCUw --> ssh-ed25519 IzAMqA cQNK62FYAGQY9+0YhVvVuKMaqB9IBPLUPCnM2nSUQzI -NOMoBDtIN9w1WlxuYHTLORS2xA//D8jIip4SidBUNog --> QjVPV-grease z #u>.AWX -ZAgcrfjgpw5J778jd9fRtQUns32SsiEybe/VTFKZw7P4J9STzRlt8/KDn8EJQ2Dh -K22xl+ENBo/+YuN1UQ ---- TYTyl621sRrBSPvYgf8uC3auUXL2ytoFi0ob6+NUSOw -›Žpns1 èž”{ ìjÏ7iˆ™'™WÓÍWôÈ– ðË¿ú©²?+Óê/P€\ú~B}æ<Ú…ƒwIü.Wâ;ÚórF‡Ä‡d³HgÎ>™åþõ?Õ½ŒÙÜTl"ïÞ-1_äñõKz¾ÁómEÕÜ™¼×A”Y{d0,VÕñ8›YV  \ No newline at end of file +-> ssh-ed25519 V1pwNA mAJQEFu0p2nxajUh4C7FrKnnyTEFVagT6rtCsKqDz18 +a85pGwh2S35v+VwC8DnIL0TJobCk8EihiN7p7bwlxiI +-> ssh-ed25519 4PzZog NbDMBIfNzmoG6jSRTrDpKbHm+5pd8tVLZhZbnzvGZRk +VzXjnmCR17I7ZX5b356OCRHJF7W10aj3SBF0MCcnzwY +-> ssh-ed25519 5Nd93w sNsptEu0kFqWKSTeEXvdsa38ka+h+LKXBqrTIqmE6jY +RrPnod0YsfbXGcfwKz3BfYyVQa2+OFR18X6f5V9xqX4 +-> ssh-ed25519 q8eJgg 7YPlbAGSZPq1IvLqk2EB0S7WfemTLkUv6FC5GrZHWDE +tTGgiNjuJl/3DLc/GKIczm5G38LZGekAXTF2TXUo+PU +-> ssh-ed25519 IzAMqA PcRZNr3VHZuB9XD3sRASaY8JaL45c8pF9Am/7P+94iU +Sml3WvRZ/wrUO5fqn02cJneCfjnZ5fJr9d3dTdqyCdg +-> ssh-ed25519 uZzB3g bWlsuR71mtorLasEP7+2cuH2S2B8uM222D6nQC5Rgw4 +rUQ1sXbeaehQm1e3/JVR8cQqE2hkwmUFV/PQ9Se1H1M +-> ssh-ed25519 Hb0ipQ kgBnX7+sd0rxcp88Hglenuf3qfoo1syJQceGxMbWDSQ +rb5cvTxSjInGgJRZq33vCIa23LkeFHbLCy2s3hZXSzI +-> ssh-ed25519 IzAMqA 0pLUe6dFlP9w2JPn53Mo6xXJNuJrLHH9mqerGYp4lFM +IvjADrsuDTHI0Ljzr899pG5/bwi+V+KfCt3hn6Nf/UA +--- jAsttyHTXJjcXYQym/QFfEvD8eMk+SK9IegD0p2bZ7Y +5:¡-Éþl+5ņe<ëîS÷¥YÆ£RKCÄä‰H<éï1etõ¡Þ"¼ä‚Êaʉ?åQ&õÔ÷’PíÓ‰€´—ï8Cšw?Nà „P‘¶Wìf|&‘¨BÈšßö†][WÓÁr¢ÁÃ|>»‡Ó«SKŒ‚“ŒÊ³³%-«&M"uпuöz \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index f9b29eea3752046dff44540dba181b77d66a0c0c..c175d33aa6ab3967818788acd08d3f19e0faa607 100644 GIT binary patch delta 692 zcmaFN*2^|Qr@qKL$KNqENjot)CC??vQQyPUr6f0^%HJ_8DKaBJGc`5B+{33bJ)VsvO zKczS@(V`-o%Tqhj%`Y<7)6_4o!pkedII+YqyCN^i-^)DAFHGOr-z}-K%EvXeBq!Zs z;z#lDAs*sFK=fLtT*CI0)qY@936n{_Ou&6}0yn<|>a5Ia^@r>f(#i^bJF6PBm z8A*mF#etbwl@*nxnU+TGemP}c78N036~5&@QR(JUL56``X?f`d{$2qYIYEYLMU{DJ z5s7X_IRRctMx~WzjyYjzk=|vV!2zBwk;Z|O&oYYFhg4=+IOh4~737ws=T&$c`(=8W z`Br5)nwJOUS~$DrC3*S;8JIX5S!9-Txs{q2=2>_}1zH3}S?1*%y1S>A2RfOW80))b zga%uh8XBfnr5E~#_=Na!>FVk#L{^3x8yQ%b`Bda(`B$bGyJQ$=d-z92l?FRTROD9W zCIy$&yCvo(rluG9a=m2Wy1=?S>u5v#hn0-2!s1zCTqiQDQyFDAPXA18(qXVn%H8;B z?|qAk^)FZQ{Ao&m^PlITdQ>0ht>3F>9(q3^=io&5zAB!S3u4zS>p9nAO-ZSL-CyN4`Q6Abyee^VYl6sP2hoOE6SXJR&d|_H&b<8Zs_m6)YmU#l ge!2fm(P`h#O^+3H(&F#lj-B$WX!BRA6HioI0nSqZZNo#UR`~Jt94)AXD4OKf|mdD9X8$-9q2R(l|8NA~7)6(%;B6BQ(=D-#yC6IikQKC8xsA!%@G~fJ@g-p}06h zH#Nn`)YQ;Y!6cw6DnDJJG$hO`!^2D8+#n;vz$`y9+pQ#DKgihA)VJ8QILs|FBq!7* zz%eMzG}tJc%P}`8$THI~w9>r9N#Ebk!avEhvaF!k!_hm;Bh0x}3@r>f(5mlb0X*p%u zA$k4*#RW-Wkzu(;<&ME=MIj|68NS7)+Ggfa5dlUyB~_kWd7)nB9{z4oX<-&AP6lZi zuI>?r0m)HL243DJ`N<(sfq_P$;rZcTB`==R{ zx#a3wRC;TB7@A~M7#0VDVxS^4G$=tgy(l%YIF&0ZN;@spGRN5@!Z0Pmxiq!Vw^%!) zAho_ESlh=etJ2GI5nVzs~{}doJ&_% zSHayk*flgGDk-NhI5o}0FfS`2+u6t2*xSt@Grv3_qSP45o9}Oo$V`RHxZ?{JZ@lCZQXpoHb$Y zt+S@BI9%L!vDnP(#g^X6Am*wiOhN{W1@c#a_#ao{DAtiAI&H;-1Iw?xcpggoye3K1_1o!6f6J$ diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index e0350a2..48c93b4 100644 --- a/secrets/gitlab/ldap_pw.age +++ b/secrets/gitlab/ldap_pw.age @@ -1,16 +1,14 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 82JAj5XsvsKT8sIuARe4FTmSiCygEhTive+jIJ7h/R8 -M3U8He0axy2HLdKnmKDyvilT99LQPEkw27FF2hUI3tI --> ssh-ed25519 4PzZog c45jK9DTUO6sXTbhs8UrUjLIELIL8XVdYiOYZsR/4yY -HS4ng3Sb4J0f9OYHZLmWHWS/c3uetn3w6HG80uZNdUY --> ssh-ed25519 5Nd93w fBv3U1fx4kIQcPWAMl1xRUeIwiM1+0FpfhJZrHQMww4 -8ANUGKVp5Tpq/wbIgXhpi5cPsxFALOuOsisMEN5A4j0 --> ssh-ed25519 q8eJgg HTr8SCqna6YrbpdEWdXf3vcR/ohxQStlXabHjZN+zW8 -vyoLfNsO0zW+S2+nIHfB1s8GaD/XjfqnPq/i3G4IJqs --> ssh-ed25519 uZzB3g f6+fXpF/3aP36u+G1sDOhaQtdaWXwxoW2aWWC5E8X0Y -KRDi36ChFupksZMkxWEnUkaNBgZujYsXEhS7ngueo8E --> /Q|[]_7-grease WOAZ6f R~_\$m7 -e0+qF+9VouiUjHXF8coBkESl7COpdlPlBQYamcTsTto6CgZUZkYqWQ ---- n0CQNPMTO1iiR+zt+dDvj0FocVteXkclIlI0EXoKV7w -OÐâr€é¥ÜP¼K]PKðxò>ÿe3rðd™¹Éçž¿¢½÷ôÝÆÀŸݦ9d¾Ñ4¿G‚ cά|T7gÕ7ßz -P”¤º´ô‹ó02ïïÀb¶Ú„fäÇ,ÔÒ¨Ñâ2Åm  ‰ŽÌz›^»]M$jùƒñÒi7uYŒØ_lNPuÌA%·<ô@Ž« €c„²ÿõ{7 \ No newline at end of file +-> ssh-ed25519 V1pwNA JVsw8ztM2WBL6uR3IHhdsrJpRddMTzcd2WwpLMTbE3Q +WSw1UmfUPZEIcJ9Rr5i1s8ZiV0O4qrEmPHPHfvzvuP0 +-> ssh-ed25519 4PzZog LgiBGLVRfnntheKxXFjqP7GNhD0hwOaTMQ70vDEkbSQ +9MGIeJUi3Y3yxUNF+NEWRj+jP52r41XRPBV0246gMDw +-> ssh-ed25519 5Nd93w 8dEhOqim1Ryg6UpeCDv3e7ykF3IMri3ut/S5yuwieyI +m56/6dPG34+lVybgmjLBQNI9ba+sz8OpUu3QapEm+BM +-> ssh-ed25519 q8eJgg wQM2ASijF3YgUBOzpB0OAIZ2XH7lLsEj0wHpzUhe72M +IycltOHlMVE/g7F31mqiIFWsCPuFAHociD2pP3bOc54 +-> ssh-ed25519 uZzB3g Q3I0tbKR4g1QRryO4Dx1B409TuS1jLcOWW+OGh0a2X8 +SjK/s4Qp/TG6ED7fg2TaFAX8FyRPVu48l9epc3wWO40 +--- CUHCxUu6RfoD6zNpkmDgWBg+SF7FvZLDZKQojCSFkg4 +»+úndê¥ëÖü~oµÕpË8bÞÎd@Õ‹ñ±³GíI6­ ðÏ[„1|Jš7oÄ»™ÊW‚ÖQ7ycõëá29ö°Ü ” RyiWpW%Ouw;)5FcBDm%MG+bE6mu!-Pb3wATd(gJFKG6)!W(2%Otcg-?g}W z;z#lDKrhpv^sIp5iX{IeM?a^aQiGDf(!D&8KjxLU- zrDf>`9&S#Ni6z>G7U8aixo%|!NoFQd-X&S)PF{IN!LI3ChOQ-!KEC;dCBZ?#xnYHl z;fZcR`d(F`xjx3`iRIeqLB9IAZvGxY2HyFT&oYYFm%Hm1xf#2dhL~CAo1|7a`Q^K0 z8+rTZM})fshF66cW|?W5m_+(!X@`_^Y5OM?8yZ{qnK&mFnK_q7TI8DMBt``3SGfD- zXGIo!1?E?!Bo({)LFVk#6q`Bco0w;%dOByj8&m}6xt9972f4Wy1(g-$_?8(K z<`lcsS4J9EWTaPRbCu}7U%TTTcaYfphgB2bo;%Y2J!bRA{`EOws_7vr)0bszk$k+N zb0PD`?(qNr^!U~?^(4h?Pinq&m7&OmJv(Na-xEuni+1s^COj4QX)PAJYQt3+=JR2F zf$O&Qv2`@X+^cZ)%8^YL%@baLH8 h9!sQNaP0r}^zde#uNxdDoPJUD`e?9x)&s-Sn*eKi1a|-c delta 787 zcmeBWd(AdMr@ktw+{-Q4DA38%BPuA<)x_J>DaFq`)jcgKFef*t#HZ9JHQ%+M(#_e; zm&-pdCDgbuEizI&GekcxGR40nvDm!8FeNh6*s{Vo)Hlh{FH1Wz%q!R{n@iVDp}06h zH#Nn`)YQ;Y!6cw6DnDJpG%+N{%q=G=FUYVUsvy+I$E{pDE5|R~peVmQ$g{N4-Cy6* z%q1eJqRhpDE5#x*T|2PK%rw8OAlDf(24)tfi8%%l zE~SQfCb{AIVHOeonZ?Bsp-}}<;l)9bM(O4G0f{a?6-MP;fhKNFt_B4`W&YVFW@P~$ zrA6Vcg{2jqVY#6p7GZvs`IUx6W`3^51^FhE&oYYFdl}~&Ct5@$Ci|PZBwAYN>lX)> zIu&@P7JKIf75aumSQHl-l$Mkg=j8Zu1^5J2gk<zQZF{yJKm4WC(yto(!iiFpu#jc zvZy{NzocBhAjmSv-`}akyU5ZjrKq&j*&sA2Ah|NcH^MX5*F87Xv?wV*%Ba-H%rddi zoXadTn@d+$SHVBY*Eq>2%s183&>-D0xXLlRP~XG6Aiv7g&nd$&)!os%(A3q_sLCkB zkxR|{wDr4OWw-4s-$W>RF#Ao7Vt%<^f$MgCr4q-*7}cc$Z(Vk|$ds$!*_*Ta6W{8B z)n2K~0#|x1EZFhR`)yvu$!8De{8;+Xda^;(r|>&D%yTx{f9Ra%M^(C6xl4gpnOnG#VVHSnX;FZ0nwhb2iFuK; zX`yS7N1BTTS87PIM@5;XxrZo#E#25u%1M&*_Mj`^198QMkVrI{vSVU-qKX}MJf zDOq_{#YN6hmhP5DM)@V#oL9lj)u+_&Se%RiRGb_;~B-n4fB%BD*fF} zjDxbOOpU|boV+|MQhh2S!XrXG9Q`Yk!lK;#l8nL)1DvwCf)gtY3PTNolDzWrtNi^V zJ=3e)^o!iXU6Os1+*~aR3-kRlLOsgU%CyTTpJf!U_i!`v3X4ee_l~g4)OLvqF3!r= z_Orm$_eyLG;lMmsLb}{3J-G)%(HX}^tI5>@h>*Z&ecy2G4u=5H?=fM zFGfNHQvQORkKJ@(fS*Eze7|G${422&#-SO{vVtbI(ty z%nT{2aSPJ+@u>_e=Q=3MyU*lY)RhI!?-SxubOg^oI>4>*K=$#!_p$4QAMmVuJH^v6 z>%|J^PwIKDozs$cb$oSd*fv3JTNB^YPQlO!MZp()g=~2LviWyS;&40iTz|s}^+VDO jJuCg3jBec2+M2a$p3TvnOV&&c_6AGUru4Vn_EOmNMxaQQHs8Sk)K&nnpZ@4 zQn|a6d5}jrSD>+rYldNzzoVsvg=1K9TA7PURpZFpbc6t*G!S zFiwk#2shUDF7-AJ3=FC&tjcmvb8$`Q^3zVPa-YgCwfxo1X2Kwx=JZfKQpad}RLXI>bW zms7r%YeA$@Vo1J4dS-@MVp51vYCu6%x{tP(VOBs|WJs!6L1B_(pszuasbOGBzGZ2W zwj-CWuC79WxqoV8riXS~LAY~7Xjqwve{Q{bWJ;c!Z-#bpXoOR4l&hJee@==^L`X7M zZ^ZXWg$+{cwys-vgLnVquRM)rw`VrJlwXn`$jhj7-tMTWwx87ga7X)C$+bJR^~-Kf zIy$}Lsr9KjGrsV|sj0+A@t2)@v&iz&1N|o!6?Lk7j=jRmjwDZY&zV+eY7tPt`bxf{ VN_-aY?p9M%N8d6TMWbsGDgcGv4>SM( diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index a2974c204df247718474e5061893337ac4d977fc..1186ce3ea499cef7c8ac7d3506e7fa18b347a491 100644 GIT binary patch delta 645 zcmcc5cAs^EPJMokpL4Q)KtM`jcD}h+aHW1leu-C*zJ*CZQfSZYDc3`r3NN!$fR#=32cv@*t zs)2W?PozgVm%hJyx=FcPj$v|&Pf=A=WL05dR;Zt&lfHIkRz;;rrdfV@kXLC~YD$Xd z#E;_PiDq7onTds#;ThiU{?7gxrNvR1ZUs(8+D7gs`P!z2ss5qP5sATt1tIBNX8A=< z$wonbl|GSf!J%0mo>9pumIdCf8NS)+<~|+$O>`^G|Vr_42klsaLz2P zD#^2SHP#MG_3f$Tz6+@hSGJ(s#=?_OSGIO9@UbiOLHuEqBXvb`9_g z_tJK$@p5&~HZb#zX>!t3lat;{D^Hmf@hoq-GW`wv($3yUn_oRik7qD+ zB$fUa-R*R%Q}*?w->bOJ-cinW?CZ8RjAEO2yF%hhhr+{Cy9FnIDJYU=wwZn|uBcpb j-QAuEn_Mp6H~qG1>$3D#ufM`vfA#HWi0;*XdMFeC1d!=A delta 774 zcmcc5dY^5APQ6EEu7O2XN|iyHW41|lT2gtgUr}UHRkB%uzISR~c7;)?VP0r%rcZIE zBUie!hgVsWQ$%oqws&BaxxP`DxpSGfYo&8yUZ7*Co1vepTS`==zG0-ZE0?aFLUD11 zZfc5=si~o*f=NJCRDQZbYE)22hJkUCNm*p7TY5xAj$4saWR7R1S4M@umr0JHNpP07 zOQmC4QKfS}S5=mNc7UgLa+IOFNp`8Dn`?$+q*=LpKxt`uSZ0}fv9D#BUzTxDWQKG0 z#E;_Pei^=zzQK`}S6zuBX_@6kVU^h-p_PRJWkKoXRmM?8rJ>oDVXo<1jxPBI z7M7)vUKJJo5w6(<1-V&)MV=OZ#XeD)CP5+D28o$LrsWZaSy|bW;~B-n-I6O!_4Crh zOH$ojTwRjQ4I`b412dEI3@oZr^NZYl6H`KSUDJ(%13a?1yp0SiQ**pR9X$fwGRo7< z^|Q4N!}3G5Q;PhYg0$01d`*o*4BdmGEWH9JpJf!UFO77~C=Cd*^l&W?NC_zL40QEN zE>9~nEcUH1w=hUa406r(b8@Q6@ej=Aa&anic6LrmE;S8IEHFsR3JUTIObYkN)z){+ z&dJJj4b3a`HVgF%4K_^%#XzlNvYuJ8ZhBE_VsWZMsk*tlU3t8jf>L0eZ4g(odzxvv zPe{F2xucGsd;T>QD}*ynOms^7uWfqUuO01djB$gY`n}F z*Xb2;;qIntxtg6xpJUgQzxlw{vth$NmAbzvbGj_P?R_|W@)iI3 z@$r}SnHcvwM-GQgo#5!Z=taS6PM?!YuD{;6WsULCjB`e(j`ODcd*-SB{uRs0BU;6h Hf^nAsO>i5m diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 1710c1623244238aef76702704257cb70eebc260..df4b192987855db577a7ba879ddc6d3254bdf1c6 100644 GIT binary patch delta 692 zcmdnY*2^|Qr{32*#j>JMKeNz3#5*G^Imjoqz(1`hKTz8=G%4LNDj>?e$T!R1(4;im zm&>^#R6El#u*^81v?wGX$j~RkFDKM5Ju@%Lu*@~hEi}(5Bg@$|+|RJkf=ky+soc9F#lkf(=Fa{_j)h)9 z{>6TgQ3j3{1?hqARmHiXxdm0Bh5lxazQ*O+X%!Y3C83^NNhz)cu1--!nL&Blo_;R= z6%lEso~i!%;gN<_t`@yt`52ZK zrDtdd2Ku>ql$bdART(>S>FVk#1m(KqhXh0>re!$m7iKtSdX$=*YL{e}hnePtk(8Cj}w#KF_*u{>3EywdjBWeLPPiShu^Q9u((}y zLS4P>L`}X;J!{Whs6MD&>{rv|pOh>AP4UL0=0$I!p6<5m=Fu~r_1$u|+e4+17IJFd=Lxo^t3@Z4GzX>B7mrr*1b1Z?&{dZ{J;XvH`6 gjT@NjHb^e17f!jeB75i5*mA9vS6;|{cof3}07^mn-T(jq delta 730 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 TyA!y>N?Y1j*G^Yzn5+r_3uPYV delta 2389 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 X+q$Ayl(E;chyC8-OYa*KvyK7)*Axgd diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index e83ef26e6aaeeb806112f882655845b5cd0bb6dc..c360a86c7e8dd8cf345396559603595a13e10eab 100644 GIT binary patch delta 691 zcmcb`*26YIr`{(wH>fN%$09jUyU@Qlz|A|+$*3$iB_+(F+^;IlN8igk)TuD2*fKaY zpDQ`D$lb|X+t14+%OInqASuh=IJ_XFFd!?!q|nzgs4CF1B*~{N!qGd~kxSQ3p}06h zH#Nn`)YQ;Y!6cw6DnDHzs>;dLzew9H(=y9H$2cq`$E`RyPe0Yqpw!i{(7-D^In~J^ zNZ-iW)z83{tJu&yvCy(G$Tzek)HO0G+&dyMG$SCeI6E;aFFo1J)G@s>IK#anQoE>l z;z#lD!m5G_%b*aaTrI*rr0i7V$n>;ySEt-!6Ia*bvf(W~KR6K}Du{ zNydhO$;JT{!9}Tl#)d|@IqrqN2E`^WX36PA`W1PGRc_f_t~nV&jw#x~M)^i%nHCxD z6;&3&q2A^mg)U(grCt$LIl-RZp&^M$hEXPy&oYYFdl>p;`Rf-}nw3_X7l-8s1v(p9 z`sR2ih8kx_Mfv81q`8Kqms*x)c~?4eIs5vi2PYb2d0XTM8(6xz6L`W2+*7`R7r>FVk#82cMV2B&LRR#lXlhPkE&R+WdOxcD0xguD2L`Xm** z`lc1sr$&`Umbtt8a`8o4`mpGTt3@2~oGkZ0G4$<;ihXAu2TV(S$RMP0c*E6bcZcs& zrgtnj;GeL{BV(#l=k8VU-LD>BJZMs!@+F#?{n~EF3u{jv`8(ITR@gaU?JL#veEyil ziZ7V7cAA*vpGZ+$?{@J@b3k;(aV~>1&8Il~Cbu3}Hq)B#7_?vfj*7CDjCXDKR{w>~ e$@BT;$IMo&uFSsnnA@b>%w delta 769 zcmeBSyTvv^r@p`=y`-YRJuTO%EYh#M%*|K7AR@9VA~hmV+tjF}$k)?Jztqv$G}9#A zg3H6pxWKGD%F@fyG&D2F%Pi2SIN#4N$15+y-Q3&Vw>U4L+`YImEX2^#kxSQ3p}06h zH#Nn`)YQ;Y!6cw6DnDHz%-GjBJk{65B-hP2Ju%7I#VsU1)H298wKAom!nIJ}JlD4* zI561XGB-G#OW)l;KfKb_&(tS0socmnJ2JE)!^J7jBQeA&(#+eb!YDV)$jP|K+dai| z;z#lDY}3lDbpOiKz`SHrLq9(=j|kt&{Oq(K%gRuFe?M>Md@p_DAg6$|JVOI67Y~!X zf@BMKzZ_%7wD6$f%tG%{f(7KS-FC6U># zmA;nYg~4uqj=}zp`u-_tPNh)>WkHpm&hC~@mfB{KDNe3jVIFR|1}>TYxh@&n!Cvke zd8MW05&20T6**=V&c?Zs{sE;XE@c%(?yiB8&oYYFCsr0mWNAC4=a-u#h6GeNl{gs} zCssL?l_#5q8KwB^8)j-pRfZeo7J8U)r6pCB`WWU!gjfWJ__#)7rc_o1WaJlSCz%@i z`T9BeRwY*znYfi@gyi^wVxSVH3gF^mbIj6Z0x+d^lV}7&fN)K?ynx-E}y+O z_@@0_hsy0fQydA@810RnPx;^YhBulON|r-a5o_ z=Jbzf{_W?3bba?sxhcND#G1qT-s$Czw@-Ys4l0Z5epqK4mCG6TSTfe+(2IPll=sE} DeccoE diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 7bebd5ea8a69c02c8072dbc32dbfb19fcf5ba327..82f2fae70df78fc2acc7ad120f06b2ac93bf31a0 100644 GIT binary patch delta 1185 zcmX@aHJfXKPQAWoplOa#YD7^{MTxUzR7qq>V5WspQ9)s#i>XhTf2Cu3RZ&)?W3EqF zHdm^CsE=1rafXMVcW|UdnRZS}N`!$yQAVy|W~ND1xk0FjnMX-!Zi(HzG-$=ny+JkN03Eowsv@_k4I9XfoX<&wz+p+kYA*+fnl)k z#E;_Ph5p{!+1Xj%!9K2$dEw5XrfCMrm1dQ0$!?xirFoIYhNUiLd4*{uMb7zL1(8)o zIcA3L$v!EDQGuZ*A(=@oLFLKj!Ij1yfjMce!A6BaB^KeuzOELN;~B-nBg!Llf-Dk~ z3f)8ei?iG+A`P7*Ba?E>938`b-8@_^(@d-Uy~0Ah^|L&=JTvw6D?&4z(|m(NT=IjG z^u3a@ld617lf!fT^1RHv%gd7uJ+vd7%Ze-}pJf!U&vrI0EKM>s$qov3%*m+q_3|}0 z$}x8F^A4zTOEJ$3$u_U_tI#(K4vxs?Dh@Hp2=vTI$#9B{@=p!PwD2i0aWOaaGS4>i zh;+^>u=LbV_A}4VvCQ*DkAc#tDktM~g@S^7f1{#A^O6jMJU=J1i0pc!(!esuzz83= zAj3S5B)6(;{XkPk$HG!4Pp&`<*Bq~+ERV9x#6V-;OkZ~+?O;pKvI1v!Q_IvyGi|Q` zpDedX7r&@vM|A5vk_<8n0u_?W(lUI?jDwQBQhXybEM1DD0>c8h>Ktm6=Np)w&E=c! z{w)B7?JK67Ufvw=ayp>SeX@WY#!?Er(c}o5ngWK2{OAr-8IV0qR28o z+$6QAJi;t5Ff`IRCDb$|)u_xk$*9!GD8RHVsmLNEGc=jYG1#>zz_TPE*f}k@EUm!O zJSjBF)u|+)!qPcAFV!Nu$fuw(*w4buA}x|jS65ddGdVvhNITQVz}PQRKPk{BB`nvX z%F9GQDabs}ImIY7EW5bg)5IjnAi~dpOY?_fveLW6K8^(;2b1b~72*qi7+C+0<=E?4 zInBE5*#q}0#|%C`ToLu?`G=;`r=?6mhmQunRBk=;lbdJCFV~D@k8UP`!tJl`;@KCkPiW9EJ zqQP$;tkCp{2y%RO{=4rTTe f+~%cqw$tM-Ei25Ik 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 BVNL)5 delta 1089 zcmcb{v5IqoPQ7`BZ=PvUNOERIa7ucWOIbvilXFtCdxS-biIGKRNx74^fxBUdzoV~H zAeUogM5M8qr?E>)V6sJsS88~6o@cm)hg(pTcSK@NcDYlYSAnUQiAR>VFPE;JLUD11 zZfc5=si~o*f=NJCRDQaGc9?07V|Z1Wg|=Ukw{ccflv}EEvWcakn^B5Sva@etVpvjD zgrP}ZKyt7JSF)K)VWxj-MM+g&cu=r^NpX;cw^weZd$5;}c4$(CWtK-+aH@wvxpr0Y z#E;_P=3aS~0old5WtAln0r^EamHB=FMHv=O!NpO2&W;fgo<80=!4_`X`RUnQnZYI5 zuG&Q*CdL^CRoUsuL8%!@VIdKQLQS+IT#Lh8(-O0cz0Fcw^^HqPEPNeJBOP72oQpgYQ%t>$azes$Tr$kF ze4>i9^E|^#Qo;*@BGb)0!b%K0k}`6A6MeHMpJf!UPt7pTb<7Pj$T2p}Gc_&B%k>Qi zGxO8;4Xr40_72f5GxvA%_KV6%%uWyGGD~&}^>8Wmh%nPPt*|f&ck@iD$O#K8@vN*c zNzL?1ba%202{1RbC^d3KkAc#tDktM~g`lK7r<`IJ%cS5!ccXB#Am@6E)Nr?qFyoA{ z;0iO(61OA|?aZQzMD0?yY_42C_v{cae;4;8?ZmvQ!lH1`2vcLnw9qtPr>u-9-;^LX zlPLGx5bY!wCo&DAd~_jYtO zE!1}psB+CQaODaM35-mR%5n}3$Wsz}co^v2qj=8B< zm6x++Mo@vVNu{H4vQucbi+^c>qe*B;W?DsXd6-{el6GQvL{v5?d?6b5@A5?b&3RH}}%% z?wo_?j%4zwJ#_vq#U}OeS=xfR*Opq9vB%A~WxS+fXxqfQ@Uc|-qMcHe$= ssh-ed25519 V1pwNA DqbnodZkTmARvGsqUcwZJ6Z6dRJw+Pc/u/OyvLUXNlI -ra9Q9EprYEJELcQi7yS/2+AvyrEDehZ2XjIE4SD3K4Q --> ssh-ed25519 4PzZog 1bLboYJt4kTh2oYIkPtBWOKyCdQQYY7Z/NMhdWRr7Bg -XYX6Sj2dfHJdVr52vy7F5SLNudmPw0l+qX4VXkxo5Zw --> ssh-ed25519 5Nd93w 1V+Zb7AmYGLbBnMLy/yEuC+vUdWq8no/X6j+7Zykbw0 -Cu9av/RkbqGfE31UO1HobDcemy0C52WYt3F3ZJuPD0c --> ssh-ed25519 q8eJgg JkrqxwHOf7vch7sa5iERrPS6GtH7SOz6vkiJZ9iejhM -G0OBTxAN1Ip3vv5loXQPejnv25tK6Xu6xNqYIBQch0Y --> ssh-ed25519 YFaxCg ZjtuzeSNBZLGykOpsyxmeRLF8GE2eIhZBhn84bN8X08 -WXQsIs4Are7WVJhkDafrMm+FwyWfWTOHR6JYUg7nzPY --> O1CHe-grease <`%L -yfN8CioGGgvdsecROJgtsRw1BVyHtPcNgKMk1bGsNry37eY0/8PIQA ---- jVQDWIOkjduvoYdMFhEl2Y8do4IsplwELZ1N1dlEv2E -3ê‘ЈØ>p¢ÿN0À‘ô¯‹jˆÚ{Ò qLÔÔÜ;{× {¼±‚%OJ›Á€‚â_“ά’í3N†R#‹ì4® í \ No newline at end of file +-> ssh-ed25519 V1pwNA 9h+5sIlvMiZRhje5GhsNJ8ucXWTkB1hS+kZBRs+YGRI +lmZ2+18WMJY38Kup8jBZDpUjQ3QQIeSgLGc9QFH2w8I +-> ssh-ed25519 4PzZog 0FIpyjjXwCcpgKB6ElsShe238/4VMNRfDGngBpqVyUQ +WAAVgHorFOmtU80RVUILGaXwfxBeV4N4EliHvxOMfCE +-> ssh-ed25519 5Nd93w dHBRtX2dXZFWY9kw74x94UAGqdb1IVe7uqfn+xbTXm0 +mvhqFd7G3pSK/W8koJI+sRU5SOQJmUwYhXdj05sMs2o +-> ssh-ed25519 q8eJgg dBrod8ucXLwEWcCiQ7bL1YYrSGGYfJwHeEfGV6aKGWk +FMHX98NsY98sIpH+Hj6zy33/qqpUIJv4acejkvs3lNM +-> ssh-ed25519 YFaxCg SQRuisMOT2BDyXCdFnXMZZoqZgSlXf6/FRmbn5qPjng +bstuHuNKdKgflf0/8s7Nlbu46EwsN/mMj8VlDDJy8yE +--- PCjE0Ry7iVdFNMznpD7I+BfW6BHV5MExXgREFVAu2g0 +ìÇÐë+‘¢‡#f|ÀM,‡°˨6ÚZÔzª‘‘AîCÄ~)â#“•G[s#g@ubñH³¯¾æçtÙ2‡y‘mè \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 863ec5e..7fa8397 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -25,6 +25,7 @@ let earth = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMpvgQcvK7iAm0QrIp5qSvUJzDhOrSBN9MJn9JUSI31I root@earth"; cadie = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACcwg27wzzFVvzuTytcnzRmCfGkhULwlHJA/3BeVtgf root@cadie"; marvin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAme2vuVpGYX4La/JtXm3zunsWNDP+SlGmBk/pWmYkH root@marvin"; + calculon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsmeBfh4Jw2GOL7Iyswzn4TVNzalDbxDgh7WuQotFxR root@calculon"; systems = [ agentjones @@ -41,6 +42,7 @@ let earth cadie marvin + calculon ]; dns = [ @@ -78,6 +80,10 @@ let skynet # our offical server earth + + # nix + + calculon ] # ldap servers are web facing ++ ldap diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index f54977814e3a8f646f157cc35e626f80f3a65b02..55710f0c43962c1229f1b63eda4c20c9ee22017d 100644 GIT binary patch delta 2791 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 GvpfLk*9s*7 delta 2814 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 diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 88a6369..ff19a49 100644 --- a/secrets/wolves/details.age +++ b/secrets/wolves/details.age @@ -1,23 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA cgA5VKQ3hp5rtso89O/MhPiHLOb782QoeLziZUeU70I -L2iCt0tsUJGLLLbezIABJvoRQMFteGqVFx6NL9cNlXU --> ssh-ed25519 4PzZog 7ze9+yot/hOqFsSK5LH8i0WLPUvC6Fi+2uGMS17lEkY -WrcC0tez5IE9zty14iBdcPQ+9AmZfVMdmSDrLVltntc --> ssh-ed25519 5Nd93w /w0wTVrmd9QZ/lojJugGFuOE4J5g7YFGBjFrnKcYhQA -CNiyiqzso5T2bqTAwhG1pmFY7SO9A5Te8BSDiiOHt/I --> ssh-ed25519 q8eJgg EoCZJYcZMdXkcJX60durhxuog/TTgHJqsUYplMCoE2Y -bCCKkvmKdQ5Kry3YBJcnPSE/dj6NJe8IUVQlT7lG9+Q --> ssh-ed25519 IzAMqA lb94hWJMJwWZbHwHRa/Fv9QsJdHqFBq5GBMWk/1xPkg -2edcY2p4ne64MkqRCvrbpWMnD7tBhwpwbVLcRx1VH0E --> ssh-ed25519 uZzB3g b6I8PBhisjX0/b5tgEAfHVqV+nRDWG2sPB+FGrz+iWc -a1mi9By/uYkB/Uyam8KZBcwogoWufD7jGwQ7A8zoi4Y --> ssh-ed25519 Hb0ipQ +MVbbtGivd/I0Sd54xFAZ0NoF0vFJFE3E/1Emalk4ww -lF573uIUJKvzpPt177h7j7jU+dBX3YE2bjoitCl0OXc --> ssh-ed25519 IzAMqA pM+865cvmhU/YQrEEiVmxMAMZqfzd8nuSBFdBYFK1S8 -mqudYwRO/KHhi4i3eeC6fMRv+q/VQn/MK5MSoRnRFTc --> B5i-grease b 9OK X;B_Gxz \ - ---- x5ul4yNubEnJfVA/vpTaKfV1eauqB8ahIEunq0G0GvY -²˜8aŽû!Q$ ¨Èíòp×>°þ‘ù­ÍZvã!»©xÄ{ì¤EGm¿Cx¯"…@ªò/÷ué•¥(ÙèPîÏ °¿<Íwƒ÷¥@±á¾á*AQê3¨'v鲸¹—™ý'\_ý«W™Äﺥ‰œ(“X†·× <+‚¢¿Þ-ˆ›„í -A⟦ª¾9Ñ.o‹± -ëg]óôk ­}`˜úÀܽ;û;O)ÇUÁK6Lòö \ No newline at end of file +-> ssh-ed25519 V1pwNA 64APjQFuCdQotU0idTNsNkQq4UurzLrI+sBfKVJeERw +0v6AqFqjTYNXd+01coluHCiNbXGoRux7xi7Xe2KJwMY +-> ssh-ed25519 4PzZog Qx/4nzBzpphw5zMU/Selzp0y2hxnuxt4riw5ZHn5/FM +LgKlXPi2C38thzhDYNI6xQlD7mF97xG+gBNKaZchuR8 +-> ssh-ed25519 5Nd93w qxvohVP435hgKa5ygKlagzB98r9Jli+alqrEck//FD8 +yCD2n/m8azvH8ivPzocnlx1JDl3VkIcz7fUIlWmXV14 +-> ssh-ed25519 q8eJgg AaxsYEyjuI/n8Cz7u40ruqB6rCwqpdgf5IKb2V3MUw4 +LH+r9sWo5ckvdl92pXPcw9QIQ85+XP1maq0a2n3SrFg +-> ssh-ed25519 IzAMqA +tU6QWR+ZPb6yw94POiSIYPr+su5CrHM9zn7XqkMoDg +CadoRJA8lpvo1hKQc0Ii2P1O6alZXEH/38H3GTVNf+c +-> ssh-ed25519 uZzB3g Yt2K67ZNN6/vLL6bvSlrfPs7vgxtS+ecF242++q1cCU +DLX5zRone3QdzVwD4Nxtpgd07wLgWs28zQEbj1Q+8B8 +-> ssh-ed25519 Hb0ipQ HADfPO++23LNnITJZIjpWOCqIJ3ZbIVBd1NvnbJqEzk +TyFj/I+a4kc8omedjAzKt0glVDbEJGkIluPClO5vFGA +-> ssh-ed25519 IzAMqA r74EwP4WbYv+CnF2Czp1xNocsF66j7y/Fbp9toufYms +zXD2vZaVTmaJtkxyBRYrn1xGf6i0K8PqFKweXQUeVa0 +--- nejIZ/IUpeIeZTR2jEbVjw574rHAeDzt7uMSIGb9rxQ +´›µ²ŠÇ¦K5§‘蹓¡LCxÕ˜Kp¡`"Q×U 8×}Ì` Date: Sun, 12 May 2024 04:57:26 +0100 Subject: [PATCH 073/563] fix: slight improvements --- .gitlab-ci.yml | 1 + applications/nix_cache/nix_cache.nix | 4 ++++ machines/calculon.nix | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3ad4b00..1ee8177 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -91,6 +91,7 @@ sync_repos: before_script: - *scripts_deploy - *scripts_base + - *scripts_cache rules: - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' changes: diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 25061d4..96d4e2c 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -6,6 +6,10 @@ atticd-atticadm make-token --sub "admin_username" --validity "10y" --pull "*" -- # for the gitlab runner, done eyarly atticd-atticadm make-token --sub "wheatly-runner" --validity "1y" --pull "skynet-cache" --push "skynet-cache" + + +Documentation: +https://docs.attic.rs/introduction.html */ { lib, diff --git a/machines/calculon.nix b/machines/calculon.nix index c11bb38..b3ca0fa 100644 --- a/machines/calculon.nix +++ b/machines/calculon.nix @@ -28,7 +28,7 @@ in { targetPort = 22; targetUser = null; - tags = []; + tags = ["active"]; }; # it has two network devices so two From 63874105a8ebe5c1b5c68e5bea067eddab25e3d0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 12 May 2024 05:31:01 +0100 Subject: [PATCH 074/563] fix: up the size limit for the cache --- applications/nix_cache/nix_cache.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 96d4e2c..91a5ccb 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -96,7 +96,7 @@ in { services.nginx = { enable = true; group = "acme"; - clientMaxBodySize = "100m"; + clientMaxBodySize = "500m"; recommendedProxySettings = true; virtualHosts = { "${name}.skynet.ie" = { From 44a7fde53c5a080cffbb31f8c397cd0ab31d03e0 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 12 May 2024 15:25:58 +0000 Subject: [PATCH 075/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 0385d34..b8365bd 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1714957946, - "narHash": "sha256-Xo4VHqECFXEYQiqEFYMqiTzaYSBCbvhKGjvnZ5rNLSM=", + "lastModified": 1715527488, + "narHash": "sha256-Bib8TlcoDGSLTPKp75f9RqZZZpBuxH/bF8JULKwg5iA=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "6cbbab80bdffea76e3990948273e523c352dd727", + "rev": "ed4c46e81db5a7c412715d52003db7632e21a573", "type": "gitlab" }, "original": { From eee9632878b9877d3d79afed80a3ff3ec6fcfb4e Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 12 May 2024 15:41:51 +0000 Subject: [PATCH 076/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b8365bd..02ac97b 100644 --- a/flake.lock +++ b/flake.lock @@ -152,11 +152,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1713355612, - "narHash": "sha256-GXa8y/H4MtQSuuww6ioWhO1/gUjdw231tGCt5I/Dyi0=", + "lastModified": 1715528376, + "narHash": "sha256-J3VZBVxB+9H2dKE3gGBUFI7Xi1TvSD2ewzwkmnYf/78=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "a4482cc61893a42e2698eb66563ce03043aa4ddc", + "rev": "d697cb7d78e93bd1d4d62b0525d779593e3699c1", "type": "gitlab" }, "original": { From 1b31b6535dc195d155038c131e4d8c1c02a5db79 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Sun, 12 May 2024 15:56:12 +0000 Subject: [PATCH 077/563] [skip ci] Updated flake for compsoc_public --- flake.lock | 84 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 51 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 02ac97b..a7c2440 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1695591744, - "narHash": "sha256-3gbqM5smCXV/MrEO9frmc/cJbKHFoUW/eOfFu88Dg9w=", + "lastModified": 1714337293, + "narHash": "sha256-QjAnpRT/LqcjNo/ofoAjylG4VyfWMIIMVc+KuQaJOZQ=", "owner": "silver_rust", "repo": "bfom", - "rev": "12301d7e8dca2312c2e7db9760b953458b43b076", + "rev": "664e5377329f8052fa7446c312ba29ca1025de4e", "type": "gitlab" }, "original": { @@ -152,11 +152,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1715528376, - "narHash": "sha256-J3VZBVxB+9H2dKE3gGBUFI7Xi1TvSD2ewzwkmnYf/78=", + "lastModified": 1715528953, + "narHash": "sha256-NWoCV1SauW8H/MibwAC+JWoomjpkIruGqfV/JTM1D4Q=", "owner": "compsoc1%2Fcompsoc", "repo": "presentations%2Fpresentations", - "rev": "d697cb7d78e93bd1d4d62b0525d779593e3699c1", + "rev": "4855b0468e1e5118d11130b164b1d57a42251add", "type": "gitlab" }, "original": { @@ -353,7 +353,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -449,11 +449,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1652722411, - "narHash": "sha256-FxzNgYiH9c91hUVAntcjrqY//KOTUPP2a4e8Wyuysxg=", + "lastModified": 1713520724, + "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", "owner": "nix-community", "repo": "naersk", - "rev": "94beb7a3edfeb3bcda65fa3f2ebc48ec6b40bf72", + "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", "type": "github" }, "original": { @@ -724,11 +724,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", "type": "github" }, "original": { @@ -738,11 +738,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1652840887, - "narHash": "sha256-gEK4NNa4GwIgTZE63kt/4WTFAWRTJVSa30+h4ZjFh9U=", + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "52dc75a4fee3fdbcb792cb6fba009876b912bfe0", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", "type": "github" }, "original": { @@ -752,11 +752,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1691371061, - "narHash": "sha256-BxPbPVlBIoneaXIBiHd0LVzA+L4nmvFCNBU6TmQAiMM=", + "lastModified": 1715413075, + "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5068bc8fe943bde3c446326da8d0ca9c93d5a682", + "rev": "e4e7a43a9db7e22613accfeb1005cca1b2b1ee0d", "type": "github" }, "original": { @@ -1052,6 +1052,21 @@ "type": "github" } }, + "systems_11": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1173,12 +1188,15 @@ } }, "utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1652776076, - "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -1189,7 +1207,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1694529238, @@ -1207,14 +1225,14 @@ }, "utils_2": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -1240,7 +1258,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1692799911, @@ -1258,7 +1276,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1685518550, @@ -1276,7 +1294,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1687171271, @@ -1294,7 +1312,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1689068808, @@ -1312,7 +1330,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1689068808, @@ -1330,7 +1348,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1694529238, From 867e7a702fb60da812f5c424a9d2b40f725b5b95 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 12 May 2024 17:17:06 +0100 Subject: [PATCH 078/563] ci: only run teh repo sync when repos are actually updated --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1ee8177..a70a1ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,6 @@ sync_repos: - chmod +x ./sync.sh - ./sync.sh rules: - - if: '$SYNC_OVERRIDE == "true"' - changes: - sync/repos.csv From 519e9072784f8ce4c330ba5a68126d91cb717839 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 02:23:10 +0100 Subject: [PATCH 079/563] Initial grafana setup --- applications/grafana.nix | 63 ++++++++++++++++++++++++++++++++++++++++ machines/_base.nix | 11 +++++++ machines/marvin.nix | 10 +++++++ 3 files changed, 84 insertions(+) create mode 100644 applications/grafana.nix diff --git a/applications/grafana.nix b/applications/grafana.nix new file mode 100644 index 0000000..cf99e11 --- /dev/null +++ b/applications/grafana.nix @@ -0,0 +1,63 @@ +{lib, ...}: +with lib; let + name = "grafana-server"; + cfg = config.server.grafana; +in { + imports = [ + ./acme.nix + ./dns.nix + ]; + + options.services.skynet.grafana = { + enable = mkEnableOption "Grafana Server"; + + host = { + ip = mkOption { + type = types.str; + }; + name = mkOption { + type = types.str; + }; + }; + + ip = mkOption { + type = types.str; + default = cfg.host.ip; + }; + + port = mkOption { + type = types.port; + default = 4444; + }; + }; + + config = { + services.grafana = { + enable = true; + domain = "grafana.skynet.ie"; + port = cfg.port; + addr = cfg.host.ip; + }; + + services.nginx.virtualHosts."${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "https://localhost:${toString cfg.port}"; + proxyWebsockets = true; + }; + }; + + skynet_dns.records = [ + { + record = "${name}"; + r_type = "CNAME"; + value = cfg.host.name; + } + ]; + + skynet_acme.domains = [ + "${name}.skynet.ie" + ]; + }; +} diff --git a/machines/_base.nix b/machines/_base.nix index d83e75b..c3d3915 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -116,6 +116,17 @@ in { ]; }; + services.prometheus = { + exporters = { + node = { + enable = true; + # most of the collectors should be on by default + enabledCollectors = ["systemd"]; + port = 9002; + }; + }; + }; + # time on vendetta is strangely out of sync networking.timeServers = options.networking.timeServers.default ++ ["ie.pool.ntp.org"]; services.ntp.enable = true; diff --git a/machines/marvin.nix b/machines/marvin.nix index 1c4f57b..fdf59b1 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -25,6 +25,7 @@ Notes: groups_trusted = map (x: "@${x}") groups; in { imports = [ + ../applications/grafana.nix ]; deployment = { @@ -49,6 +50,15 @@ in { sudo_groups = groups; }; + services.skynet.grafana = { + enable = true; + + host = { + ip = ip_pub; + name = name; + }; + }; + skynet_dns.records = [ { record = name; From 115535c386ed1eb72c34e62c7ffb2fd0eb1abfee Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 02:25:37 +0100 Subject: [PATCH 080/563] fix cfg variable --- applications/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index cf99e11..2c6a575 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -1,7 +1,7 @@ {lib, ...}: with lib; let name = "grafana-server"; - cfg = config.server.grafana; + cfg = config.services.skynet.grafana; in { imports = [ ./acme.nix From 70b1d6324db18d56bcd7006dd06690df0ce7448a Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 02:51:15 +0100 Subject: [PATCH 081/563] rename grafana-server, move some things around --- applications/grafana.nix | 49 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 2c6a575..d8679ba 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -1,14 +1,19 @@ -{lib, ...}: +{ + lib, + config, + ... +}: with lib; let - name = "grafana-server"; + name = "grafana"; cfg = config.services.skynet.grafana; + port = 4444; in { imports = [ ./acme.nix ./dns.nix ]; - options.services.skynet.grafana = { + options.services.skynet."${name}" = { enable = mkEnableOption "Grafana Server"; host = { @@ -27,27 +32,11 @@ in { port = mkOption { type = types.port; - default = 4444; + default = port; }; }; - config = { - services.grafana = { - enable = true; - domain = "grafana.skynet.ie"; - port = cfg.port; - addr = cfg.host.ip; - }; - - services.nginx.virtualHosts."${name}.skynet.ie" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/" = { - proxyPass = "https://localhost:${toString cfg.port}"; - proxyWebsockets = true; - }; - }; - + config = mkIf cfg.enable { skynet_dns.records = [ { record = "${name}"; @@ -59,5 +48,23 @@ in { skynet_acme.domains = [ "${name}.skynet.ie" ]; + + services.grafana = { + enable = true; + domain = "grafana.skynet.ie"; + port = cfg.port; + addr = cfg.host.ip; + }; + + services.nginx.virtualHosts = { + "${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "https://localhost:${toString cfg.port}"; + proxyWebsockets = true; + }; + }; + }; }; } From 961509ddc8a16f3082581f09012c28ed93536790 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 02:57:32 +0100 Subject: [PATCH 082/563] fix: https to http --- applications/grafana.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index d8679ba..6eec760 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -61,7 +61,7 @@ in { forceSSL = true; useACMEHost = "skynet"; locations."/" = { - proxyPass = "https://localhost:${toString cfg.port}"; + proxyPass = "http://localhost:${toString cfg.port}"; proxyWebsockets = true; }; }; From 739529caae46cb290b2842aab14bab01fb27d264 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 03:02:37 +0100 Subject: [PATCH 083/563] change grafana to {name} everywhere* --- applications/grafana.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 6eec760..b120e89 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -5,7 +5,7 @@ }: with lib; let name = "grafana"; - cfg = config.services.skynet.grafana; + cfg = config.services.skynet."${name}"; port = 4444; in { imports = [ @@ -51,7 +51,7 @@ in { services.grafana = { enable = true; - domain = "grafana.skynet.ie"; + domain = "${name}.skynet.ie"; port = cfg.port; addr = cfg.host.ip; }; From 2a605151f80d36dac1910407bdfdb83597d11bae Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 03:21:50 +0100 Subject: [PATCH 084/563] remove prometheus from base --- machines/_base.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/machines/_base.nix b/machines/_base.nix index c3d3915..d83e75b 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -116,17 +116,6 @@ in { ]; }; - services.prometheus = { - exporters = { - node = { - enable = true; - # most of the collectors should be on by default - enabledCollectors = ["systemd"]; - port = 9002; - }; - }; - }; - # time on vendetta is strangely out of sync networking.timeServers = options.networking.timeServers.default ++ ["ie.pool.ntp.org"]; services.ntp.enable = true; From 4ce0f69fb3d18a1ea97afdf445b8b16b7afb597e Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 03:40:58 +0100 Subject: [PATCH 085/563] remove redudnant options --- applications/grafana.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index b120e89..e3057d1 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -24,16 +24,6 @@ in { type = types.str; }; }; - - ip = mkOption { - type = types.str; - default = cfg.host.ip; - }; - - port = mkOption { - type = types.port; - default = port; - }; }; config = mkIf cfg.enable { @@ -52,7 +42,7 @@ in { services.grafana = { enable = true; domain = "${name}.skynet.ie"; - port = cfg.port; + port = port; addr = cfg.host.ip; }; @@ -61,7 +51,7 @@ in { forceSSL = true; useACMEHost = "skynet"; locations."/" = { - proxyPass = "http://localhost:${toString cfg.port}"; + proxyPass = "http://localhost:${toString port}"; proxyWebsockets = true; }; }; From 183f5a0e7df037e0e16cbb2f417ae7b932378157 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 06:16:35 +0100 Subject: [PATCH 086/563] Initial prometheus config Also did provision config for grafana, could be done directly but went through skynet.grafana config --- applications/grafana.nix | 32 ++++++++++++++++++ applications/prometheus.nix | 67 +++++++++++++++++++++++++++++++++++++ machines/_base.nix | 4 +++ machines/marvin.nix | 34 +++++++++++++++++++ 4 files changed, 137 insertions(+) create mode 100644 applications/prometheus.nix diff --git a/applications/grafana.nix b/applications/grafana.nix index e3057d1..fd06612 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -24,6 +24,26 @@ in { type = types.str; }; }; + + ip = mkOption { + type = types.str; + default = cfg.host.ip; + }; + + port = mkOption { + type = types.port; + default = port; + }; + + datasource = { + name = mkOption { + type = types.str; + }; + + url = mkOption { + type = types.str; + }; + }; }; config = mkIf cfg.enable { @@ -44,6 +64,18 @@ in { domain = "${name}.skynet.ie"; port = port; addr = cfg.host.ip; + + provision = { + enable = true; + datasources.settings.datasources = [ + { + name = cfg.datasource.name; + type = "Prometheus"; + url = cfg.datasource.url; + isDefault = true; + } + ]; + }; }; services.nginx.virtualHosts = { diff --git a/applications/prometheus.nix b/applications/prometheus.nix new file mode 100644 index 0000000..fcda5c9 --- /dev/null +++ b/applications/prometheus.nix @@ -0,0 +1,67 @@ +{ + lib, + config, + ... +}: +with lib; let + name = "prometheus"; + cfg = config.services.skynet."${name}"; +in { + imports = []; + + options.services.skynet."${name}" = { + server = { + enable = mkEnableOption "Prometheus Server"; + host = { + ip = mkOption { + type = types.str; + }; + + name = mkOption { + type = types.str; + }; + }; + + port = mkOption { + type = types.port; + default = 9001; + }; + }; + + collecter_port = mkOption { + type = types.port; + default = 9002; + }; + + #list of servers passed in for monitoring + servers = mkOption { + type = types.listOf types.str; + }; + }; + + config = + { + services.prometheus.exporters.node = { + enable = true; + # most collectors are on by default see docs for more options + enabledCollectors = ["systemd"]; + port = cfg.collecter_port; + }; + } + // mkIf cfg.server.enable { + services.prometheus = { + enable = true; + port = cfg.server.port; + scrapeConfigs = [ + { + job_name = "node_exporter"; + static_configs = [ + { + targets = map (server: "${server}.skynet.ie:9002") cfg.servers; + } + ]; + } + ]; + }; + }; +} diff --git a/machines/_base.nix b/machines/_base.nix index d83e75b..f46eef2 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -29,6 +29,10 @@ in { # every server will need the config to backup to ../applications/restic.nix + + # every server will be monitored for grafana + ../applications/prometheus.nix + #TODO: make sure no additional config needed for exporters ? ]; options.skynet = { diff --git a/machines/marvin.nix b/machines/marvin.nix index fdf59b1..963ff7c 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -10,6 +10,7 @@ Notes: */ { pkgs, + config, lib, nodes, ... @@ -26,6 +27,7 @@ Notes: in { imports = [ ../applications/grafana.nix + ../applications/prometheus.nix ]; deployment = { @@ -50,6 +52,32 @@ in { sudo_groups = groups; }; + services.skynet.prometheus.server = { + host = { + ip = ip_pub; + name = name; + }; + + port = 9001; + + servers = [ + "agentjones" + "cadie" + "earth" + "galatea" + "gir" + "glados" + "kitt" + "marvin" + "neuromancer" + "optimus" + "skynet" + "vendetta" + "vigil" + "wheatly" + ]; + }; + services.skynet.grafana = { enable = true; @@ -57,6 +85,12 @@ in { ip = ip_pub; name = name; }; + + # maybe just do provision config directly ? + datasource = { + name = "Prometheus"; + url = "localhost:${toString config.services.prometheus.port}"; + }; }; skynet_dns.records = [ From 4637777e5c9d5c532870a4a70b838f536bcdaa45 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 07:32:25 +0100 Subject: [PATCH 087/563] Fix servers list location --- applications/prometheus.nix | 9 ++++----- machines/marvin.nix | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index fcda5c9..c673600 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -26,17 +26,16 @@ in { type = types.port; default = 9001; }; + #list of servers passed in for monitoring + servers = mkOption { + type = types.listOf types.str; + }; }; collecter_port = mkOption { type = types.port; default = 9002; }; - - #list of servers passed in for monitoring - servers = mkOption { - type = types.listOf types.str; - }; }; config = diff --git a/machines/marvin.nix b/machines/marvin.nix index 963ff7c..3f25f48 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -86,7 +86,7 @@ in { name = name; }; - # maybe just do provision config directly ? + # maybe just do provision config directly ? datasource = { name = "Prometheus"; url = "localhost:${toString config.services.prometheus.port}"; From 7f5f21dc8a796ce836f01120df20f4ddf43ab142 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 07:34:28 +0100 Subject: [PATCH 088/563] Use port from cfg --- applications/prometheus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index c673600..9ae7df8 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -56,7 +56,7 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = map (server: "${server}.skynet.ie:9002") cfg.servers; + targets = map (server: "${server}.skynet.ie:{collecter_port}") cfg.servers; } ]; } From cf600e2dc10e08d5ef351e836db7a6d64e45b41f Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 18:23:56 +0100 Subject: [PATCH 089/563] Using nodes instead of hardcoded server names Might not work probably did smnth wrong --- applications/prometheus.nix | 9 +++++---- machines/marvin.nix | 19 ++----------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 9ae7df8..dbd7275 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -10,6 +10,11 @@ in { imports = []; options.services.skynet."${name}" = { + #list of servers passed in for monitoring + servers = mkOption { + type = types.listOf types.str; + }; + server = { enable = mkEnableOption "Prometheus Server"; host = { @@ -26,10 +31,6 @@ in { type = types.port; default = 9001; }; - #list of servers passed in for monitoring - servers = mkOption { - type = types.listOf types.str; - }; }; collecter_port = mkOption { diff --git a/machines/marvin.nix b/machines/marvin.nix index 3f25f48..12465f0 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -59,25 +59,10 @@ in { }; port = 9001; - - servers = [ - "agentjones" - "cadie" - "earth" - "galatea" - "gir" - "glados" - "kitt" - "marvin" - "neuromancer" - "optimus" - "skynet" - "vendetta" - "vigil" - "wheatly" - ]; }; + services.skynet.prometheus.servers = lib.attrsets.mapAttrsToList (server: server.name) nodes; + services.skynet.grafana = { enable = true; From be56e6b9e90e6c3ff511ac78e454a9ff49caa0bb Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 18:32:37 +0100 Subject: [PATCH 090/563] Reorganise prometheus/marvin config --- machines/marvin.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/machines/marvin.nix b/machines/marvin.nix index 12465f0..f0c7a39 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -52,16 +52,19 @@ in { sudo_groups = groups; }; - services.skynet.prometheus.server = { + services.skynet.prometheus = { + servers = lib.attrsets.mapAttrsToList (server: server.name) nodes; + + server = { host = { ip = ip_pub; name = name; }; port = 9001; + }; }; - services.skynet.prometheus.servers = lib.attrsets.mapAttrsToList (server: server.name) nodes; services.skynet.grafana = { enable = true; From 82305d43ff1c941bc22294cd106ead312d7fb412 Mon Sep 17 00:00:00 2001 From: daragh Date: Tue, 21 May 2024 18:33:52 +0100 Subject: [PATCH 091/563] fmt --- machines/marvin.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/machines/marvin.nix b/machines/marvin.nix index f0c7a39..0c240aa 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -53,19 +53,18 @@ in { }; services.skynet.prometheus = { - servers = lib.attrsets.mapAttrsToList (server: server.name) nodes; + servers = lib.attrsets.mapAttrsToList (server: server.name) nodes; - server = { - host = { - ip = ip_pub; - name = name; - }; + server = { + host = { + ip = ip_pub; + name = name; + }; - port = 9001; + port = 9001; }; }; - services.skynet.grafana = { enable = true; From 9b3e7265dd4e9e29a8663bfd4e5b753022012fc7 Mon Sep 17 00:00:00 2001 From: daragh Date: Wed, 22 May 2024 01:51:21 +0100 Subject: [PATCH 092/563] Added new option to specify ip and port for other nodes, fixed server.name to go through deployment.hostname --- applications/prometheus.nix | 15 +++++++++------ machines/marvin.nix | 2 -- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index dbd7275..a431e1a 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -1,4 +1,5 @@ { + nodes, lib, config, ... @@ -10,11 +11,6 @@ in { imports = []; options.services.skynet."${name}" = { - #list of servers passed in for monitoring - servers = mkOption { - type = types.listOf types.str; - }; - server = { enable = mkEnableOption "Prometheus Server"; host = { @@ -31,6 +27,13 @@ in { type = types.port; default = 9001; }; + + other_nodes = mkOption { + type = types.listOf types.str; + description = '' + To add other nodes outside of nix, specify ip and port that server should listen to here + ''; + }; }; collecter_port = mkOption { @@ -57,7 +60,7 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = map (server: "${server}.skynet.ie:{collecter_port}") cfg.servers; + targets = map (hostname: "${hostname}:${collecter_port}") lib.attrsets.mapAttrsToList (server: server.deployment.hostname) nodes ++ cfg.other_nodes; } ]; } diff --git a/machines/marvin.nix b/machines/marvin.nix index 0c240aa..191f0a5 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -53,8 +53,6 @@ in { }; services.skynet.prometheus = { - servers = lib.attrsets.mapAttrsToList (server: server.name) nodes; - server = { host = { ip = ip_pub; From ca872275712c7ea590b63dc5861ac2baafb204c0 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 01:21:02 +0100 Subject: [PATCH 093/563] remove redundant option --- applications/grafana.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index fd06612..beb66a8 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -25,11 +25,6 @@ in { }; }; - ip = mkOption { - type = types.str; - default = cfg.host.ip; - }; - port = mkOption { type = types.port; default = port; From 113084148c209fddfedba9d3b36ad4fe2cbc091c Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 01:21:29 +0100 Subject: [PATCH 094/563] Make map clearer, more parentheses --- applications/prometheus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index a431e1a..67d1ca0 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -60,7 +60,7 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = map (hostname: "${hostname}:${collecter_port}") lib.attrsets.mapAttrsToList (server: server.deployment.hostname) nodes ++ cfg.other_nodes; + targets = (map (hostname: "${hostname}:${collecter_port}") (lib.attrsets.mapAttrsToList (server: server.deployment.hostname)) nodes) ++ cfg.other_nodes; } ]; } From 1ea703bfa13da4bbcfa4a897ce8434c9bbb00f6a Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 01:27:02 +0100 Subject: [PATCH 095/563] Removed redundant conf, rename portcollecter --- applications/prometheus.nix | 6 +++--- machines/marvin.nix | 2 -- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 67d1ca0..e4fd5e0 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -36,7 +36,7 @@ in { }; }; - collecter_port = mkOption { + port_collecter = mkOption { type = types.port; default = 9002; }; @@ -48,7 +48,7 @@ in { enable = true; # most collectors are on by default see docs for more options enabledCollectors = ["systemd"]; - port = cfg.collecter_port; + port = cfg.port_collecter; }; } // mkIf cfg.server.enable { @@ -60,7 +60,7 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = (map (hostname: "${hostname}:${collecter_port}") (lib.attrsets.mapAttrsToList (server: server.deployment.hostname)) nodes) ++ cfg.other_nodes; + targets = (map (hostname: "${hostname}:${cfg.port_collecter}") (lib.attrsets.mapAttrsToList (server: server.deployment.hostname)) nodes) ++ cfg.other_nodes; } ]; } diff --git a/machines/marvin.nix b/machines/marvin.nix index 191f0a5..e4df5dc 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -58,8 +58,6 @@ in { ip = ip_pub; name = name; }; - - port = 9001; }; }; From 9aeb7313b47f359029b7b28e96a520615c2ef94d Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 02:10:16 +0100 Subject: [PATCH 096/563] Moved grafana / prometheus to kitt --- machines/kitt.nix | 26 ++++++++++++++++++++++++++ machines/marvin.nix | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/machines/kitt.nix b/machines/kitt.nix index 5891571..88f383c 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -9,6 +9,7 @@ Role: LDAP Server Notes: */ { + config, pkgs, lib, nodes, @@ -25,6 +26,8 @@ in { ../applications/discord.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix + ../applications/grafana.nix + ../applications/prometheus.nix ]; deployment = { @@ -77,4 +80,27 @@ in { name = name; }; }; + services.skynet.prometheus = { + server = { + host = { + ip = ip_pub; + name = name; + }; + }; + }; + + services.skynet.grafana = { + enable = true; + + host = { + ip = ip_pub; + name = name; + }; + + # maybe just do provision config directly ? + datasource = { + name = "Prometheus"; + url = "localhost:${toString config.services.prometheus.port}"; + }; + }; } diff --git a/machines/marvin.nix b/machines/marvin.nix index e4df5dc..3bb6d1e 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -26,8 +26,6 @@ Notes: groups_trusted = map (x: "@${x}") groups; in { imports = [ - ../applications/grafana.nix - ../applications/prometheus.nix ]; deployment = { @@ -52,30 +50,6 @@ in { sudo_groups = groups; }; - services.skynet.prometheus = { - server = { - host = { - ip = ip_pub; - name = name; - }; - }; - }; - - services.skynet.grafana = { - enable = true; - - host = { - ip = ip_pub; - name = name; - }; - - # maybe just do provision config directly ? - datasource = { - name = "Prometheus"; - url = "localhost:${toString config.services.prometheus.port}"; - }; - }; - skynet_dns.records = [ { record = name; From fd3beade9b94c43b9a25ca0247219aaa1050a901 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 02:13:06 +0100 Subject: [PATCH 097/563] Added entry in secrets.nix for grafana --- secrets/secrets.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 7fa8397..6c865b3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -69,6 +69,10 @@ let wheatly ]; + grafana = [ + kitt + ]; + # these need dns stuff webservers = [ @@ -150,4 +154,7 @@ in { "bitwarden/id.age".publicKeys = users ++ bitwarden; "bitwarden/secret.age".publicKeys = users ++ bitwarden; "bitwarden/details.age".publicKeys = users ++ bitwarden; + + # grafana + "grafana/pw.age".publicKeys = users++ grafana; } From 40e4fe5ac487aab5e3f2d05d63dd9633d9cad675 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 02:13:14 +0100 Subject: [PATCH 098/563] fmt --- secrets/secrets.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6c865b3..0ba160e 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -70,7 +70,7 @@ let ]; grafana = [ - kitt + kitt ]; # these need dns stuff @@ -156,5 +156,5 @@ in { "bitwarden/details.age".publicKeys = users ++ bitwarden; # grafana - "grafana/pw.age".publicKeys = users++ grafana; + "grafana/pw.age".publicKeys = users ++ grafana; } From 23f77caef60dc506217631b99975d83e0af31301 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 02:39:36 +0100 Subject: [PATCH 099/563] feat: setup the password for grafana --- applications/grafana.nix | 4 ++++ secrets/grafana/pw.age | 13 +++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 secrets/grafana/pw.age diff --git a/applications/grafana.nix b/applications/grafana.nix index beb66a8..84af996 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -54,12 +54,16 @@ in { "${name}.skynet.ie" ]; + age.secrets.grafana_pw.file = ../secrets/grafana/pw.age; + services.grafana = { enable = true; domain = "${name}.skynet.ie"; port = port; addr = cfg.host.ip; + settings.security.admin_password = "$__file{${config.age.secrets.grafana_pw.path}}"; + provision = { enable = true; datasources.settings.datasources = [ diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age new file mode 100644 index 0000000..6a01432 --- /dev/null +++ b/secrets/grafana/pw.age @@ -0,0 +1,13 @@ +age-encryption.org/v1 +-> ssh-ed25519 V1pwNA ly/9CnXtgQlXTbKcK+gD+v0Ck7rmGtNrA/S9XfBdg3s +6skVNVJTgCf/EWlDbH6urfr4CUibVH/N+HcfIYPkzTo +-> ssh-ed25519 4PzZog 7+Fc9ec8zvlKP6VGKJa3MRN6p9bUrA07/BlL8rSnp3w +YgALG1b8QOmMqWuqr9iVxAal9cWFf8me0KT1Mg0onko +-> ssh-ed25519 5Nd93w /lx/evI9jsXzHMxXYQMoavWucTMiGMXwxACpjXYFZlU +nVWhQydOO8eaTYcR66u1MeH/glmwTDJnJM0I9tXUvV0 +-> ssh-ed25519 q8eJgg wYOxbUUXrTgY9XkUz02qtW8TaYJfNej9VBdwvfUWrT8 +/47DLKQGt1M3fJWDHo2Eg2ij4jCGd17ieYZ8gA/uYjY +-> ssh-ed25519 IzAMqA FfUA/kyLBOFIHFUO+PSsdTwaRjGvfsq7OTMXYo7/WjM +jEn8y+mncrOPmDzvsK90X2D/m8ZxmuIL8H0h27YP3hM +--- ibLXLaT49j/Mb8CwbcL+Gjwy5GJ5YDX31JQFqfOIXRw +ºôag9Ò a“Yâ«Òöä”GADóðgûÅi°^ýUaß±Fà YÏã@4> ¬óÐàò£Ý*‚Š?úÉ„5»F-íã8à \ No newline at end of file From 061453e5d19b1bdc0f95a4c29b6f159661963600 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 02:44:39 +0100 Subject: [PATCH 100/563] remove dead code --- applications/grafana.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 84af996..ca13ff4 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -25,11 +25,6 @@ in { }; }; - port = mkOption { - type = types.port; - default = port; - }; - datasource = { name = mkOption { type = types.str; From 03ae1c5101558dfefea4fd21f079ce1e15bf4484 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 02:57:10 +0100 Subject: [PATCH 101/563] Remove config from marvin --- machines/marvin.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/marvin.nix b/machines/marvin.nix index 3bb6d1e..1c4f57b 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -10,7 +10,6 @@ Notes: */ { pkgs, - config, lib, nodes, ... From 0f75f119184c6fc351b4369471a260d2df9b58ce Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 04:07:07 +0100 Subject: [PATCH 102/563] fix: this was blocking teh web interface --- applications/grafana.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index ca13ff4..6d27d40 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -55,7 +55,6 @@ in { enable = true; domain = "${name}.skynet.ie"; port = port; - addr = cfg.host.ip; settings.security.admin_password = "$__file{${config.age.secrets.grafana_pw.path}}"; From aba1a41d4df2a598dc4f672f3bfe84f0dd43bd86 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 04:07:19 +0100 Subject: [PATCH 103/563] fix: file permissions --- applications/grafana.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 6d27d40..a1c67b7 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -49,7 +49,11 @@ in { "${name}.skynet.ie" ]; - age.secrets.grafana_pw.file = ../secrets/grafana/pw.age; + age.secrets.grafana_pw = { + file = ../secrets/grafana/pw.age; + owner = "grafana"; + group = "grafana"; + }; services.grafana = { enable = true; From 62ead11aada617e5ce98b5c0313ee4a8949e0dae Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 04:07:37 +0100 Subject: [PATCH 104/563] fix: have to actually enable it --- machines/kitt.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/kitt.nix b/machines/kitt.nix index 88f383c..04d450c 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -82,6 +82,7 @@ in { }; services.skynet.prometheus = { server = { + enable = true; host = { ip = ip_pub; name = name; From 15271c1d09b73270b446f27fe92bb5a9d8403dcf Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 04:08:50 +0100 Subject: [PATCH 105/563] fix: this does need a default --- applications/prometheus.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index e4fd5e0..207863b 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -30,6 +30,7 @@ in { other_nodes = mkOption { type = types.listOf types.str; + default = []; description = '' To add other nodes outside of nix, specify ip and port that server should listen to here ''; From b8c6e153a4f124fc88b43e7da7b1e84d54c6757f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 04:10:15 +0100 Subject: [PATCH 106/563] fix: set the type of protocol --- machines/kitt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/kitt.nix b/machines/kitt.nix index 04d450c..6d8eca5 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -101,7 +101,7 @@ in { # maybe just do provision config directly ? datasource = { name = "Prometheus"; - url = "localhost:${toString config.services.prometheus.port}"; + url = "http://localhost:${toString config.services.skynet.prometheus.server.port}"; }; }; } From 9148963c1f6d3ee6569d084737247450d0863b70 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 04:20:44 +0100 Subject: [PATCH 107/563] fix: final set of changes to get it working --- applications/grafana.nix | 3 ++- applications/prometheus.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index a1c67b7..4e42f81 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -67,9 +67,10 @@ in { datasources.settings.datasources = [ { name = cfg.datasource.name; - type = "Prometheus"; + type = "prometheus"; url = cfg.datasource.url; isDefault = true; + editable = true; } ]; }; diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 207863b..7c53f77 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -61,7 +61,7 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = (map (hostname: "${hostname}:${cfg.port_collecter}") (lib.attrsets.mapAttrsToList (server: server.deployment.hostname)) nodes) ++ cfg.other_nodes; + targets = (lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString cfg.port_collecter}") nodes) ++ cfg.server.other_nodes; } ]; } From 963a189bcbaa93177df7c6bf21d6b4730d4b7a63 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 04:34:19 +0100 Subject: [PATCH 108/563] Removed provision config away from kitt --- applications/grafana.nix | 4 ++-- machines/kitt.nix | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 4e42f81..be8e948 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -66,9 +66,9 @@ in { enable = true; datasources.settings.datasources = [ { - name = cfg.datasource.name; + name = "Prometheus"; type = "prometheus"; - url = cfg.datasource.url; + url = "http://localhost:${toString config.services.skynet.prometheus.server.port}"; isDefault = true; editable = true; } diff --git a/machines/kitt.nix b/machines/kitt.nix index 6d8eca5..f036fe0 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -97,11 +97,5 @@ in { ip = ip_pub; name = name; }; - - # maybe just do provision config directly ? - datasource = { - name = "Prometheus"; - url = "http://localhost:${toString config.services.skynet.prometheus.server.port}"; - }; }; } From 147bd86ad56dbd9363eea6a6b95f17092cd48ac0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 21:48:23 +0100 Subject: [PATCH 109/563] fix: get the attributes merging correctly --- applications/prometheus.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 7c53f77..cd0dfcc 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -43,7 +43,7 @@ in { }; }; - config = + config = mkMerge [ { services.prometheus.exporters.node = { enable = true; @@ -52,7 +52,7 @@ in { port = cfg.port_collecter; }; } - // mkIf cfg.server.enable { + (mkIf cfg.server.enable { services.prometheus = { enable = true; port = cfg.server.port; @@ -67,5 +67,6 @@ in { } ]; }; - }; + }) + ]; } From f7dd90e92ba331a40c03f7bfc25a7888da5324ca Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 23 May 2024 22:04:15 +0100 Subject: [PATCH 110/563] fix: needed to open teh ports to be able to get the data --- applications/prometheus.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index cd0dfcc..76281e3 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -51,6 +51,9 @@ in { enabledCollectors = ["systemd"]; port = cfg.port_collecter; }; + + # make sure the port is open + networking.firewall.allowedTCPPorts = [cfg.port_collecter]; } (mkIf cfg.server.enable { services.prometheus = { From 889bb0dab6cb03db010e4aebce3bdcde70778ea0 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 22:34:02 +0100 Subject: [PATCH 111/563] doc: added link to node exporter options --- applications/prometheus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 76281e3..eb15c48 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -47,7 +47,7 @@ in { { services.prometheus.exporters.node = { enable = true; - # most collectors are on by default see docs for more options + # most collectors are on by default see https://github.com/prometheus/node_exporter for more options enabledCollectors = ["systemd"]; port = cfg.port_collecter; }; From c0816ccce43bbe6b18ac6e43787c1f5e23f30bb9 Mon Sep 17 00:00:00 2001 From: daragh Date: Thu, 23 May 2024 22:35:31 +0100 Subject: [PATCH 112/563] remove todo --- machines/_base.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/_base.nix b/machines/_base.nix index f46eef2..63acbb5 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -32,7 +32,6 @@ in { # every server will be monitored for grafana ../applications/prometheus.nix - #TODO: make sure no additional config needed for exporters ? ]; options.skynet = { From 44750155f159c46fadaf90bdc4f199ec85c5a41b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 24 May 2024 00:00:44 +0100 Subject: [PATCH 113/563] fix: use teh hostnames for these --- machines/earth.nix | 2 +- machines/skynet.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/earth.nix b/machines/earth.nix index e8c2f9d..a6915be 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -24,7 +24,7 @@ in { ]; deployment = { - targetHost = ip_pub; + targetHost = hostname; targetPort = 22; targetUser = null; diff --git a/machines/skynet.nix b/machines/skynet.nix index ee8ea13..4acaf6f 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -27,7 +27,7 @@ in { ]; deployment = { - targetHost = ip_pub; + targetHost = hostname; targetPort = 22; targetUser = null; From b545c623d261274602f5759df54f4ae0111cc723 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 24 May 2024 00:30:25 +0100 Subject: [PATCH 114/563] fix: use teh hostnames for these (missed this one) --- machines/calculon.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/calculon.nix b/machines/calculon.nix index b3ca0fa..87b7a60 100644 --- a/machines/calculon.nix +++ b/machines/calculon.nix @@ -24,7 +24,7 @@ in { ]; deployment = { - targetHost = ip_pub; + targetHost = hostname; targetPort = 22; targetUser = null; From f55d23e82108b9acea956d779439deea5390c915 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 24 May 2024 15:55:12 +0100 Subject: [PATCH 115/563] fix: regex was not quite working --- applications/skynet.ie.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 02c2f7a..ee4059b 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -83,7 +83,7 @@ in { }; # this redirects old links to new format - "~* ~(?[a-z_0-9]*)(?\\S+)$" = { + "~* ~(?[a-z_0-9]*)(?.*)$" = { priority = 1; return = "307 https://$username.users.skynet.ie$files"; }; From e7e5d554b27f11078f29f68d70eb70bb38e9b14b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 24 May 2024 16:13:49 +0100 Subject: [PATCH 116/563] fix: regex was not quite working 2 Previous version had a + instead of * + means to match one or more * means to match 0 or more --- applications/skynet.ie.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index ee4059b..6390b79 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -83,7 +83,7 @@ in { }; # this redirects old links to new format - "~* ~(?[a-z_0-9]*)(?.*)$" = { + "~* ~(?[a-z_0-9]*)(?\\S*)$" = { priority = 1; return = "307 https://$username.users.skynet.ie$files"; }; From a6b070a9718f666c644b18905aab32549c9c3874 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 27 May 2024 11:31:37 +0100 Subject: [PATCH 117/563] fix: nginx upload limit increased --- applications/gitlab.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/applications/gitlab.nix b/applications/gitlab.nix index 36b2aae..ebb2dd7 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -160,7 +160,12 @@ in { "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { forceSSL = true; useACMEHost = "skynet"; - locations."/".proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + locations."/" = { + proxyPass = "http://unix:/run/gitlab/gitlab-workhorse.socket"; + extraConfig = '' + client_max_body_size 1000M; + ''; + }; }; # pages From c71b3571cea00c40140eebd189618dc8c3628757 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 27 May 2024 22:26:03 +0000 Subject: [PATCH 118/563] [skip ci] Updated flake for skynet_website_renew --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a7c2440..e7aee8a 100644 --- a/flake.lock +++ b/flake.lock @@ -992,11 +992,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1707152932, - "narHash": "sha256-Dd4bvrWVoPME1OT998f3PBx/kDlC3spmr22snU0CRC0=", + "lastModified": 1716848712, + "narHash": "sha256-0QOzHlYyuCxrsL4A+u5zW9BoV0pvmqDB681BVTxoD3c=", "owner": "compsoc1%2Fskynet", "repo": "website%2Falumni-renew", - "rev": "43a17dd41708e6a3b0360f2f95a14c67560467c4", + "rev": "054b04f46285ef80a3d059253f1ed9e607b6fd46", "type": "gitlab" }, "original": { From 9eafd6f53eef528df8854a4cad6636907ebbf682 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 13:04:44 +0100 Subject: [PATCH 119/563] feat: use hockeypuck instead of sks --- applications/open_governance/keyserver.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/applications/open_governance/keyserver.nix b/applications/open_governance/keyserver.nix index 8629e33..be682d4 100644 --- a/applications/open_governance/keyserver.nix +++ b/applications/open_governance/keyserver.nix @@ -41,9 +41,21 @@ in { } ]; - services.sks = { + services.hockeypuck = { enable = true; - hkpPort = port; + port = port; + }; + + # hockeypuck needs a database backend + services.postgresql = { + enable = true; + ensureDatabases = ["hockeypuck"]; + ensureUsers = [ + { + name = "hockeypuck"; + ensureDBOwnership = true; + } + ]; }; services.nginx.virtualHosts = { From 75f0a17fcbcd34ca8d50c9c5e5bfa4f33b1e6c69 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 13:12:37 +0100 Subject: [PATCH 120/563] feat: use calutron as the public services server --- applications/skynet.ie.nix | 6 ------ flake.nix | 2 +- machines/calculon.nix | 20 ++++++++++++++------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 6390b79..9b64594 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -11,8 +11,6 @@ in { imports = [ ./acme.nix ./dns.nix - ./open_governance/open_governance.nix - ./open_governance/keyserver.nix ]; options.services.skynet = { @@ -64,10 +62,6 @@ in { } ]; - services.skynet.open-governance.host = cfg.host; - services.skynet.keyserver.host = cfg.host; - - networking.firewall.allowedTCPPorts = [80 443]; services.nginx = { enable = true; group = "acme"; diff --git a/flake.nix b/flake.nix index 714096b..173639a 100644 --- a/flake.nix +++ b/flake.nix @@ -165,7 +165,7 @@ # trainee server marvin = import ./machines/marvin.nix; - # nix cache server + # Public Services calculon = import ./machines/calculon.nix; }; }; diff --git a/machines/calculon.nix b/machines/calculon.nix index 87b7a60..0557968 100644 --- a/machines/calculon.nix +++ b/machines/calculon.nix @@ -1,11 +1,11 @@ /* -Name: -Why: Speed everything up +Name: https://futurama.fandom.com/wiki/Calculon +Why: Public Service server Type: VM Hardware: - From: 2024 -Role: Nix Cache +Role: Public services such as Nix Cache, Open governance stuff. Notes: */ { @@ -18,9 +18,16 @@ Notes: name = "calculon"; ip_pub = "193.1.99.82"; hostname = "${name}.skynet.ie"; + + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/nix_cache/nix_cache.nix + ../applications/open_governance/open_governance.nix + ../applications/open_governance/keyserver.nix ]; deployment = { @@ -46,8 +53,9 @@ in { } ]; - services.skynet.nix-cache.host = { - ip = ip_pub; - name = name; + services.skynet = { + nix-cache.host = host; + open-governance.host = host; + keyserver.host = host; }; } From 023b491d89055db8bee4f2f1d3682a44b9f6e6eb Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 13:25:52 +0100 Subject: [PATCH 121/563] feat: standardise dns to using ``services.skynet."${name}";`` format --- applications/bitwarden/vaultwarden.nix | 2 +- applications/dns.nix | 91 +++++++++---------- applications/email.nix | 2 +- applications/games.nix | 2 +- applications/games/minecraft.nix | 2 +- applications/gitlab.nix | 2 +- applications/grafana.nix | 2 +- applications/ldap/backend.nix | 2 +- applications/ldap/server.nix | 2 +- applications/nextcloud.nix | 2 +- applications/nix_cache/nix_cache.nix | 2 +- applications/open_governance/keyserver.nix | 2 +- .../open_governance/open_governance.nix | 2 +- applications/skynet.ie.nix | 2 +- applications/skynet_users.nix | 2 +- applications/ulfm.nix | 2 +- machines/agentjones.nix | 2 +- machines/cadie.nix | 2 +- machines/calculon.nix | 2 +- machines/earth.nix | 2 +- machines/galatea.nix | 2 +- machines/gir.nix | 2 +- machines/glados.nix | 2 +- machines/kitt.nix | 2 +- machines/marvin.nix | 2 +- machines/neuromancer.nix | 2 +- machines/optimus.nix | 2 +- machines/retired/ash.nix | 2 +- machines/skynet.nix | 2 +- machines/vendetta.nix | 2 +- machines/vigil.nix | 2 +- machines/wheatly.nix | 2 +- 32 files changed, 76 insertions(+), 77 deletions(-) diff --git a/applications/bitwarden/vaultwarden.nix b/applications/bitwarden/vaultwarden.nix index 3e0c84e..1ae912c 100644 --- a/applications/bitwarden/vaultwarden.nix +++ b/applications/bitwarden/vaultwarden.nix @@ -39,7 +39,7 @@ in { domain ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = domain_sub; r_type = "CNAME"; diff --git a/applications/dns.nix b/applications/dns.nix index 6b7bc6b..5af8b46 100644 --- a/applications/dns.nix +++ b/applications/dns.nix @@ -5,7 +5,8 @@ nodes, ... }: let - cfg = config.skynet_dns; + name = "dns"; + cfg = config.services.skynet."${name}"; # reads that date to a string (will need to be fixed in 2038) current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}"; @@ -245,10 +246,10 @@ ++ builtins.concatLists ( lib.attrsets.mapAttrsToList ( key: value: let - details_server = value.config.skynet_dns.server; - details_records = value.config.skynet_dns.records; + details_server = value.config.services.skynet."${name}".server; + details_records = value.config.services.skynet."${name}".records; in - if builtins.hasAttr "skynet_dns" value.config + if builtins.hasAttr "dns" value.config.services.skynet then ( # got to handle habing a dns record for the dns serves themselves. @@ -294,51 +295,49 @@ in { ../config/dns.nix ]; - options = { - skynet_dns = { - server = { - enable = lib.mkEnableOption { - default = false; - description = "Skynet DNS server"; - type = lib.types.bool; - }; - - primary = lib.mkOption { - type = lib.types.bool; - default = false; - }; - - ip = lib.mkOption { - type = lib.types.str; - description = '' - ip of this server - ''; - }; + options.services.skynet."${name}" = { + server = { + enable = lib.mkEnableOption { + default = false; + description = "Skynet DNS server"; + type = lib.types.bool; }; - # mirrorred in ../config/dns.nix - records = lib.mkOption { - description = "Records, sorted based on therir type"; - type = with lib.types; - listOf (submodule { - options = { - record = lib.mkOption { - type = str; - }; - r_type = lib.mkOption { - type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"]; - }; - value = lib.mkOption { - type = str; - }; - server = lib.mkOption { - description = "Core record for a server"; - type = bool; - default = false; - }; + primary = lib.mkOption { + type = lib.types.bool; + default = false; + }; + + ip = lib.mkOption { + type = lib.types.str; + description = '' + ip of this server + ''; + }; + }; + + # mirrorred in ../config/dns.nix + records = lib.mkOption { + description = "Records, sorted based on therir type"; + type = with lib.types; + listOf (submodule { + options = { + record = lib.mkOption { + type = str; }; - }); - }; + r_type = lib.mkOption { + type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"]; + }; + value = lib.mkOption { + type = str; + }; + server = lib.mkOption { + description = "Core record for a server"; + type = bool; + default = false; + }; + }; + }); }; }; diff --git a/applications/email.nix b/applications/email.nix index 82e9e7f..8831d14 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -285,7 +285,7 @@ in { }; # set up dns record for it - skynet_dns.records = [ + services.skynet.dns.records = [ # basic one { record = "mail"; diff --git a/applications/games.nix b/applications/games.nix index 1c35588..f112ed1 100644 --- a/applications/games.nix +++ b/applications/games.nix @@ -46,7 +46,7 @@ in { }; config = mkIf cfg.enable { - skynet_dns.records = [ + services.skynet.dns.records = [ # need a base domain { record = cfg.domain.sub; diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index 5d51620..3f64108 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -62,7 +62,7 @@ in { "*.${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ # the minecraft (web) config server { record = "config.${cfg.domain.sub}"; diff --git a/applications/gitlab.nix b/applications/gitlab.nix index ebb2dd7..fc15cd0 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -106,7 +106,7 @@ in { ]; # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide - skynet_dns.records = [ + services.skynet.dns.records = [ { record = cfg.domain.sub; r_type = "A"; diff --git a/applications/grafana.nix b/applications/grafana.nix index be8e948..11efcfe 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -37,7 +37,7 @@ in { }; config = mkIf cfg.enable { - skynet_dns.records = [ + services.skynet.dns.records = [ { record = "${name}"; r_type = "CNAME"; diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index 929404e..c5630f4 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -60,7 +60,7 @@ in { "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = cfg.domain.sub; r_type = "CNAME"; diff --git a/applications/ldap/server.nix b/applications/ldap/server.nix index 107c3f9..d531cae 100644 --- a/applications/ldap/server.nix +++ b/applications/ldap/server.nix @@ -83,7 +83,7 @@ in { domain ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = cfg.domain.sub; r_type = "CNAME"; diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index a915980..5ed9c9e 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -59,7 +59,7 @@ in { "onlyoffice.${domain}" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = cfg.domain.sub; r_type = "CNAME"; diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 91a5ccb..fd6ae5f 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -44,7 +44,7 @@ in { "${name}.skynet.ie" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = "${name}"; r_type = "CNAME"; diff --git a/applications/open_governance/keyserver.nix b/applications/open_governance/keyserver.nix index be682d4..e86c314 100644 --- a/applications/open_governance/keyserver.nix +++ b/applications/open_governance/keyserver.nix @@ -33,7 +33,7 @@ in { "${name}.skynet.ie" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = "${name}"; r_type = "CNAME"; diff --git a/applications/open_governance/open_governance.nix b/applications/open_governance/open_governance.nix index 263488c..dab1a8d 100644 --- a/applications/open_governance/open_governance.nix +++ b/applications/open_governance/open_governance.nix @@ -35,7 +35,7 @@ in { "${name}.skynet.ie" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = "${name}"; r_type = "CNAME"; diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 9b64594..6e7c542 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -33,7 +33,7 @@ in { "renew.skynet.ie" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ # means root domain, so skynet.ie { record = "@"; diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index ac9112f..1b37c36 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -43,7 +43,7 @@ in { "*.users.skynet.ie" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = "users"; r_type = "CNAME"; diff --git a/applications/ulfm.nix b/applications/ulfm.nix index 36329f9..18e0ddd 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -57,7 +57,7 @@ in { "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" ]; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = cfg.domain.sub; r_type = "CNAME"; diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 161b001..0c36db7 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -31,7 +31,7 @@ in { tags = ["active-firewall"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/cadie.nix b/machines/cadie.nix index ae21be3..73c6bf6 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -31,7 +31,7 @@ in { tags = ["active"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/calculon.nix b/machines/calculon.nix index 0557968..556b605 100644 --- a/machines/calculon.nix +++ b/machines/calculon.nix @@ -39,7 +39,7 @@ in { }; # it has two network devices so two - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/earth.nix b/machines/earth.nix index a6915be..16dd17c 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -32,7 +32,7 @@ in { }; # it has two network devices so two - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/galatea.nix b/machines/galatea.nix index f82217c..e2c2574 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -32,7 +32,7 @@ in { tags = ["active"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/gir.nix b/machines/gir.nix index ebb17e2..eaf1d17 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -33,7 +33,7 @@ in { }; # add this server to dns - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/glados.nix b/machines/glados.nix index d1e7d2c..0b9a530 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -32,7 +32,7 @@ in { tags = ["active-gitlab"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/kitt.nix b/machines/kitt.nix index f036fe0..b5c6c5e 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -39,7 +39,7 @@ in { }; # add this server to dns - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/marvin.nix b/machines/marvin.nix index 1c4f57b..1f16c70 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -49,7 +49,7 @@ in { sudo_groups = groups; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 660f618..4dc819f 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -44,7 +44,7 @@ in { tags = ["active-core"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/optimus.nix b/machines/optimus.nix index 095c55c..c5290cb 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -32,7 +32,7 @@ in { tags = ["active"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/retired/ash.nix b/machines/retired/ash.nix index ca2384b..b16fc39 100644 --- a/machines/retired/ash.nix +++ b/machines/retired/ash.nix @@ -39,7 +39,7 @@ in { "ip daddr ${ip_pub} udp dport 51820 counter packets 0 bytes 0 accept" ]; - skynet_dns.records = { + services.skynet.dns.records = { external = [ "${name} A ${ip_pub}" ]; diff --git a/machines/skynet.nix b/machines/skynet.nix index 4acaf6f..4cd0f05 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -35,7 +35,7 @@ in { tags = ["active-ext"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 73effa3..0305baf 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -52,7 +52,7 @@ in { }; }; - skynet_dns = { + services.skynet.dns = { server = { enable = true; # primary dns server (ns1) diff --git a/machines/vigil.nix b/machines/vigil.nix index e3c811c..0bda7ad 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -36,7 +36,7 @@ in { }; }; - skynet_dns = { + services.skynet.dns = { server = { enable = true; # secondary dns server (ns2) diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 02eabce..6b16cbc 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -31,7 +31,7 @@ in { tags = ["active-gitlab"]; }; - skynet_dns.records = [ + services.skynet.dns.records = [ { record = name; r_type = "A"; From 449ada5cec0ddfa618220671c2cec62845cfad38 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 13:34:59 +0100 Subject: [PATCH 122/563] feat: standardise acme to using ``services.skynet."${name}";`` format --- applications/acme.nix | 20 +++++++++---------- applications/bitwarden/vaultwarden.nix | 2 +- applications/games.nix | 2 +- applications/games/minecraft.nix | 2 +- applications/gitlab.nix | 2 +- applications/grafana.nix | 2 +- applications/ldap/backend.nix | 2 +- applications/ldap/server.nix | 2 +- applications/nextcloud.nix | 2 +- applications/nix_cache/nix_cache.nix | 2 +- applications/open_governance/keyserver.nix | 2 +- .../open_governance/open_governance.nix | 2 +- applications/skynet.ie.nix | 2 +- applications/skynet_users.nix | 2 +- applications/ulfm.nix | 2 +- 15 files changed, 24 insertions(+), 24 deletions(-) diff --git a/applications/acme.nix b/applications/acme.nix index b4761f7..e4aec7a 100644 --- a/applications/acme.nix +++ b/applications/acme.nix @@ -5,21 +5,21 @@ ... }: with lib; let - cfg = config.skynet_acme; + name = "acme"; + cfg = config.services.skynet."${name}"; in { imports = []; - options = { - skynet_acme = { - domains = lib.mkOption { - default = []; - type = lib.types.listOf lib.types.str; - description = '' - A list of domains to use for this server. - ''; - }; + options.services.skynet."${name}" = { + domains = lib.mkOption { + default = []; + type = lib.types.listOf lib.types.str; + description = '' + A list of domains to use for this server. + ''; }; }; + config = { # group that will own the certificates users.groups.acme = {}; diff --git a/applications/bitwarden/vaultwarden.nix b/applications/bitwarden/vaultwarden.nix index 1ae912c..c4ab5a2 100644 --- a/applications/bitwarden/vaultwarden.nix +++ b/applications/bitwarden/vaultwarden.nix @@ -35,7 +35,7 @@ in { #backups = [ "/etc/silver_ul_ical/database.db" ]; # Website config - skynet_acme.domains = [ + services.skynet.acme.domains = [ domain ]; diff --git a/applications/games.nix b/applications/games.nix index f112ed1..7ab1511 100644 --- a/applications/games.nix +++ b/applications/games.nix @@ -55,7 +55,7 @@ in { } ]; - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${cfg.domain.sub}.skynet.ie" ]; diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index 3f64108..9768b64 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -57,7 +57,7 @@ in { "ip daddr ${cfg.host.ip} tcp dport 25565 counter packets 0 bytes 0 accept" ]; - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" "*.${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" ]; diff --git a/applications/gitlab.nix b/applications/gitlab.nix index fc15cd0..355d4cf 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -99,7 +99,7 @@ in { group = cfg.user; }; - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" # Lets Encrypt seems to have a 4 levels limit for certs "*.pages.${cfg.domain.base}.${cfg.domain.tld}" diff --git a/applications/grafana.nix b/applications/grafana.nix index 11efcfe..a7f4e00 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -45,7 +45,7 @@ in { } ]; - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${name}.skynet.ie" ]; diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index c5630f4..d94a61a 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -56,7 +56,7 @@ in { age.secrets.ldap_mail.file = ../../secrets/email/details.age; age.secrets.ldap_wolves.file = ../../secrets/wolves/details.age; - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" ]; diff --git a/applications/ldap/server.nix b/applications/ldap/server.nix index d531cae..e54c7e5 100644 --- a/applications/ldap/server.nix +++ b/applications/ldap/server.nix @@ -79,7 +79,7 @@ in { group = "openldap"; }; - skynet_acme.domains = [ + services.skynet.acme.domains = [ domain ]; diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index 5ed9c9e..ae23a05 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -54,7 +54,7 @@ in { group = "nextcloud"; }; - skynet_acme.domains = [ + services.skynet.acme.domains = [ domain "onlyoffice.${domain}" ]; diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index fd6ae5f..3f4802d 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -40,7 +40,7 @@ in { }; config = { - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${name}.skynet.ie" ]; diff --git a/applications/open_governance/keyserver.nix b/applications/open_governance/keyserver.nix index e86c314..56c9441 100644 --- a/applications/open_governance/keyserver.nix +++ b/applications/open_governance/keyserver.nix @@ -29,7 +29,7 @@ in { }; config = { - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${name}.skynet.ie" ]; diff --git a/applications/open_governance/open_governance.nix b/applications/open_governance/open_governance.nix index dab1a8d..c855f30 100644 --- a/applications/open_governance/open_governance.nix +++ b/applications/open_governance/open_governance.nix @@ -31,7 +31,7 @@ in { }; config = { - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${name}.skynet.ie" ]; diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 6e7c542..63eae7a 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -25,7 +25,7 @@ in { }; config = { - skynet_acme.domains = [ + services.skynet.acme.domains = [ # the root one is already covered by teh certificate "2016.skynet.ie" "discord.skynet.ie" diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 1b37c36..8e0b98f 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -38,7 +38,7 @@ in { }; # Website config - skynet_acme.domains = [ + services.skynet.acme.domains = [ "users.skynet.ie" "*.users.skynet.ie" ]; diff --git a/applications/ulfm.nix b/applications/ulfm.nix index 18e0ddd..d3073a4 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -53,7 +53,7 @@ in { 8000 ]; - skynet_acme.domains = [ + services.skynet.acme.domains = [ "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" ]; From 73a941979880a2d3efa447eaf6fb849ef51818c1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 13:39:12 +0100 Subject: [PATCH 123/563] fix: small nginx cleanup --- applications/nix_cache/nix_cache.nix | 3 --- applications/skynet.ie.nix | 3 --- applications/ulfm.nix | 3 --- 3 files changed, 9 deletions(-) diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 3f4802d..88fe408 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -94,10 +94,7 @@ in { networking.firewall.allowedTCPPorts = [80 443]; services.nginx = { - enable = true; - group = "acme"; clientMaxBodySize = "500m"; - recommendedProxySettings = true; virtualHosts = { "${name}.skynet.ie" = { forceSSL = true; diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 63eae7a..37dfe0d 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -63,9 +63,6 @@ in { ]; services.nginx = { - enable = true; - group = "acme"; - virtualHosts = { # main site "skynet.ie" = { diff --git a/applications/ulfm.nix b/applications/ulfm.nix index d3073a4..4cf88ad 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -94,9 +94,6 @@ in { }; services.nginx = { - enable = true; - group = "acme"; - virtualHosts = { "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { forceSSL = true; From e156b4ecafeeb1fd4e79514ad998ec1b79c54f53 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 13:56:40 +0100 Subject: [PATCH 124/563] feat: standardise restic (backups) to using ``services.skynet."${name}";`` format --- applications/dns.nix | 2 +- applications/email.nix | 2 +- applications/restic.nix | 9 +++++---- machines/agentjones.nix | 2 +- machines/cadie.nix | 2 +- machines/earth.nix | 2 +- machines/galatea.nix | 2 +- machines/gir.nix | 2 +- machines/glados.nix | 2 +- machines/kitt.nix | 2 +- machines/marvin.nix | 2 +- machines/neuromancer.nix | 2 +- machines/optimus.nix | 2 +- machines/skynet.nix | 2 +- machines/vendetta.nix | 2 +- machines/vigil.nix | 2 +- machines/wheatly.nix | 2 +- 17 files changed, 21 insertions(+), 20 deletions(-) diff --git a/applications/dns.nix b/applications/dns.nix index 5af8b46..a3e8a8b 100644 --- a/applications/dns.nix +++ b/applications/dns.nix @@ -342,7 +342,7 @@ in { }; config = lib.mkIf cfg.server.enable { - # services.skynet_backup.normal.backups = ["/etc/skynet/dns"]; + # services.skynet.backup.normal.backups = ["/etc/skynet/dns"]; # open the firewall for this skynet_firewall.forward = [ diff --git a/applications/email.nix b/applications/email.nix index 8831d14..d60e65f 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -198,7 +198,7 @@ in { }; config = mkIf cfg.enable { - services.skynet_backup.normal.backups = [ + services.skynet.backup.normal.backups = [ "/var/vmail" "/var/dkim" ]; diff --git a/applications/restic.nix b/applications/restic.nix index 4d6a277..09365c6 100644 --- a/applications/restic.nix +++ b/applications/restic.nix @@ -7,7 +7,8 @@ ... }: with lib; let - cfg = config.services.skynet_backup; + name = "backup"; + cfg = config.services.skynet."${name}"; enable_client = cfg.normal.backups != null && cfg.normal.backups != []; @@ -37,11 +38,11 @@ with lib; let ownServers = builtins.listToAttrs (builtins.concatLists ( lib.attrsets.mapAttrsToList ( key: value: let - backup = value.config.services.skynet_backup; + backup = value.config.services.skynet.backup; in if ( - (builtins.hasAttr "skynet_backup" value.config.services) + (builtins.hasAttr "backup" value.config.services.skynet) && backup.server.enable && backup.host.name != cfg.host.name && !backup.server.appendOnly @@ -85,7 +86,7 @@ in { # using https://github.com/greaka/ops/blob/818be4c4dea9129abe0f086d738df4cb0bb38288/apps/restic/options.nix as a base # https://git.hrnz.li/Ulli/nixos/src/commit/5edca2dfdab3ce52208e4dfd2b92951e500f8418/profiles/server/restic.nix # will eb enabled on every server - options.services.skynet_backup = { + options.services.skynet."${name}" = { # backup is enabled by default # enable = mkEnableOption "Skynet backup"; diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 0c36db7..5748b53 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -45,7 +45,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/cadie.nix b/machines/cadie.nix index 73c6bf6..c9a8ed0 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -45,7 +45,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/earth.nix b/machines/earth.nix index 16dd17c..534ffcd 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -46,7 +46,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/galatea.nix b/machines/galatea.nix index e2c2574..3df97b5 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -46,7 +46,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/gir.nix b/machines/gir.nix index eaf1d17..c3dfb44 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -47,7 +47,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/glados.nix b/machines/glados.nix index 0b9a530..a6aa5dd 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -46,7 +46,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/kitt.nix b/machines/kitt.nix index b5c6c5e..4c39703 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -53,7 +53,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/marvin.nix b/machines/marvin.nix index 1f16c70..e44332f 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -63,7 +63,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 4dc819f..323e859 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -58,7 +58,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { server.enable = true; host = { ip = ip_pub; diff --git a/machines/optimus.nix b/machines/optimus.nix index c5290cb..3f44061 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -46,7 +46,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/skynet.nix b/machines/skynet.nix index 4cd0f05..5f1cb63 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -49,7 +49,7 @@ in { } ]; - services.skynet_backup.host = { + services.skynet.backup.host = { ip = ip_pub; name = name; }; diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 0305baf..702b724 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -45,7 +45,7 @@ in { ]; }; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/vigil.nix b/machines/vigil.nix index 0bda7ad..66abfb4 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -29,7 +29,7 @@ in { tags = ["active-dns" "dns"]; }; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 6b16cbc..835e0ac 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -45,7 +45,7 @@ in { } ]; - services.skynet_backup = { + services.skynet.backup = { host = { ip = ip_pub; name = name; From 54b43c9962dec9663c56b05aab72fff1e7788cea Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 14:11:45 +0100 Subject: [PATCH 125/563] feat: use a host attribute to make the config less verbose/complex --- machines/agentjones.nix | 9 +++++---- machines/cadie.nix | 14 ++++++-------- machines/earth.nix | 14 ++++++-------- machines/galatea.nix | 14 ++++++-------- machines/gir.nix | 15 ++++++--------- machines/glados.nix | 14 ++++++-------- machines/kitt.nix | 30 +++++++++--------------------- machines/marvin.nix | 9 +++++---- machines/neuromancer.nix | 9 +++++---- machines/optimus.nix | 14 ++++++-------- machines/skynet.nix | 14 ++++++-------- machines/vendetta.nix | 9 +++++---- machines/vigil.nix | 9 +++++---- machines/wheatly.nix | 9 +++++---- 14 files changed, 81 insertions(+), 102 deletions(-) diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 5748b53..ee05feb 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -17,6 +17,10 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) name = "agentjones"; ip_pub = "193.1.99.72"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ./hardware/RM001.nix @@ -46,10 +50,7 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; # keep the wired usb connection alive (front panel) diff --git a/machines/cadie.nix b/machines/cadie.nix index c9a8ed0..acc6810 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -18,6 +18,10 @@ Notes: name = "cadie"; ip_pub = "193.1.99.77"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/nextcloud.nix @@ -46,18 +50,12 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet_nextcloud = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; # this was causing a conflict for some reason diff --git a/machines/earth.nix b/machines/earth.nix index 534ffcd..9cfefd2 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -18,6 +18,10 @@ Notes: name = "earth"; ip_pub = "193.1.99.79"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/skynet.ie.nix @@ -47,16 +51,10 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/galatea.nix b/machines/galatea.nix index 3df97b5..8c842af 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -19,6 +19,10 @@ Notes: name = "galatea"; ip_pub = "193.1.99.111"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/ulfm.nix @@ -47,17 +51,11 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet_ulfm = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/gir.nix b/machines/gir.nix index c3dfb44..3121a19 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -18,7 +18,10 @@ Notes: name = "gir"; ip_pub = "193.1.99.76"; hostname = "${name}.skynet.ie"; - #hostname = ip_pub; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/email.nix @@ -48,19 +51,13 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; # we use this to pass in teh relevent infomation to the services.skynet_email = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; domain = "skynet.ie"; }; } diff --git a/machines/glados.nix b/machines/glados.nix index a6aa5dd..a28e836 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -19,6 +19,10 @@ Notes: Each user has roughly 20gb os storage name = "glados"; ip_pub = "193.1.99.75"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/gitlab.nix @@ -47,17 +51,11 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet_gitlab = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/kitt.nix b/machines/kitt.nix index 4c39703..6b8dd7c 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -19,7 +19,10 @@ Notes: name = "kitt"; ip_pub = "193.1.99.74"; hostname = "${name}.skynet.ie"; - #hostname = ip_pub; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/ldap/server.nix @@ -54,18 +57,12 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet_ldap = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.discord_bot = { @@ -75,27 +72,18 @@ in { services.skynet_vaultwarden = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet.prometheus = { server = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; }; services.skynet.grafana = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/marvin.nix b/machines/marvin.nix index e44332f..1be7d49 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -17,6 +17,10 @@ Notes: name = "marvin"; ip_pub = "193.1.99.81"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; groups = [ "skynet-admins-linux" @@ -64,10 +68,7 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; # Put test services below this diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 323e859..255c503 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -18,6 +18,10 @@ Notes: name = "neuromancer"; ip_pub = "193.1.99.80"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ./hardware/RM007.nix @@ -60,9 +64,6 @@ in { services.skynet.backup = { server.enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/optimus.nix b/machines/optimus.nix index 3f44061..0e7a1f6 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -19,6 +19,10 @@ Notes: name = "optimus"; ip_pub = "193.1.99.112"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/games.nix @@ -47,17 +51,11 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet_games = { enable = true; - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/skynet.nix b/machines/skynet.nix index 5f1cb63..435bbc5 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -21,6 +21,10 @@ Notes: Does not host offical sites # for internal network connectivity ip_int = "193.1.99.82"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/skynet_users.nix @@ -49,15 +53,9 @@ in { } ]; - services.skynet.backup.host = { - ip = ip_pub; - name = name; - }; + services.skynet.backup.host = host; services.skynet_users = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; } diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 702b724..c46c988 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -18,6 +18,10 @@ Notes: Using the server that used to be called Earth name = "vendetta"; ip_pub = "193.1.99.120"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ./hardware/RM002.nix @@ -46,10 +50,7 @@ in { }; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet.dns = { diff --git a/machines/vigil.nix b/machines/vigil.nix index 66abfb4..7885aa4 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -17,6 +17,10 @@ Notes: name = "vigil"; ip_pub = "193.1.99.109"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ]; @@ -30,10 +34,7 @@ in { }; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet.dns = { diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 835e0ac..3e6f339 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -18,6 +18,10 @@ Notes: name = "wheatly"; ip_pub = "193.1.99.78"; hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + }; in { imports = [ ../applications/gitlab_runner.nix @@ -46,10 +50,7 @@ in { ]; services.skynet.backup = { - host = { - ip = ip_pub; - name = name; - }; + host = host; }; services.skynet_gitlab_runner = { From f8c7860eb5920d4c960c0fd085c307072c31a449 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 14:59:20 +0100 Subject: [PATCH 126/563] feat: standardise all services to using ``services.skynet."${name}";`` format --- applications/bitwarden/vaultwarden.nix | 5 +++-- applications/discord.nix | 6 ++++-- applications/email.nix | 5 +++-- applications/games.nix | 7 ++++--- applications/games/minecraft.nix | 5 +++-- applications/gitlab.nix | 7 ++++--- applications/gitlab_runner.nix | 5 +++-- applications/ldap/backend.nix | 6 ++++-- applications/ldap/client.nix | 7 ++++--- applications/ldap/server.nix | 7 ++++--- applications/nextcloud.nix | 7 ++++--- applications/skynet.ie.nix | 5 +++-- applications/skynet_users.nix | 9 +++++---- applications/ulfm.nix | 5 +++-- machines/_base.nix | 2 +- machines/cadie.nix | 2 +- machines/earth.nix | 2 +- machines/galatea.nix | 2 +- machines/gir.nix | 2 +- machines/glados.nix | 2 +- machines/kitt.nix | 6 +++--- machines/marvin.nix | 2 +- machines/optimus.nix | 2 +- machines/skynet.nix | 2 +- machines/wheatly.nix | 2 +- 25 files changed, 64 insertions(+), 48 deletions(-) diff --git a/applications/bitwarden/vaultwarden.nix b/applications/bitwarden/vaultwarden.nix index c4ab5a2..68698dd 100644 --- a/applications/bitwarden/vaultwarden.nix +++ b/applications/bitwarden/vaultwarden.nix @@ -6,7 +6,8 @@ ... }: with lib; let - cfg = config.services.skynet_vaultwarden; + name = "vaultwarden"; + cfg = config.services.skynet."${name}"; domain_sub = "pw"; domain = "${domain_sub}.skynet.ie"; @@ -17,7 +18,7 @@ in { ../nginx.nix ]; - options.services.skynet_vaultwarden = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet vaultwarden server"; host = { diff --git a/applications/discord.nix b/applications/discord.nix index a4b08a4..df8f934 100644 --- a/applications/discord.nix +++ b/applications/discord.nix @@ -6,13 +6,14 @@ ... }: with lib; let - cfg = config.services.discord_bot; + name = "discord_bot"; + cfg = config.services.skynet."${name}"; in { imports = [ inputs.skynet_discord_bot.nixosModule."x86_64-linux" ]; - options.services.discord_bot = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet LDAP backend server"; }; @@ -24,6 +25,7 @@ in { age.secrets.discord_mail.file = ../secrets/email/details.age; age.secrets.discord_wolves.file = ../secrets/wolves/details.age; + # this is what was imported services.skynet_discord_bot = { enable = true; diff --git a/applications/email.nix b/applications/email.nix index d60e65f..8ab3c72 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -6,7 +6,8 @@ ... }: with lib; let - cfg = config.services.skynet_email; + name = "email"; + cfg = config.services.skynet."${name}"; # create teh new strings create_filter_array = map (x: "(memberOf=cn=${x},ou=groups,${cfg.ldap.base})"); @@ -128,7 +129,7 @@ in { ../config/users.nix ]; - options.services.skynet_email = { + options.services.skynet."${name}" = { # options that need to be passed in to make this work enable = mkEnableOption "Skynet Email"; diff --git a/applications/games.nix b/applications/games.nix index 7ab1511..b6dd735 100644 --- a/applications/games.nix +++ b/applications/games.nix @@ -6,7 +6,8 @@ ... }: with lib; let - cfg = config.services.skynet_games; + name = "games"; + cfg = config.services.skynet."${name}"; in { imports = [ ./dns.nix @@ -14,7 +15,7 @@ in { ./games/minecraft.nix ]; - options.services.skynet_games = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Games"; host = { @@ -74,7 +75,7 @@ in { }; # the minecraft servers - services.skynet_games_minecraft = { + services.skynet.games_minecraft = { enable = true; host = { diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index 9768b64..4c20a69 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -6,7 +6,8 @@ ... }: with lib; let - cfg = config.services.skynet_games_minecraft; + name = "games_minecraft"; + cfg = config.services.skynet."${name}"; # got tired of how long this is so I created a var for it. short_domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; @@ -19,7 +20,7 @@ in { inputs.arion.nixosModules.arion ]; - options.services.skynet_games_minecraft = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Games Minecraft"; host = { diff --git a/applications/gitlab.nix b/applications/gitlab.nix index 355d4cf..32f0ddc 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -5,7 +5,8 @@ ... }: with lib; let - cfg = config.services.skynet_gitlab; + name = "gitlab"; + cfg = config.services.skynet."${name}"; domain_base = "${cfg.domain.base}.${cfg.domain.tld}"; domain_full = "${cfg.domain.sub}.${domain_base}"; @@ -17,7 +18,7 @@ in { ./nginx.nix ]; - options.services.skynet_gitlab = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Gitlab"; host = { @@ -43,7 +44,7 @@ in { sub = mkOption { type = types.str; - default = "gitlab"; + default = name; }; }; diff --git a/applications/gitlab_runner.nix b/applications/gitlab_runner.nix index c6dda6b..dc642cf 100644 --- a/applications/gitlab_runner.nix +++ b/applications/gitlab_runner.nix @@ -5,12 +5,13 @@ ... }: with lib; let - cfg = config.services.skynet_gitlab_runner; + name = "gitlab_runner"; + cfg = config.services.skynet."${name}"; in { imports = [ ]; - options.services.skynet_gitlab_runner = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Gitlab Runner"; runner = { diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index d94a61a..177add3 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -6,7 +6,8 @@ ... }: with lib; let - cfg = config.services.ldap_backend; + name = "ldap_backend"; + cfg = config.services.skynet."${name}"; port_backend = "8087"; in { imports = [ @@ -17,7 +18,7 @@ in { ../../config/users.nix ]; - options.services.ldap_backend = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet LDAP backend server"; host = { @@ -74,6 +75,7 @@ in { locations."/".proxyPass = "http://localhost:${port_backend}"; }; + # this got imported services.skynet_ldap_backend = { enable = true; diff --git a/applications/ldap/client.nix b/applications/ldap/client.nix index b1102ad..038907d 100644 --- a/applications/ldap/client.nix +++ b/applications/ldap/client.nix @@ -5,7 +5,8 @@ ... }: with lib; let - cfg = config.services.skynet_ldap_client; + name = "ldap_client"; + cfg = config.services.skynet."${name}"; # always ensure the admin group has access create_filter_check_admin = x: @@ -27,9 +28,9 @@ in { imports = []; # give users access to this server - #services.skynet_ldap_client.groups = ["skynet-users-linux"]; + #services.skynet.ldap_client.groups = ["skynet-users-linux"]; - options.services.skynet_ldap_client = { + options.services.skynet."${name}" = { # options that need to be passed in to make this work enable = mkEnableOption "Skynet LDAP client"; diff --git a/applications/ldap/server.nix b/applications/ldap/server.nix index e54c7e5..9f041f0 100644 --- a/applications/ldap/server.nix +++ b/applications/ldap/server.nix @@ -9,7 +9,8 @@ Gonna use a priper nixos module for this ... }: with lib; let - cfg = config.services.skynet_ldap; + name = "ldap"; + cfg = config.services.skynet."${name}"; domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; in { # these are needed for teh program in question @@ -20,7 +21,7 @@ in { ./backend.nix ]; - options.services.skynet_ldap = { + options.services.skynet."${name}" = { # options that need to be passed in to make this work enable = mkEnableOption "Skynet LDAP service"; @@ -65,7 +66,7 @@ in { config = mkIf cfg.enable { # passthrough to the backend - services.ldap_backend = { + services.skynet.ldap_backend = { enable = true; host.ip = cfg.host.ip; host.name = cfg.host.name; diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index ae23a05..2b5bad6 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -5,7 +5,8 @@ ... }: with lib; let - cfg = config.services.skynet_nextcloud; + name = "nextcloud"; + cfg = config.services.skynet."${name}"; domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; in { imports = [ @@ -14,7 +15,7 @@ in { ./nginx.nix ]; - options.services.skynet_nextcloud = { + options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Nextcloud"; host = { @@ -40,7 +41,7 @@ in { sub = mkOption { type = types.str; - default = "nextcloud"; + default = name; }; }; }; diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 37dfe0d..107dc89 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -6,14 +6,15 @@ ... }: with lib; let - cfg = config.services.skynet; + name = "website"; + cfg = config.services.skynet."${name}"; in { imports = [ ./acme.nix ./dns.nix ]; - options.services.skynet = { + options.services.skynet."${name}" = { host = { ip = mkOption { type = types.str; diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 8e0b98f..341822d 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -6,8 +6,9 @@ ... }: with lib; let - cfg = config.services.skynet_users; - php_pool = "skynet_users"; + name = "website_users"; + cfg = config.services.skynet."${name}"; + php_pool = name; in { imports = [ ./acme.nix @@ -15,7 +16,7 @@ in { ./nginx.nix ]; - options.services.skynet_users = { + options.services.skynet."${name}" = { host = { ip = mkOption { type = types.str; @@ -30,7 +31,7 @@ in { # ssh access # allow more than admins access - services.skynet_ldap_client = { + services.skynet.ldap_client = { groups = [ "skynet-admins-linux" "skynet-users-linux" diff --git a/applications/ulfm.nix b/applications/ulfm.nix index 4cf88ad..77c4401 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -5,7 +5,8 @@ ... }: with lib; let - cfg = config.services.skynet_ulfm; + name = "ulfm"; + cfg = config.services.skynet."${name}"; in { imports = [ ./acme.nix @@ -14,7 +15,7 @@ in { ./nginx.nix ]; - options.services.skynet_ulfm = { + options.services.skynet."${name}" = { enable = mkEnableOption "ULFM service"; host = { diff --git a/machines/_base.nix b/machines/_base.nix index 63acbb5..80a8f5e 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -98,7 +98,7 @@ in { }; # skynet-admin-linux will always be added, individual servers can override the groups option - services.skynet_ldap_client.enable = true; + services.skynet.ldap_client.enable = true; networking = { # every sever needs to be accessable over ssh for admin use at least diff --git a/machines/cadie.nix b/machines/cadie.nix index acc6810..d180703 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -53,7 +53,7 @@ in { host = host; }; - services.skynet_nextcloud = { + services.skynet.nextcloud = { enable = true; host = host; }; diff --git a/machines/earth.nix b/machines/earth.nix index 9cfefd2..9854f34 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -54,7 +54,7 @@ in { host = host; }; - services.skynet = { + services.skynet.website = { host = host; }; } diff --git a/machines/galatea.nix b/machines/galatea.nix index 8c842af..c32d38b 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -54,7 +54,7 @@ in { host = host; }; - services.skynet_ulfm = { + services.skynet.ulfm = { enable = true; host = host; }; diff --git a/machines/gir.nix b/machines/gir.nix index 3121a19..07c5893 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -55,7 +55,7 @@ in { }; # we use this to pass in teh relevent infomation to the - services.skynet_email = { + services.skynet.email = { enable = true; host = host; domain = "skynet.ie"; diff --git a/machines/glados.nix b/machines/glados.nix index a28e836..7b0a277 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -54,7 +54,7 @@ in { host = host; }; - services.skynet_gitlab = { + services.skynet.gitlab = { enable = true; host = host; }; diff --git a/machines/kitt.nix b/machines/kitt.nix index 6b8dd7c..29fae63 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -60,16 +60,16 @@ in { host = host; }; - services.skynet_ldap = { + services.skynet.ldap = { enable = true; host = host; }; - services.discord_bot = { + services.skynet.discord_bot = { enable = true; }; - services.skynet_vaultwarden = { + services.skynet.vaultwarden = { enable = true; host = host; diff --git a/machines/marvin.nix b/machines/marvin.nix index 1be7d49..df99a32 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -48,7 +48,7 @@ in { ++ groups_trusted; # allow trainees access - services.skynet_ldap_client = { + services.skynet.ldap_client = { groups = groups; sudo_groups = groups; }; diff --git a/machines/optimus.nix b/machines/optimus.nix index 0e7a1f6..111cadf 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -54,7 +54,7 @@ in { host = host; }; - services.skynet_games = { + services.skynet.games = { enable = true; host = host; }; diff --git a/machines/skynet.nix b/machines/skynet.nix index 435bbc5..0d1442c 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -55,7 +55,7 @@ in { services.skynet.backup.host = host; - services.skynet_users = { + services.skynet.website_users = { host = host; }; } diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 3e6f339..b285ce9 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -53,7 +53,7 @@ in { host = host; }; - services.skynet_gitlab_runner = { + services.skynet.gitlab_runner = { enable = true; runner.name = "runner01"; }; From 379cb848394957419ee4248d8b786679565394ac Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 17:55:29 +0100 Subject: [PATCH 127/563] feat: simplified the config for running services, only one hosts config is required now in each server config file --- applications/_base.nix | 59 +++++++++++++++++++ applications/bitwarden/vaultwarden.nix | 19 +----- applications/email.nix | 20 +------ applications/games.nix | 23 +------- applications/games/minecraft.nix | 34 +++-------- applications/gitlab.nix | 24 ++------ applications/grafana.nix | 11 +--- applications/ldap/backend.nix | 12 +--- applications/ldap/server.nix | 20 +------ applications/nextcloud.nix | 19 +----- applications/nix_cache/nix_cache.nix | 13 +--- applications/open_governance/keyserver.nix | 13 +--- .../open_governance/open_governance.nix | 11 +--- applications/prometheus.nix | 9 --- applications/restic.nix | 29 ++++----- applications/skynet.ie.nix | 21 +++---- applications/skynet_users.nix | 19 +----- applications/ulfm.nix | 23 ++------ machines/_base.nix | 3 + machines/agentjones.nix | 18 +----- machines/cadie.nix | 24 ++------ machines/calculon.nix | 24 ++------ machines/earth.nix | 24 ++------ machines/galatea.nix | 24 ++------ machines/gir.nix | 27 ++------- machines/glados.nix | 24 ++------ machines/kitt.nix | 53 ++++------------- machines/marvin.nix | 20 +------ machines/neuromancer.nix | 19 +----- machines/optimus.nix | 24 ++------ machines/skynet.nix | 21 ++----- machines/vendetta.nix | 35 ++++------- machines/vigil.nix | 36 ++++------- machines/wheatly.nix | 26 +++----- 34 files changed, 200 insertions(+), 581 deletions(-) create mode 100644 applications/_base.nix diff --git a/applications/_base.nix b/applications/_base.nix new file mode 100644 index 0000000..bd1f017 --- /dev/null +++ b/applications/_base.nix @@ -0,0 +1,59 @@ +{ + config, + lib, + pkgs, + ... +}: +with lib; let + # root service + cfg = config.services.skynet; +in { + imports = [ + ./acme.nix + ./dns.nix + ./nginx.nix + ]; + + options.services.skynet = { + # since we use this basically everywhere provide a standard way to set it + host = { + ip = mkOption { + type = types.str; + }; + name = mkOption { + type = types.str; + }; + hostname = mkOption { + type = types.str; + default = "${cfg.host.name}.skynet.ie"; + }; + }; + }; + + config = { + services.skynet.dns.records = [ + { + record = cfg.host.name; + r_type = "A"; + value = cfg.host.ip; + server = true; + } + { + record = cfg.host.ip; + r_type = "PTR"; + value = cfg.host.hostname; + } + ]; + + services.nginx = { + virtualHosts = { + # for every server unless explisitly defined redirect the ip to skynet.ie + "${cfg.host.ip}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://skynet.ie"; + }; + }; + }; + }; +} diff --git a/applications/bitwarden/vaultwarden.nix b/applications/bitwarden/vaultwarden.nix index 68698dd..52e0422 100644 --- a/applications/bitwarden/vaultwarden.nix +++ b/applications/bitwarden/vaultwarden.nix @@ -19,17 +19,7 @@ in { ]; options.services.skynet."${name}" = { - enable = mkEnableOption "Skynet vaultwarden server"; - - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; + enable = mkEnableOption "Skynet VaultWarden server"; }; config = mkIf cfg.enable { @@ -44,16 +34,11 @@ in { { record = domain_sub; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; "${domain}" = { forceSSL = true; useACMEHost = "skynet"; diff --git a/applications/email.nix b/applications/email.nix index 8ab3c72..ade5e0f 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -134,16 +134,6 @@ in { enable = mkEnableOption "Skynet Email"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = mkOption { type = types.str; default = "skynet.ie"; @@ -246,12 +236,6 @@ in { # to provide the certs services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; - "mail.skynet.ie" = { forceSSL = true; useACMEHost = "mail"; @@ -291,7 +275,7 @@ in { { record = "mail"; r_type = "A"; - value = cfg.host.ip; + value = config.services.skynet.host.ip; } #DNS config for K-9 Mail { @@ -345,7 +329,7 @@ in { # reverse pointer { - record = cfg.host.ip; + record = config.services.skynet.host.ip; r_type = "PTR"; value = "${cfg.sub}.${cfg.domain}."; } diff --git a/applications/games.nix b/applications/games.nix index b6dd735..7ffd9f7 100644 --- a/applications/games.nix +++ b/applications/games.nix @@ -18,16 +18,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Games"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -52,7 +42,7 @@ in { { record = cfg.domain.sub; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; @@ -61,12 +51,6 @@ in { ]; services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; - "${cfg.domain.sub}.skynet.ie" = { forceSSL = true; useACMEHost = "skynet"; @@ -78,11 +62,6 @@ in { services.skynet.games_minecraft = { enable = true; - host = { - ip = cfg.host.ip; - name = cfg.domain.sub; - }; - domain = { sub = "minecraft.${cfg.domain.sub}"; }; diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index 4c20a69..8953efe 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -23,16 +23,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Games Minecraft"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -53,9 +43,9 @@ in { config = mkIf cfg.enable { skynet_firewall.forward = [ - "ip daddr ${cfg.host.ip} tcp dport 80 counter packets 0 bytes 0 accept" - "ip daddr ${cfg.host.ip} tcp dport 443 counter packets 0 bytes 0 accept" - "ip daddr ${cfg.host.ip} tcp dport 25565 counter packets 0 bytes 0 accept" + "ip daddr ${config.services.skynet.host.ip} tcp dport 80 counter packets 0 bytes 0 accept" + "ip daddr ${config.services.skynet.host.ip} tcp dport 443 counter packets 0 bytes 0 accept" + "ip daddr ${config.services.skynet.host.ip} tcp dport 25565 counter packets 0 bytes 0 accept" ]; services.skynet.acme.domains = [ @@ -68,38 +58,38 @@ in { { record = "config.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } # our own minecraft hosts { record = "compsoc_classic.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "compsoc.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } # gsoc servers { record = "gsoc.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "gsoc_abridged.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } # phildeb { record = "phildeb.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; @@ -109,12 +99,6 @@ in { ]; services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; - # https://config.minecraft.games.skynet.ie "config.${short_domain}" = { forceSSL = true; diff --git a/applications/gitlab.nix b/applications/gitlab.nix index 32f0ddc..80664af 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -21,16 +21,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Gitlab"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -111,13 +101,13 @@ in { { record = cfg.domain.sub; r_type = "A"; - value = cfg.host.ip; + value = config.services.skynet.host.ip; } # for gitlab pages { record = "*.pages.${cfg.domain.base}.${cfg.domain.tld}."; r_type = "A"; - value = cfg.host.ip; + value = config.services.skynet.host.ip; } # for email @@ -127,7 +117,7 @@ in { value = ''10 ${domain_full}.''; } { - record = cfg.host.ip; + record = config.services.skynet.host.ip; r_type = "PTR"; value = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}."; } @@ -151,12 +141,6 @@ in { services.openssh.ports = [22 2222]; services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; - # main site "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { forceSSL = true; @@ -264,7 +248,7 @@ in { # default for pages is set to 8090 but that leaves an "ugly" port in the url, # override it here to make it look good port = 80; - #external_http = ["${cfg.host.ip}:80"]; + #external_http = ["${config.services.skynet.host.ip}:80"]; }; }; }; diff --git a/applications/grafana.nix b/applications/grafana.nix index a7f4e00..15c076f 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -16,15 +16,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Grafana Server"; - host = { - ip = mkOption { - type = types.str; - }; - name = mkOption { - type = types.str; - }; - }; - datasource = { name = mkOption { type = types.str; @@ -41,7 +32,7 @@ in { { record = "${name}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index 177add3..b4b0e13 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -21,16 +21,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Skynet LDAP backend server"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -65,7 +55,7 @@ in { { record = cfg.domain.sub; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/ldap/server.nix b/applications/ldap/server.nix index 9f041f0..67bd1fc 100644 --- a/applications/ldap/server.nix +++ b/applications/ldap/server.nix @@ -18,7 +18,6 @@ in { ../acme.nix ../dns.nix ../nginx.nix - ./backend.nix ]; options.services.skynet."${name}" = { @@ -26,16 +25,6 @@ in { enable = mkEnableOption "Skynet LDAP service"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -65,13 +54,6 @@ in { }; config = mkIf cfg.enable { - # passthrough to the backend - services.skynet.ldap_backend = { - enable = true; - host.ip = cfg.host.ip; - host.name = cfg.host.name; - }; - # after changing teh password openldap.service has to be restarted age.secrets.ldap_pw = { file = ../../secrets/ldap/pw.age; @@ -88,7 +70,7 @@ in { { record = cfg.domain.sub; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index 2b5bad6..02bc5f6 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -18,16 +18,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Nextcloud"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -64,12 +54,12 @@ in { { record = cfg.domain.sub; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "onlyoffice.${cfg.domain.sub}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; @@ -109,11 +99,6 @@ in { }; services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; ${domain} = { forceSSL = true; useACMEHost = "skynet"; diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 88fe408..6716146 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -29,17 +29,10 @@ in { ]; options.services.skynet."${name}" = { - host = { - ip = mkOption { - type = types.str; - }; - name = mkOption { - type = types.str; - }; - }; + enable = mkEnableOption "Skynet Nix Cache"; }; - config = { + config = mkIf cfg.enable { services.skynet.acme.domains = [ "${name}.skynet.ie" ]; @@ -48,7 +41,7 @@ in { { record = "${name}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/open_governance/keyserver.nix b/applications/open_governance/keyserver.nix index 56c9441..c507a50 100644 --- a/applications/open_governance/keyserver.nix +++ b/applications/open_governance/keyserver.nix @@ -18,17 +18,10 @@ in { ]; options.services.skynet."${name}" = { - host = { - ip = mkOption { - type = types.str; - }; - name = mkOption { - type = types.str; - }; - }; + enable = mkEnableOption "Skynet Public Keyserver"; }; - config = { + config = mkIf cfg.enable { services.skynet.acme.domains = [ "${name}.skynet.ie" ]; @@ -37,7 +30,7 @@ in { { record = "${name}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/open_governance/open_governance.nix b/applications/open_governance/open_governance.nix index c855f30..93d2974 100644 --- a/applications/open_governance/open_governance.nix +++ b/applications/open_governance/open_governance.nix @@ -20,14 +20,7 @@ in { ]; options.services.skynet."${name}" = { - host = { - ip = mkOption { - type = types.str; - }; - name = mkOption { - type = types.str; - }; - }; + enable = mkEnableOption "Skynet Open Governance"; }; config = { @@ -39,7 +32,7 @@ in { { record = "${name}"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/prometheus.nix b/applications/prometheus.nix index eb15c48..556a16e 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -13,15 +13,6 @@ in { options.services.skynet."${name}" = { server = { enable = mkEnableOption "Prometheus Server"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; port = mkOption { type = types.port; diff --git a/applications/restic.nix b/applications/restic.nix index 09365c6..df273e6 100644 --- a/applications/restic.nix +++ b/applications/restic.nix @@ -39,21 +39,23 @@ with lib; let lib.attrsets.mapAttrsToList ( key: value: let backup = value.config.services.skynet.backup; + backup_host = value.config.services.skynet.host; in if ( (builtins.hasAttr "backup" value.config.services.skynet) && backup.server.enable - && backup.host.name != cfg.host.name + # chgeck that its not itself + && backup_host.name != config.services.skynet.host.name && !backup.server.appendOnly ) then [ { - name = backup.host.name; + name = backup_host.name; value = base // { - repositoryFile = "/etc/skynet/restic/${backup.host.name}"; + repositoryFile = "/etc/skynet/restic/${backup_host.name}"; backupPrepareCommand = '' #!${pkgs.stdenv.shell} @@ -64,13 +66,13 @@ with lib; let mkdir -p $baseDir cd $baseDir - echo -n "rest:http://root:password@${backup.host.ip}:${toString backup.server.port}/root/${cfg.host.name}" > ${backup.host.name} + echo -n "rest:http://root:password@${backup_host.ip}:${toString backup.server.port}/root/${config.services.skynet.host.name}" > ${backup_host.name} # read in teh password #PW = `cat ${config.age.secrets.restic.path}` line=$(head -n 1 ${config.age.secrets.restic.path}) - sed -i "s/password/$line/g" ${backup.host.name} + sed -i "s/password/$line/g" ${backup_host.name} ''; }; } @@ -87,8 +89,7 @@ in { # https://git.hrnz.li/Ulli/nixos/src/commit/5edca2dfdab3ce52208e4dfd2b92951e500f8418/profiles/server/restic.nix # will eb enabled on every server options.services.skynet."${name}" = { - # backup is enabled by default - # enable = mkEnableOption "Skynet backup"; + enable = mkEnableOption "Skynet backup"; # what folders to backup normal = { @@ -128,16 +129,6 @@ in { }; }; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - server = { enable = mkEnableOption "Skynet backup Server"; @@ -176,7 +167,7 @@ in { services.restic.server = { enable = true; - listenAddress = "${cfg.host.ip}:${toString cfg.server.port}"; + listenAddress = "${config.services.skynet.host.ip}:${toString cfg.server.port}"; appendOnly = cfg.server.appendOnly; privateRepos = true; }; @@ -196,7 +187,7 @@ in { # merge teh two configs together # backblaze = base // { # # backupos for each server are stored in a folder under their name - # repository = "b2:NixOS-Main2:/${cfg.host.name}"; + # repository = "b2:NixOS-Main2:/${config.services.skynet.host.name}"; # #environmentFile = config.age.secrets.backblaze.path; # }; }; diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index 107dc89..fe83fc4 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -15,17 +15,10 @@ in { ]; options.services.skynet."${name}" = { - host = { - ip = mkOption { - type = types.str; - }; - name = mkOption { - type = types.str; - }; - }; + enable = mkEnableOption "Skynet Main Website"; }; - config = { + config = mkIf cfg.enable { services.skynet.acme.domains = [ # the root one is already covered by teh certificate "2016.skynet.ie" @@ -39,27 +32,27 @@ in { { record = "@"; r_type = "A"; - value = cfg.host.ip; + value = config.services.skynet.host.ip; } { record = "2016"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "discord"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "public"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "renew"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 341822d..0ff76e1 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -17,14 +17,7 @@ in { ]; options.services.skynet."${name}" = { - host = { - ip = mkOption { - type = types.str; - }; - name = mkOption { - type = types.str; - }; - }; + enable = mkEnableOption "Skynet User Linux Server"; }; config = { @@ -48,12 +41,12 @@ in { { record = "users"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } { record = "*.users"; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; @@ -92,12 +85,6 @@ in { }; services.nginx.virtualHosts = { - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; - # main site "*.users.skynet.ie" = { forceSSL = true; diff --git a/applications/ulfm.nix b/applications/ulfm.nix index 77c4401..b1013f3 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -18,16 +18,6 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "ULFM service"; - host = { - ip = mkOption { - type = types.str; - }; - - name = mkOption { - type = types.str; - }; - }; - domain = { tld = mkOption { type = types.str; @@ -62,14 +52,14 @@ in { { record = cfg.domain.sub; r_type = "CNAME"; - value = cfg.host.name; + value = config.services.skynet.host.name; } ]; skynet_firewall.forward = [ - "ip daddr ${cfg.host.ip} tcp dport 80 counter packets 0 bytes 0 accept" - "ip daddr ${cfg.host.ip} tcp dport 443 counter packets 0 bytes 0 accept" - "ip daddr ${cfg.host.ip} tcp dport 8000 counter packets 0 bytes 0 accept" + "ip daddr ${config.services.skynet.host.ip} tcp dport 80 counter packets 0 bytes 0 accept" + "ip daddr ${config.services.skynet.host.ip} tcp dport 443 counter packets 0 bytes 0 accept" + "ip daddr ${config.services.skynet.host.ip} tcp dport 8000 counter packets 0 bytes 0 accept" ]; users.groups."icecast" = {}; @@ -101,11 +91,6 @@ in { useACMEHost = "skynet"; locations."/".proxyPass = "http://localhost:8000"; }; - "${cfg.host.ip}" = { - forceSSL = true; - useACMEHost = "skynet"; - locations."/".return = "307 https://skynet.ie"; - }; }; }; }; diff --git a/machines/_base.nix b/machines/_base.nix index 80a8f5e..5972e49 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -18,6 +18,9 @@ in { # for the secrets inputs.agenix.nixosModules.default + # base config for all servers + ../applications/_base.nix + # every sever may need the firewall config stuff ../applications/firewall.nix diff --git a/machines/agentjones.nix b/machines/agentjones.nix index ee05feb..1fb3c4e 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -20,6 +20,7 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -35,22 +36,9 @@ in { tags = ["active-firewall"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { + services.skynet = { host = host; + backup.enable = true; }; # keep the wired usb connection alive (front panel) diff --git a/machines/cadie.nix b/machines/cadie.nix index d180703..96a6bed 100644 --- a/machines/cadie.nix +++ b/machines/cadie.nix @@ -21,6 +21,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -35,27 +36,10 @@ in { tags = ["active"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { - host = host; - }; - - services.skynet.nextcloud = { - enable = true; + services.skynet = { host = host; + backup.enable = true; + nextcloud.enable = true; }; # this was causing a conflict for some reason diff --git a/machines/calculon.nix b/machines/calculon.nix index 556b605..30ad6bd 100644 --- a/machines/calculon.nix +++ b/machines/calculon.nix @@ -22,6 +22,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -38,24 +39,11 @@ in { tags = ["active"]; }; - # it has two network devices so two - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - services.skynet = { - nix-cache.host = host; - open-governance.host = host; - keyserver.host = host; + host = host; + backup.enable = true; + nix-cache.enable = true; + open-governance.enable = true; + keyserver.enable = true; }; } diff --git a/machines/earth.nix b/machines/earth.nix index 9854f34..9106027 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -21,6 +21,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -35,26 +36,9 @@ in { tags = ["active-core"]; }; - # it has two network devices so two - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { - host = host; - }; - - services.skynet.website = { + services.skynet = { host = host; + backup.enable = true; + website.enable = true; }; } diff --git a/machines/galatea.nix b/machines/galatea.nix index c32d38b..62af7e3 100644 --- a/machines/galatea.nix +++ b/machines/galatea.nix @@ -22,6 +22,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -36,26 +37,9 @@ in { tags = ["active"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { - host = host; - }; - - services.skynet.ulfm = { - enable = true; + services.skynet = { host = host; + backup.enable = true; + ulfm.enable = true; }; } diff --git a/machines/gir.nix b/machines/gir.nix index 07c5893..0f6dde4 100644 --- a/machines/gir.nix +++ b/machines/gir.nix @@ -21,6 +21,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -35,29 +36,9 @@ in { tags = ["active-core"]; }; - # add this server to dns - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { + services.skynet = { host = host; - }; - - # we use this to pass in teh relevent infomation to the - services.skynet.email = { - enable = true; - host = host; - domain = "skynet.ie"; + backup.enable = true; + email.enable = true; }; } diff --git a/machines/glados.nix b/machines/glados.nix index 7b0a277..a745ee6 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -22,6 +22,7 @@ Notes: Each user has roughly 20gb os storage host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -36,26 +37,9 @@ in { tags = ["active-gitlab"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { - host = host; - }; - - services.skynet.gitlab = { - enable = true; + services.skynet = { host = host; + backup.enable = true; + gitlab.enable = true; }; } diff --git a/machines/kitt.nix b/machines/kitt.nix index 29fae63..54474c9 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -22,10 +22,12 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ ../applications/ldap/server.nix + ../applications/ldap/backend.nix ../applications/discord.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix @@ -41,49 +43,20 @@ in { tags = ["active-core"]; }; - # add this server to dns - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { + services.skynet = { host = host; - }; + backup.enable = true; - services.skynet.ldap = { - enable = true; - host = host; - }; + # ldap setup + ldap.enable = true; + ldap_backend.enable = true; - services.skynet.discord_bot = { - enable = true; - }; + # private member services + discord_bot.enable = true; - services.skynet.vaultwarden = { - enable = true; - - host = host; - }; - services.skynet.prometheus = { - server = { - enable = true; - host = host; - }; - }; - - services.skynet.grafana = { - enable = true; - - host = host; + # committee/admin services + vaultwarden.enable = true; + prometheus.server.enable = true; + grafana.enable = true; }; } diff --git a/machines/marvin.nix b/machines/marvin.nix index df99a32..175d61d 100644 --- a/machines/marvin.nix +++ b/machines/marvin.nix @@ -20,6 +20,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; groups = [ @@ -53,23 +54,8 @@ in { sudo_groups = groups; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { + services.skynet = { host = host; + backup.enable = true; }; - - # Put test services below this } diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 255c503..6e2cbd9 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -21,6 +21,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -48,22 +49,8 @@ in { tags = ["active-core"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { - server.enable = true; + services.skynet = { host = host; + backup.server.enable = true; }; } diff --git a/machines/optimus.nix b/machines/optimus.nix index 111cadf..6f36726 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -22,6 +22,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -36,26 +37,9 @@ in { tags = ["active"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { - host = host; - }; - - services.skynet.games = { - enable = true; + services.skynet = { host = host; + backup.enable = true; + games.enable = true; }; } diff --git a/machines/skynet.nix b/machines/skynet.nix index 0d1442c..360896b 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -24,6 +24,7 @@ Notes: Does not host offical sites host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -39,23 +40,9 @@ in { tags = ["active-ext"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup.host = host; - - services.skynet.website_users = { + services.skynet = { host = host; + backup.enable = true; + website_users.enable = true; }; } diff --git a/machines/vendetta.nix b/machines/vendetta.nix index c46c988..3cff501 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -21,6 +21,7 @@ Notes: Using the server that used to be called Earth host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -49,32 +50,16 @@ in { ]; }; - services.skynet.backup = { + services.skynet = { host = host; - }; - - services.skynet.dns = { - server = { - enable = true; - # primary dns server (ns1) - primary = true; - ip = ip_pub; + backup.enable = true; + dns = { + server = { + enable = true; + # primary dns server (ns1) + primary = true; + ip = ip_pub; + }; }; - - records = [ - # vendetta IN A 193.1.99.120 - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - # 120 IN PTR vendetta.skynet.ie. - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; }; } diff --git a/machines/vigil.nix b/machines/vigil.nix index 7885aa4..421ebaa 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -20,6 +20,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -33,33 +34,16 @@ in { tags = ["active-dns" "dns"]; }; - services.skynet.backup = { + services.skynet = { host = host; - }; - - services.skynet.dns = { - server = { - enable = true; - # secondary dns server (ns2) - primary = false; - ip = ip_pub; + backup.enable = true; + dns = { + server = { + enable = true; + # secondary dns server (ns2) + primary = false; + ip = ip_pub; + }; }; - - # this server will have to have dns records - records = [ - # vigil IN A 193.1.99.109 - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - # 109 IN PTR vigil.skynet.ie. - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; }; } diff --git a/machines/wheatly.nix b/machines/wheatly.nix index b285ce9..308bef9 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -21,6 +21,7 @@ Notes: host = { ip = ip_pub; name = name; + hostname = hostname; }; in { imports = [ @@ -35,26 +36,13 @@ in { tags = ["active-gitlab"]; }; - services.skynet.dns.records = [ - { - record = name; - r_type = "A"; - value = ip_pub; - server = true; - } - { - record = ip_pub; - r_type = "PTR"; - value = hostname; - } - ]; - - services.skynet.backup = { + services.skynet = { host = host; - }; + backup.enable = true; - services.skynet.gitlab_runner = { - enable = true; - runner.name = "runner01"; + gitlab_runner = { + enable = true; + runner.name = "runner01"; + }; }; } From 689344e518c87da932b5741da81ac15e2972703b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 30 May 2024 19:42:26 +0100 Subject: [PATCH 128/563] fix: all servers now require the dns secret for acme now --- secrets/dns_certs.secret.age | 71 +++++++++++++++++++++--------------- secrets/secrets.nix | 2 +- 2 files changed, 42 insertions(+), 31 deletions(-) diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 7d1f348..e4e29d5 100644 --- a/secrets/dns_certs.secret.age +++ b/secrets/dns_certs.secret.age @@ -1,31 +1,42 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA tzgPuOSktRbzGWk2BDFHmbr1Sm05qdYjyRz2/HTx6B4 -U81/Gr5l69wte3fAtN3nYfx5OAMu5x7WTS4gygHUucc --> ssh-ed25519 4PzZog EPHeQJYsFoEHlgScAHEsu5qvylaTzvcPw3Y2CXOSuWQ -U2PGDUHKIAR/0qovVc7ovAT9dyn/fOTncfNWrKk8ljY --> ssh-ed25519 5Nd93w 4CHAkRax2v275ksja2Pxw+5DoZXWNKd3lHZq8+Y1W0U -Br95FoQN2AZf2io3wFTX7SCHxGoGv2O/8/kbnu2bqvg --> ssh-ed25519 q8eJgg zds5ccfqHdh67yLnN+33eXwHF5FFKVFAxW8Ecgk7ZHg -vDZ13K30m+rx+wyteX8SuA5uEI9dZMV/vRJSt9ydKMo --> ssh-ed25519 XSrA6w 27EVcnWYtJnsl1EJtmbucY3pyXHRZKezi8KN30bK0Vc -y41vgV5yH3aZJUx0Wl/zP29466yOl2IGgl+6ti3pAVQ --> ssh-ed25519 DVzSig XRuB0GkA1CFvcq7mc2Nod79+jYnN26dEOfCDcRoS+nc -Oy//M5W8tspc/YmQjYK8joYYpm3SoKfrKKmrLmSy7z0 --> ssh-ed25519 SqDBmA cSiRVHtiZbLp/OFS+5tOgmf5msgfaTUW+6U9vC8Nj1s -8pymGU7WaIx3o0WkwqFXgM9lFjvablusQF/9O9xRrcQ --> ssh-ed25519 UE6fcQ rl54j3p+k4eMCC63Hl2hKyWkKwWAS61iBdhGolnh7g0 -fqO/fSuwRyTAW49t0w/ffTMaIAvBnJrX94grAO2f0uI --> ssh-ed25519 8vZ9CQ old/mJ0AN9vJmvbr1/0ELh02R8tGPys+rwSj6Tq2Sh8 -W+BcsKswtQv+e7kAjHn6vrdApawGuNwIAK2hNV3SJWo --> ssh-ed25519 IzAMqA lotJU4JW3eHjdb+ZQ3s2XN7JmZz3FFBh7CJ1t+/+Ghc -wIJsNn4SUXjtobDz1xzLSe0oEqo3nRlWjJiLqDiHv6A --> ssh-ed25519 uZzB3g eH+/Tew6AU7j95BBMcUtwnaoReZeFp6CaF1S+JdWUCQ -VjNNv+gd1JkUVFtJx4H7qDKpOPSkgRVcsJhYFhPxbWI --> ssh-ed25519 Hb0ipQ k732pON+GqpltKfPmArf/d6wX0L5OLVh6l56M0Vf6UU -UdEG5xrFoFnjXAb47uPO0lC957yvocPgK7iRrxwBvg0 --> ssh-ed25519 uZzB3g 0Q1BNGOJoH41b6z8YG/QOi8wshGJsPHN7XXMAyIVTwE -ecj8oOZyRSYCXPXEQXmM/KDZktEpsgyohQtK45Du1ow --> ssh-ed25519 YFaxCg hHWU1ehve1zeDoilyZh1QjtSiGgii0i3ks7+DCXuPmI -krPnm4YCmcg98u735WdiwCeMLG/5Ie8rk0/AE7ZP+qk ---- 6aIkITPoSXpoPQB7IqEDvbC5SqQt+91+8SiNZbfrfwQ -0fÊd”ŽÁr«·CT ا‘w°êwŒ…«éÇýTSšÿ=‰M©(F ·“§Pº×Qжÿx*îæü TÒáÍaƒÉöd·]Dt>W0¦T²?¾ài‹}¬WŠ.“Ï…ñŠàìn0°ºjéS¶Ê«2\~ýÄ sòçnДläÀ³e¯$ 3Ô­ˆ쨋Ïï¸8…®{i–Y.¦uI•|€vâkÇáFv¿äOÛÏOc—sùÏA ]:ûÜÓ3p0Øý†¸\þÌç91( \ No newline at end of file +-> ssh-ed25519 V1pwNA JVysrUp8W6swlXv0ERKcVHqSaQr+oA3LC2fogPlwATQ +3hr+AvewDRSjsPJM3BbFQKAPLCGSl6IHuaOZtHMyF50 +-> ssh-ed25519 4PzZog zR6rKPs9vcvC/nk1qyHip1i9+6kbEgBcLQqDJI7e/hU +d748TFIo0EKwKreJEdEVaFO9+FxzantexynqvjHucZA +-> ssh-ed25519 5Nd93w S9jU/4qN3E9s0bXi5zoH0nxuzcGYPXLwqezNJw3TIhc +oXaibBkKdjiqDuko/GsWKkF5C92FNQIxs+fNQQEP0+g +-> ssh-ed25519 q8eJgg oCCuyZPi85tb+UxXMtfJx479RLEPtAagH9HkQ3Undww +YENj+QuWzxgJBCEXcekBGc20TQI2/Q+UKUH0V88h1JQ +-> ssh-ed25519 /Gb5gQ wv0DOmgF0JOnAIqgjFS/mxMpwovX+m8RYpWxljnN9hQ +R8h2ZzUBwX2QtSTpS6+Owp6Ih6JYK1MIBJ53xwMbCBc +-> ssh-ed25519 NtlN/A Aqz2cgvhFaYfOMw/rdQ6BvETChlgGQZN2QvKC936+lo +WkXzMfw/IJjLXgoddYZ74+i/+yM6+WXykFSH+DkZREg +-> ssh-ed25519 v2Y09A ZOHo6cr4vyTkgPsJsAZ+LImajSkXVQ3mzAPKlSS6ZmI +0sAYUb0rJUPNk0egtyksB58uPDN4F+xk7CnPI1DH/EI +-> ssh-ed25519 XSrA6w 1tciV+KCPcAvwIr1DuG4Eoe2oPNTquT7msB30HnYljs +LBYy5RQLHMIcOTUcUZ6+MpLYdnfXbSyx4kcNMxMrkKk +-> ssh-ed25519 DVzSig aarBueaR0rgOhPGIwDeboqBfQvT/dkRvf0swKm4NlWw +pxEhg8dfxz7obMdyipbpUg7IQeixNJhFfhq72jyx+bA +-> ssh-ed25519 uZzB3g g6K54jq2HOqx7wzbycJJ3ZTs98OOEb/rYFzNb4D7PC8 +yiVfm+9tFTP2Rje9HLCOWDoYpA8hMnQmovAFRLI8bb4 +-> ssh-ed25519 yvS9bw 8MuNIrtc61CGDQm/6wGBVfRZnjo7/UfbDyRq1Sj04CU +7Mnbaqeak9ykwLgh3OI3VeQ1EIZo2+80skVZZtEiSGo +-> ssh-ed25519 IzAMqA AziNzb8XO/A9IaiE5fgxTU9xNvMO5g/z6RG/loOFCGE +xxbml25nPGs1kDN/yAYOuh26Nzhx/7hOv25/8/bC8cM +-> ssh-ed25519 Hb0ipQ NDzUtPajSgMdo++L1FD5/Zx6549/8+uz3RmOYFfvV0s +cIFWJHhmvNtZjyVVBEjKYgZQcmRh6CE5fCCRpb4wPxo +-> ssh-ed25519 3pl/Kw At1BJ2WKbgJveuLxvhOUWPPJGPd9wc2AuWgQlBtnDRw +BGuaoiMt3UYwfBGPvG6JJHnQ2Ndf+J5QhsvPaL4F8ks +-> ssh-ed25519 SqDBmA WWU3AT+9L8SPXPz1sOJaBwXxT1NU5ZlcSjaPQaWydlY +aceO83wb8oNXCuWY86tOc2UqwYMHJP9y/gQc/SVXrx8 +-> ssh-ed25519 UE6fcQ b7r0Im5jYaaUMY54Tmkr+v/8n/CmfUp6+UrKPzf8wRg +1nSQ93LLZ4OVaL2D1VE5w/Wk1HaGuyGSe3jIz8cEdl8 +-> ssh-ed25519 YFaxCg cveiV9/m6G8UZWGloGOus3ftaYLTHH0N2ibTh03CqmU +NIPQrVigfgSIg01f9lzYHHemUi8fZiRllbjCBd8gG90 +-> ssh-ed25519 elCEeg inFC6DXefO27b54O70iRAhM8qzYVFYqJT2xIDDfsqWc +J4Mr0K3TIlvmY5luZPL9bYKHX1l/1rkRCKxg0gGZxZ4 +-> ssh-ed25519 8vZ9CQ xHkHzdIbHKp+qvkPG5wUgKA61wkCOTziuYbZaDo3FAI +MQh8gvvKAZahtvqqBizqVVu/rnxznzhZishIrFavIhs +--- PJAog4mRqJvcK2KqjhWxMauvAstZ02CVEIWo1+cgVMI +ÔåÄ(>ŸÙ"Äl¢•F÷Å$\lG¿[H#íŸB›ç·ó²Âé‘píøãBp=‡q2Ú"ñÒ‡ÖùNñV LÓEuå¦#¿Ñóø +ÒèÒžÞeY#„†ˆ¢ôr'±©ÕÒÓßXp¹X`ïB ù6Õ1 u[’=µQÏKSq{(ÛuÃñ!§92˜4ˆ¾\ÚáD¹YÇ\Tls¥†MæüÈ¥þŸI„ŒMœU"…>(˜={íÿ …žL§úÁj³2 Date: Thu, 30 May 2024 22:10:40 +0100 Subject: [PATCH 129/563] fix: dont have an internal ip --- machines/skynet.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/machines/skynet.nix b/machines/skynet.nix index 360896b..720e9a3 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -18,8 +18,6 @@ Notes: Does not host offical sites name = "skynet"; # DMZ that ITD provided ip_pub = "193.1.96.165"; - # for internal network connectivity - ip_int = "193.1.99.82"; hostname = "${name}.skynet.ie"; host = { ip = ip_pub; From 9316caa55928b6b2ff0ff3a01f23eb173e5533ca Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 31 May 2024 16:21:05 +0100 Subject: [PATCH 130/563] doc: up[dated csv of ports/services --- ITD_Firewall.csv | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/ITD_Firewall.csv b/ITD_Firewall.csv index fe5e0b9..a6ac0b7 100644 --- a/ITD_Firewall.csv +++ b/ITD_Firewall.csv @@ -1,18 +1,19 @@ -Index,Name,IP_Address,DNS_Name,Ports_Current,Ports_Requested,Related_Tickets,Description -SKYNET00001,agentjones,193.1.99.72,agentjones,"","","",Firewall (currently not active) -SKYNET00002,vendetta,193.1.99.120,vendetta/ns1,53,"","",DNS Nameserver 1 -SKYNET00003,jarvis,193.1.99.73,jarvis,"","","",VM Host -SKYNET00004,vigil,193.1.99.109,vigil/ns2,53,"","",DNS Nameserver 2 -SKYNET00005,galatea,193.1.99.111,galatea/stream,80/443 8000,"","",ULFM Radio -SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,"","",Games server -SKYNET00007,kitt,193.1.99.74,kitt/account/api.account,443,"",i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" -SKYNET00008,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,2222,i23-05-18_249,Gitlab server -SKYNET00009,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,"",i23-06-19_525/i23-06-19_525,Email and Webmail -SKYNET00010,wheatly,193.1.99.78,wheatly,"","","",Gitlab Runner -SKYNET00011,earth,193.1.99.79,earth,80/443,"",i23-06-19_525,Offical website host -SKYNET00012,skynet,193.1.96.165,skynet/*.users,22 80/443,"",i23-06-30_024,Skynet server. (DMZ) -SKYNET00013,neuromancer,193.1.99.80,neuromancer,"","","",Local Backup Server -SKYNET00014,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,"",i23-10-27_014,"Services VM, has nextcloud to start with" -SKYNET00015,marvin,193.1.99.81,marvin,,,,Trainee testing server -SKYNET00016,optimus,193.1.99.99,,,,,Games server manager (replacing SKYNET00006 soon) -SKYNET00017,bumblebee,193.1.99.100,,,,,Game server - Minecraft \ No newline at end of file +Index,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description +SKYNET00001,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active) +SKYNET00002,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 +SKYNET00003,jarvis,193.1.99.73,jarvis,,,,,,VM Host +SKYNET00004,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 +SKYNET00005,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio +SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Games server +SKYNET00007,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" +SKYNET00008,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server +SKYNET00009,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail +SKYNET00010,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner +SKYNET00011,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host +SKYNET00012,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ) +SKYNET00013,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server +SKYNET00014,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with" +SKYNET00015,marvin,193.1.99.81,marvin,,,,,,Trainee testing server +SKYNET00016,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon) +SKYNET00017,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft +SKYNET00018,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver" From 62d28bab4e04aa2712a607c06d2de96b26f5ac96 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Sun, 2 Jun 2024 17:51:37 +0000 Subject: [PATCH 131/563] Add records for old compsoc server, gamesoc server and philosophy and debate server. --- config/dns.nix | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index 991f058..be272e7 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -47,7 +47,7 @@ value = "193.1.99.91"; server = true; } - { + { ### CompSoc Minecraft server record = "minecraft.compsoc.games"; r_type = "CNAME"; value = "bumblebee"; @@ -57,6 +57,36 @@ r_type = "SRV"; value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; } + { ### Old Compsoc Minecraft server + record = "minecraft-classic.compsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25520 minecraft-classic.compsoc.games.skynet.ie."; + } + { ### Game Society Minecraft server + record = "minecraft.gsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25521 minecraft.gsoc.games.skynet.ie."; + } + { ### Philosophy and Debate Minecraft server + record = "minecraft.phildeb.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25522 minecraft.phildeb.games.skynet.ie."; + } ]; }; } From 1fb2bba4ce70aa26e56ade991021f69dc74f7cf1 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Sun, 2 Jun 2024 17:56:41 +0000 Subject: [PATCH 132/563] REMOVED COMMENTS BECAUSE LINTER ERROR UGHH --- config/dns.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/dns.nix b/config/dns.nix index be272e7..1cdbe2d 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -47,7 +47,7 @@ value = "193.1.99.91"; server = true; } - { ### CompSoc Minecraft server + { record = "minecraft.compsoc.games"; r_type = "CNAME"; value = "bumblebee"; @@ -57,7 +57,7 @@ r_type = "SRV"; value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; } - { ### Old Compsoc Minecraft server + { record = "minecraft-classic.compsoc.games"; r_type = "CNAME"; value = "bumblebee"; @@ -67,7 +67,7 @@ r_type = "SRV"; value = "0 10 25520 minecraft-classic.compsoc.games.skynet.ie."; } - { ### Game Society Minecraft server + { record = "minecraft.gsoc.games"; r_type = "CNAME"; value = "bumblebee"; @@ -77,7 +77,7 @@ r_type = "SRV"; value = "0 10 25521 minecraft.gsoc.games.skynet.ie."; } - { ### Philosophy and Debate Minecraft server + { record = "minecraft.phildeb.games"; r_type = "CNAME"; value = "bumblebee"; From cbc5af9b53a14031b7f12313077d55a9b172c8d5 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 2 Jun 2024 21:27:27 +0100 Subject: [PATCH 133/563] feat: retiring Optimus and teh games server that was hosted on it. Now fully using Pterodactyl --- ITD_Firewall.csv | 2 +- applications/{ => _retired}/games.nix | 0 applications/{ => _retired}/games/minecraft.nix | 0 config/dns.nix | 2 +- flake.nix | 3 --- machines/{ => retired}/optimus.nix | 0 6 files changed, 2 insertions(+), 5 deletions(-) rename applications/{ => _retired}/games.nix (100%) rename applications/{ => _retired}/games/minecraft.nix (100%) rename machines/{ => retired}/optimus.nix (100%) diff --git a/ITD_Firewall.csv b/ITD_Firewall.csv index a6ac0b7..41a4dc6 100644 --- a/ITD_Firewall.csv +++ b/ITD_Firewall.csv @@ -4,7 +4,7 @@ SKYNET00002,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 SKYNET00003,jarvis,193.1.99.73,jarvis,,,,,,VM Host SKYNET00004,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 SKYNET00005,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio -SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Games server +SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server SKYNET00007,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" SKYNET00008,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server SKYNET00009,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail diff --git a/applications/games.nix b/applications/_retired/games.nix similarity index 100% rename from applications/games.nix rename to applications/_retired/games.nix diff --git a/applications/games/minecraft.nix b/applications/_retired/games/minecraft.nix similarity index 100% rename from applications/games/minecraft.nix rename to applications/_retired/games/minecraft.nix diff --git a/config/dns.nix b/config/dns.nix index 1cdbe2d..1851ee9 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -31,7 +31,7 @@ config = { skynet.records = [ { - record = "optimus-reborn"; + record = "optimus"; r_type = "A"; value = "193.1.99.90"; server = true; diff --git a/flake.nix b/flake.nix index 173639a..50b17f9 100644 --- a/flake.nix +++ b/flake.nix @@ -135,9 +135,6 @@ # icecast - ULFM galatea = import ./machines/galatea.nix; - # Game host - optimus = import ./machines/optimus.nix; - # LDAP host kitt = import ./machines/kitt.nix; diff --git a/machines/optimus.nix b/machines/retired/optimus.nix similarity index 100% rename from machines/optimus.nix rename to machines/retired/optimus.nix From 8d60c67722904a87813e8eddf2d3790abd599380 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 2 Jun 2024 21:29:06 +0100 Subject: [PATCH 134/563] doc: added a status col --- ITD_Firewall.csv | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ITD_Firewall.csv b/ITD_Firewall.csv index 41a4dc6..7978336 100644 --- a/ITD_Firewall.csv +++ b/ITD_Firewall.csv @@ -1,19 +1,19 @@ -Index,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description -SKYNET00001,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active) -SKYNET00002,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 -SKYNET00003,jarvis,193.1.99.73,jarvis,,,,,,VM Host -SKYNET00004,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 -SKYNET00005,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio -SKYNET00006,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server -SKYNET00007,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" -SKYNET00008,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server -SKYNET00009,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail -SKYNET00010,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner -SKYNET00011,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host -SKYNET00012,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ) -SKYNET00013,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server -SKYNET00014,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with" -SKYNET00015,marvin,193.1.99.81,marvin,,,,,,Trainee testing server -SKYNET00016,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon) -SKYNET00017,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft -SKYNET00018,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver" +Index,Status,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description +SKYNET00001,Active,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active) +SKYNET00002,Active,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 +SKYNET00003,Active,jarvis,193.1.99.73,jarvis,,,,,,VM Host +SKYNET00004,Active,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 +SKYNET00005,Active,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio +SKYNET00006,Retired,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server +SKYNET00007,Active,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" +SKYNET00008,Active,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server +SKYNET00009,Active,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail +SKYNET00010,Active,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner +SKYNET00011,Active,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host +SKYNET00012,Active,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ) +SKYNET00013,Active,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server +SKYNET00014,Active,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with" +SKYNET00015,Active,marvin,193.1.99.81,marvin,,,,,,Trainee testing server +SKYNET00016,Active,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon) +SKYNET00017,Active,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft +SKYNET00018,Active,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver" From 991758ef461319f000c5ebc29cedbf9b7269e6f5 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 3 Jun 2024 03:31:40 +0000 Subject: [PATCH 135/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e7aee8a..9013a7c 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1715527488, - "narHash": "sha256-Bib8TlcoDGSLTPKp75f9RqZZZpBuxH/bF8JULKwg5iA=", + "lastModified": 1717384007, + "narHash": "sha256-IeCdXn//JXE68biYc2tc47gUbjehOriE7iliRhMyk4o=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "ed4c46e81db5a7c412715d52003db7632e21a573", + "rev": "55b2e534d4ce6986edfdd4fb59a6302e9cd923ad", "type": "gitlab" }, "original": { From dbf7a4d5d13d85fe9c1609bc76af8b01e0f64cc5 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 3 Jun 2024 04:36:44 +0100 Subject: [PATCH 136/563] fix: didnt set the server cname properly --- config/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index 1851ee9..0dd6133 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -39,7 +39,7 @@ { record = "panel.games"; r_type = "CNAME"; - value = "optimus-reborn"; + value = "optimus"; } { record = "bumblebee"; From c4e3a41831a3cbd84dad977b1c7b93138f499f62 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 3 Jun 2024 04:17:55 +0000 Subject: [PATCH 137/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 9013a7c..a44cbda 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1717384007, - "narHash": "sha256-IeCdXn//JXE68biYc2tc47gUbjehOriE7iliRhMyk4o=", + "lastModified": 1717387764, + "narHash": "sha256-paKfG0eYMlCYFXTey0Bgza7R+z8lMqPnSFHOU5lmxyc=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "55b2e534d4ce6986edfdd4fb59a6302e9cd923ad", + "rev": "86bb566e5e5669a66bfd31de26327448b0db87ac", "type": "gitlab" }, "original": { From b2ecb14f6876ee1ff06d0a717cb439494889b40b Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 3 Jun 2024 17:25:15 +0000 Subject: [PATCH 138/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a44cbda..218fa6a 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1717387764, - "narHash": "sha256-paKfG0eYMlCYFXTey0Bgza7R+z8lMqPnSFHOU5lmxyc=", + "lastModified": 1717435434, + "narHash": "sha256-r02WUVXq+QojkBcvWl7kn3M42d9G5iCNtM3/j8hEmv4=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "86bb566e5e5669a66bfd31de26327448b0db87ac", + "rev": "15720a1f131efed9924482e58fceef04fcb1c1e6", "type": "gitlab" }, "original": { From a156d1ba1ec0b5b3ac95c8fab6528114d004e279 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 3 Jun 2024 20:03:49 +0100 Subject: [PATCH 139/563] fix: new cache key --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 50b17f9..397f721 100644 --- a/flake.nix +++ b/flake.nix @@ -82,7 +82,7 @@ nixConfig = { bash-prompt-suffix = "[Skynet Dev] "; extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; - extra-trusted-public-keys = "skynet-cache:OdfA4Or0JcHiHf05fsiIR4nZT2z2yDEtkoLqhntGAz4="; + extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo="; }; outputs = { From b7a5042538db24d3141f60a09f273ad0a6ea4c3e Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 3 Jun 2024 20:19:50 +0000 Subject: [PATCH 140/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 218fa6a..7393009 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1717435434, - "narHash": "sha256-r02WUVXq+QojkBcvWl7kn3M42d9G5iCNtM3/j8hEmv4=", + "lastModified": 1717445428, + "narHash": "sha256-KL5PlkkWvFtq2R1dxavvZOQzA2CI5hjpa/HJEIpla2Q=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "15720a1f131efed9924482e58fceef04fcb1c1e6", + "rev": "7c2d392e356f8a7e2a985b7c8abc0ced308001cb", "type": "gitlab" }, "original": { From 62fe4a2ba5f910e7aef926605c0cf407e323fab8 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 3 Jun 2024 22:42:04 +0000 Subject: [PATCH 141/563] [skip ci] Updated flake for skynet_discord_bot --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7393009..a330be9 100644 --- a/flake.lock +++ b/flake.lock @@ -865,11 +865,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1717445428, - "narHash": "sha256-KL5PlkkWvFtq2R1dxavvZOQzA2CI5hjpa/HJEIpla2Q=", + "lastModified": 1717453955, + "narHash": "sha256-axbeauP+9PP4qiwCiMvvGd6XTnjv12+QkZP3K2yFCeU=", "owner": "compsoc1%2Fskynet", "repo": "discord-bot", - "rev": "7c2d392e356f8a7e2a985b7c8abc0ced308001cb", + "rev": "48b52f3c0905af7341e45e2b950aba43af68c80e", "type": "gitlab" }, "original": { From 37bfebec20ac84b00e9474e6e056b7003c5cd61f Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 3 Jun 2024 23:04:52 +0000 Subject: [PATCH 142/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a330be9..8a0894f 100644 --- a/flake.lock +++ b/flake.lock @@ -887,11 +887,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1711629668, - "narHash": "sha256-ZLnOj4YczToeIZ5k+E2qyfAa430urUnHmGC23cmQtqo=", + "lastModified": 1717455454, + "narHash": "sha256-n3Q+1GU95sn4/TMErtaWuq9hKisYx9U3xBowFvbAG6g=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "c1b42a81320a7091e200e966354cf2c839c9f08e", + "rev": "7ca705cc0a19d5e684f45354b9f71325bdf3b4c4", "type": "gitlab" }, "original": { From 7d8833a4514204619d7fdcd76268aa011d7e673d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 5 Jun 2024 14:31:50 +0100 Subject: [PATCH 143/563] feat: results f testing exporters for DNS last night Relates to #70 --- applications/dns.nix | 10 +++++++++ applications/prometheus.nix | 41 +++++++++++++++++++++++++++---------- 2 files changed, 40 insertions(+), 11 deletions(-) diff --git a/applications/dns.nix b/applications/dns.nix index a3e8a8b..deec46d 100644 --- a/applications/dns.nix +++ b/applications/dns.nix @@ -342,6 +342,12 @@ in { }; config = lib.mkIf cfg.server.enable { + # logging + services.prometheus.exporters.bind = { + enable = true; + openFirewall = true; + }; + # services.skynet.backup.normal.backups = ["/etc/skynet/dns"]; # open the firewall for this @@ -386,6 +392,10 @@ in { # need to take a look at https://nixos.org/manual/nixos/unstable/#module-security-acme-config-dns extraConfig = '' include "/run/agenix/dns_dnskeys"; + + statistics-channels { + inet 127.0.0.1 port 8053 allow { 127.0.0.1; }; + }; ''; # piles of no valid RRSIG resolving 'com/DS/IN' errors diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 556a16e..d60dc83 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -7,6 +7,25 @@ with lib; let name = "prometheus"; cfg = config.services.skynet."${name}"; + + # dont have to worry about any external addresses for this + # create a list of either "ip@port" or "" + # the ""s then get filtered out by filter_empty + exporters = { + dns = ( + lib.attrsets.mapAttrsToList ( + key: value: + if value.config.services.skynet.dns.server.enable + then "${value.config.deployment.targetHost}:${toString value.config.services.prometheus.exporters.bind.port}" + else "" + ) + nodes + ); + node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString config.services.prometheus.exporters.node.port}") nodes; + }; + + # clears any invalid entries + filter_empty = inputs: (builtins.filter (value: value != "") inputs); in { imports = []; @@ -19,7 +38,7 @@ in { default = 9001; }; - other_nodes = mkOption { + external.node = mkOption { type = types.listOf types.str; default = []; description = '' @@ -27,24 +46,16 @@ in { ''; }; }; - - port_collecter = mkOption { - type = types.port; - default = 9002; - }; }; config = mkMerge [ { services.prometheus.exporters.node = { enable = true; + openFirewall = true; # most collectors are on by default see https://github.com/prometheus/node_exporter for more options enabledCollectors = ["systemd"]; - port = cfg.port_collecter; }; - - # make sure the port is open - networking.firewall.allowedTCPPorts = [cfg.port_collecter]; } (mkIf cfg.server.enable { services.prometheus = { @@ -55,7 +66,15 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = (lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString cfg.port_collecter}") nodes) ++ cfg.server.other_nodes; + targets = filter_empty (exporters.node ++ cfg.server.external.node); + } + ]; + } + { + job_name = "bind"; + static_configs = [ + { + targets = filter_empty exporters.dns; } ]; } From 5ba92dcbc136a182c5f7932dd2b456964737efc6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Jun 2024 18:45:09 +0100 Subject: [PATCH 144/563] fix: seems like some of teh dashboards want processes Closes #70 --- applications/prometheus.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index d60dc83..674d161 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -54,7 +54,7 @@ in { enable = true; openFirewall = true; # most collectors are on by default see https://github.com/prometheus/node_exporter for more options - enabledCollectors = ["systemd"]; + enabledCollectors = ["systemd" "processes"]; }; } (mkIf cfg.server.enable { From 8c7f2b545495d6d3bdb40a04247a9f986b65476c Mon Sep 17 00:00:00 2001 From: daragh downes Date: Thu, 6 Jun 2024 18:01:46 +0000 Subject: [PATCH 145/563] feat : make esy admin --- config/users.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/users.nix b/config/users.nix index 3f4fd28..eafa6ba 100644 --- a/config/users.nix +++ b/config/users.nix @@ -61,10 +61,10 @@ in { "evanc" "eoghanconlon73" "eliza" + "esy" ]; trainee = [ "milan" - "esy" "kronsy" ]; lifetime = []; From e94683c3d52a7b9ebb6208989198043891460f61 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Jun 2024 21:35:35 +0100 Subject: [PATCH 146/563] fmt: better formatting of the backup server file --- applications/restic.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/applications/restic.nix b/applications/restic.nix index df273e6..e410a5f 100644 --- a/applications/restic.nix +++ b/applications/restic.nix @@ -144,14 +144,15 @@ in { }; }; - config = + config = mkMerge [ { # these values are anabled for every client environment.systemPackages = with pkgs; [ restic ]; } - // mkIf cfg.server.enable { + + (mkIf cfg.server.enable { networking.firewall.allowedTCPPorts = [ cfg.server.port ]; @@ -171,8 +172,9 @@ in { appendOnly = cfg.server.appendOnly; privateRepos = true; }; - } - // mkIf enable_client { + }) + + (mkIf enable_client { # client stuff here # A list of all login accounts. To create the password hashes, use @@ -181,15 +183,17 @@ in { age.secrets.restic.file = ../secrets/backup/restic.age; - services.restic.backups = + services.restic.backups = mkMerge [ ownServers - // { + { # merge teh two configs together # backblaze = base // { # # backupos for each server are stored in a folder under their name # repository = "b2:NixOS-Main2:/${config.services.skynet.host.name}"; # #environmentFile = config.age.secrets.backblaze.path; # }; - }; - }; + } + ]; + }) + ]; } From ce820a5d3c96419044809c8b66d04c917f05a088 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Jun 2024 23:22:55 +0000 Subject: [PATCH 147/563] fix: this should fix up this job (hopefully) --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a70a1ad..4e56b1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,7 +48,8 @@ sync_repos: - chmod +x ./sync.sh - ./sync.sh rules: - - changes: + - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + changes: - sync/repos.csv .scripts_base: &scripts_base From 8c96241b67ce4acaf924d4654c7103a35fbdd085 Mon Sep 17 00:00:00 2001 From: runner_nix Date: Fri, 7 Jun 2024 17:59:13 +0000 Subject: [PATCH 148/563] [skip ci] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8a0894f..874f430 100644 --- a/flake.lock +++ b/flake.lock @@ -887,11 +887,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1717455454, - "narHash": "sha256-n3Q+1GU95sn4/TMErtaWuq9hKisYx9U3xBowFvbAG6g=", + "lastModified": 1717782746, + "narHash": "sha256-LZovqXjhDIUe/T+bU5wtwN1RbcPjkZK6yQNhPa9Nrwc=", "owner": "compsoc1%2Fskynet", "repo": "ldap%2Fbackend", - "rev": "7ca705cc0a19d5e684f45354b9f71325bdf3b4c4", + "rev": "5b94811276d70b00cc292081f623b6f52a710b84", "type": "gitlab" }, "original": { From 4b9a743e40b863a9127b5e6d43c0d0fbd43ff56e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 7 Jun 2024 19:11:08 +0100 Subject: [PATCH 149/563] admin: add eliza and esy as admins to teh secrets --- secrets/backup/restic.age | Bin 2320 -> 2320 bytes secrets/backup/restic_pw.age | 24 ++++++++--------- secrets/bitwarden/details.age | Bin 825 -> 825 bytes secrets/bitwarden/id.age | Bin 701 -> 701 bytes secrets/bitwarden/secret.age | 24 ++++++++--------- secrets/discord/ldap.age | 39 ++++++++++++++-------------- secrets/discord/token.age | Bin 805 -> 805 bytes secrets/dns_certs.secret.age | Bin 2374 -> 2374 bytes secrets/dns_dnskeys.conf.age | 31 +++++++++++----------- secrets/email/details.age | Bin 1089 -> 1089 bytes secrets/gitlab/db_pw.age | Bin 781 -> 781 bytes secrets/gitlab/ldap_pw.age | Bin 780 -> 780 bytes secrets/gitlab/pw.age | Bin 781 -> 781 bytes secrets/gitlab/runners/runner01.age | Bin 735 -> 735 bytes secrets/gitlab/runners/runner02.age | Bin 735 -> 735 bytes secrets/gitlab/secrets_db.age | Bin 781 -> 781 bytes secrets/gitlab/secrets_jws.age | Bin 2330 -> 2330 bytes secrets/gitlab/secrets_otp.age | Bin 780 -> 780 bytes secrets/gitlab/secrets_secret.age | Bin 780 -> 780 bytes secrets/grafana/pw.age | Bin 694 -> 694 bytes secrets/ldap/details.age | Bin 1307 -> 1307 bytes secrets/ldap/pw.age | Bin 1110 -> 1110 bytes secrets/nextcloud/pw.age | 24 ++++++++--------- secrets/secrets.nix | 2 ++ secrets/stream_ulfm.age | Bin 2864 -> 2864 bytes secrets/wolves/details.age | Bin 1131 -> 1131 bytes 26 files changed, 73 insertions(+), 71 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index ee33aa47ccfd2eb07eba6e7de681eaf1e058afef..191ec82ee821742d8d3cba3eb14ce01bfc9da5e7 100644 GIT binary patch literal 2320 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zL6H8U|c zEz^!NtuPNMsEBekck(U{HuOz)FOSeqHZbuE%gakNHVjM)OXi9Q4$F%QO-n9KaSY6H z$+xI9$w&^%%1VhWs0hic2+hnf@k%xG_YMim%|^G)B%mrPKV6~FKPw|A$FtHfB+=W; zInywpsvO@B&FCZq9C&%KQb!I$%M<)Gs3{P&?nC)F~vPM$ko^*Gb7tL zJ<>uu-Otyj)FLONJS!(X!YC~*-51?9Q@<2T<8p-(|MIkapTyjvl1K{^i}X^1EGiRAt8yZ9f`XkY5 zJJdoy$bc)@qq01=BG9zRFeo%DFsm%MGSSJ~HzTRi&&|mt-BLd*%eTtVKRnzeFcjTy zekD16`i=?#RplxAj=n}2Ub&(EIpqbVMOCg@!AYj6A>mnuPUeBW!R|Sw6&?XmmFZl? zWdX&3>5eXuRr$e*g~nk;mgU-!0R@=`QDNl){zZXFDHfH+;T3^V0T$@Cl^I1ESUM`C zgjhIcr~0O)nWTE;XQn%Pd0XZg6z8U=n`=9nq?Sg6RRl)(Ih%Mo2bXgt8D}J$8G4w9 z7)M5Am^vF9m4>*5W~X`>rxjFL6h~SnRV0-L6&aiP`A4GL77<+JXjZOJWftO`>{D4> zYEe*Snr~ieQe2vmkr^D69FUb3SYldQnVIPCT;}NSSC!3Gk(g#`TAZAi9F!CioD=4m zpHf^IWSMFanNyOLmu+m|9hvD{Wn5n6SLupwn@d<#aAvwfQe|OMn169dcyL*!tCMR; zxuI9MV{&+)rMpX7p+|5)QBiPYxVB}Eb7(S`t3_sdc|c@daB-<|nx(gSW{J70x0gpm zo|k8dTX1Daxp`zrZnn3#n_D@$ZKY9FPR8j9#bqgFnZ^~`DftEI0pY>krU9t|E@uAW ziIJ(9t{$$Q?iD3z=^>f^w__lJclh(@Ee1Cy%azye>F!aSpVAG7cfzi|C@r)o2O@F1%#(WnY$Pkl_dEkIR^xXhnriv2YG~=24tp|M7or7S>!lp zdnEd1mSp4>ghsf8rR3>{r6-z3x`ve%X6EH3J6bwrrTUr|>3d^ zr$kTZe6ut!eG{WB3+GDhjNr7ufI|1I>|n#(tSa-oJRhU*NW)03ilETIsI;IEFaMz6 zC>Otcv#O%dQu8bi#|qaf{mdkfG_Sl6r=ZfZER%F}zXcb%IORGj_y?q$SGg9YIeHhA zqy_jSC8Zk#r<9wy=O?9_r~2oWdzotc8E5;JI(ZaxxhDpd85UH9nim=sBzigKL}fb` z_p-`sXI5strAHQ{+ZO6-mX;i-P!w2F>6n+C5*C?R;*(pFmYkw* zR_+z-?_-!#l@@5E@0(pzVq}n;>6_`uhz$dS{q<7F$N9Yn!Gdxn(5gR~Bbv z8G3kThM8pqx)eGk`DA%=Ri-;-=lYww6a>4Pre)-(IeH}rrWE@Zgyu(thI;uF1sMe- zh3F@T1f*c(fYcmk*VJ?cBmKNIpQJRu%raN~Aj{ISqGJ8@B<(7XybvGHG`A4{%n#t}*Cexyd>0Rcl$4xM*K`+uZv%Y;OViRspQL>B zkhCa^vUCnqNUt)=FfufDDsstBH3@KyO3sQ(HZ%3g3rLAf^ff3gEHbz7jW8`U$q6*! z@(;>QG{~>0G|CT8k1VQ4D@aL=G){>!Nq2S5@wISGFUWAN@~zBrDfDpU($&>f(2j@- zG6~YJ$PWqjNcT^5s|t(^Pc7Cqa&^@94=}MPbx$h~FmX%IPIXJ>G7D?oz{#I+@rYQ4 zXI*|^RjyUW+nO)j0egZjYD8$-WNhk8vs@ImwW;r=-@-YUH;c@FX_4f=KacqlCr6{P zubq<69E;9LF4$_LEUPX$mcOjKrT^wvq3V6cDG$2-)jf6zTk&=_ E0M~{DB>(^b literal 2320 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t-0%QQ?Z z332sGD=^CR^LMu}GYK&>$uN#AFv;}y_A+zMOwM&FbImWzbma;OF3B&-E-Ug6&rC~6 z^eryWHuB9h&<^+VcQZCCDGjbDu+)xBPN^u!azwYyB%mrPKV3oFTi?|pq&%cBz@W6G zEG0C%B+b&o$T`q5D(|1oYO%GJ4C@Klcj;QjejBu~AEHDiBbT-WNaf>i3bPdc14XaAEFipuQ z%<(bJH;Cj4_sU8yFAjHeOf?S)@D7ct%FFgDNwm=S2@Fin3AIej4l+;4&h#kqNx}$8 zzmgn3eMbdO1er&e8@u_X86^2<7#5@377<+JXjZOZo*EvU5p0oD z<{R#&pX;AmYM7d2>Xq!2ogSE5oEhTi9Ta60YLs47o?gxs;gb|nmgDB^>su6PUY75X zQ($4}nj2PB7?vJnkeOfLk!5O9aY;Zx zUbeTFiKCZuNS=S1UqDrAW@NaTTUbO$pocG)VU6K&#npz^>?Z;O!AKmD)ToCFm&}PEUYY#OexGN zcg;q(&9lnUx6n}`x70Y_H@K|I)g?GJ+^i}qsU#=axwIrZ-_SKQsVvVY!@$JPtE4R7 zz$KC^IKVS7JuKO>GSKAU8X)P`@BM$|R+#z_rB9*ef$2EGN)8!_+OyG`SqzHjgBO z%z{9L)Q~*CEYA{Gmz1brZ*L#3iX!8j)PRVHQeXEfN7Eeril~T+tiTG7fbwE4uVg3F zAQLz3!o;f7q~xS@Ll;+*P^YReBUc~osLb35bJrl#+*0ktoHC4fGcL%{_byj(4Kpjs zbzQEqmGzE`$OVnkk` zU#fO)h(&m@yGM9MP>8=pUYKcBP)?)$P3gj$fEG|PU&2}Mma&@25!Z{8Rf>sfu<1wCawYbnMsa5QC>c!rjF$0q{w`^5C2raN!RD2wRjyptE4h1?mG9m&f9uYz zl1^8bZZUt>?733&`WrC$#sd`+Uvo>Zz4s>H2)HSDSaTo(W%?WwO_W zmF3r7`S?AlSup#+s{E78jCmPCt6x7pz|5+#DL!Y7f~(W%tLb*uPmgNMu(UgLA@WhC z+bR$CoZH3o7awYCpY!ZwM%B8{7N>%LdcXN;d^uFZJ$Twe-tQ9>uRXK4aB55RQmI-U E07$3-*Z=?k diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index 31474d1..494ddca 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA olslO4c+ZlJtfdnTvlUz/JToxVa4mKVMc2eImIb3R34 -xVWXF6S38aPtZnhVdJBFcNMLZbsXyfGOyP4xvVmcqwg --> ssh-ed25519 4PzZog zmdNvTqZx9XNzXITLXZrIrtlKm1+r3BCthr5z3JNMDo -hGyzFvvPf/OpNwBKml3R7nas8n3KihaMtZipnbB6Hx4 --> ssh-ed25519 5Nd93w FB2Q42uQesjMDfE0WpVAp/0bob/37k1BDBBH13ul5QM -tFrXKb372CcnEMaunjm9aJ6ZBEXLK/EvhAD0Lc5haqQ --> ssh-ed25519 q8eJgg yzncjdMSAILkSPzccY9uq4yULhbVi447IkC2mk+b5GY -YdEh5Fbr4U1Jwr2r7tNDorzrxyRVy5n5Cb9hhQG+TPs --> ssh-ed25519 3pl/Kw sZ0skpiwJWPoqGMIhIUonQkJ5Pa1i37X9OyJHVwRngs -FqHMytq+bYoQBI/BwQvmjR1hvInhltkcuV1H6mcolUY ---- 0MouBOwGiCtj1xzuEZNiu0v/1vsqrHX349hRrTADwZs -sÑÈå+7¾¸pëûÉÖõÀ`hâ*p¿¼Œ„B½N°îyb:4 TÛ°,ù"yæÚ«˜Î“@N€R]Ñжb uk/1ê߆jDn®È]À'Æz¶ ‡á¿éoG \ No newline at end of file +-> ssh-ed25519 V1pwNA qZ7CudBTDbC2IN/xxqKXGOY6NqHtm3Vmk1VInhjawAA +MPoBpMCNwXDWr2Kv4c0BFClkWfUl2n6JMyxhQ0XRRMc +-> ssh-ed25519 4PzZog AI4ny+mDIRaaJc2spa4gWBpjK5i8M3Feh8wL+sYXUnM +hRs3ZFUIC9TQzhLwI6FvZ213pqoa6aRRdhGmX793t5M +-> ssh-ed25519 5Nd93w GpuVJYN3AYLO2YMvkaDpxeqJtsUfpS5bmIGvnHMMLmo +0niSwyHjIcMHad21h026P3zbucg7h3w4DNrkdDNw2c4 +-> ssh-ed25519 q8eJgg dNylSaId05RAVPAm6NHTGmWks0NLH4GU5mIXgo7w6To +x5iyeOAWE/K+wMbyTkvnH29WDYeIBy4ItFk//jRU5Ak +-> ssh-ed25519 3pl/Kw XPioumuJdUvoP0radVfv24qxql3HxdKjWseK0Oy3KC4 +4WbwRgjTnmugQfelfcZaArsWbFtfHydojT6gblfID9Y +--- abaCteISdhpp4Q77f7FDW4f5LJuJa21GfZUeNwM5SFQ +:½×êÃ-lPJÜÌL²[f4°¶V·Ä{ø`\¡V¨~úgÆüip–G9¬øIgaQRÁønl^qMTã-š>Qè¬V˜„· 6Ü‘ œFùœªÇ=;0$y|‹ \ No newline at end of file diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 80c4e9e837e44ded274f589e8b3d101c2439bfe1..500ac6e96eacfccb14408863de1db3b89c0fecea 100644 GIT binary patch delta 736 zcmdnVwv%mwPJLLaXJ}}JSGHxbW4Wi3qfb#*xvyn%L8W`KUsiT#m0x~JaHLmgfTeMH zHkWCZslS(7gm6q4O+pj%Q=Gj+J#s88BQgq|bE1k3i@gmz6Z0auBFzeuvrP5N^bN{$O9JvM zQ{6({Li0mQOVbNW^>f@pO~Z-;wVhM_OH<1ypJf!U&o8WSGssOhEwwPn4@u8TOfM)8 za7`+AH}S17&#}xZ(hjo>NX$(P^h_`2N;gciEJ!kQ4@wJk&&ka3F0U%gD~-%H3O4YL zD9bA|E_I7C@O2Kd&@am8($&>f&`&WmOZ3Yu2{+CwHY+RAPWAV24@l2St~ARiDJ-`z zsR}WwFD2E%pEH*zlMX}n}ByZJ| zKQ}lmjn+)etDmBOs7%rB?ggvQ)1=%3O4qGF?x1k#;OUs@i$pY+T;E#s=}1P_*Q(RD zcPhRYG|g_5+c;-w#^M)0qt2Jx-}7#pgH!PFeX}#_67s z26-vLp2exzZvGWT+Wwvy@-*-> z@QBh546zK2O3%y-_HnZC4{@t-bqOryayRoa3=225C@@I%bt*Ft_A>NLEAS7_&j?9O ztIRNqGz=)O%<@amO0;m~($&>fNR24;c25oP@ia1ZHg``6jttB)DE2E&^~(<|GAr~? za}9K_H}cO7a&#%l=8CJXmzncv>(RXimzV|gMb51~dHdAiUbzA_uXE>Bojvmp&r{?} zuK#qkI9e^ROn{j-|Q2u|;IDvA?B$fw8M)x=CoHBbTn7LUD11 zZfc5=si~o*f=NJCRDQaGxus-=ZfWx7{caDH%_xm!U%M82i5bBL+0iE&z3VX~vS zQ?Qw~mw&DaSCMIQd2pmzc}Z4~LArT{cbdM3X_i-IUZ7v1fpbPkLAribd46${dA6^~ z#E;_Pj-g>Le&GR@hG|Z&eqoha#YN#>NtVfGk)>%amWd{b#$o!7so~mYX^zQU8AX-) zp+%+ThWVcE&f&h5IbKDMVSY(vrIFeCZc(n;l~ENX0UkNw=Ea_q;~B-n{R~rmO^XBb zLiNq^-Mk8N^L@PC-HV;dES$5m5~E6tT%A%2vh^#oKLp(eupJf!Uk210dN=Y+G^9xS)%Qeo9^a>3z z2{iG^NvrZoEG!O4^>EKO3U*6MEO9L6@^wj!^eiY1Gfu=K4e_Vv>DC@iihFgLZZ^!4>G@b!-hDfOz*HqG`5 zGKzAEN)Jwo@T$sk delta 611 zcmdnXx|el=PQ8JCa;Q;QdZE6Fk#}~KhrWMGgtmLOt8an6eq?S&cD_Mbs-;VjYoS-D zBUe#GWpxm%z|aY2-YTX2f zPl=mFv8ii0mv4}%n@^Zewp&h1nB_{ck;~B-nebd9uqSC!H z^7BfJ{nC8%jPfj!jFU4x@=PKNf;~(!oqWpDio=4<^urCf5)FI|TqAQlyds^-vs@D` zvdZ!;J$$45{ZdWx-LuToj4i98(vrf`sw{mcpJf!UHw!ZfG_fqu4=kxDEOiMtuJZB- z2rclgN;1r?Dh)|CE6cWUtkQQkb#n{l3Jmei4lVby%*?J#4)I7a&Tw;bbIvxdtaQq; z$Tsl|HZ)5r%8d#Rc6N2;($&>fu<-W^vIwb4N-T3pb}=^e*UrrJ^Dz%JNzL)}GAawO z)OU4?a>>s3^9~6OIZk y(6f{b=ID8^OO)7t>C3oSF)y2QC}&?>$gdsC8Z}!hAK99IRw@k1u&VdVoCyG)C(mjC diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index 654e6dd..3118fd5 100644 --- a/secrets/bitwarden/secret.age +++ b/secrets/bitwarden/secret.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA GVmv4CgKJ4b8Hv52C+1f/g58CbBLacpZ1CuyMrH+P3c -2JJ0TfpA4V+ZjbcbRxVN/NKPTm/KtKQ/A5fE33n0jAU --> ssh-ed25519 4PzZog 8ZoG98iY1oUChmdWuRzxwAY0Lk88FVwMH6M5+HctGjg -TZ6bTswrAXji/YEaqUcZpxcqZnijvZBa3nq/rDorHkc --> ssh-ed25519 5Nd93w 1QLznyfI5HuZiFOKlDJW/tw0tRiz/VADYJTfQVxzrRg -2n5f2UMzG7BFNV7zyPw4lleQdQJsRRG+0lcbuTvP1Pg --> ssh-ed25519 q8eJgg 1ihAcMOK6p+chq0ivA0JY5QJrjhkGc9b1AxzWHFa3Xc -nfC3dXD6J4S18qjUO91hSNxOGnukFVFykq8HqntmKv8 --> ssh-ed25519 IzAMqA wBM3jR8cmXa6yvNi1wTsdBX6qotosuBRu1rKYLJ/FCk -MUtMJjn+8Fbx9CjpUaciJPd8NOXxsJHGT/x60OF6O1U ---- d0tAB4cQva5jGPj8G8v5GrSFu0WfmjSYU+BmvDZsaLU -wÀ’'”Dzޞšjǵ‘«Ø$d-–µÊ¢¯…ÓC󣘽5îÝŸWª, íFjÓê¬Yî9çÂ[[´8à ¾ \ No newline at end of file +-> ssh-ed25519 V1pwNA ug+N7c1pGJIg4FrB9FCkZRAim7+JZstHdzH9suIMvAo +Yc32pfDF7SK3oUK3MtN/1m/CeIVyL1FTXgTa1rwvLyc +-> ssh-ed25519 4PzZog lrb7BCp/RvMFUv/0w0fpUjZTjKOyxH6WI9LGvWhFdHc +Aco+AOcJO3XvutxhdE1MTArs/8uUewi87Hyq8CKb39Q +-> ssh-ed25519 5Nd93w h2tpZjb9NR6ZiRi8/QEIhNRHTDvg7sPdJBBxknLc6Us +Di3LCjAmYQEmUskQEZEsj+wZE2DJFjVOVjeZ5Dr0bs8 +-> ssh-ed25519 q8eJgg mMAWWPyVN4H3m+yNB2EQCpZ6R1yT1JcAcYlgC1fIC30 +2mi6FGPrpWES3kd4fpb/7ky/0SrN7Ra8Yaj/htLpYi4 +-> ssh-ed25519 IzAMqA Gz8ZYcpsuJ1rzsCouE058CZd1+D8SftNZUKOzMJWOC8 +B7F+k0n5a7oR6kJZDFRBbYXu8PBHUOyCgqP6bhpWiCc +--- ALFWZf/GBndskjX2wQIkQrt+CfM9/Cfng/IXZ5QsN3g +Ká?ìû§MF¥Z/vm:4 °‰ß«#Ù™ՎÍ~:ižs8 ý2@ãµ7Œ.¿/Àf‹½*¤à{ð \ No newline at end of file diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index f036de1..236a11c 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,20 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA f6xGNtufcGjWlCNkhlF1YMNhwMIjpW0ojqD7fDhPjBE -fCVybFD61VIpm20zeVvKCsOclGhzN7RwRViw6EeWY8o --> ssh-ed25519 4PzZog nHWP3E5ZNvSwTjeNWL5qqmPsnXBWUEs/e7trIQuT2CI -n9zztxz/XTIY5mPLSkFabYfsGugSrP7bdrXzf993MTo --> ssh-ed25519 5Nd93w 1Nxqu7Lgv+KBNSoWMem3dBou4xrafQcE4XFlGCgwpCk -vZe2WYM+FfrNXog4iEKAwlAQsAuDEp2tdl/WzhRaju0 --> ssh-ed25519 q8eJgg ywDORriWBqKl15CDZccFC0EbX8StgGYP3nbkOwKDbTU -ULGvROpIUv8GG/WdRIxpfovjl/08knlgQxpipUJe5vk --> ssh-ed25519 IzAMqA RgipLXB0jBR4ghCrXXMx9/Pu03E4gBYow4gWYDPzHCc -gVAHf9H0fZrPL/8+NWx5Jlr/7UrvQdpLSGXEMiNdmrQ --> ssh-ed25519 uZzB3g UbeXy7a4ZkdEjIIBCLD/zNKmlY2ooTO0CbGl1Y9lJRg -aajwx+NrY7iwOkT9hkk9ocdUlNm1f4epqXNosPxJpr0 --> ssh-ed25519 Hb0ipQ 8sdgjex0JqgckMibuS1jdiJgkjvWGO8tUvlpWoYmxiM -CoUeJ+vEbBit9JZhvyz0dHX5IgNywGE4XfeCtVV94GI --> ssh-ed25519 IzAMqA 41gq5+Itn20lMFlS7AnJ5JLl6OEbJ9Q32M/1TUDl0is -PFjQ3Gb4LajOxSjJgp6s2dkZrDFinniDGL8hXtlomqE ---- vxbU9/Jgdf0fkUD3hrdHUgPV3ipn9MazV54zlh4s4Yc -+I¾d®¤†/ìff£È›1˜/xOä®ã=÷"<›( £O‡ŸÇfsrh+=Eâ{Ø=è ² -šÙïÝîCõ&ØQûës¹‹ÒùÙüVùu}4Åéìä4¿U‰ëÙ½USj%ËiƒHXÚšõÈÌã7ÂF«Ù݆¦º4ý>ѨføÕ0ŠãÇƶ)ìDXÊ)À“Ï—‡°$2YXå×Ù®šÿ£%¸sÛ \ No newline at end of file +-> ssh-ed25519 V1pwNA gCv+qymhOvrz4Y3m5cjOETv6DKoJpA74Uy1ARoBtUHQ +xRJ7PaS545rmlt2mFjcywHsXPnihD+MQF+1vbi/DX5U +-> ssh-ed25519 4PzZog l+6I+0bRe1SEt58W0vY0Dw1N2ChFqhK8bHxjQdKdvgQ +7IcPIy6EN4CybAZTVFbtEijjAmNlQ1BLPwCazm5kv2o +-> ssh-ed25519 5Nd93w A0ZXv5Mxtz3xqRM7YRqBjarPn2LhA1Y+n2EaAIKkJjc +DtmQLk48GhWcTsV9d+mRL0Bhbky83TGH53b8BMg6OlI +-> ssh-ed25519 q8eJgg 0fbckI9LuqibGrGNbHO70Oi0N9Uw1+FkNBjf/xy9ilA ++CbuSytnkS4IupKMATafrCUXYEnxDdmBomtTMeUtGP4 +-> ssh-ed25519 IzAMqA +/WbGfhARVDm319TR0qHLHI6hiEtkhdIsL2Sh8s6ckk +Qq47gjD6jHbd6v17hjVY2VF2N57CQDQTM+bFW0bBaaE +-> ssh-ed25519 uZzB3g RzTSqxOiFyNmhCBmv9scMZh9SIQNUBzYCjAx0UrjWCk +Ut52LPdRClX4VyVtPfMteYIL0nnbgQupAzOtiP+S8RY +-> ssh-ed25519 Hb0ipQ /kb1PQTrQgLZgIuW4+QtZsbSSDbrYI3Kv2QSBYGtv2U +HoRoUilEz0cIZbohYK1J//l1Ujc3MyGzz2XJvc+jsMs +-> ssh-ed25519 IzAMqA Li8UwQoWuxMCiXsj0IoqI1CWKIo8DP6B9Zruy242uAw +zUhpTd+uPWBvIyMoxIZbAMmP1sRi0yaoeLCfLy7ibpo +--- LPUW5Nd9pAyWqP52DXjB6UIyih9WsLZHNCDAEe08DT8 +«¨Èïsz·lŽéq +$‡|#þ,òkÃGÞ[ÚØÀbYOô +H˜F!û`z^©pÙs»¶´j`îW¶gØÎabæ}=yÚ><ñä¾Ètv±#‡~pÎv<ºåâh¢"¾‹MºÚ’ºkõEáR€d¢²‰O|e'=9”\ÙaJÓ!P;féÆá„>þ‚/z³ZXˆ¡Ê8(K:ù¯Ý-"ïŽrÔÞiU¡ÇL—V(l3{Bû#Ž¡ \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 4e083cafce5c9139a4f5e427c3fa7c8cbbd3812a..ac09624f8447e7b68a81f7019ad5ab5174f61c2b 100644 GIT binary patch delta 715 zcmZ3=wv=sxPQ6c|pIeq$s9#w~YLH==p@DOhMY>16L6u>WpSF=jMP^Wukx4{Ud5BX; zHdjVKWrlf~v$mg0RFYAmpRd20kAZioYm`xPSx%X&b6P;4n@_4=Xo#n)FPE;JLUD11 zZfc5=si~o*f=NJCRDQZbSW!t?PN6|cQF%~dfs?OSky~bdu#u%%eo9znsHJI9s+)dD zwv&rXR;p7rmr-G9qMw1Am!C^gMw+*qk*QO%cCtyKU$%2uShAC0aZqG&Nmf8+wqt4N z#E;_P1!>0F$w39>hEYB#r8)kdCPszY8A;AA{$}2$232NenWg#xZU*{!J{9R)Mt&w0 zVMdmzxt@iAX{NsJPI;yVQQ_J7QAIu_0iNmlX=avzE|rePg-*qj;~B-nbHl>(D@+2s zy)E*+N}LnRoekXFDt-JS-2>e#vdgstqRLV$lS;!1N?k&^Ts;f4lQVr%j04Lm0wWSl zD)LH=vm+}@6Wv@35-t6sN`iBe!;D=Fjl4rApJkM&H%TgrD9K4N3N|kHGE8+1ElVpi z^vE*}Dz`9oGt(|NG%3pnODZ;Ub9CiOuL!M5kFYfHNy-S%3-wQ~$_$7|^zyg#uS~Wy zN;XOhEXwoO4%QF$a`fcV)zwwdPfs`YcXoC4v-EOI%y3QejVej>cenJx198Nnbd2-|b`@C)1~85B6538wDjD z5OG`WnDVH2-A_K&z0VdX3FW7iDcr(>u+dJ1up&<1l&c%k;13G~Onld*+geyWGRPojle zx}&yJx|d@)S4K!^h_Q*0k-m>{l2N9iw@HY8acG%~c}`|%vcG9*WL0=}PN;!blz&P7 z#E;_PE}_N-sfPL4ksgjN`TBWPW~P}&PA--%Dfup?mMJbJiN&U-!BL5p0dB=ymY$YL z$&UKzp{W(FX1>1Z8KrK)mVSk%$wd_r28r1g#)cVgNfxfA-eHcD;~B-noytu^^@|J2 zD@}YWGF&24JiQIV!n6F!E%kFuA|w4gjM9yh!@^SwgM$sYLW)f)vrRJ$3iB#MQ(ZHi zLL);1wf$X+ii>?hvMW6-!Xm=;Q-XuTT}mS-pJkM&&&)_P&=2x5sxovfEp#<=4=M0A z3C{?Q3@%9Van<&7&bCM~@-i$63-;tP@iR9_kIMB)E;Vv>PcjTIDM-vo^hpgY4o=O^ z^>uX&i!?J2a7(VrEh*;G)zwwVD$O+VH7rkdEwc=D_A&OziOllx%1d>2cXvwkDDq57 zH!(`BkMztg^)t`r%96L;ne4k`-_Q6%nkMp5pTwl)D>dEM%ad=}oVAx9nAjL=O!Mrb=I|xfbgh-O3SynY7WpXF=(;0*nR_qS zHGRf~2=B)$t`svYZLVwY=2>C2s>F76)6czEPCDotzLY7k`lwLcvEF*Ad+|Q@<2T<8lSFU|$2*sBo_+&vI?wL?^@KVAtf- zGP8)R(lqUC|HQni5M%#v1MNx|qhzjfH zk1%%42=wKus)($zC<_ZJF;DUfaxp5=uPSjZ_R>!@%#Dal4bLm^Fw`zK^hrqyDlbR3 z&95ZKPv21?AS}PYDMMd7$=AuzIW^SWJJK=BOgl5&H95UF(WEjg$;%@#&E4C(JSU&4 zs4%ReBsi(Ou*$>BvB=UZ(#WD9IKZ?d-^jHhGc__hDbhb8Gt}MHKiL=Ewlbqg14~DR zBIEE0w&kA$@ zkO<$L(3C3YY(oQmms}5XOBbh!i(FmJlX44PD~v0BbMgy|Q!K*s0xZz|<`PyFoSClR8*Z3k8DW|e>K9^S78<1O z6`AFmjKe z9$r|OZ|a(zloXzmYg%Y-V1SVWN~5ZrjMEiT^oxVs%e)MeQ=KZZf^&=`jeXtCO$=Of zgHkR1%{+~=v_tbUJoWvG0u8tVl8eI9qC7)WJ-iIE{e4X{l8bW9gQ8qAd@V|ge8SRl zf-Qn`Bh5W4QbW=GR#_HonN+Ue<(L>$;_8%<7Z4KWTJ9EU78a4@mZP7ZTH=!&P+;J% z?_`ve<>3-mW#G$|mu8yhm7b_y6;u)#Se}{_5)tN7Q0VO&73`c_scoK;>t*+R%QAg(+_aO8D~()&qaqSr-Ghpp^ea8{i!;;x3^8(mN0LEi zL7;+{p<8%GhL=HmCacNPiPkxl8hnZK1mw|V#cWADYeqws1Nph)?r7L2Wx`ahWx>*=y>0^{!!G$hPxsD21i9U%&9z~{^#+gM< z7NzFqVHu?suB9$M9!9~Lfkin6?g8%3p{3zf&L&(*eg!V(Wu*m{5y9C8-XT>)R{fr03L3w1S1OAb`XC{6Y)iAvG0Dl&7bFe@?32z5+O z4fn_mF3KqkaI*BuN(xM^(AQ3j2zTWw3SGmr{*}jrlu<-2YF?ArTCWkgoh+&`x=#7B$v2kMjE)5SZ0^`1?pGign1h{ zyCk`nm3wl9h9xucFG_%!uH~&~&b( z65pt>#EKxVph`>Ew9K@m6hF^$W3Q@`FpGdpvjF#!?A(-M*Th^igFr4_U0sF3(2&3Y zS94bbv!a|ZOQY~yU#CdV^s+4H!laaf3XiO$>>{5aNA0Tc3JWgz9kR`{KP!CtqS_f1 zeOq~MP0rpeAM5X%EOnRv{3Fa{YWntxlXTB5&UsN(CDL@D`+FMyBCXd}b9%y5Pn17i z6tv^(y5|d4zsqN!p$!mHka(lUbfAuv-#G<4QbL_wW_v;ScvC* z?pgZjf8x@es#9YkFF604$tqgTr)4F5^(52((;UWAr_cGlDv{xo|22*L^lkCCZf=}o z{p9icz4bK=Oe)oL5AEQ5HYfR@k+iAl6Lu5 KzVY9g@g4wN@U3(+H9)t`B%mrPKV6|J$gIdapxCl3xy)HV zFWa!N(j&9LFw;`oEIY|H-6`28u+YWJ(>zr_Ba|z}+{7Zp%`@M?)w|rgDAmg~#WgI^ z&EHbnt)eP1uOzjiGOw^K%cC?o$`Rc*Q@<2T<8p;y%dAj+lR`gZSIc69q=-z@s(cTF zyo%DQWcSE`2%qx8)G9x(a^n!sjAX9-h{Vh!r)=+(tjt1}((HVF_u_ExY&TP9OCvYG zK+lR|?KHo@K-T~R?R0e83N2E-($f|4ot;Z7qXIH5OiPlqLn|VDOVYe5Ow28Vd|U%c z923($EIqOVjYIQN%FDSTUH!7O153lJD$>22oLwW5Q?s4ilZ^~Q0zHlN1GPiFLp=<_ zEG#k%y#mo~(|1oYO%GHkFEeoQ&rNqT@bb@d^ejxzatqeat?(@<&o7J6&b0`NEC{d2 z$;$Jy%n0NPvdA!sstR=~k1z@>2@WX;Hq-VmFEI1WF!PG^HuUv$@-j89DECcrc1lLK z&95ZKPv23&v9QW0IlU~yEip39-?v=9C?(L$smwLRIU^_CJuu48D6q`i+0xidJ13tj zJUgPwH?3UX(<{p-B0WDPB{Is~L_1SoyVBQ8J3OK?+b!5b+a)_H$Q2_b%ZwroEFBf1 z{5|r`l8a2rDnqi<1B$(h9iy~;JaZGXg0myS0*!O490R;_f`iSXay_{WiX9_ElMITy zLIeD=4N}ufDzl57Of5MPjv@5dBo$~@b4P89+T|LqL77<+JXjZOZSdyF>rtR$< zknC7i?pb8$QtEEvnxATvAK({KSQ=uUTkK?P;E@-ZlU2;+;}ltG8WiZ`;p>^~9}=1z z8fB*KTi_F!l9v{d6kJ(hlAY}5Tj5)j?VXKon@d<#aAvwfVq%d~X=-ASK~cJYMu59# zxl3wNexXxZU|EQMN_J3Lnn7{7cdm(FPIx(2L4|8ZxR{!XHiMAnW3}0OJJ_PS-HDYSXxk2URJ)jerQ^f zOJz`@VQ`j#iE}8Ixo=)lVqt1xwq<2@xlekAvA?HrSZbi5t7lZck+y|Faduc#REcY5 zuzNnbZJt$*zJ-noj#Zg{RY?{R{`!uVo{5>RrfKOFA)%HPer3M?rs?`sW z&hD;U6%|RjIYy>=0q(_y*)D$im5!1Ar5Q$MepMM2`sNw_Wk#m@7Wzrf7RkQows|BO zWEKP}__PJ(-@9DFvBc2H z%P8DCDc!3qwbZAgEW;o+gijv?BXJ{G|N z5dl?(#r|H2PUR65A%=dTrcpV`!C8p`fr;UjDLIi`iOH${7RKdC7WsY=&ZXgz7G@>> z$wr}t<&nM~UICVs`ssnm`oUolMHLq4wuQQyr6mU{B$*c(c;=dBMJ6VO`bL_Xgyd!y zX_x6+2o;mg|RS8+s(V zmsYw5ry6H@R#_ywrsQDQ7U`B);he6JT$Y*{W~rZR=57%h74Dvs@9tk(Y@Ak-80iz@ z;bGusl$jKgVPNcBm>bIF=NS-K6qcEumLBYxZeW;ZnNt<%;gOmfnrV?1l^K+ila%G` zlwy(YZi!L9rRF%hrlu=o=D9hWxkRL<`5T!hnVR^U8)ODKX82kZRz-%nMHYI67*%+> zxTF;qh9`4*nfMkNcpHa!=9J||n&y;71^8GdMS6Qg80P337G(!Hdsn0zq`OB|L}BDN zi?S$7=Rk!Dk8F>s6wf3N?*i?@vg`nN)AG=CZ$~r3@@!}SkgCkm$fT%5mwaP4M^7%_ zzzmD@vNCVSsKkttvcf{A%&Nk$uu}b^yo##4s*I@2;tbCsx5P5fjAAZbU0sC$FUS0J zliZ*}ud-xsBk#hjjPMHI#L_ay;*ux>Bj+$z&+vRh?d0?@Ur(+pPmgHW&A+L1Bxli7 zx8CnZRbq17_sc|kD8HTW#5Vi+_RpIRy_{I^_QzwV0^9aNBaT~2A1}3E`|0;FjMwL~ zYpMLxWy}&G&5S z@#SNl6ROl|r!m8}`t5(-)_Fe5e;v%)Y{YC+@VWlr^b}Fn4Jl%=6KeM{oh+Ysv%d9F J@YzM(iU6=+9EAV? diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 54ede46..c264c36 100644 --- a/secrets/dns_dnskeys.conf.age +++ b/secrets/dns_dnskeys.conf.age @@ -1,17 +1,16 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA omE94iB1hTPkde6EfVej2cCtb8tCAczYOeHa9ZibcC8 -85+fPpShqO4OmETJ72eQlJmueOcof9nWOMW9B4Kd+Gw --> ssh-ed25519 4PzZog gAreCKVlc+bRbbwbg706yWOeMJtbQNxNm5ZO35tETjg -XYn9InewtIZgp0hu/Z+HgU0qQLWuDtk9YH2rTG8Dy7E --> ssh-ed25519 5Nd93w 8+RDdkA6k+L0B1FaajfF7gNKAVWi+jSOEu4qGYmrvTA -453wvNGH3ghMtQ5s69U2saSNVBxHya4h6AK73l7u7Mc --> ssh-ed25519 q8eJgg igT5/6JbBdC5SNSSmB5c/Fe/hEbkJM7shzTa40hmKm8 -uWiet2aX+Jvhm64xEBajbvWODK2s974Qx6wGBDuTP80 --> ssh-ed25519 NtlN/A 1c+c70Cl+2NxacvNdAQSV0APTtH99HN5iRTgN36vyV4 -rPhvangDj9jL/SFW/3ztNdXpQYQxKBQUB2uTbuS3bRY --> ssh-ed25519 v2Y09A H0G9oRW2GOP3j8zqHSbFi+N0TaBGhMa432y1xiojdkg -5C8EzqYSUvJxn4ePw4XTIsWOuVEZCCj3e0Z5PvIwTPY ---- 4H+V7sfTROtlJ+eKrXYaKnCm7cSmnQjj39cQdY39PWI -Â.Jo<¾]W„ñ}HIß*4ݸžgïb¹{ETÑE#5bŸ÷z!?ÇoM&Lœ'ƒeó‡·´õϵb­° -­B‡6Néòcê¼”/Ù-æä9Ú¾Šõã`. ssh-ed25519 V1pwNA /aUAZW9tSsBQ8xRS/yJ+Je69j5sl8iScrzqOkywoiX4 +wmMAZavRVgBA+e1Uw7ACZkrkRC22xI7H/90K8ZeL/8w +-> ssh-ed25519 4PzZog fDgP+2ChRIH0ylChyRumpvYjFn/rM+NPxrKbNYbP5zE +iU5bZmafl+Zt8Uw0+3DmQSi+4YJVGXf88W39+mOzkmg +-> ssh-ed25519 5Nd93w 1a4QFM4DR6iTKpoIBf0zu5LVELOJrkCjqmdz9ksVP1c +U3dOhocNgCs7mwAIIIr1GdwXwzx9lzg4ygKdDoM/YHQ +-> ssh-ed25519 q8eJgg 1pSJU3CrMP7VO/nLZepMDCOoJWu+rs+lGs2n6cHuMTo +caC79crN5hoIZ8CKg8oPm2HB/swgbGRl7GWV50ZGxiQ +-> ssh-ed25519 NtlN/A PGi4H1QF9TD7QmeOdTwf8Xlvgs6+LoDpaQRjNCthiTI +VWc6rmqNT8U/y00x7suwi/hAuy+M4WGKpvraYmY0sfQ +-> ssh-ed25519 v2Y09A TJ1t55HLWxKCc6UDiZHZAl0rJyCutEeB6KP+a0/CyTk +iV6/HA6q80mPnqDvAxfiszRIOWErjhBAKqAyWQFYYJ0 +--- Y0yrlECqXY/j3N0Z0ebhSlPCdXbCMreeWyLcpipi2L4 +Yûuf¯â ÖÑ'C¢M$·4Ä;–BL|xr>jpdtyjpfp2DVSxBCXWpQ#^j#-p;rhb`Q zD3^yzVa$%%?a)gnwxl55>ak{fhPEL`tMOnCcR7i43ph<;sntpNq z#E;_Psg|aGQLd)xA$cjmkzs~uuE_?8g&u)nk&)qPRpthsB?V4}F3DkmNfE_d#@_jb z#g+Mq6^@1h6_zFC1p$^Jp2lwJK2g4=YVRoNM?L4Ns@;~B-n11vmKLyJ>P zb3z=WjIu0C!iv(&$|78IODnX)eT$5$EGs;`4P7IR(<>~vd@@a4y|ul=bDYY;0|SHo z%0vCq4MU84Tug%tz4AN~LyWVNT_e&hauc&BpJf!U_prz`%rSE+aq;vmFDVO3vot8p zO7bx(EeXu7N(u5aH!Tbg%PcVVF$;I)a<_;w)wguc$tiX-HLlEeDNRnTNb^n#iA;^k zN-qvEElf`hbu#k~@=wf0kAc#tDktM~1*5Do-;4l1mr^H-N(*OnVABep0!z!%ytJb9>`Y6i0w3ofBX0}WsNe#3|B%Rh zPvfAFfOI#PNObEwk_<8n0u}T8^;5h(3(L$> zO>+}X3``4)s~ov9{n9fF94*q4{le1%gDnHn&HVGVE7J`^lu6jtgO3=3Z!)FH_9Up|P*n|QJO@^`ih%UB0q<^ukj919a&)yu)| zPUZVrGX>|L@%beEZb$o>bneQ%^+h(>$Ju^=O0QHf;hNL|N|OWr hRbN=g_+2z8U>|pB*|Wpu^LxJSXSgXoduzg}G5|2HSOx$9 delta 984 zcmX@eagbwzPJOPUSD>p~sX>8JUPWS7XoiWixm%HUUS4I0t6NxNdWcz3iF2`cp-Yva z1y`blX@PrrhEcGwX_mz#OGp+RDnaj=t{fvj%8U3`-D z-Mu}Nt8z`SvW##sE)H@G zPK>nhO7t-?O|~d-vvkbWHxJOZG|3F*3eL?j4lfIe(l0Lx^*2o`%rh`b_R33jPRq)R zGEMU;vP>~f2}voebWTY}kAc#tDktM~g{1JD;?f{)!*MNF+ZKLE;52Iis zCyP>FBO@ahv%ElO)1dTn6Rx7rK*QpQq}0UJjKEyORAYUwupo=%z(QA}jO_BiYk%|EG#_Ib5iq4(~Jw#^79RgE4>1f zO;g<~e3Qamf&;mVl1!7!LMno@JoDVsy@H|&jg8BkJrj+LeX>*CJd%8zD~*bcGom7b zt31IWXHei1nrfEfmJ?uEZsZk^XKL)5Z&nfEJsANY2cGpRb*jlS>SG}pH!Zy9j5J_=3HW&k!R+YrXT9arK_u}kmXohQc~#= z65*AV91$56w~d?_yA3loVwi$z^J_P`CHwzZ`ATqiv}+ zhgS=|3;y1_H1gQuAaCa*PdYssZKPkmH%u-0y6~QalF*(fO{Wr1b=p5=2~_)f<@=<7 zx0fe$Hf)(L{oX>vc~-f-u-{>xmVk-d!lmA%vDBzdT;X(L*8Oj7vC-j|4;C#tc(}%H hcl+hl!QP@hO}&$QPHo<-Dx|ww%~z@P!v4~4RRE?%SA_ro diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index c175d33aa6ab3967818788acd08d3f19e0faa607..772418cf67c6e6992537a39a900e4b9adf7e6f5d 100644 GIT binary patch delta 692 zcmeBW>t&muQ}0`tlO60DZf<5~TIOL9=IEE_;p7pLm6NQW?~|66oK==#;gesSk{ccr z$W?BltzG7%9q5v1n(P`C8tz(^rJoa?mz_}+l(aTS5|7N?GheZU|tef?pBx^oLcH@7s^a;6 zZ(vEHp@*rLOJG*Mxm!S9fqrm~n~{N!XiM6EzSKsL-W1d z!!o_i@+&I6^YgRv-3zk0baizVa#DPq-6Eoj%7T(Y%99<_eXCM4v$M0!+>QKAybLTV z!is$B3p312bN!-1xhyB#i<=qT!Z_*H(wx#NU$yVOr7er&xBbab-8(6L-tW1yxYcK$ z&^h!+ss7=uLjtGsehO(_U*jz}bLp;39sX^`4LzHJtu1}mrit#}_2Pq{Z6J%Swv4A- zL~ZP}yBVh(&C~AW?@=q&mXvFJymIa>t&muQ(xqrZd7LAYERn>t zpHdu{Xi<^P<*6O%<`Q)Kl9O&R z@uPTna!QV&e`-=-u33J$fp2+gxpq>TWoda(Rfu_3rnZNRcAkl4MnH~Ng_{YNVMuUj zdU#%rQ+h>lRY*prb6|OvYmu3YQHh61iod6CSX820UO~1`xS7S|ct-K?;#AK97xUt( zj3h&o;=s(T%8JU;OiLqoznn5Ji;9r23g2>{sC4tFAj3eew7m2Jf3JXyoFK!rqRPCq zh(tG|oB*#RqtZ$<$DFXVNbfSw-~dmTNaMiCXBoxoLn^Z@9P|A03UbTR^D4ZJ{W87G ze50z zLW3<$4GmMP(hL1Vd_sJ=baizVA}d3UjSMWzd@Ay?{3}z8T{4WbJ^Ul1N`oCEDsroG zlY&d?-4b&XQ`3ulxn44GU0~gvb+jS=!%D_hVeu?6t`iy7sf;olr+=n4=`dI(1mg3 zJ;=b9xok(5rli!r?yqv2{BGnIUX{4GH9=&tgJ{F7iQ1EDXK3gpXI}ny)%MD@HOFUN gzuf<(=(KO=rpF38Y4LY&$4>cGwE3&mi6^S90Oia8jsO4v diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index 48c93b40c84f19eebd892b80f509d05cf3a2d250..b35242d18bde38f93a18acd998232a1d57e22029 100644 GIT binary patch delta 691 zcmeBS>tUOqQ*V)DR2kwP=I8FIt!)@!Y^oh)>0DXj?B!_Sm89(+lI|lpF4y&82InP+Xj$ zo0?)|YHDbyU=mOjm7lIqX>4AkpO_fzS>|ivS7l-7;pQG>VBsH@V;P!Jl;v6MTIuE# zRb-G=79Q%#RpOs$5SZ&0USJuV8Q~jXl;mNY=jHE~7m=Il8)=!GoEeZ(6yRGK9#Eb> z@uPUSNtAzRnORt5nQ4@fc0^XWPg0aYP>4}xL1mS{L8xg)XldTRRQct-JXXZL*5+(M<>IyilAV}Jd0%S&J97EE)tMm(tBP@+AbG*vJOoI!G zA`L^F%R*A~O@sXnaze|wbaizV(%d{ls(g#R+*1P0N-T1GDzkDtqB8T6k^@~#sw(nJ zU6b_d9bM8(3^PhRx!x_CT3w#;*#7rNrqrFU&95?egskDZc1c$IzzjD2IUSA@0v4^? z7;rrN<<~-?vkOB1X`gqt-CDI~n%W~(`{0vStIkiVa5QtcFY)5wy2WfP4f>}8q@3ox zo$sd09AJ3hkie{^CM_q@Erb=0$-k>{nWFc2eM)KZiWyoA&EF4f|Fuf}(alK=rx@ka gKAK9ohiv+sF#BQi$;Cgty#t*sr5{E#UF7Hk0M|_Xd;kCd delta 691 zcmeBS>tUOqQ|}d4Ty9ZS;%gM{Y40i8B}DNX;^F#l^JH>Z&Fy~nj7E|;E`5VRaP2cz@=-aP+Xj$ zo0?)|YHDbyU=mOjm7lKQlb-41?h_W2mX}wOk?LI$;pUcA7+~)1m*HZNQSP4@;u~mg zQ0C&AofI6%W$Ekgnd%jqX&h->SrO{zrtRk%9+ah>6<}&qWMUW*6yOwQU}R#J?(0%M z@uPUSMT%>Ne_>{>VNhkdS!hA3vrCzAs(EF$o3W>FQKoTeiGHwYWodb4YNaPvuBn;6 zSxSJrv59t0SY=XrZkCTzpr5B@QlfTom4$ynXsK~vVu5R}wv+GVct-K?@<3lB$KcE? zH{;0kP$&PY0w)81N6#pu2oLidpJLZ6gL038s?dy7b0c3a&&uSS5`T{z-!NDGbaOXj z!`#A5Pq*-5=YUc-N00pEOc$eq0OKV8WK)yLXBoxo1C2cmN|L;TOwtVlgNiEsOD@!iV$GE%k;qUbD<6ezzkyF1##zTBbLc;5Gp3SF>iVT-1Ds$!D@Jn8jv{K9ayRrH)fj19K_#I6x)^1NZ fu=q-upl5mg?t9Z?tu#!G<0ka}6MCk*-PQ>JzH0gN diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index 0459d2f16fb1acee49c9e02f4025c08f70e2aebc..b6b627ee6cea2512cdaf02102a251e2f3e9218b8 100644 GIT binary patch delta 692 zcmeBW>t&muQ}3Q0l33~OXX0&M>FHM(>T2klkrr7Q;S}lXUXbhOlAh=pkXq?#np7C> z%N5`oY?>lK*pIMMtW#*Ef=@^i0n4WHAVrH6?ne12YYMPnol$leU&!uapP+Xj$ zo0?)|YHDbyU=mOjm7lJlZ4prAo|2W78RTseo?Gfv;^rPw=AGe{Rh8viRhS!C9O74O zVicV1mX{UDWttdRl@uOe=49&RZ0egMC;TVUxErd^ai z@uPTnu7_v3VY;JpevX-kfs=Pmd6buLdT^*)s+*a6R(gqZL79Gre{O2ANlrGGzN?d) zUqz0SnPWk2a8y}Ra#>+WYE^|no`<<%zKMByhEImOi<@?taengTct-K?KvS=hyu=87 z=ls;5fQqy{ll;ueg3L<&+4@=DVHw}8;Hu*!6<3g;5@?DRB0BR^lmlENIL zlB{CwV&lYAlU%ndLrc@7j6$zSBeVDjmJt(hXg5lR{F%BQ2ab3kAJ!i6%Wj}ePaMtD63hU!%F5W-i!z27MFkR|@?EIdBiM?faO)m#jzRyW+PT5w! zYtl~j%W3uoZ!dd^T?t)Me`t!V_|~9*YI;r^=dAl+5~{uLXZi-S`kAhls_~L{`<%rd g_?D;h6vYJ_l|{Wi`0t&muQ(s&WQWBYG8eUwfUErkeZkCafo|aNpkss+AnNkpJ>7G?-U~E>Eo0V&9 z!e#7ISZ*4XXk3vQS{UK!lIL3D8(x{8<5yfz?vh>^WTtQF6do3lT2>fX%%y9mP+Xj$ zo0?)|YHDbyU=mOjm7lIq;8EWa>EY&5m7QIp?H3S`6=rPV?&}j-kQk}$9ad53>h0|1WfEGL?^;|w z@uPTnpqFV-dR9PjMUsD#qn}eysX<9_RFq3)RB~i;o_AESzj>v9p?^S;WlkVhaav@l zQNDLpv9>{mucdRaMW%j$X`pFnrJJR(v!S1Vq(QEmQLsT}qCxrOct-K?;545qM;Axa z(z0{|4>zaC#1d^oi*VP%T(>fVBr}sJ?~*KYC$BuCVApgmL)Q{VAK(1KlHj1=+^|B& z@I<#DeXpv}Tpwfe#B%NQAYc7lH-C>H1MmFFXBoxo%iZ;h+>BjJL(DAmO;RhI{PJD0 zjlBKyBf?z*!>d9Jv&^(jOd@@=v_s0dwEdHc4UH}QOq>&o%$&<3EpknB5+j22E8P9^ zvm%SV0`sdWmI&mHOi9<%vl|N5LT)$|aR>B};rVQ=1ecxZdyTu^4`S`bcI=Sv4 hk0nwsIQIW~dU&(W*9{I6PQR#neKc4;>w)3vO#p3E1Q`GT diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 235b3b04557827a4fa7a6a22ae5f4e891e813f8a..6b9d42b1c98fcef8a04d11c77795a6a7063c78cc 100644 GIT binary patch delta 644 zcmcc5dY^TIPJKq1NoaCmhGTYUVnkYEqH(#ALAbALctk~Nh_<$$NwB$bilbLnQMrq| z0auxMT86tORScHjhprc1lm3FREVR>1(E0?aFLUD11 zZfc5=si~o*f=NJCRDQaGlZ&TzO0ZvwWr|N#P=UEYiJOsjaaovQMvg~SvW2gak8w$a zyFr0hagkdnS3q8%iFs+bMP9Z+NxE}XxKV1Vv8PLkiBUDzQ&GR$w{6* zX;lTTWuacaW!Zt=hE66yxrT6xC9`6iR&7$w3Bi_CqivXcU` z11d`@JVR5=JhEMioGUWQ9gRxLDoPv+y|XgPQ{2px+)cO=gY}J)y?o45Obg1hEel-C zT{C_1BMYkvd|ZOG4Slq;+>9%HL$V6peA6eNWfZTkDsannHHa`U2uSjXEHTQe%y%=$ zx5$jjF)A|FFUmDeE({4zbSVor49(`s%QwwUj&#ZNs){rT%t(rg@NfwWtMV+!i_8l$ zF*C{a@o`Fb^>p;h&r0Uf)zwun$OteGjR*?L4Gzst4h)RQ3vx>@iO9~X%&;g=FU|Ef z^YX2U(k{vK3e73!I#V*g=udbkpW|ok96jlVTUD!`Trr;(;QQ#$j#+;hU+gzg{>Li7 z^fzJEwvCT+KFa(LXqT=$D1E5Ra%M^(C6xl4gpnOnG#VVHSnX;FZ0nwhb2iFuK; zX`yS7N1BTTS87PIM@5;XxrZo#E#25u%1M&*_Mj`^198QMkVrI{vSVU-qKX}MJf zDOq_{#YN6hmhP5DM)@V#oL9lj)u+_&Se%RiRF{y7$w3D^ODRe{oPHB zgR-hjjlIql6{lhTrCO<^ZhbHJ<8L{w96--WfZUXa5M4>i%9hMj_VK^>vFn5%@T_|~#nUnC z#R}(7>Upl6(~@^}e06HrHbHG$6W`NL!O#dr!54dlYBi>i`GxtRsfIa$?wRFTCKjHP;~B-n4T2mE!ptqx zO;eHz%%hwf4PDbJ0)xzo9Zj7hio$)gT{Dc#ffu!!>T%Zp5p2y_ebEpbeaFvzZq@=A9v$#yF=v$V`k zwD1h7F)Ip6F3ilf;9~Cj(%C-w+`}D<#Ez+l|8lYl_}{I?JH2^oTJf!0#kudw9F}Q2 z?P~gG^m3`~IS%dBc?T}N=>Prrob{?_&*yh1A9H*&a|dIE{39h j9SJ=`OnjEoA`2SAq#f7Q|9##4-$Q-tjcsd$ME3yzKv?4{ delta 645 zcmcc5dY^TIPJMokpL4Q)KtM`jcD}h+aHW1leu-C*zJ*CZQfSZYDc3`r3NN!$fR#=32cv@*t zs)2W?PozgVm%hJyx=FcPj$v|&Pf=A=WL05dR;Zt&lfHIkRz;;rrdfV@kXLC~YD$Xd z#E;_PiDq7onTds#;ThiU{?7gxrNvR1ZUs(8+D7gs`P!z2ss5qP5sATt1tIBNX8A=< z$wonbl|GSf!J%0mo>9pumIdCf8NS)+<~|+$O>`^G|Vr_42klsaLz2P zD#^2SHP#MG_3f$Tz6+@hSGJ(s#=?_OSGIO9@UbiOLHuEqBXvb`9_g z_tJK$@p5&~HZb#zX>!t3lat;{D^Hmf@hoq-GW`wv($3yUn_oRik7qD+ zB$fUa-R*R%Q}*?w->bOJ-cinW?CZ8RjAEO2yF%hhhr+{Cy9FnIDJYU=wwZn|uBcpb j-QAuEn_Mp6H~qG1>$3D#ufM`vfA#HWi0;*XdMFeC0u1Rj diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index df4b192987855db577a7ba879ddc6d3254bdf1c6..f464de84071336c657a6d66378acb6b3d83f80e5 100644 GIT binary patch delta 692 zcmeBW>t&muQ}2y%Gg1E0%%y9mP+Xj$ zo0?)|YHDbyU=mOjm7lHd{A==9lFdS>#n=U})(( z@uPTnX_TX>b7n=ZYfz}Eg^8z;zCmVKK~`0^qpx{kps{gEzJXAyk+z?= zQ>BZ)Z@!_oi8T?QYf=eqSQj?urA~MUlQnHMKT}t%BGeRm&3v&%3OacM}LM$U9ijyl` zoQr}Z{Zl=Q+_RhtoXs4$baizVLXE?`+`Wypo&0<=lS(s-4U)_9DxGuPT+-Yv!;%uc zt0F?`ODnVu9o-U>xzW=ibvLeBsmRoRw9Ec*q{nLMd;LlE;hn;Y zCfuv8&r472aar_Yvhe4%Tht;rBYA#B7e_GEu2mN{{3okrF>AiW)Twu}47UESm>%

z8csR?uX4{>GzvtAqQ6bLDco4QBcQ08@AO!vFvP delta 692 zcmeBW>t&muQ}1h@Vp&nBpIPW1;+>I|9ORQ);Gb5MAE<2_nw0Js6%gfKzX}?q^tN!KG`bP+Xj$ zo0?)|YHDbyU=mOjm7lI)>6&RATu>2J9$1wfU~KGJ?pExdnD0}ZRPJ4oV&R`;<`a~f zYh>;e73dns6{eq@m}Ow%Z{g*g9qwM1XcpiTlI<64P>|1LPF18|w!49)v1f*Vg;#*KUs6#(PPu`5q){c@T??vG)3P18jKa!u{LBm8vZI1MA`&x-!@OK`J)8@Sd<;vA z(lfLJ1O41QN=%&ms*D}EbaizVf^uE*Ljocb(=wd(3o{%uJxa|@wM(+g!%TBR@{%!c2LTh99am?r+&AT1cy6tVw6+l&)9>9z0yg^}z0?wawBnok g#tqDM8zh(13#Z&!k-c+jY`NCTD=*|eJc{7~0ONZ4xBvhE diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index e693ddc10d227a6bbe415f508fa5a9ca734445e0..df1bf93eb37433ba584ff91cf9d45a73b967e50c 100644 GIT binary patch delta 2253 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 TyA!y>N?Y1j*G^Yzn5+r_#P1&6 diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index c10014f4565d68d7811eb87c9aa8f1facd242e40..2c547b7252a57e357bda04945d1fdaf38a2768b9 100644 GIT binary patch delta 691 zcmeBS>tUOqQ}65+;BDdQpPm?MknL5F@8shb8tmoclM|%vA=;mdfn;n)~k(OiR9$K21ml7Ci zP?S?q8d{#sos?*jZ<<{ZnB^ak7Lt+gZsC_57MbUmXKq%W=%Sq#;%pX>5s~gY z@uPUSOSVr`vPY^@x^`5qzIT{!c~yo*s+&nkp-E|Jm0wtBevU_~Z)JX7NnSoza)D2I zQl43+m%Ce0c6e#7hrW+bVq!sRNqCW2NN`|gq;pVGX_9`pYq7!Pct-JX_hk3%up*aI z$8gWw5*K~P3df*))6|SC7vE$bi!@iGu!71mNAD{0yo_wFa3>F+szS^3vSh!kU|*LC ziz-jwBJC(w%k+wH$H>eamqdLR)7(U3gUI~JXBoxojl;r2jZye3If85ea&-Hj2w-e z!y>%WLo$5x^PF;0ygg00baizVf=l%c3^Ic)jm@(X!;CXM4D?OBOAWj;OmYI#&5ff1 z-69R^ohynX4II-AxYma0Ca&oCxiW7_sp&bf(`C{Xd(stI>)J%u>e4lcxj$ z0S>!n?wvaQjmVakTTAO1&Ci9oT#l80vrBR3cGmRL;JEdn)7L${$e-#rJO9PJ&x@T7 zWh68mop`o%_PL42&tCrWp!-2TTa<>o#bO(`n?*S`D`m9y@}Jz3b!g?bNk5&nnIl^D gZ>Id*;MAYE$M*ay_sx&IR1Up$Q(ZDkb^E0001TG_-v9sr delta 691 zcmeBS>tUOqQy*Ss;O-e_l37wzRA5E~Znl@XR$85EIS5UL%R zm+WS0S!U?Vm7Hzjn;MqyYZmE}QXXvS7wDT&lI9dt5tf>5m=kDhQkCaZQBhtH8kUhi z@uPUSxtX(mN@QMYL87HgfnS7&r&ErxQAk8UPMKR!Sb3Ohewjyvld-;qvuhw%S$<)b zQBroclVz@_r-`4JYmTw8w||+oM{;>uV3Kd4sk2XZL9$12U})&%ct-K?0yp!dG?Vl^ z^N@g|qVSM%BjfyBqr_Z&ldKYhLgQk?sG<~;s+7_svp@r`P?HKveUF^VK;OcgfRg;M z(x9M%^kDNc6CcOaR1y$#EQ{lfAsxJ-j4?heVhocatPl-*L}cY~#mmX8R_DVSSK{=NC<$8!q27*SND3&l9=w=G>-f zBFmGX=x}N1uj8MygEe}JVYsQ&ude!I=~liM93MM>y{h$Z@%nqIv!4nr^kH4k<=p;o g-bDx9t=XMybEf{tUOqQy*y&X728q>{Sqz6ryeD9;Q9-QrE;8`A?otEO_%B5?kP+Xj$ zo0?)|YHDbyU=mOjm7lH{^=VY7lB^5?tZo;#*o73WK!~BYK}lg`W>_(on_Eg! zu#=NxR;ja5c4nn}RbqKwfl+9tiFST=U{#W7N|9StcyL)^j$8KRct-KCyo|J9BTHXP z-?TjcJd5D$U<=RS@Qf&TS2N3uG}lm1BcnY3FsDqDEMs4;N}tTipzILCA~O@SV5dqG z%glg`@{H6fkB}(W+yM8qLU(QdN=M857$xc>g43KsJ&m%{LjqE&!ZY%7vn)eP z5_2M43QZjiyoz1S%G~qP9V^SUb4|EXy^C`S^%Gr63cS4x{i-~2ysKQ2f+8G)jr>wd zqTH)|A`O!x9rd+KTnxB$b#)aii#)R20{xOpqRJDif-EDnEut*5EHa$EGQAQF^;3tUOqQ}2_T8&sB>W04%FUFcsN;O3p^WKQoq1Y#AJy z&y}26Sy4}RcvUUSZG-oKd68?j4aBnh_9KoShhzm!529>X=>`oZ(&(sa;e& z@uPTnVO2qeWl)Gyu9;5uB(Z5c37CJzP^udqG#mfct-Isv(o&kpd!<} zBxA$CWaEH};G$GNV?(3d9QQ(BgJKgGv*h$5{fa!pDz|Jd*PM(X#}w^gqkN;XOp6Tn ziYklXP;YaOLYJ_LQm=@roM2Dy(2&F=!>Gw;7$xdG41Kcv^$RP_N-NEa!}5ayosBGg zbG#EnjkBYoeDgxmTtm`JElab!D;>F>RN6m1=rEf6QXV z7ff0^O-%Anq$sX;yLhEJAiCl>m%*9lQ=EO1TaPQ7Y0Y;G+An@bMOjP6yS96)|H9_v d`TTNn|KwAR)&^?0DeSeF|36!!C#CEx4*&vV_IUsR diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index 6a014327e0b12de1077364d468c87a1d7d03b2ed..0feb54596c7a7ba72deca46c8e3f657853e412ef 100644 GIT binary patch delta 604 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 diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index b369e0fe7652dfa89eb47d868aaa02417acaee82..37febec6c6028ff9ca0468da063a2cb977159649 100644 GIT binary patch delta 1005 zcmcb{agAewPQ71%S!%XLZmDN-Scso_go&whqKS7!R;FKhfoDK^rI%S?K!~Ytgh#%M zCzqFFN~K?=VXAYUse!(`MZRTdl(t7mv012RS$b(sVN_Xpl$TLqKzVvjIhU@TLUD11 zZfc5=si~o*f=NJCRDQZbg=bP(Rj{*#skd2)X^y$RiJP-UrFUp*NpY^5d0|#WKw5}F zW}=sIcz8rPmsg&9SV*yZiHl)+Xt{f3uy>MAWJrOTkx4;GP`-PRyGK|~R#`+|xKCc_ z#E;_PDY=C~<`Km?p%vL?sRg-NZaKy2eoh`fUO~;OS9Yqvoc*nwOxIkgCl$=pJf!U_c9Ev$TBcawoDIqsVFMUc1bmL zD$-BOPe}<3$O{RyNXv0ANpua3%8#(%at#i5D$FiTbI-3x40bCDDNIe(Hw#P2a;r*B z^l{BLEG^5aOsXl1gW1S8Wf+fPgA@ZNvKTC@+(!bPscX z->Br^@GA3Mb8V*_bF(O8PcGkJOV4oED3eNG&%#vq^a8^Sqx58_5X17K(9kUJ(gN?q z!nDL-X9L4P19a;=k_<8n0u_8cOxO`|;Wvh%q@{X;X2)4ZJxDv~NPwDU8)atj>;on6C9T$7AlgChzvEz67Y!t#ql z4PC(@7w8n=A6A)Z8RFuc?BSnZo>JoMl)=5uRbdRTgHE zSW;~4niA++YF23CX_4Y%ETgTV(FG`5?tyRYEWWol;>i?rK_u}5SW(g6=tlT z=$h&8ZIoeP860JnQxsViQS4Syo|2}Y>hEY$pP%j@Wa4X_%vGP3G>zpm=LOY6;>JNL z-`D8B`663&Zt7>pm4ACQ%7 z4$HmQnV&u@x`F+IadJ%7x8R6Ntv@;Eq=wwtBvi9rT}I!$f5CC(4>g)4|Ic~*9A<7_ z#8RhmLRL#y@banh&pnIXj7}=eua>Cv&n#Ov^+twUabEW7<1)h2*T4F>dqJG`wZLEi D?+aoU delta 1005 zcmcb{agAewPJKX5g=b=+afN?sSayoLet~~_UZPJ{dXRU7mvL%_nUi0Zg=dnhV`fBz z30Fw6Q)FPGL4;3XQhH)aprdD%r(=;(rlpsgdqlCPyN_ptPg!cEQ9xNzHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGnU{r2RFJ#3mq)&@M}~=0mRo9ZdSr^Wn`LOCd%k~^XMvw~ zrDvXxp-Hd_SBRsTr>jMNU|N=+dsUfBN_lByp?7A4WrT5RR$-cXu9HuIah7kmVQ{d) z#E;_PZi!WX7LjQlnO?ct7AcOw&SAcJzF`@q<%vO|=^2%QnIR>PhJ_`GVR?aEQ6WAS z+1?qEsRad@<(1{(1>wPIZstB-`A#K~7M9uh=Al(SE`gP1Rb>{F;~B-n4P1+o3)0*o z^mDz;osE5pjlH7^yrT@G%)`Ay%N(P!+zQGK^c}U!g42Duv<(9+g40sUa>K)&jXb=) z9R0F$Qk+7)vx7^$&B6mcD}5ugioFWcqmnEppJf!UPfN_n3imG$&T^_O)z<|wNE+bdxNW-wIpYSSG7AC~oU#M*bCZHX(+ynBQhk&4(=zluQq25KwJTC8oFbBoP18)B z15JD?{rt0hxr(v^OM?n5!t>J8D*Usuf}A|e@^jqH!vge80wc@A%AA5+yaV0*vYaX$ z!6BEJt{sq{ZfxpR?j7#tmy#V6>RA*NkYVf@=u=wZ>sDfFSrwI1R#BGXVZoIgl~v&s zoEM_+m22SW6YS_2k&+l}lI-K2oR{QknV(ylXOWebUSJkzSk9%ZtE*7#l9pki9br;d z5mFZAR}fNKU}=<580hb8l9p_c?_!?eR#hLCpW@}~;hxPkON2e3<`HA>p^xHM7_{@_ zdlUZ8b*xyNf4E)5=3&^|#LLT;msd`C`!Hgb7fZ4TXJ>+`s;v5ie-8hTebZYOuOE5f z!d}(XSL>cg9PE5`*|c}la<%tYrK;Q=XRnyUp*xRN^KtB%RVx=h?T?XJ@_E_Lwi*2^ z3*WuA)lw3OoH0@TVfbEqMm{DxhA-2&?Duf_=XhmbS)00#&35T8Ci$4~=?A$ZbO4AI BVR--m diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 1335375..e5612e1 100644 --- a/secrets/nextcloud/pw.age +++ b/secrets/nextcloud/pw.age @@ -1,13 +1,13 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 9h+5sIlvMiZRhje5GhsNJ8ucXWTkB1hS+kZBRs+YGRI -lmZ2+18WMJY38Kup8jBZDpUjQ3QQIeSgLGc9QFH2w8I --> ssh-ed25519 4PzZog 0FIpyjjXwCcpgKB6ElsShe238/4VMNRfDGngBpqVyUQ -WAAVgHorFOmtU80RVUILGaXwfxBeV4N4EliHvxOMfCE --> ssh-ed25519 5Nd93w dHBRtX2dXZFWY9kw74x94UAGqdb1IVe7uqfn+xbTXm0 -mvhqFd7G3pSK/W8koJI+sRU5SOQJmUwYhXdj05sMs2o --> ssh-ed25519 q8eJgg dBrod8ucXLwEWcCiQ7bL1YYrSGGYfJwHeEfGV6aKGWk -FMHX98NsY98sIpH+Hj6zy33/qqpUIJv4acejkvs3lNM --> ssh-ed25519 YFaxCg SQRuisMOT2BDyXCdFnXMZZoqZgSlXf6/FRmbn5qPjng -bstuHuNKdKgflf0/8s7Nlbu46EwsN/mMj8VlDDJy8yE ---- PCjE0Ry7iVdFNMznpD7I+BfW6BHV5MExXgREFVAu2g0 -ìÇÐë+‘¢‡#f|ÀM,‡°˨6ÚZÔzª‘‘AîCÄ~)â#“•G[s#g@ubñH³¯¾æçtÙ2‡y‘mè \ No newline at end of file +-> ssh-ed25519 V1pwNA PiQsqOT6Kgdo6s5Xj7/YrOF/xcFUY79IVGWh9QrqiTM +oDH/CXTFBNOQFFJRIcP2jrJhPb/CabqxBOPUyjCBgBE +-> ssh-ed25519 4PzZog //UFKnG6srGzPvcZZGBoV3C7LCV3mkbiRwyKRfk5txU +sOIxSDePjj7gt4fsgy134MaYasE6bylaxMgwCYEsopA +-> ssh-ed25519 5Nd93w uJVBYfAdaQD9F6Ps3/K1BvjmHd0KL1A38G+6tZ8uTB4 +ua+xSp1+tSVMEM7kG/0x6XcXg4zllyxGGt6UT4o0tH8 +-> ssh-ed25519 q8eJgg 9F7SNeeEpCWgH3EnigRYnX48R/1ST2xjcPEX70qcklU +8JisSMHjwXWAYH22V4EfaFN1rQk/fr5kG8Uf6vFcfeE +-> ssh-ed25519 YFaxCg 4ZlNZRZ0DPBGXA10Rkvy7Iyk+r8nSREK71n93aZrbUs +YWFtPzyae1TZ+cA/vmWAHFr9P3bA6NYxkpAUeVNK7gs +--- e1ZdhiA8AMinAmj4jY5ApJ6ASLdH/wK95iWw8jjWg6o +þTØtd‹l~ ˆou•òí¨8¥´/È.w¢Š³Õ•¶œ=*Œ1r·´æ·}@ð ãFy¦×;J!§ðIÓÆ¿AV –=ül \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 80ee5e8..6cc5101 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -3,6 +3,8 @@ let silver_laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFQWfVKls31yK1aZeAu5mCE+xycI9Kt3Xoj+gfvEonDg NixOS Laptop"; silver_desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIN34yTh0nk7HAz8id5Z/wiIX3H7ptleDyXy5bfbemico Desktop"; thenobrainer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer"; + eliza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIJaVEGPDxG/0gbYJovPB+tiODgBDUABlgc1OokmF3WA eliza-skynet"; + esy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINS2UR/o+nK8lNHHTj5I84ZAAp6P+ZhXqhedMfx0KHE4 "; users = [ admin diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 55710f0c43962c1229f1b63eda4c20c9ee22017d..7405101deae928f263551687f491de79f3ac8239 100644 GIT binary patch delta 2791 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 MgJkPzTV&eO0EC|?L;wH) delta 2791 zcmdlWwn1!yPQ8OQ(;8DYeim(L8wpi z#E;_P#Yw@=Md<;-rTRX`k$Jh11z`n+j!BjtM!tTLY3X56;W>$x&VE_`1;OQ986n0w z6`sKsZq8xOIprylj&4CtM#f%Yei0$2?tvM8E(KXx9@*}m7D?%o;~B-n^&^suawf@bk>evvf+1@Jvs%3^5I{j0p7hFUv~I$%@GFiL!J{ zb#@D?Pj*c%Ez8L(=h`J;V{u}}9i{Gd4;8Ofd%2tx-q+}q*XjJR;%1KAG}!7(H$4-@2vw)IEQkFx~gXSjV>Zn5!E)V{)-{Lbfj=NL$!S=+I=?3A|mW>-zBkSbP zxPHlqe8XVpTCMwt|2>be$Jt;p_NwVwCnuAO z&*pC1NgU>y(IpH2)c^V#)AVLn(dL98 zyKS34ONP|5P2N@6UnadbuEv@x3*k}nT0&8gR% z`9gM8Xx5)-^$43)`>Ru)FdnaZY`INi`?9{?C!&^uQpv)suhxE#wb@mFY}KUZS2NXl z%Jg{r2A5NZ~FA^$(T_2dV&wbCWUnC0OwQM>q?7r*VUzTfDx_+84D^Anx^OfK0L zQF7+^r01po8(ys_^_y}d!$)*(+q?P-9<4}$Pf`DNR@F~Ab1*XJ`QG-pIYoXepK)yq z{?hn2_itwS*Q8B1{MNjYa?0b~sGD&?R!6@1qV;O2*8ei{ySkTOmsk0;vPr=6AJ57w zdYO+KdM`Ny&SQDNx=NUDjacA|y&OK;k*{2<7yQw_bhTpp>rHHXH=A9YykVArhKNu0 zzWRFZv@}JJV)o-Ju1w0)kuy2t^s-On>-K#_E>yQ?uUO>(e=PE9TR|s9jYNJ|AS5()a%OqJGi&WPpzGyLSD1 z!F~dV?yP^3Ia`18yB)WEwx8F2HTUR;e?1CEc4XA|*5Bt`=o7zYk(0nj=Awg*_S4O5 z&U?P=Pd3_G{4H22x!%h-@^wP{9?>13bTffmZNcHjTZ*LD6i&!7< zJi=zCa^{)rxgmvr9xBB4{4|_Yy-RI|)5YVS zkE;#;PJXG*_Ud4L=A?a3Pi8LD-?l%{V5#KE#CMA&_g;9dq{#JPe@(Vpw#Gjbm=+3_^U`_BcT`Y0<`>jx9Mug59{YfY@lIwrLLz%J|DS(Z;9-kR!I zu;bE)_(K+~Pwp>xp-yb`eB>R;?P)w(srH5;+OSkqvN2dq+ zySte^r+qqdqxtmOXZF|6$DUe#)=b|l{kL0SMftOv^6UR6Z83evrGH5{qOOhY$BxDI zM_zjRxt7*yM^q|pa`==Y*na=)`^d9_L2Hj}sAPHI?QBt0b@JY=^{$t@`5ZiIG|k+u z{uN!QG2_7@ao<@zr)#8nmJ!F_&Q*#&Z%iCZWje}Iz3ju6m1SKI~&~GlefIV z%ue+o_hiPb=f5v*cX?Le@palKL00p|iXXRXFVs7Dr>(E=wPa*XJSHiu)#L6g-XJ!! z&U5QmwUDTowrx7yHm~0q{yUvC>HWI}rJZN4p5AO6ez)aS@-DexGGpO9WEapTqKJ z7xMaeTwhPG-!ye?$;FxZ>sKGR{IMrsvGWTt7vb7;<{imj8#F_e8hCAvJ?@L|ZFn?$ zyG^F=gP0=>s%l5tg3IOhb;hUeS#vgwt@XQC6_@i$`%CTZA{o(lCbQ2jWZf3S6y+Wu z5z{;K-u{Svlk$RC)OKi@#uka_btGQtdbw%S966OOPt?R3p4LAWU-7)pcwq&%cdYZ7 zPs?iehHgA~v*WelnPM@C$%c_zUMxQIt>*gj>vua26fNkQ>vQ5*)Yq6RyL75!7Mir_ zh1y16=K68gVU76bnHRkqr!n7Eymr#g(6d0na*fQ)w}QN?%E^LH{geZ%PcHi_CVx`& zOSg-_DVfTGC1)4pYX0`0Sua{?_9)}g&bFKzdi$^Mc~^R%@9`VXeI^YZoJH?H6j`24 zofTtg1@BAKp^?PPoDJ#6#;nn{ScNcl= zWpuQNn%(wTW9IMeg}gjpFGbZpZkPYQe>VSLM~%+g>q8e6o1C6p{%(f45Uv^V}*B589pIpf)XA-xhAl*sm_MY}=fg|zTe7DV8raN=(zFIM1C#Nkt zy-L;u{th{D_tWLjrP+Ls&U|fgG!2cDGAXWK7|B_(>)*de6E2AF**sNjMyVQWRrq;} zvaEstol2o*=8gOx-ZP)64m{vu{qE$sr~h}xGrB6TsI|$je3GiBQ><^vvfi7?BamzH zl}9N-3};QVUM;;5`fF#B-PVVDUtd<5{Z4R(->ll#lN%XcN+emUyB zluf8k=8WT=dmuP^+nJ2S(dfGkkjufJeH@aY!T)!8&@ GvpfLq2MP`V diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index ff19a49ec51246d1504aee6458645a5e33c5932d..2e2e63cd32cfc1a635ec21b8feb0a659fed281ab 100644 GIT binary patch delta 1025 zcmaFO@tR|TPQ81sQCYc{MSf9vrnh#Ig_EC=zE_f4Wu$Ykxkse7YihD#d7*xepb{uwS}+}wqbZ6m!*4nc(OsByPHvQXi2cKud$17fV)LxzI$PLVz`BWxKUVfqGe`5R%%%G z#E;_P;pzFAk(Sv$rIyLXu9nF;PMK*Q*^%i%PRZtF*@oT`$!3OSxjB)+!BzQOIhG;$ z6~0-aX(pA4;hE)y;fAiB`DS@}rDiFvrs+w=+R3R=VQvQDF6N$-;~B-n^UT8h^ApX> z{XO#>3tWsm41KH0{Ty9V%!|D%@;#zl61{>9JR=Pg3k{RGLcAkOeT_{0ip(v7^%IM7 zOLNRq^2;4P3@khgyq$xpLINyQG0Je%kMuDz zN%Si;PBqInO9_hb3{T3*@lJBeb#mqMPcAUY$~1Nf_A#~0@y&2Cu`D+Z@+%1`FwaVL zNe@m<3ytu|baL~nDlbNlfYPWcC*yR5K)>=_OQXsZb1&~ClM4S*qtg0JZ+GJ&?LZ65 zQpcbW?Z_P0Vw0ePY)_X+t|T8%CzD|R@SLKQh@8U0H2~^u_Q1g(lIkVtFW}BEYs03%OlS`-Oo4IkxN%sS0T_pC@`zjr%Qwa1vT_~r-hSv#ljT0EHbJ?)}s#?7VO0^5cEa=oys_x0D=l-#Rv zqV@Crf?J0Rer~c`X@AX9>&2IR8`TPi^GhxVhtw&p*4Vb|;Hz)q&ShomJyzsfTWm`* zknf$r!?D|bO@LteQk5M~o$K3sqa!=t{+KFha6q;H<@vLo7N@kBU$ZlGe<`}Le$}^a auCJbJW|m9t>AM*unw%}}y5rQbSXlt(Mr;}Y delta 1025 zcmaFO@tR|TPQ96lV?b7*Td8wOV17xcL1s#bU$I|yV4+E9X;GC=k*9XCQ<`^}SE_4J zIhR41nPZ__VOB__Uqp(wfnjofPN|1;re9Kodwx)9g?UA$c|@v_w^zAuB$uw8LUD11 zZfc5=si~o*f=NJCRDQZbV1>R(UX@c-K|w~jX_arNzFTl=PE~Mrn}6 z#E;_Pg%xG_8DRk?#-E1bs=~Yga7Dbj`IhoptIfX^8$=Uk)ZY~yFmCi0k zdHT5)iB)AD7MW!MRr$$zITeOpE;+_w*`CQ&=4qjxIpMhxVTLA?;~B-n9TO{xBV8-A zN#DpJkM&F9|gZ3=h(d3P>`mEVncX@XrkP zj0`B!E-p27F7oiTtjaTwD9rZFcS+}RPE5%U@^ZAuDJaV~%+M!(``BE*GB&)2g8Syj0`Bl&Y|D7ZbmVl7jRU1M_m9^zdRMi>g4^ zq%6ZgZ3`z0bn85l3^EG>6+9eW(gOUowT+B@{PH|QyrMj_3c~%J3q8Gzqmn$soKg(^ zOv>_-yb4{bvbjPk-LmvOwG&OUlP&UdQ&X}WtGr7L(sROGl3cyqvpsW41DtdGP0QTe z9Vee<6t6EbH*qZwFbPkJEYo(*b2D9hP4p_suBdbhiY&@AtZ+{=%QWz|2q<*(E>DdJ3{4G7G~m+J)m6w#&GL-W z_Y5sa^-PTl2{OuZO$y5@H#IjY@^DObsVXrq^{o%~bWgG@stDxTGJET$uH(zRO_wuI ztbeg{@qGPkq}aCzy7OXOjL??l*P{NlZExf&P|zgXpiWNy=iOf9zRPu>3i&oyxsxD>+xH7 b Date: Fri, 7 Jun 2024 19:19:03 +0100 Subject: [PATCH 150/563] admin: add eliza and esy as admins to teh secrets Actually add the keys this time.... --- secrets/backup/restic.age | 84 +++++++++++++++------------- secrets/backup/restic_pw.age | 29 ++++++---- secrets/bitwarden/details.age | Bin 825 -> 1045 bytes secrets/bitwarden/id.age | Bin 701 -> 921 bytes secrets/bitwarden/secret.age | Bin 682 -> 902 bytes secrets/discord/ldap.age | 42 +++++++------- secrets/discord/token.age | Bin 805 -> 1025 bytes secrets/dns_certs.secret.age | Bin 2374 -> 2594 bytes secrets/dns_dnskeys.conf.age | 33 ++++++----- secrets/email/details.age | Bin 1089 -> 1309 bytes secrets/gitlab/db_pw.age | 29 ++++++---- secrets/gitlab/ldap_pw.age | Bin 780 -> 1000 bytes secrets/gitlab/pw.age | Bin 781 -> 1001 bytes secrets/gitlab/runners/runner01.age | 29 +++++----- secrets/gitlab/runners/runner02.age | Bin 735 -> 955 bytes secrets/gitlab/secrets_db.age | Bin 781 -> 1001 bytes secrets/gitlab/secrets_jws.age | Bin 2330 -> 2550 bytes secrets/gitlab/secrets_otp.age | Bin 780 -> 1000 bytes secrets/gitlab/secrets_secret.age | 33 ++++++----- secrets/grafana/pw.age | Bin 694 -> 914 bytes secrets/ldap/details.age | Bin 1307 -> 1527 bytes secrets/ldap/pw.age | 40 +++++++------ secrets/nextcloud/pw.age | 29 ++++++---- secrets/secrets.nix | 2 + secrets/stream_ulfm.age | Bin 2864 -> 3084 bytes secrets/wolves/details.age | Bin 1131 -> 1351 bytes 26 files changed, 193 insertions(+), 157 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 191ec82..df98b44 100644 --- a/secrets/backup/restic.age +++ b/secrets/backup/restic.age @@ -1,41 +1,45 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA jm6475v+Z5x7TpxZE7BKsS1McGwX/c04NVnna31QfVc -XSVnZUfcudAQlDo8y4hcVjjdYpxTnxUil4Je6OKTVmk --> ssh-ed25519 4PzZog qOjhllIy1TaKJCi1PzxiZGLjCeMW3tdsJXpipoYZjB4 -5IX0MqLnLadGmRE3Hihk3gY8+gNMLu8lhwjlgX2ffgM --> ssh-ed25519 5Nd93w tOwfoLamrtY848gu0ccQps/l5HpaCXklYmLBMc2bBBY -Z+3jT9h6ZidFK1o3WoOq0j0A7c00IRJ2ePXwXpi1yv4 --> ssh-ed25519 q8eJgg W9CplimyN1y6VTqlIQ/MiusqwM/BgBiwSikAl8PlGUs -s/V3Oxu/b2U29Mqf3nBKd8yauzlYlRSBxaI6sXx415k --> ssh-ed25519 /Gb5gQ 9n1xFcZt4P1nhe5/plprSfN2A0DkYgXeLlwuykU8/R0 -SHywmxQ5r1RUjQjvSyaBKMhbyNFBDg9/jjMz1OWWDQU --> ssh-ed25519 NtlN/A Pzwd/AM2hJmUOlwpurzEjSb5eTWj1B7QMSGluxHPZyg -svPsQgADYzoSaq3Vr9w+YPpi0ZVwPOrQbd8y3WxQZP8 --> ssh-ed25519 v2Y09A dT8AkeMff4eHoigAJK9n0smgg7+B4euXVxQXNC4ICSw -b3hc61H7T3YXh5C32uTFUkeH3fpz8sY9bxbuRr36NOY --> ssh-ed25519 XSrA6w z6TCcLysu8pz5o7u4suhhiSRcPjfQt5uyiaOCvAONzk -xaf55scacRbTSlVIodsyR9e8Yltjnk30KYiMz3wzNyE --> ssh-ed25519 DVzSig byqbVOsTWSviEBETw1JWAcWQ9GDfqHSPrrSYW+9lCUc -E8igwPYnSsu3f9K7it7EKJHXnJItFSyTw7YTmkKKFFw --> ssh-ed25519 uZzB3g svdvi3x+dopgPWSK5PePD6OWaYeiEHEIGxtfgTiOwHo -pdXk70JPzCGBsl2JbgeGn32kZkwTBjJHTJ0ObLOL1L0 --> ssh-ed25519 yvS9bw EIixVKmCU3K72ci1Cc6CirPD+m5fGbghwjhqxVfgtjA -NPsnqCMOZdAk9lZgmeZut29uPja28rc1f1z0OYMyu/M --> ssh-ed25519 IzAMqA HgXRxXv+lZNxyQI65GwVvCNxbTqEtwZu5bG4Z0wJIBc -g1wD9iDLaAHwfHlw04zsQpMDqn2oL6WTNW/gBkIboEc --> ssh-ed25519 Hb0ipQ unKeQMV37ghjPWdZ7D1rtbNbCPSWW79GRHU5PietYDw -8lCkHaMithmpUXDVdn/Vga5YEVvqinncA9BjeM7r/JE --> ssh-ed25519 3pl/Kw BLeXBaICo6fJ/42j8Cy+hSfQPqGjkS1mjz7nnL2WY1Y -xRUQZfRTJORSZDNo6zrUu7jHAxEz/ibHfJnTBRuvj4g --> ssh-ed25519 SqDBmA OPg7zErfAKptfPLbbg0Sdw6Gobe7eOnwJ5+N3kMuBHs -GaRv1pzU7q2paJAlZkAplhU69n05Omadm2HkbnbRgYs --> ssh-ed25519 UE6fcQ rQtyAncdVYitLmtfcd/6wJSOL1lzfQ2/Mkrt20miMiA -NWl8Bv/vMaaQNwylum4s5RWtyzlImP+wtlGITZwVSWk --> ssh-ed25519 YFaxCg FUJ76CPiKh6Is9Yg+5dbFhaoyshj1HIiV6hQDqBbLjI -ygBkmO7DpSE5fhofAJcQdsOpUoXUUJLrR2PbT/cTPd0 --> ssh-ed25519 elCEeg 2/nfLbfNivE/R9uvrs/gb+zHnTLIfFTOiTKRr6USuGQ -HQRLH7N7sSbObTYPEb6hoDH0ddlUEgDOK0/095uaLbo --> ssh-ed25519 8vZ9CQ gz2h213BrDoe4PEZcjZc65JnPdYaM0uqr78MX5v4lQ4 -ORma0oxy2oWgYrxfpdeY3dZ4gEClM8EgphCzMyjDqHA ---- +XZR4R/xoTSHgOeFzQYWes+2EA+OP48uGfwP4FgkeFc -6Vƒ° hÑÄhI~oQzm:hí|ô P¼RÑ(X)"œ8‰’\jQÖ–+²çhÜhX¶o‘Æ=ÎÙ&Ø3.¹‹Z „VÂzºµZíKŠ:Ô†`o¥¯lé6üRbg©5ð`øªÑAwé~Ú/ìúq%ß”àŠþ~ãDV¨í› \ No newline at end of file +-> ssh-ed25519 V1pwNA 7yvURMKPgnbCWAE2q51v3fDFuXCivslOvDuxGIi2JHc +numnCMoai7pCs0qBhsWr/CjU8FfrUeQsfq9mvMTVj34 +-> ssh-ed25519 4PzZog O2zDjiWrxoqWp0QYlwXw8Oushe2wwlw1J336+QksnUc +oBJ9zPd7+Agc9KSYgA64Sbj0aZLJRRQS2MgnPGHbcic +-> ssh-ed25519 5Nd93w adTzuNLU94FC3fR/uK3XsI5XZSANXZmwp6fG9ZeoA14 +7U4C8ZbZKsl3kdPMymoHc42k4i1Wom+wi/THXosDgYg +-> ssh-ed25519 q8eJgg bgfuSRzrmyVG7ewvPztde7o0QJyQXXBbvK+Rs5JdN3U +2wABMhVimVi4Nyrfa7EWji5YClqh6GhOjFUKzcJqJcs +-> ssh-ed25519 KVr8rw xQcp6gQPq/AxA8cEKjhgvQ8NBmSmXd9LN1ZBxxqSlQU +gy7wbZiCsKdCUAPH82xgnxWXc/sxY2S8JKcnzzypyOY +-> ssh-ed25519 fia1eQ Xh2ErHfrIvHTvUyDHmDD1X0Dxnz9bUnnRne0RYPIPk8 +V3+5H/8vMWV3lriiiEd/C7lg8IcQSKkO0JrhD8KrNGw +-> ssh-ed25519 /Gb5gQ ftm+TgiEOPimzA+qsus9/rFUqTjWn/VVORIs96Lgy2E +mzRiPpqZj/tkFvdphOWn15IHv+GhTd4vj+T/lpsXJtA +-> ssh-ed25519 NtlN/A 2t0YPeV7uzYhrIZU1TDi8xxPGvpCReUL5Rxt8sflK28 +r61bhrJj6irlo2xTU8iCJj8YzSbYWFjH8iiC88SOrAA +-> ssh-ed25519 v2Y09A BXWbnz7DUn5tssTCFkM9cFzF4M5oj3rcFMrfhFzL5lM +2GVsK4gq4HIBVJWlQVd1G0kags2peJ63AfuBdOxbY70 +-> ssh-ed25519 XSrA6w OJ2j5EQe69sPH+wTsiMBlopI4QmHiLsfJDQj+F9rEiw +u/9MNFViy7TvNTA7lvBKnL/qYWlkOJrJKcSG563Btnk +-> ssh-ed25519 DVzSig 6djjmbfge5li1ZTlaA4Wc58xfk0Kb4EdXPxX1bPdJAE +HMnnH5Cd5ffp9t+tJdhagDLoGk9HKpjI28SMQGcMvIc +-> ssh-ed25519 uZzB3g NS2dkA9o84OuCTUSoHU7MaUMJG85vr2tnCq3rSKtTGo +6+7gqBrSIogz7nYdDUmtS3650x/y4rmgy4ru9sOf7hY +-> ssh-ed25519 yvS9bw /CoelQvArSJCFKTV8x/OHVWTYEsNTkbRqweqaIvlykA +TGuI9tt8EnEThL3l+wgipOtDMPPTkVTdFLpRKHGFMpU +-> ssh-ed25519 IzAMqA Hb0cVXd+8WrWJWVs6j/qxBUCOv67M+Se+v2y7470oB4 +i8GWMK8uXbaODkQm02TqCn79+b1zu9Zq2W7c7Rg3FHE +-> ssh-ed25519 Hb0ipQ 3Gr6C7Q1yfHWcxn0pImpI4mQjdIHJKyzSZDv+5Eo1Vk +8WFp3fNRKFb0jxmSDNVlRM+ec4bd2O5POeY69T0bVz0 +-> ssh-ed25519 3pl/Kw GCks2XrtAKpVRl7nC2g+q7c+Q1gqh2tSfPDHHI+wxng +iyblirNv3byNgI27599Dq6kc0ae2xaoMh7thSIoVLJ4 +-> ssh-ed25519 SqDBmA FxJJFJboiAe5T4TTcx7VY2brEQN5DqlQ3Ak5C03MKzw +yLYdnZHSftMTwruQYJy1I2oWmWZNPykqxe6nlAdLTDs +-> ssh-ed25519 UE6fcQ Y7XmsyOOMffkb7GofPufJ6d/JdVi9fg3LK17C1zL1wo +hfo5xZcNpVSOiNuZFe1fJ8o4mPF2cHoyAoyc2LO6XhY +-> ssh-ed25519 YFaxCg 1t6GiHkJUaJ795x9PRVkDU0P0FP+RC1QEedl4qHgNAE +o9hxn0jLFBqej4D7xJdtVCB9UnUBrCXZM5gpFbibldA +-> ssh-ed25519 elCEeg TunOY5HCLU87gGej0HWFm775FLsbtL+41HqYS3hgLyk +E6rAZdQUj/Zia6i0Q32SfqugEJ3rrQt8OM9sPQ+ZXOk +-> ssh-ed25519 8vZ9CQ Pwqq6eKEIf/fLLiB+j5IQTFxRXrEi2ajORzH8GQpHVY +nmrnjLLmUPPOgk1y64Zcfhhhm87dRg5V8GM5GIfB6oE +--- dBHJ3bG+te1AZd+FHj/ssxBbrCBiyl3VARjnd5F0yz0 +8|ÁÔÌåp™Èh1DMZ ê¦À‘Os+^ƒ:ËËŒ¿øÇ™ÉækâLÃØ°çùãá¹»¢]gžši`í™jþê;JÄp/€·• ‰^×a<@Ï} ÚÛ¶ÞÆä  Ÿ¢J¤\P¬Ò7çK7÷Ö òâçÎ~ µ+6NõýüÜä2k<Õ<ç^§³„9Pôi/X4uË \ No newline at end of file diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index 494ddca..31c2bbf 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,13 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA qZ7CudBTDbC2IN/xxqKXGOY6NqHtm3Vmk1VInhjawAA -MPoBpMCNwXDWr2Kv4c0BFClkWfUl2n6JMyxhQ0XRRMc --> ssh-ed25519 4PzZog AI4ny+mDIRaaJc2spa4gWBpjK5i8M3Feh8wL+sYXUnM -hRs3ZFUIC9TQzhLwI6FvZ213pqoa6aRRdhGmX793t5M --> ssh-ed25519 5Nd93w GpuVJYN3AYLO2YMvkaDpxeqJtsUfpS5bmIGvnHMMLmo -0niSwyHjIcMHad21h026P3zbucg7h3w4DNrkdDNw2c4 --> ssh-ed25519 q8eJgg dNylSaId05RAVPAm6NHTGmWks0NLH4GU5mIXgo7w6To -x5iyeOAWE/K+wMbyTkvnH29WDYeIBy4ItFk//jRU5Ak --> ssh-ed25519 3pl/Kw XPioumuJdUvoP0radVfv24qxql3HxdKjWseK0Oy3KC4 -4WbwRgjTnmugQfelfcZaArsWbFtfHydojT6gblfID9Y ---- abaCteISdhpp4Q77f7FDW4f5LJuJa21GfZUeNwM5SFQ -:½×êÃ-lPJÜÌL²[f4°¶V·Ä{ø`\¡V¨~úgÆüip–G9¬øIgaQRÁønl^qMTã-š>Qè¬V˜„· 6Ü‘ œFùœªÇ=;0$y|‹ \ No newline at end of file +-> ssh-ed25519 V1pwNA Q6fzzE0ZuVtBGR3fFnmw45hrQU/vKj2y2aEzYA2cvAs +c0A5Ieu188qIE3QKvC+6DqjDxAC4HqfBUbPu3m72NTA +-> ssh-ed25519 4PzZog AzQaulqa+X3fxgk/sP5jjFfPGAPMzGlbacGIQdKpSxs +d5OgkPftJ8wqrMlfGcxLld+DWVQ58/SvXGOmPj79SUQ +-> ssh-ed25519 5Nd93w u+Fu4cNNKnHht6Gj8NgCK96U8SL4h+hFv9SZ+DSMrGg +zy6Jf8ZBInhOVDuFuFAZso6KJl8gLlklqWCayPqb14w +-> ssh-ed25519 q8eJgg s6jAIb95QqWDKGEx2lbnJruSfp6mgERcI2SzTip+Gnw +IHPOcqeagr79owKNqyk9dLjz5Qz1fQ1A/vOxt+NPlu4 +-> ssh-ed25519 KVr8rw VO/YREcq6mknjN2JdAr3GWg91Hml4k1Ojx1tUMXAXks +1BhUi7kRCZV+c9TROQIFeNt2WSL9Xa14J40vo/qyJ70 +-> ssh-ed25519 fia1eQ w6T0/iajXe7pgvX75tm/94HueS6OlKlXAo3IgIIlcm0 +Cun2Xmb7fbXCg18lLmsdhqViEG8lqOAGGoghJlvunu0 +-> ssh-ed25519 3pl/Kw cpVAh+pifXN3ohww8TqmyCrCRWU06OAPPdLX/5DBUwo ++GQ7xCXSJp6nwGymXD+9AqeZC7ScJl4a/A/2XWQzKbA +--- GhvvZMgI8VzeGNtLQ+EUIPYpR6EgLpxiuxn9Upu6o7g +ðKihãPSëÔd~p‹{%Pàbªc•£„ã't«kÀÙ?[e0¤þbþë +éŠ{Ú Æ&$tWŠë.œ"ûÆX˜f¥\-‹vIýL{]”óõš¡Õ1;ûúüU¦ \ No newline at end of file diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 500ac6e96eacfccb14408863de1db3b89c0fecea..9cf7d05126dae1c94f96c3e5e77f81a73afa65f8 100644 GIT binary patch delta 958 zcmdnVHkD(7PQ6!^Wkr^=PeoovzNK?!PI9upTd=RAYh-?)epNx0Q4zEN6w zF_%S-n^9)6WxkWXMO99|Q(;bMh)0QcaduR4PGGvZc49Nuoiqr<+G!dS;fdabiibv1L$YWMX(; zae0MVXj--_SF%y1sd<#PfkCigYE)!WqGyhAPOzh?XfRRz) z#E;_P<^HA_CHn5Zd7hRY>3O9=5f%RCSy^Rn$q}LDmFX!tLGC5_c>zYD?&+>v8D-&B zX<-3w6`p1J!P!Yssil=>S(OHPj!EUlPKN1070Fpyf!?ke-sO&y;~B;44LmYDbHkG& zT%5B^Jks(EdBk zBfZTmGn4$Y(_8|BG7Z9t0xWZ!GCh4uD?{?pL&-a=$fBrRAt)y-6Py7uiV@@pDQ@YGN>TZusl0mJHRq5!#k@Y*VQz# z(9y)vFCfyzB-203**VXtq)I!j9NoIK%tXV~K!sAr@PN#0FH1}FeA7_N^ui*qq^h(q z-^!3YKSxK)0AELa)AFz)C++M~Lsu>fx3cU~3;pb1)4UOH*?)Ov`-T1Ilv)yuGr*3!VL|a{XMw3QN2_{X!j$L&D91 z%F?-Xb#)bdQXQj`(j&_)osyFy%S{S%O#OZHJu@>ROiYtaOe~FjO$+PY-ODR{qFjr) z=2H{x-_jed3^m`2wQCLk&_!e z&nAgJJMs7U-nUm4i0#;Lud!y$DK--;shq9+wWmy8O#*m382o ODkmtmTg-~pKnVc6q4O+pj%Q=Gj+J#s88BQgq|bE1k3i@gmz6Z0auBFzeuvrP5N^bN{$O9JvM zQ{6({Li0mQOVbNW^>f@pO~Z-;wVhM_OH<3yL&>ws(YMf1A-}M~%^)}3wA8{NKO{XX zF}=Q^Jis-n+}*^t!aT<^t4KS{G9WQGG0-!;m@C~d&9WfL%snVA&^;$J$Gg0$Ft0Q+ z+bGz;JEAPF%(&Do%D~q-$U?s;pG#L)S3y6;&@9m}vn1R&uh^`tNITWv!#yB9E4k7v zqolCh!lWw1sI;`wFUmD1oomL6kBUkux7O8Pzof)D@swKm$49F36{o-XY_iz=;1tDb zTa&z1PyXECuryjTF|U4#{-H8OySo>xK2MW!4=7!?{h(3elbQGay)AzO*kHO*9mTV z-X9qCP|@*G{N&%w~Wnaw##~!$ gRc*>FHv&RMZbz(ht3W^N`SNsgs{X2qsXNdbobKE9LV8O7^8EPYG^Gd%OM zeZ!sdQi37_Jv;+La!Y-~oQix)5+e$oiwayL!t^r=oLspAeT+;BlTzH1(o%BEjFQrW z4ND`lf;^l|)4T(U(sGk>eKS+CJS|gPJ=4(x$vdpbqNrTKy)f4!#V;-0-_1KY%1pbe zqTbsjJYC;2*D=gB!XqTOpvooJDb*rPzbrSO%cRsOHQUt1Bh{tUDYGiF!XPgwHPyh# zJ7&v+~B|*N3NpM0`0Pr$`s$?f{2LJz(7mSJdt#p?t8GyQ`@{VUAPJUyM0EQ*5j4g4!YN-CrBDk~i=@}l$$ z%1T|LlEczMJ-NzULW9$t%u>>-y!|{298L5M0+PzS^u4Q+!_vbob4peDEs{cg!=nmIBaDjNEe*I9 z9)Duewn}>;&$2@o0?$r!a*H(DAU|1U-Vs)d;*WbSwiGhX(&Gzd-glyZmFd_1wnx(f lw^w?<&QD)1wxDILMcnz*8SkWi>20)~aPHas%{?bwB>_c}9$Nqa delta 629 zcmbQqzL#}^PJKzLqd};7g?_faM@nXTp{j-|Q2u|;IDvA?B$fw8M)x=CoHBbTn7LUD11 zZfc5=si~o*f=NJCRDQaGxus-=ZfWx7{caDH%_xobf{M82i5bBL+0iE&z3VX~vS zQ?Qw~mw&DaSCMIQd2pmzc}Z4~LArT{cbdM3X_i-IUZ7v1fpbPkLAribd46${dA9Gw z4-(;yp%jZMV0!Y zMWyA2`JV31;l7nQUPX>!eo1Aek=gogQLfpQQ57Wt9y#IW#h#Pn8O7`U3{!ngiv#mQ z_096#yb5yjeZ1Y>i=E0WoU^kMqe_fiol*<3^()GqU46MCy$VCzGc$@({QNyF+#TIY zf`i=5lU-ATgY*-#Oe?kZiz6~z(^5P`JUr0@$+ODQx6n}`%E%%pCCwzwFF4sR*El=U zt3EWuB+$esC#}jWv9LHG)x$mCDA+A2vBa^M%hx3_(zBp6(A+&JIm19d*CI4u+sU}n z*f}TC-P1oL)GM^uBOoLr->smSOIKG{!P2*?*w;(nqp-N5z}(cr(%09&z}G)2q|~cI z+ceuN$SBGsJvb@Ct18QtYq6-eew@G*anGH{Qbm`jRPQK1ta#$lqkz_%qDLlnT#{I{ zLiX^d&?DlE46Vo6Zns&N7;Cz{on$+UEWYzsvvv{x4&kc+ DU;frw diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index 3118fd550e63eba12a2aeccbae1a3adaa9404094..cfdd6e450f349b84624209cdf043f5bee49bb31d 100644 GIT binary patch delta 813 zcmZ3*+QvRXr@kP}yDYsTDLJ<&u|nIx&o86M#nmFYBrzv2Te~8{KO!s2%{1H9+oi~` zn5)FlxXioQD9Fd%G0;3M-P^?^+as?cC%Lku$iLjI!pzwy(cB~@(=^P~kxSQ3p}06h zH#Nn`)YQ;Y!6cw6DnDJp-P^#pFsv%PB0MZS&C=1c#MQ^h-zO}>uQ;gKJup$*t2p1% zIjJnOur$Jxt1>s+JUqw5FyGK9J1fO9JvSuGG04!%tK7#VCp$MY*d)_EG}qNwJGf}# z2Z`{!H0Lb$G9TxXe9PSOr1IpvtdM+n3-=r|gOISih}^0`%PiA!kJS7e*K96F_q4o7 zPnXQJ%D|F>eD{K?P|rYvN#!+D4fXVfkF<+39Bfh1uR_-sO(Y{zfJd zo(8^27U5ZrL17+-L8ZwRp~l6*#qN=jxd!Ng;Es667m5>Q;~(5m;H7>t>vt>7?(AZe3btqG4*Ff`w;Mq-$E1cUq)(S%7x7hhtG>dQ_4{ zq)SOweqLl@flrcYR=S6Ww_j9dB$s)XfnQ2)ZbV9!Yf-R?g&OXKFK0#5Q zjul2Fkp{)tfn51PS>+{0g?<6vp`Hd#+7ad!DJGRkP61`k`306no|f7XIa$tmP9|9< z>0G+Hx(d!FVP!?7$)4ItCW#h4#h#f}B{?~n0r`gc?#>n3>29u}>F)l8S><8HnFd_( z>aTs-vf^_Y`li29yE?;C_KSSvk>@UR86&wJm9%RT-Je&Sb>N>qLAxa3T%q@>hf$X4 QoC~vNZP%r@k~@+s{1Nu)y8RGu_0k$jQ>pIXf!IF*Da(+bgQL#3QB3!?L*4)3?kq zpDQxi*r*`Q#mzj}+c-be+t|0nPv0DBp}06h zH#Nn`)YQ;Y!6cw6DnDHzrzpwX$+ zy(~P#EyW|5%P~1$+tEMS%ilPnthA&eBgNIwH^i~1Sl^;FG_^d_!rY^>(8Ad}$=Gt@ z2Z`_uqmqKCtRzdnAhW2Kv&NUzaWngm$G#8;(!z{C#Q<+JfCE<&|)r^Ok*GC zEXUl)K-b*R;_N`zDA(dF?eZvBBNs2XtT6wutkft|mm-6tVvEV~jNSb6|RqUK! zTJLILYT+D}VyNw65u8@y7ZvL5U*+o+?(b~DD6PloT0J zY7yY%5$a#*oL(4UmXuKtp6Q&-rK_u};OOHP9+jr=?v$5OoShY6R37M=9avPN?VRRo zsqdVYm#*&_5oH=!>}QUym*=M`IU|K%`}a(KMeyhm@p{(-day;@5iRDS>ffwRj~ diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index 236a11c..a72d82c 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,21 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA gCv+qymhOvrz4Y3m5cjOETv6DKoJpA74Uy1ARoBtUHQ -xRJ7PaS545rmlt2mFjcywHsXPnihD+MQF+1vbi/DX5U --> ssh-ed25519 4PzZog l+6I+0bRe1SEt58W0vY0Dw1N2ChFqhK8bHxjQdKdvgQ -7IcPIy6EN4CybAZTVFbtEijjAmNlQ1BLPwCazm5kv2o --> ssh-ed25519 5Nd93w A0ZXv5Mxtz3xqRM7YRqBjarPn2LhA1Y+n2EaAIKkJjc -DtmQLk48GhWcTsV9d+mRL0Bhbky83TGH53b8BMg6OlI --> ssh-ed25519 q8eJgg 0fbckI9LuqibGrGNbHO70Oi0N9Uw1+FkNBjf/xy9ilA -+CbuSytnkS4IupKMATafrCUXYEnxDdmBomtTMeUtGP4 --> ssh-ed25519 IzAMqA +/WbGfhARVDm319TR0qHLHI6hiEtkhdIsL2Sh8s6ckk -Qq47gjD6jHbd6v17hjVY2VF2N57CQDQTM+bFW0bBaaE --> ssh-ed25519 uZzB3g RzTSqxOiFyNmhCBmv9scMZh9SIQNUBzYCjAx0UrjWCk -Ut52LPdRClX4VyVtPfMteYIL0nnbgQupAzOtiP+S8RY --> ssh-ed25519 Hb0ipQ /kb1PQTrQgLZgIuW4+QtZsbSSDbrYI3Kv2QSBYGtv2U -HoRoUilEz0cIZbohYK1J//l1Ujc3MyGzz2XJvc+jsMs --> ssh-ed25519 IzAMqA Li8UwQoWuxMCiXsj0IoqI1CWKIo8DP6B9Zruy242uAw -zUhpTd+uPWBvIyMoxIZbAMmP1sRi0yaoeLCfLy7ibpo ---- LPUW5Nd9pAyWqP52DXjB6UIyih9WsLZHNCDAEe08DT8 -«¨Èïsz·lŽéq -$‡|#þ,òkÃGÞ[ÚØÀbYOô -H˜F!û`z^©pÙs»¶´j`îW¶gØÎabæ}=yÚ><ñä¾Ètv±#‡~pÎv<ºåâh¢"¾‹MºÚ’ºkõEáR€d¢²‰O|e'=9”\ÙaJÓ!P;féÆá„>þ‚/z³ZXˆ¡Ê8(K:ù¯Ý-"ïŽrÔÞiU¡ÇL—V(l3{Bû#Ž¡ \ No newline at end of file +-> ssh-ed25519 V1pwNA FJbuXA9iZkVimh/bRdl2MnswKZpHkF6HmIqG/cmE62s +2vP3FNg2f1ijAMwWGcLa7aZQD7/Tq8iXwf6+/bMEgb8 +-> ssh-ed25519 4PzZog 75e7m7A1i4/XjB+b9OozGjKttQ3VzJuoNwKV6z1xYB4 +9/czRQ3V/Kb/8p9h3cdiXXbNBECeZfLLEWg8gR+WBE4 +-> ssh-ed25519 5Nd93w Kier0iAHycxtmgq9n5Mq/eLR2akqKB2Z/JBA2ACjaE8 +HokkZ2jHa7DV6KqODEH5rF+YprwNwBIjLLFGbfXdkrc +-> ssh-ed25519 q8eJgg cFNBrJQ1R4tDi4HTI/1lGEy44cjCDpnUXGYsXQ4daA4 +GPJ3fX/AxxhUjvfnAJNREQDEGp/Bz4zvfiTWHD5bwMI +-> ssh-ed25519 KVr8rw hzHh/c9qM7v7eFFpvD/uvCcDD12kSaTabVVA8CKosgI +3bwDd/aWeYWmYf8b2ko4N37XXgTP5LeP98qYXSlaxwM +-> ssh-ed25519 fia1eQ gol262stWS/VMaXgAJNC/VK5QkNb/UHN8X2khm3PHFQ +3eBj1/cUkTSNBGANSYp6S7IvMU+8dKKEtZxqo7kMzxY +-> ssh-ed25519 IzAMqA Z70Jqsw7IR9vk4uLef56F1+YCQtK2YvDC950d+WVNHk +nXqGHPrbh3VS2DMToRKs9FxBsn8PftR6HTkeA2KXRLU +-> ssh-ed25519 uZzB3g Zrc8idjRB+ZPHq9ScsCnXDqipGM83pio/V8mO6YYa0I +JFVQ8V3Jkn8vxklAZzwGpmOcaKUd8QBDFO/+gAyb3Ug +-> ssh-ed25519 Hb0ipQ Yhn/pwNTNmMdW3L2RV2MJECEYRlAzNTYztcA5MfRCjk +S3rkfwU9Nln8WFPSr102lX+H96wnHWVZa6z8upTRgvk +-> ssh-ed25519 IzAMqA 8SVaC/2C2+xmeCP07Mu+/xGFSB1UXrIlVJ/i8YfQXUU +y4mt/hZRuc0+5OXFs3VjYH/Q/nEACAd30YlyUyNzSqw +--- M8Emn3XUVeSu5qTgSbR7/93DjFawmR5iZ2qxQEJ9gd0 +zg*õFŒô·ç½xÍ?¬7,¬ò”‘ïaƒ1'Ü¥ôtmR t[øVFÝl=ç+Mç¸îm᜴ÙÑj;¿Ä”Fy6—O\î™Ó¬µ²Òªo=¹UG#%{®ÇÛoæÛ<²Àèi*à,RO;L2Oy¤ðŠð×NŠ”¡`g‰*î$‚yÄÜ’R]-õo¼böÑ05Q/ÂXˆýk[dE’Õ_…i é’ å­ï+KP8Kÿ \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index ac09624f8447e7b68a81f7019ad5ab5174f61c2b..5d092e209af13772cfe3ba659a2df6403ed801cb 100644 GIT binary patch delta 938 zcmZ3=*2pnIr#{rkKhZF=sMOrI%+xL2z%9(rJk!O^vdl7|ASKz`$;`|kJSx*f->=j- zpR2N5-?75UsMsLX*~vfHz05x`+0@e0C9T-cNV_~RBtk#W%iJ{A(Z#~jf=kyg2#@b09j(Nd` z`e_m686K9t`Kiek`iTaP{@F>zA$egYA-?A3r9Mt>DF&`w0f{E2QN zZoydrxyezLK_%vvk%@jq-tHO3#@Q(bK1K%Uq2wJ_WKmSE;AvXu6K0v}mzV786YAP( zVQ86Y=H!^2Rge^(ROarOZ|>;hif&z6W};zgpn_qDWkra7YHnnDsbxS>U}3RgQIuI! zPL@}&VQPv&nsG?BX}Z3nzqVtEhY44dccqWNf2En5lVyIoXL*QUxn-qqWmdjVUZI<1 zdR9e{qh&x=YKVEcPxj=qjNwd1v#N1L2249{$^Fq zE~&+39u_WzP8M8=Az4|b=I-vke!2eI89^!jrbZE_{uSoot_5Be7G)7ZdEq|(1zx@p zLB(9Uy1EMfneJt-8QBq4!LC6`5pF*2L7_=0Ro+4ACOKjGE-tRV`dRfpp%&r3k^Y`s z|M+grtl|H0`EG5Z>AH^(*th9)@lH*bepIVhbyqiWL*~BLDm@NIzV+(`K3_RD_0Ov> zpMD5N2%a$scQf9rClY4eAh-YL1;NKto$95Hrpp#*zJI&S^quBY=hl2{KP9X()Y7yl)lEMn z+sVZxE7d8R%c!t4(a*rm%g-e#BhA~*$kZuWJK3brFWb2+EZNDhI4H8XBr6~@+p#os z;z#lDf;8jog2xnbe?6(#}R z-WK^@CC-WE&IWF7l|Fuv?t$(V+2z^+QDv!>Nu^;0r7odduAT+j$(cSW#(`xOff0!& z6?vt`*^!l{iEge1iI)CRCBZq#Va6_oM&6<5q2yWR=v(Nh5NMKA6j73sVias#?q!(j z8d_hLR%YmtXBt#)Vd`e4U2bSnmJyazY~<$X%9UObT9qDQY2uTV5uO+7pInt05RvHR zZ|Pr|Y-yBilonW&=dT^CAMEAm$)&5StDv8rZtU;u>gs3d<(Qb^n&cZ*lIZVl>7N%- zSXO9Z7U3P7=USB$@=Ps<+c ztxPuxN;)9ow%Re}QSrK;e5`w?ef?S4!0VP0Y!SR$Hhos9Gef&TRxo0Trg+Loqwnm>11>T<_n^4gc_U(ad0O?3b8=Xdw|UB8k}J8uhd zn9Ot5&xlLz1f L8l=~5ne7e$%V-Q5 diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 4b1089da42d83f4e020fa9b452462c14ad213ec8..8b370a8c5876a92821f28bd6c6095290a4a1365c 100644 GIT binary patch literal 2594 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 KzVY9g@g4wN ssh-ed25519 V1pwNA /aUAZW9tSsBQ8xRS/yJ+Je69j5sl8iScrzqOkywoiX4 -wmMAZavRVgBA+e1Uw7ACZkrkRC22xI7H/90K8ZeL/8w --> ssh-ed25519 4PzZog fDgP+2ChRIH0ylChyRumpvYjFn/rM+NPxrKbNYbP5zE -iU5bZmafl+Zt8Uw0+3DmQSi+4YJVGXf88W39+mOzkmg --> ssh-ed25519 5Nd93w 1a4QFM4DR6iTKpoIBf0zu5LVELOJrkCjqmdz9ksVP1c -U3dOhocNgCs7mwAIIIr1GdwXwzx9lzg4ygKdDoM/YHQ --> ssh-ed25519 q8eJgg 1pSJU3CrMP7VO/nLZepMDCOoJWu+rs+lGs2n6cHuMTo -caC79crN5hoIZ8CKg8oPm2HB/swgbGRl7GWV50ZGxiQ --> ssh-ed25519 NtlN/A PGi4H1QF9TD7QmeOdTwf8Xlvgs6+LoDpaQRjNCthiTI -VWc6rmqNT8U/y00x7suwi/hAuy+M4WGKpvraYmY0sfQ --> ssh-ed25519 v2Y09A TJ1t55HLWxKCc6UDiZHZAl0rJyCutEeB6KP+a0/CyTk -iV6/HA6q80mPnqDvAxfiszRIOWErjhBAKqAyWQFYYJ0 ---- Y0yrlECqXY/j3N0Z0ebhSlPCdXbCMreeWyLcpipi2L4 -Yûuf¯â ÖÑ'C¢M$·4Ä;–BL| ssh-ed25519 V1pwNA QUveqW1V2eyNUoLz3VlbU1eoeKqpMhKhM3xidvLzmAc +ONNE8H73iwIqsGOugXQdeH12oro0eAU2qBgIMc6/OS0 +-> ssh-ed25519 4PzZog oYUJKbA2TI8onEnEDLBLpRDqXBZlX4Wa5qk/vT165iY +J9LPEQfwudit3Fa7Po4tR+ZGMGJEVAL6QWD8S2pVeXk +-> ssh-ed25519 5Nd93w r3fH+siDMDiuo7MAYUzxpcCk+SM/kY/cL/ndRWn4OhA +zPQrQS9E7narD++03B1ECfz3w7Wtckbk3nC002GkjD0 +-> ssh-ed25519 q8eJgg l4ZcaUycpCI4o4NDfsQlsnl/BzS4UKhxSEYKbIclmik +lqT4jCsxhtK2tNNzRIiiZmB5iHFfzMR9w2TayZlTuvs +-> ssh-ed25519 KVr8rw CRuDx3JbAfKvRQ1SyD5whrlw2MpFnlP33YMiClgXvC4 +LKZIzgEEjLvKQgDJOZUi6tP9hi/lXehYQyodLOiNrYg +-> ssh-ed25519 fia1eQ uOoglDTy0OlQm+aUqsg3KfPFXynHnJi7d7WStsw7hmQ +Vt214X0k+A+BWzDwbk3JHX9/lOY74bUPVt0CdYUxHHg +-> ssh-ed25519 NtlN/A yAVmup2BnnPIyRVQD4+e3Fh0RTfc6mJZRLKTPV69AHw +dEAj8GqDaIMq84hU5DHEQsba5d7Fvp71xaMVQfMD6CQ +-> ssh-ed25519 v2Y09A 5rxrWgwLfUKqbWIyPzODXJiFSCPYB+Xlchj+9wF2RTg +x9qWFO8KJ6R2EUqbdkFVFYMs7nHelnqZ9XF4bZ6bx8k +--- XvVzqiGGv9j443pVSwh9lZYRjgSuUn98bICJichEzhY +åõ×/—"cÅ–R"_`QS‹ÚÂéy­p)ö꯼» z¼ÔeNÆîó–júÉTéõc:9%I™ùƒ÷ }$~Û¢RW`0Qä'©XÕÍûVJƒ[’@VÛ]$,‚¢ÁžˆËÀѱô[?òuwK½»!à¼Ì¹÷ÔÿáÌuBâç:) xÄ·æÁ‡ÝÑâi \ No newline at end of file diff --git a/secrets/email/details.age b/secrets/email/details.age index e058d9ff20a105adbde8df406ff25bc4a3522b82..6e3f187bfd319e6c13e85f19f2f30e703a98b010 100644 GIT binary patch literal 1309 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t<13`+M4 zDojhUEC}{1_3|yUuqdi>3(Kt3uZRpzE-fhYD@~3x$?|s$a^><)4RJEhOA5*Kt_U`F z$}tQLh%)!g_c4pe3GuEdb#?Jf49$$H%ql9bFhRG?B%mrPKV2cnB*n!sDBm)$pfJeY zvd}xL$f&X;yTB{by-?r6$S5Ku)5q1x#m(P0+k(r_B0Rh(vBJy1!^bf_)y>x+$@%rn5WATiwE&?q3is5HY8(>7DT6iefBg|MXjoUFv)psd8KqHN~^!^|9CXS2dG zmoj7RAb(dga|4fJ!%ROn@1Tf$uBy<8h^or+QvKlaprXRuz!JaI%tC{V{KQH>m(p-U z3sND})s$x#}nBr=+-~<(LF#RHTL*d!`tdWkrN}IRzMc zM|tOYg@t+*yXKS^b5)v`hUU0MWEqC$c;^LH6dOcjXI7M%l=_5PRs=;wWS8Vd8s&Mq z=sUW(qTA*jR%B6Bu8`vFuCJdSVV+ZEkXGbrVv$~&>E@Sf8B$i7@91UdWT_vhpKsz8 zm>KS#&s83!9T@JXZ4l{g<`UuIT#}noQR3v1TaxWj;+N*{ROFqQZ0zXbS>df8if&t4 zW};zgpn_qsX{JX}VU)gkNJ@sYVOgkoVY$DNb9#|wxS?xcP>NG|gln#OsCGndD3`y5 zM`V7UVWNIUa$seaYhZSkk9KL8XPJvpVvwalwsugyg|R_KrFmeQC%SE(RgS)ejtZWU zCLyj)iJ7@3jwKcTCVtwHUXBH2p*b#@X~|yM$(}_X21ZGt0Y(OupTiPB~ughT#=H7QvZb<>8x0JnnT!hG#4v(k)^^2CU!lG1>(DtCP^ zzkGw_U`qqXGDG(?$KuF5Tp?NE?(Gwmlw;;v<7BmYe5ilI)`&nd6t3U1C`1 z7GCI`;qR4L5y_RARcdOQmtGN^ZQ@x_;+hu}Wolw> z=*gw4tE*61;O>{}m=$249aLIeR2&iRoZ?a*9^sW)=x>%}n4Xtc6cTg)SV3DbMxw6vR09`EEFU uHtGG7hLGyZ9e*m@j%jEK3%y#zGOf~S-m=f9n-8#rGS1Gw|J!iO;bj1M2E6A0 literal 1089 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uz6(vNg6 z4@*xmH#A5MHFxoGc25jREbz@tE(^(Xu`Etb%Q1`6&eSh+3+3|gDy;I!Ei(1WsWOgm z&9Q>Qa?Gu$k^Pa$geov z*(E2Z$l0PS+&n5Ixg^k}!Z=O8I3L|MQ@<2T<8p;mOH;onSJU*6yp-U`FvB$0WP`*) zkHE0V$ndl(a|6$k0;fWk7gA2X#JQ72Uvy)vT z(k*fmv(f$LS>@04e>7L;abP@0wGV^mram|c|;70{O>}G0QneS4XoLZ6QofHz88kLn^9Aa9So*L?8<{jjZXBnPZ$^NhOR1AZrG>j$m`9|uUt*bWfRkmoS#Cy^Ye=fUPk^PqPku!tmy=1b zX@yULrDbVeT2Xp-rlnJXk8_Zbw}op|aDlsjNMydJaZpG=x|>TRy5BsK3^EG>74$um zBU1xXT}mqh+`^o4%nM3#a}rI0jLR+cQ@lM3%gj=96HN?E3yZ59xibCIGYcFo(vtnc z(*lDn1Jcd>^R+9}4LwT|D?@!;OS7s1Ql0cu1APM=(QSiXjm#(g^LZ*3kws%&3a<;iogrjF@WtF3mhhbq*Zj?t< zW_VhXv3YKJn2T|EP^hsl*C#>4UoVbz)hyp|;oyejt0X@!+#t!2xn@t5rGZn;$*e=A zr>8A{`5-25;>GgI-`OfGV;y*z3;1htEKGD&F9*9jmG5iK6r6v?=acli9qnh*xhwb9 z7ujSVXZ!sry;8x1Yfj@I$_o Lrugiw38%^cZ7p)^ diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index 772418c..cd1ad00 100644 --- a/secrets/gitlab/db_pw.age +++ b/secrets/gitlab/db_pw.age @@ -1,13 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA MqlkSEW7665vH8VANnHBHTjlc/oLffcjvh8LosdmWRQ -w4++vB+QDa5cEZUWEzj/lWnkhzRmHkJbXvYzW+h1bCY --> ssh-ed25519 4PzZog jABRNvu9+DWUp7tQwqmSeuM2LcpFwW4wH6wJ4sYWhxc -HyaQan5J3FJXkngmaMJZRzPCCGv0NX4k6Ui0R28+Tvs --> ssh-ed25519 5Nd93w ETCnB462oOWu7uapPz06qHlLOw9lX6E9KLKr2zvENC8 -q3lYMQta1H5JDQjo7FPnp/SlF20L5fwD547SK8uiu0Q --> ssh-ed25519 q8eJgg 66LBY5S1DAXFdVnOHcpsNF/+w+X3c5gRC6f44Ql/QAE -qp0qjWWWcP4Ke+8ecq7v7xi1bCmRjWvKxc/qYXXuq2M --> ssh-ed25519 uZzB3g Mxi2ZLmLnoZH8iQW7fCu0+Rq5a1xyJsboJBp/vL1EUY -Wpp1drSllzmrsx5MJlwq97OIUoJGViK6oxyKoojoGpk ---- ldMCFXZrvRbTwcAgMzeikkk6G2O4J08xVrMqh65mNZU -9Þ^™S„’Ú¥luzM&÷u„£_¶üh%½’gžûš '›È,Âü"áÚÂËnù*׬K™¥ºi,¶3€Œ²S;9M­f»ºèðN=Q=+IX}]–ÝhÊA7fÜo¼&u+ã©Ú#Èö­ãr‡QŒ§PÖºX¸×kyº&ÑŒ®"ò¦UO+8HÑá´ë׎'².˜Ü»3½³ \ No newline at end of file +-> ssh-ed25519 V1pwNA a2hqKI7aO4y8QLvINHmeFrAeUthzoE3gcsNiJS87yTk +iy7zvTi6gh3/t42Pe+f5ylDx4eq1hINSAFhI3S1wOks +-> ssh-ed25519 4PzZog S4zRlO88rWpco1NY/7yJDQvCtPnRvYjWosE8VNtYkWU +iX+b3W2Pa3kw+ErHo/Qk+ZTH5B8svQTfMcXdN4IWVZY +-> ssh-ed25519 5Nd93w WDwhO/1jtbE+DbLq8BkReY/Vdyhdc35win+n3HMqclM +v2lqyU6RwTm6KX1z99FE78jv1KlyuoAWRG2x/Wq/X6U +-> ssh-ed25519 q8eJgg J7F4QM4iT3+8HbJo4ARh7iLn5/GBptn1wGM7amyr8ms +9DuYiyXOOWzXdlUAO7/rUYuPy9MyyxB88w814aM3XE0 +-> ssh-ed25519 KVr8rw BEBn1R3n2JYWqcjgfO5IIRWnrcPnMtI2E/hQGktypVk +ErzCxi8fht4tWQxzMAvkDnbNUtcbiyBiC9pNdp1vbaY +-> ssh-ed25519 fia1eQ G6EtgOxK54K97LCUNZ8h87WwWwXrn8cKtkCXa75pKGc +M86xqkKJ/DtjB7mIE1gPhoXTYzHp2393w0cZMOHQNQQ +-> ssh-ed25519 uZzB3g /sd3xL4WAKbPxvdqq/fihyAhxkn0FAiBCYydIXB1/VY +/hdi7E2cEU8U82/CVB+OpGacC+OfVpXXYEu6B8bQnB0 +--- HGKIhGq5mH/k6m63FdnLdO2R1fs7o7K/wlP6zBwopL0 +w×7°¥1ñµ“×»Áì }5¨-g-+GXVØpªD’å³)IëoróÒ£m´!ò¹ç®]7ï–Z)»Å±Œý"ÿ…±šét¯Öu$zâUÞyJ‡g_¿‰Yø'94Th‚Â_*„d¼%I‚oQ7JH#TulS|i5p}06h zH#Nn`)YQ;Y!6cw6DnDJp#n3V^Ex^UtCDq)lq|#sC+$|_fJ3QGy_$$k{VBH!;H3B0I`= z;z#lDa9^kJK&OaY-_-2Dau=tlDib69z+_inw{&xlg2q24~G6~3iO zAyvtS-enbKKDjRGX(5@ZrGY`^j;WrB7VhbVhIu)WP6p*%xi0y|kv=(=mBF6j`azLi zzAhF{7JkM~5q|!a-sOebITnSvQRbGBX4;PEq2wJ_WKmSE5K?YbUhM6k=U1Fsk)2c$ zoL-+=l5aE;_QWoYB?qrb{k?ori%H3hCjNy1EJ$LB^JW-Ua395&jjSSyh?o9!^P>#-*l?AqE90-WkqL9wGH9RR%5*DcPP} z9~|^@f4hEj{<%f%r2PRAyPP>U>fKf^D3bmx(6r{|zMrQ`8?2XC*GzId?^iQt$N7#m zr|Lvaj4vK4kgS;fxm(_>NpI09uF983w-hj(kkHR7Gg;2(-Y4tz?qK`U9L3x3N;mC~ zTd*T~-=%}AKR;5OzT(ht@q4RN6t$XkAG-=D^zz?W(6W72xn%p=)Aq4vWNu6}b=7@) T=CFPotB?5?{i<7UjTZm_3e!Xa delta 710 zcmaFC-orLQr`{sRs4~Po%+K9ZTiYmR#EIibetHeLiATZZ0yudOzGr~8(D9OV(&&%H}FCsV9H_|dWIWr)oD8RQeJfJ*% z;z#jtlPLetGPAJAGSes{?TD;$pQI>*pb(?Xg32m?gHY3q(!BhTvJ`#y;w(q5(84h1 zk`On?@^F&~_xwU_gKWRdl2CuIst^}%_prQ-oP0OqlA?&9^wjjp@r>g2&hGi9x%v9q zsoIvFc}{*oj!uSY6+yv{c^1jup&8DWeu+Mr!9^Cn!5N-hM!6YIVP;vL={W`Fg&v6k z!EOcyZu%t!k;z^qr5-_1IflMoiJ_IrCE3O3p;Q`GTDk3T$)xD?BkRg;N+ibQdtmeSrV0Nz~z))7#$2%k8Vz4 lIK?QR_EFMQ$~|P$=Y-i0n@=wO>FpipY$^RPqUj<>9{^hL0m}dY diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index b6b627ee6cea2512cdaf02102a251e2f3e9218b8..cbe77d7944c16b39df0bf0871a984dd3b8b1f8e6 100644 GIT binary patch delta 914 zcmeBWd&xdQr@qKMAlKKcEHgaHB*@Fd#U(r`JlrfOF~`u!zrfU0zoH_|&&jnswLHnu zmCMcDLqAnN#jhgY$fC^4Eu$>mIK$7^(cjP6+d0cMqoTMlG&4Qf-KDbBf=kyTj593V#WS6K);|l%Mtn}o3CzH%@-^vivoJ`lGT(@j4-$1W` zbnWD%NUul_58w3gV&5>I2n#2VfQr=O+`ym!@6!By!%%aJ6bqBd@r>g2My|dgMH%|R zxe-M^;l&|E7Loq>?*3UOc}01FmW8?Ap5;a!CVqM0#@W7H86mDwuKH0}P6}?4s}J?PsbV zl2PyC9hg{|9;|I%QR-FdQ4x@3n&W9%=9L+0z~yOTZjhB0VdiC!3U{Qca zn08)RrI$%|j;TqhkICe-jN17$FiDr@c$;s*I z<)K`!3M^;sTH2d>A9{xfsQ%FiBb7(mL^pto_U2%SxNN)ZdD~k0nW)> z-~4v3{`l>|lkMv6zbmhO>{@$oQ@|4AtEcjgPLBJ$WOkJM#5D`zRu^oXmpeI5{KAGy zkuNwKO9OA@%_}Nvc)P_QV~4~N))>v@to6IjWk~Qvyt*$V+E-S7i=q4H^!$y!Nqg3; z5_0OSnBe#}P^0n98pbyhSGXp$&e7JsTO-{WV_5JrGNPx+QsUqLrHmKVUq0Dxx4_aTOuHz3 z;z#lDTo2E5!*oaI{2Vh611ImC@+dFg^x#mpR5vsCtn?D+f-?OK|J>AKlbmcWeOD(p zzlt0uGslA5;Ha{sg2fu>$1d5IDF z&iSc90TpR^Ci$6_1(}ul$(3d$QNdn8<&~xZZULcXVU_7z70xB*+39J1Mt;7AC51Ug zC0WJV#m0%LCb@1^hL)yD8HHYv#>JH;=?2B0AUS^T!6nqq0`o|#(i;br7kWsp%>oDyMH zY?PR0RuCDeol;)rnVK8voKo(d&84fWtKgXHRgn|sZBgmy<(6*flA9Eg8Xjrk^!aYT)6S&-K2x>ey`7I}!EE-Wesi{t`JaBjF#LaHU#$P0794Y6;;x zPjJ+>3RJJ ssh-ed25519 V1pwNA hv4UcqhAkUaXfaa3w20WMEWXxeT++N4S73dAJjrwDG0 -v7fhGJZx12JXb1S9lqAYu3R3K+VX4MQAHlz+mBqwvwE --> ssh-ed25519 4PzZog BDI+dSNd9dLzRp70t2+svV1hlHzc8M2L3tXG0pJsrFU -PnQ47uW8nk0tgCZW2ee3IDt42tZA4vDz2NUIlsgvcKo --> ssh-ed25519 5Nd93w 53iuwGqWfa4rtJPoG5u18V4yS2PZEodQiJZlA1JiM3A -cbILfzpEvUJMvkQK1B4Rm11+3FB5l7a6cxsCgiIYo4U --> ssh-ed25519 q8eJgg qr7MzkbPkPytxIUd6HkDrCxhwA2tvxtAqKjhwdF7bG4 -aS/2cJL7d5pwk9pD7EiLoYqzpLDR+1L+jF3xMTjqFMg --> ssh-ed25519 yvS9bw zpFmE0X00PbHYt2jyoF0o8iZl2r3/rm3cqTWaDvW1Uk -no5mcYDiJzY4QhbZXHDVVzIpnYnR464mLLBgEIANojc ---- 0hP7UXRRmSUkcQQXnRFgtXkjyh8wgumK6JMZ+tnJUlw -ÌtŸrüWUAó+l.€ÚzªäÔ7–PMâü¸šýè¿4#þý`ª¶±âlñÿP‡yÁÂ{ðØýØ5ûéàŽ®´ù”ñŠ-Î0ˆ½áHåÐÙ:­ÉK`~jô -±¬ê(dN]°Pðå°òŽÊIj¹-_ÉÔ~ \ No newline at end of file +-> ssh-ed25519 V1pwNA ho0uObE03nO0vqsvZTMzPnCtKtrDY97NPnB7gEB/jQw +ACi9I0H6kVueAxy78vk/O9jRCWWg3oNqUpZca9DRxaM +-> ssh-ed25519 4PzZog tDFtlM+D+UCo4S1mvrsza3oITzMP4Ce5aoA2qHH/cic +xANLix3cVUbIaDoITNMmeWhGwDBI2Or6dRzHVgX90pc +-> ssh-ed25519 5Nd93w D0hUE96J87zkA4RFBeWT+DNQ1+Ias22qCBGJqCoNy3E +T5LQfnfbDroncMKocmQncKNn5hNk8DbHr7PbxRiREsI +-> ssh-ed25519 q8eJgg AAaT4eLvau98av6noniPXsxO2/hNe5zKhe4/652Q5gY +Fm8LUMsas1I+7Gk7bgCQLDglgWNBzoU35pOOYhrAhas +-> ssh-ed25519 KVr8rw di5+pJXvYhhCorxEEMtzCUaVyxAfj4lou7dHGJTa3TA +BlpXjM4e1nHQMP6l4yDqIyqDeSxBPqY+d00ovsXWxfU +-> ssh-ed25519 fia1eQ HQh4QEHVWYSUjfnXUa3hBjFiNztpUht3WQfrOdJUHiY +rBls9Iu1MJVl1kWlcXAuMfkvSUYTBgXX/+Z47zpNGCY +-> ssh-ed25519 yvS9bw +E73rDWXej0/ZciIvu+femktarnlQoXF7zZUQy6q5TY +u/+L9EEdQcztppqUIIX46cxFtneEEZXdIeCUQDHhApk +--- C9L0vzou3KDkzfFX3SvziLf3k14nDFtuCvrO53WKdZM +Æ#9+ø²±”kí(Â@ñŠ–4“ñ PÀ—›õü$ïp Ʊ©/7)¡|K'×é©)‹ã, Ï Î,5§£™hàÍZmÀÚX‹)RÞ—š [m %‡ØEÆ”^b_´a"Èwe½?jyc0©L-; \ No newline at end of file diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 820393fa1774604052e50515de68bcf31e79ebb2..2901579acabfa034ce58ccc9828422e801d15bc9 100644 GIT binary patch delta 867 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 diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index df1bf93eb37433ba584ff91cf9d45a73b967e50c..57748892d9e6094eb6ac67437de8bd0925d39e19 100644 GIT binary patch delta 2475 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 Yb_t%J$-8;N_Q%<$me+BF^nE!A0JRbvy8r+H diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index 2c547b7252a57e357bda04945d1fdaf38a2768b9..b397015d1d29df634bf82b4dd6416021b2a59746 100644 GIT binary patch delta 912 zcmeBSd%-?Ir@qv<$jj8UytF7O(5TYL$=JlD%);2cD&N!B)88_pz%eJYsIVX`(mN+F znX5E6DAYJOBCD*xu-wdB+bG%C&m<`)DJUl`%0RnF+c?lXvC<_VH9a%jlS|i5p}06h zH#Nn`)YQ;Y!6cw6DnDJJ+$_k@&o{)WG%vu+BOo%{#Vyq}P(Llg-zX%|w;-^}KRqnj zw=^W!)Ue8vDS{Irsg3hm(1auc)A{E7erW3QCtqKsm$N|PY{ zWG_!`)4-I7f{Ms0lj7jQTvHd1EH_u@#Nv{Wf{dU*GjDhOz{tSK@r>g2CE=DO8NT7! zj`^X1MZS6A*@jWZIcXtD0eMDgnLgV3PFZ1DA^L89MInJ)SrJ9%#Ra~psZp6pWrqH) zer16r#pxkw5n0}zc>xB-VUZ?jCgxRfz#39vYHv z} zVPJZRWuZ%;muazyNmyEBq?ci?dnlKIOOc_sQ%JIBPO*n)P`PWefmv>vf2D;*UXi~~ zzM+AiS!JT#F6P<#RYt*XW{$2V$yF6Wq3))p9*%BqVHPQs z#az0&x(Y5ySteN_`mRP%+Bua)p)Q3!?g9DPt^s)w`W_LM5vHk;W%YqRff;UoUddcJ z7vJu`{M&N9K{e+qzKXw#LcL8)(>F6P9(t81`!cC}nvN$c*TS9+atm_zuHU4uz2lbu zK3%!W4<7t2LasA!^K^7Mu%|rY7BiPTY89^MfAxXsxhXDX(WZH>GkXpD-8lu~eS+3a zl~+EmXmh%B?^N!84GPws=gw#yn_ZK6Z^^08RcBtV>z`aVcgv%@Ra*O)^`0z^^w6HZ R$FBD?_iDYbhdKX00{~0*KH&fW delta 710 zcmaFC-orLQr{38uz}v#pKRq$jAls`T-^s@>G}z0>CnreT$3H32B0DrJGO@rdt3p55 zmCHA^!rU~XIKv`5-8{UiINdAC(=yXJw8GFJ$SJ}*FsRC_z%Zpu-^I}|olDnFp}06h zH#Nn`)YQ;Y!6cw6DnDJpFVUmG$kMCO(A(49Fe@rK(9O#{H#;n~A}ze@~RArR5z27LX*FlDvGb#KeNslJFw4kl?_~NavuW(j@(G*J6Xo@r>g2?#b@iVMQ*b zj^UoUB`*4o6^=pqrl}cOF22b=7HO_VVFi_Cj^0(~c^TPU;Z7btRfU%6WyyY7!M-jP z7FC|UMcPrWmgyDYj**!;E{Xasrn!m629f#bp;Q`Gp`6YLpsiT4GsIRgzg; zVqWj)oR%Nz5>ezH;A~W$=ogS_TA}ZkSW+Aj$rY)sZDlj7}Z!lkRLs}NkOZ(xuaY-wzsl^AB6>0zL6;$3Rsonev_ zm~L(y73dae=v+}8Y2cV{z_m6^H*rPB&z1FgOG-`8iJdN!uGo{V$XeGXx^_-Cf1q6V z^HncC>2E}~wA@-+&uD%w%;j>d{F_~hJGZl@mj=hJ51qd5=|%ojzuEaO z=6zo5bSNXC>FC6>rL)gXJbw1_mj~Ss`q`p1+$|Q{xZNzuu~{jzm;dCRtV1ieP5SAq m%^cCHe^WB$=LV<##67m>U%797 ssh-ed25519 V1pwNA Y8V7GEcJpZbT+1JLRePnZqvhDS0XKI46MYNbY8HAAAA -+J8be6Slfuy1J00wkTjt3pznu/lz/s7SkJ0IwWkfdDE --> ssh-ed25519 4PzZog Zwyx5zJMwmL2A8yyvw+kKzDRIWuEgO2Gbgft7YYv4WU -/I/FfVENjO+dbl2CEunE0U94SxHDMuyRGWsdyTRtNdU --> ssh-ed25519 5Nd93w CfTiEdDV6lQz93KtvsvBThNc1psegKNlPT1K0tqYiVs -FFdbSBBAjuC2kiyGzawnp2Ui4+okQzb5drFzWSvqlFk --> ssh-ed25519 q8eJgg nhfS29M9MfnOn8SkS8ISWhZGE69hfEUI22nOVBi4j3M -yLiyRkT1r646SBy49iPhwhezHTZEmPGfqG+OyA9ocx4 --> ssh-ed25519 uZzB3g XSfCUI2kgTPdzWhomj9UtalXDq5A0JsD6vGngAyv+m4 -eKslq/aDtpKJ1NzHlKzDbRXAS2NdtZGzLY1cYA/+tD0 ---- 9rHjFQNctZwazR9X+8Z9j8hCJiJa1/e2zmJIG8b2gzo -Ú+¾f˜5Š^÷,9‚›k±Šç¬+³ëþ!CÀ>?´&õÓ³ƒèµ4ø(fsÇ-`%é3C¦xØ%üýÿWÊE.™(½gI -úƒl -ÃÅCÅœòLI¾ÿV åuE}ÈÁèG–~¤v˜!è‚žNûüvhS`‰S`l|k^ØœAÖ†;uXϬºwÓ•Ô"·V6§„)@ñ× -[gBI˜ÃI \ No newline at end of file +-> ssh-ed25519 V1pwNA 9M7GmhZKBWIG3aKDhybPf3j9L4lhTrGG9aGpV7dRKy8 +BfUZCdKn6rZGgHMf3475lgPqJamnm2W0tPkPctZHqyk +-> ssh-ed25519 4PzZog ijLfuYQCg2bofPXdcj+2wo4yar/Rcocw4e69nO/Kuyk +H8/Un3MCa/u+WvWUIl1L0W6agAC7qMm6XyRslDy/4SE +-> ssh-ed25519 5Nd93w ti92GZohdr4Yr2ezaLt4iJJaBeu6xfe3cU8YUvW0vH0 +NFm7YCcsy+X3OykCrBcO5/83qVojV2JacoSSdR1ctaw +-> ssh-ed25519 q8eJgg PvJPouqT8s+EeBv+SZUsfVXk6VY4R+o8SktSyDdxvHE +kGVDmEqA2kKGwmtK6Ue/rq8rmOUIdrF7tvZI4qjCuoc +-> ssh-ed25519 KVr8rw iQOHwjOQgTHEnn63/GBv9mRS5DZMouNK6ssawJIomGU +5wrSu/IlWpOWQ5WW0Ii0JhgWfY2qDRTT2dIayJWfPPQ +-> ssh-ed25519 fia1eQ ORWzCW6WqJttUok3KIJOJuR2a3mvJRD6EqJMDhaTHi4 +cO4hefRRmCNJT/5ShZ5G68JR5nNqsjIuCsMm9ymWW84 +-> ssh-ed25519 uZzB3g tlXiwBwJtKqA8xIJpUtS3/3R0loyD2uYI57P7HzcwXs +8Y1cOMDwGTPIUOKSZpx8ngab7dgtTRzvTb3r87x6Um8 +--- KZjYtWrcPBYnbBRRzKuyOr1IUvEdd+XggCg3rzPLKX8 +l˜M ¯Ô0Æ4a¨Ÿ”À'h^‚³žš®°ž/ðìé!©óÖ{D#]Ô”îõ¶û Ž ø;úqax×&¼ÉÑ1®(zwí"6YÕa±¿Ôì‹Wàv:©ÀوʲßÔÙOvc• +Ë8¦ÉdjbA€º¢µ +\·ø–l¤›Ož>ðä=‹Gÿò¾œYQçóñ¬ÅÙ  \ No newline at end of file diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index 0feb54596c7a7ba72deca46c8e3f657853e412ef..22587894a8ec0f3c863b7363ea42e6e9ddf12d9e 100644 GIT binary patch delta 826 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 delta 1185 zcmey)J)3KSPJLKXVXnKOms4R6xtX!HM@X1k zGFO(XXGL~Su#16NdZ}Bwr&*b2rf+CoRZdENu6t#8abB@exqEU>Kz5K}IhU@TLUD11 zZfc5=si~o*f=NJCRDQZblD~7Zk8xtLN2!ZrRbX(Ei(9a>t8rjqp;?HRtFcK*hPGQ# zwthucMRs61S4L`bK$>}up_xgMN0q;YL5_Zof3b&QmZ5P#xwlV*u}Nf6QiW%Vp_y~? z#E;_PxhBqzX>J8hh52FHxu(v!p_Rq?=6R_(0g=8g>HfxUAtu_z#zw(OmBF4|e#ub* z8M)=-z-NMQ(3)3q~%mYJx^Yx1|a$P*Re6#$LD~c+DOCx;3bHWo{ zJzPACyqt0~^ut^toQkwvf=pdJ%W~aJv$8!WC$fmw2Ua?{>6;rTr;brWsmrnS^=f2IrXjq=Xg~26}j+$3SURm6LJ0LScGN z*vvf7%-c67(=WoPu*5&bD77NbqSQ0MG|AD(t;Ed4Kfux4B-qy%WOlu8Mxc?CyMMZS zrH83cu6|^0RalNiQEE|6QIeanv0+}8QBGQ5k*QCWy8%~*x4)OGdumjbcBO%NZi;ib zfnQo$o_AhIdPRn_pIexTOJR9-MX*bn~q;0uGp2NXrO_jMY*zSSqJQxq^$on_9iPVSXU z62HE#YSoi^8R9zqYvue&8w>tv3NNYYulJq)?|gm$%feE2mjAh7nPO(_g=6wolKMLez38#K5t7!$C4u# zKP$W42wi$SEkfB&d0Xzj1BPDG7f)RHT&cVBp~JUNpXwR%9$dfg5|jCiNB&5~$8^I< zQt>R`-tOJU@TGP|)Z&|2U%Sk|oqsg{UF&5%$>wHG72hM*7MlO~5^eQB>banPZ<0Bi eKWAIumA!u+?{l`e(r6ML8_VbP=JzqCvkd?p;;lab diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index 37febec..c5f5459 100644 --- a/secrets/ldap/pw.age +++ b/secrets/ldap/pw.age @@ -1,19 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA NP6ek8muIcVTN7X45Ca4KxjiNwpIPgyJ6QPT5MXHoDI -JAdyNy1eCn50/G8o9UZ+HTs6UIvgulqZvwZJ2qPwglw --> ssh-ed25519 4PzZog xIbvzSC85K6t5l7/4C8yKUetsmF7qjXPfT0iaJ3WWXw -JnGVTsGtD1gUwGySKbLYTp624ptRoGRGHVljvXnWLnU --> ssh-ed25519 5Nd93w dmqR7XslUxk6epmjFlsgNBHLJRCTJEXYp8yg204/CFs -s2dgY+P2Kbk5W+3afA5dDhRExu7yDDdEIk7a2hjiYuA --> ssh-ed25519 q8eJgg w/wr6gwWRhNiOH7eXtGsvll4yVqHNHyTMGkV/DQOFTM -2Kh/Y9RoKQkrVVNZmXIKea1YimkUujGQjiEU+EMCSXM --> ssh-ed25519 IzAMqA J1Uxj03c9gWDxrqkDe5Br/foddQPnTQ8flGtaEUZoX8 -ESWBqkufGoxaSFrTqee/6VdjFzeaLEk1uvlycyZu1UY --> ssh-ed25519 uZzB3g QtwtyCCE+HAPPzG+1WZJ4ZgH7OMZcSWz7m7+Bl76Z3I -MS9IWEZ4yMIqeGgp1h2gcBT1wrUUjKupKaqfaSC01Q0 --> ssh-ed25519 Hb0ipQ MH5FmXTUgMaos5XJZadaf0EFEQWap0KFFFmUC5ZHnko -UOUi3fKC0xbxh+oiJmqAQCEVtEb3ESXqi9wrnVosU1E --> ssh-ed25519 IzAMqA QBPOVyi9TDCcHOowdtCBcH2dX1bxDOQnl3a/5hixWh0 -vV8ats3EdQMu6q4I8dL2HpbiHHzt9Fk4SuNU0t52nD4 ---- QfeJV3/aEiOK2h09SZ6lrYvXsFtwdf/eOA4ogOR4M3c -fb–ó Ð%Â3R$÷¬/ìôzΕóA©1ø·”²-2¡a/Á²vf}Êâe@ëWËÏÊ9¶¯°ÓÀƒVmÞ‰ogš[€Ð3c\jöSXÒ…ù œeTܲ|¯'/7 Ç#ð|)tÿÎKLâ~(ÈÓÊwóŒ£F2É"Ÿ{yOiv®•ØhFsnk«Ç—¯êñ» ^+ÖQS \ No newline at end of file +-> ssh-ed25519 V1pwNA 87SmLeH/I1VzLSj65xOuPZsPDnVl9xliQ5/CVijnYmM +2RNAdkwpR7AHsYrh4/NnANF5oNa6NnKF2TvqiuMrxAA +-> ssh-ed25519 4PzZog BUlnW06UQsJzwcQ3Jtca5Mzgj+iFUunwhisvtIYlv2g +8zGP78Pcw7Sx2mCWAEBf/v8vH3PXqqQ5GmBXvLQN0jk +-> ssh-ed25519 5Nd93w 985aPULvm7eHx4VACN0MU9tkZvuhEGfTse5rCILxCWE +kX2GxHAC1XJe837p6kJtaqnESrNQZgBOnw47zE7enf4 +-> ssh-ed25519 q8eJgg J4Gdo5cacvP19ZyUFSsIQdy6imX6oJDrBIH2nLUC4D4 +d4VhUAvqAyIAYKJjNPg5rsM7GifGQo+nl1+Oyvk7tsQ +-> ssh-ed25519 KVr8rw cmAn4m7om7xJ8ByH1mWE9sG4NZVOOENZYuqh8yly7CM +qgZjhu1fvNbDgbF3xFMqVI0klgZOZ0gEuXU/dq7ZziA +-> ssh-ed25519 fia1eQ xTLCJGaocQf99+Fl6FHXu6hOXLmq2i8aFDoS7RevYV4 +K4JxlKPHjUfQZj9LnVXAryWln2c10lZhrpt4ALCF6k4 +-> ssh-ed25519 IzAMqA VCMeNgMAgywehKU6Fvh9O0nXHWSFD2PkNM8++ZqWYB8 +uCnmYYPiuKt22eplH3Ms0LzBynU1JqMjWDDx9Zep2Q0 +-> ssh-ed25519 uZzB3g OIeb65JzQmV+GPw1RxBYEKrWBovyqD+yUNkvD5ey7Ds +7RlSzUGmwcuV+NwwOIJ1dAsiBk48lD3vbsnq7U/xJks +-> ssh-ed25519 Hb0ipQ s5bT1+VXT8ySjSTCoD6dDqc+cU49SDv1AgUIKmaKcno +oa+M7RQq31nzSccRUdEw1NuHQo4xHaSva6CaIBgz9V8 +-> ssh-ed25519 IzAMqA hvFsxUBn484Uga9+JGPDxsjhZBhmNGlLXn/jX2BxwA4 +pSdMVOfWttPbioa0Pkl2eSjE+TpocHu5+/l0f8IoOFA +--- B28xN6XA1WfkiAYzDCfdKMxbosPv9ad0V/NFX3KeJNw +Œí»X˜1«š*Ö‚Hk’—,ïÐè2>è<ÑþÄfŽiP# Ù‘3ç³h<ßM±RD¥ASe†ö!2`­Ž£?¿ª0µ–F¼÷='à¿ŧ¦øCëõñr¾@ÒêXvƘî{Ç"+s[Ûî­š€‹E«‚Ÿ¥65CÚÎx§¡xr°]™Ÿdê3_ä™1J7áÆÚ”¹½Àµº \ No newline at end of file diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index e5612e1..2a15d74 100644 --- a/secrets/nextcloud/pw.age +++ b/secrets/nextcloud/pw.age @@ -1,13 +1,18 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA PiQsqOT6Kgdo6s5Xj7/YrOF/xcFUY79IVGWh9QrqiTM -oDH/CXTFBNOQFFJRIcP2jrJhPb/CabqxBOPUyjCBgBE --> ssh-ed25519 4PzZog //UFKnG6srGzPvcZZGBoV3C7LCV3mkbiRwyKRfk5txU -sOIxSDePjj7gt4fsgy134MaYasE6bylaxMgwCYEsopA --> ssh-ed25519 5Nd93w uJVBYfAdaQD9F6Ps3/K1BvjmHd0KL1A38G+6tZ8uTB4 -ua+xSp1+tSVMEM7kG/0x6XcXg4zllyxGGt6UT4o0tH8 --> ssh-ed25519 q8eJgg 9F7SNeeEpCWgH3EnigRYnX48R/1ST2xjcPEX70qcklU -8JisSMHjwXWAYH22V4EfaFN1rQk/fr5kG8Uf6vFcfeE --> ssh-ed25519 YFaxCg 4ZlNZRZ0DPBGXA10Rkvy7Iyk+r8nSREK71n93aZrbUs -YWFtPzyae1TZ+cA/vmWAHFr9P3bA6NYxkpAUeVNK7gs ---- e1ZdhiA8AMinAmj4jY5ApJ6ASLdH/wK95iWw8jjWg6o -þTØtd‹l~ ˆou•òí¨8¥´/È.w¢Š³Õ•¶œ=*Œ1r·´æ·}@ð ãFy¦×;J!§ðIÓÆ¿AV –=ül \ No newline at end of file +-> ssh-ed25519 V1pwNA gR4aFo/u2ow8mMgTInSPElO6gBhgig2s9Wzp+IkGjlY +mVWoBrKH7AihCbdrspCIzPjF8N0kQGDML6pkybH5Y4U +-> ssh-ed25519 4PzZog BhiSfpYVlUgTLX6rHisiyzLOmzrqcZ8JKDqwY1lg+D4 +nSxNNHRYPy0C0ufqa2QMIylMr5IPlPUiDcg+d79KkDA +-> ssh-ed25519 5Nd93w +bZMaaPc0jTIQ/eu/uWWgA41UQnKveaaVjgqoIaAGyw +elodhm0K17eQQInvae1tkkhFY1aPrbTdaRsviYDEBEg +-> ssh-ed25519 q8eJgg LlaIdTPw3c2H8R5mDIIam4Ygvvk5gpgPahNJvf9UnB8 +BN901oRUt0j75RnQZnn4uFiLKEtRhCvFtKHug7Ikg8U +-> ssh-ed25519 KVr8rw Bv9wfs5KP7lvH3Bpnsbzpgzduq1xiQlwVcWndWFL7Qo +LgGA4X5MOelYhpXWfsX95J+YGjcPzL6ISlPKr9ZNv/w +-> ssh-ed25519 fia1eQ WaxlI+aHWQdJs2YtttcQ4TzI3aIlkmdbm21mhv71VRE +yI6QKxZ/TwXRDdaHxt6+ZVldnB7sZRGQFABnd7zeXtE +-> ssh-ed25519 YFaxCg /V6Ab/BqFQ13K0qN1DOfaw8LLGR049s0S/FuK6dL6WA +fZbxvQWiPh/MH4/fOzV5trPL+B4H2o2WtVBIPuFsdLE +--- kUKnoRQARSlp+lGUNu5Zu7KztkK36VZeK9xozWZwmyY +¼‚‚϶ÞãtT€‚)ÊãQ*12wc¹ÍÛvѶ^ÁE~]ïÀ!³TÎÎB‰3?³ +§R™}ˆDÚ>º uðÃ-.¿¹9DóŒ \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 6cc5101..07213ca 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -11,6 +11,8 @@ let silver_laptop silver_desktop thenobrainer + eliza + esy ]; agentjones = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDHOxA3uYcqS5gTrG1hS8XXwehzQYAI2I4iULtU8cXft root@agentjones"; diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 7405101deae928f263551687f491de79f3ac8239..85b35f3c94d729cb633403e689a9458ddce726e0 100644 GIT binary patch delta 3013 zcmdlW)*~@Nr@ma@)FmppvM4DmB|9Uz(9k==(84sZETF_JxZKw}A~?LnCqE}B-6h>E zlFK{S)GIY5$lEWt)Y;iMEw3^o$|BpP&>%ZFq%0!8*fAt2G}K5tTt6ZxnM>DBp}06h zH#Nn`)YQ;Y!6cw6DnDHz-OVJ`-7+-AI3&3^+&?AM(XG;@yujEw#Uj@$sI1(jGC#92 z%rm4aJjBg{E8H{E%q%(8!>l~p$fVe^G%?x7zrw8|B|<+cHOMLWm#|{45DPC) z6Q|UyR1^K6vg2j>SHq9zi+I z1v&a|g^mU$X8F!$+2LlUUg6~dMxoj0q2wJ_WKmSEkm2T4RcxxA5}Iz5<>why zo?D+^`n7QvZ8Atinp`o4yKz5)7aMqUL;Sx%Map~j{DDSi==#m32rx#~~6^SgH#**;JYKDj7gQgV|p8FhL-&xd?b1?dDt=p~h>TKU{ggCR$ z?46YNyl_t^-_PlmhugThv)zqnmImgV=;e2wJl*jrYx#oSgah}hHGC9a@H}y@u$i!e z;hTQpHj}T1U3GhVYA&q%%A>coKBDcVoc%G&GJ7uRsN|DE&exbW$S~)KkBelbE>fIW{GhA^*`&F_tAq4Yv+6X`@i}W4}0mWdL6BO2ArAULDf}d%FBXV zLuP!wQ>4WkbMHxoTwd~9v+swt?w+B=JYm0Ot+-Qd&xWetY0EUuFbdE3z^wN+^-T)P z@`+dG9y`%{aJrg+X~M@97N0Vj=!aV~!C1MVZ1Y{6z1-|$uBnqJ@dXIski`$ua}Ti!de+lEtUh1gY2 z!xwYgr8g~iulIYZx9;DXrY-kc??3cnUOnYZt2f7ovdQ6jvYo_~M*E`;^(jJ}MI#SPFh~JX6`UJ0kqkdDi@m$Ar3f zv_9|Ja6M@6cRq6qi7GuI#jPGnO_e2G%ez<`Wqu~NJlb!6tJ|VJbit#deP-%;&iB8a zu73LGGqX7B?};BH{*~X%e-*x4bMd4O_bxNzIlHZ|cPrM>o9c@ruDO8g zPG+*J_P%F_xUNo={_vSUYi4tqi1@<`zAO_$K16M7*E#8!9(;r;D1CWWVNK2EjrE7B ze#^ZI5{#RoH$!P%+s=Cn!u@?s8Q1SuOnD|8leTQ>u}2bfcsA@{X7f(0)0pIbDo@4i zMc7fn^Y54J6}Nu7Gr6EB>!Rhc#m3_5+ZkS3N$?t8@|i4oLvV6dv-m9kxM_d4#;^Fu zCK4ZE_BZQmcigs*#(%{v;__WO9XpM;Pr4CQAHFo&DJ@{}$wy)jmG`PFfBja=a`k@S zHDz9_uXo&5do$JiWsuUkyG)wC6Cc$J38dB^oquhn!3k!)d&PhECmc1GeD@-&sh#!L zeihZGvfLHhmhKUpjN)}X?=bAapz;_iy``~JfB2Y|7`kD zR9Ur6r2TfioLkGv>OV7&zvwNG?tf|t(W!q^8CvTPKC#g+P>dnlzywn#Z6<5dBW|-1zhpZcLklDwfWy{v1V@1k6P1w zo;;X#!1T`~ejk%J3+B%Kbh-N1O^H%f^%Dl_X?MO{zx=4?ThiZiryVpWh%H<$zb|EyziQ>T`ah;k zU)|y#vX#V7S?k!iOUUHAn8#C{W!vuc#~zJxO)0kBYOBE*nyQeMw=s9I-uY$uccU{) zJYKAv8fNgSrssHf;l}L;+vglwb?a^U{S{9wKUaMD_IppBo z+syp5bz%|(lIC+g$xx%Rd@ACnabmVQ|w z5x3DNQO1m4^kl2L>v|>D)JOAXRIO0AR#WczbFgLMr?T zj@7+)(@su2*mxIKppGMh!n03505{$c0Bp(`L@%!CqtI8RD^U(oOXS8Sz>u} z9M7d4tM(ggxZBrCSx0D7t vN7Ubl{r>h(ZqT!D2N`(7;>*@;e)e7@^lY%$3a4K+;(6BLj;oJc_ptx~kS%Lm delta 2810 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 literal 1131 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5wB8H7YCj zvdAwg&-B(#vT*V<()UVotBiCGHus3sc1=w-EHBj0F*HmKiR6m1)Gl$2EH#eus|-xZ z5B9PM_HipqPfIcK4Kzvi3-(LbFD+s5rDF*x1+D#W%p+ zA~N5-usku`!av+7tT@p!vmh%qEF0Z6Q@<2T<8p=Y^!&_7%WR)g%j9BL%j6uV%ruYe z$n+qmWb?9YL+^-WGsCjnoXFtds(h{-%aHsE->lFylgh;K%<{r;Ls!pyv%I`gvlLg; z^rT|#&N0#~;nfeu(TLkMT7Uh=an5X2IJ9-#ccouj&2UUdxSO&Ye z1)1jLm81L3v&zx8&{09#Fx)r5(I>DZqQEo9D8o@d(#Oao(XY@r)hypEB`Cr(JSiu~ zJIN{6$(74LxxgeV)7T~0$J8>%H^armvfMbxuOy_vJS){DJvcQjG{Pg($<42-ycpfK z(x@sY<8*~Uzw%s5qskO>FYhFi3jb20(oAo6<09=q3(Hc+pb+iI9M@u#pn_~qmq@N8 zA5SNfVE^!(qLhf7!ooEFsFEx%{jkd1BIlG)Uw@x`Z|}&o7 zQLSJ&zvOaoNS)GZjcvOQzWOHaTvoQ;V@1BT#kM2^`Q8~k9J|*92$nBZ+40o5zP&d( zvh(easgecbYiSx#XU{n?a(<+2XD{P92Mt F1pqLghO7Vp From fee1e34ca88b06ad6ea0ee3da9a08f61574387df Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Jun 2024 20:36:16 +0100 Subject: [PATCH 151/563] fix: move to a better naming scheme for previous versions of teh skynet sites --- applications/skynet.ie.nix | 28 ++++++++++++----- flake.lock | 64 +++++++++++++++++++------------------- flake.nix | 8 ++--- 3 files changed, 56 insertions(+), 44 deletions(-) diff --git a/applications/skynet.ie.nix b/applications/skynet.ie.nix index fe83fc4..188bc64 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie.nix @@ -21,7 +21,8 @@ in { config = mkIf cfg.enable { services.skynet.acme.domains = [ # the root one is already covered by teh certificate - "2016.skynet.ie" + "2017.skynet.ie" + "2009.skynet.ie" "discord.skynet.ie" "public.skynet.ie" "renew.skynet.ie" @@ -35,7 +36,12 @@ in { value = config.services.skynet.host.ip; } { - record = "2016"; + record = "2017"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + { + record = "2009"; r_type = "CNAME"; value = config.services.skynet.host.name; } @@ -63,9 +69,8 @@ in { forceSSL = true; useACMEHost = "skynet"; locations = { - "/" = { - root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}"; - }; + # this alwas points to teh current version of teh site + "/".root = "${inputs.skynet_website_2017.defaultPackage."x86_64-linux"}"; # this redirects old links to new format "~* ~(?[a-z_0-9]*)(?\\S*)$" = { @@ -75,11 +80,18 @@ in { }; }; - # archive of teh site as it was ~2012 to 2016 - "2016.skynet.ie" = { + # 2017 to now + "2017.skynet.ie" = { forceSSL = true; useACMEHost = "skynet"; - root = "${inputs.skynet_website_2016.defaultPackage."x86_64-linux"}"; + root = "${inputs.skynet_website_2017.defaultPackage."x86_64-linux"}"; + }; + + # archive of teh site as it was ~2009 to 2017 + "2009.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + root = "${inputs.skynet_website_2009.defaultPackage."x86_64-linux"}"; }; # a custom discord url, because we are too cheap otehrwise diff --git a/flake.lock b/flake.lock index 874f430..d9c6ef2 100644 --- a/flake.lock +++ b/flake.lock @@ -620,11 +620,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -634,11 +634,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "type": "github" }, "original": { @@ -807,8 +807,8 @@ "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", - "skynet_website": "skynet_website", - "skynet_website_2016": "skynet_website_2016", + "skynet_website_2009": "skynet_website_2009", + "skynet_website_2017": "skynet_website_2017", "skynet_website_games": "skynet_website_games", "skynet_website_renew": "skynet_website_renew" } @@ -922,45 +922,45 @@ "type": "gitlab" } }, - "skynet_website": { + "skynet_website_2009": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, - "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1707154174, - "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2023", - "rev": "c81db388fac570a8cb646391ea461b9e60282043", - "type": "gitlab" - }, - "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2023", - "type": "gitlab" - } - }, - "skynet_website_2016": { - "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" - }, "locked": { "host": "gitlab.skynet.ie", "lastModified": 1690726067, "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=", "owner": "compsoc1%2Fskynet", - "repo": "website%2F2016", + "repo": "website%2F2009", "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e", "type": "gitlab" }, "original": { "host": "gitlab.skynet.ie", "owner": "compsoc1%2Fskynet", - "repo": "website%2F2016", + "repo": "website%2F2009", + "type": "gitlab" + } + }, + "skynet_website_2017": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, + "locked": { + "host": "gitlab.skynet.ie", + "lastModified": 1707154174, + "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", + "owner": "compsoc1%2Fskynet", + "repo": "website%2F2017", + "rev": "c81db388fac570a8cb646391ea461b9e60282043", + "type": "gitlab" + }, + "original": { + "host": "gitlab.skynet.ie", + "owner": "compsoc1%2Fskynet", + "repo": "website%2F2017", "type": "gitlab" } }, diff --git a/flake.nix b/flake.nix index 397f721..3480a59 100644 --- a/flake.nix +++ b/flake.nix @@ -41,17 +41,17 @@ owner = "compsoc1%2Fskynet"; repo = "ldap%2Ffrontend"; }; - skynet_website = { + skynet_website_2017 = { type = "gitlab"; host = "gitlab.skynet.ie"; owner = "compsoc1%2Fskynet"; - repo = "website%2F2023"; + repo = "website%2F2017"; }; - skynet_website_2016 = { + skynet_website_2009 = { type = "gitlab"; host = "gitlab.skynet.ie"; owner = "compsoc1%2Fskynet"; - repo = "website%2F2016"; + repo = "website%2F2009"; }; skynet_website_renew = { type = "gitlab"; From 34f8f0eb8c50cb056b8ab96e719108b07a4ca919 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Jun 2024 20:38:46 +0100 Subject: [PATCH 152/563] femt: move skynet into its own subfolder --- applications/{ => skynet.ie}/skynet.ie.nix | 5 +---- machines/earth.nix | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) rename applications/{ => skynet.ie}/skynet.ie.nix (98%) diff --git a/applications/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix similarity index 98% rename from applications/skynet.ie.nix rename to applications/skynet.ie/skynet.ie.nix index 188bc64..fa69885 100644 --- a/applications/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -9,10 +9,7 @@ with lib; let name = "website"; cfg = config.services.skynet."${name}"; in { - imports = [ - ./acme.nix - ./dns.nix - ]; + imports = []; options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Main Website"; diff --git a/machines/earth.nix b/machines/earth.nix index 9106027..4e63521 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -25,7 +25,7 @@ Notes: }; in { imports = [ - ../applications/skynet.ie.nix + ../applications/skynet.ie/skynet.ie.nix ]; deployment = { From 5c8dcdef000bc22c10f29c128ece3c0cf2dcab18 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Jun 2024 21:28:52 +0100 Subject: [PATCH 153/563] feat: really easy to import in old versions of the site --- applications/skynet.ie/old_site.nix | 43 ++++++++++++++++++++++++++++ applications/skynet.ie/skynet.ie.nix | 33 ++++----------------- 2 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 applications/skynet.ie/old_site.nix diff --git a/applications/skynet.ie/old_site.nix b/applications/skynet.ie/old_site.nix new file mode 100644 index 0000000..3b4a211 --- /dev/null +++ b/applications/skynet.ie/old_site.nix @@ -0,0 +1,43 @@ +{year}: { + config, + pkgs, + lib, + inputs, + ... +}: +with lib; { + imports = []; + + config = { + assertions = [ + { + assertion = asserts.assertOneOf "year" year [ + "2009" + "2017" + ]; + } + ]; + + services.skynet.acme.domains = [ + "${year}.skynet.ie" + ]; + + services.skynet.dns.records = [ + { + record = year; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + + services.nginx = { + virtualHosts = { + "${year}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + root = "${inputs."skynet_website_${year}".defaultPackage."x86_64-linux"}"; + }; + }; + }; + }; +} diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index fa69885..b5bcdf9 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -9,7 +9,11 @@ with lib; let name = "website"; cfg = config.services.skynet."${name}"; in { - imports = []; + imports = [ + # import in past website versions, available at $year.skynet.ie + (import ./old_site.nix {year = "2009";}) + (import ./old_site.nix {year = "2017";}) + ]; options.services.skynet."${name}" = { enable = mkEnableOption "Skynet Main Website"; @@ -17,9 +21,6 @@ in { config = mkIf cfg.enable { services.skynet.acme.domains = [ - # the root one is already covered by teh certificate - "2017.skynet.ie" - "2009.skynet.ie" "discord.skynet.ie" "public.skynet.ie" "renew.skynet.ie" @@ -32,16 +33,6 @@ in { r_type = "A"; value = config.services.skynet.host.ip; } - { - record = "2017"; - r_type = "CNAME"; - value = config.services.skynet.host.name; - } - { - record = "2009"; - r_type = "CNAME"; - value = config.services.skynet.host.name; - } { record = "discord"; r_type = "CNAME"; @@ -77,20 +68,6 @@ in { }; }; - # 2017 to now - "2017.skynet.ie" = { - forceSSL = true; - useACMEHost = "skynet"; - root = "${inputs.skynet_website_2017.defaultPackage."x86_64-linux"}"; - }; - - # archive of teh site as it was ~2009 to 2017 - "2009.skynet.ie" = { - forceSSL = true; - useACMEHost = "skynet"; - root = "${inputs.skynet_website_2009.defaultPackage."x86_64-linux"}"; - }; - # a custom discord url, because we are too cheap otehrwise "discord.skynet.ie" = { forceSSL = true; From 1d3549d54149cf2397b25e31d36459453f0b3cb8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Jun 2024 21:34:43 +0100 Subject: [PATCH 154/563] feat: current version is always on top --- applications/skynet.ie/old_site.nix | 9 --- applications/skynet.ie/skynet.ie.nix | 3 +- flake.lock | 95 ++++++++++++++++++++++++---- flake.nix | 32 ++++++---- 4 files changed, 103 insertions(+), 36 deletions(-) diff --git a/applications/skynet.ie/old_site.nix b/applications/skynet.ie/old_site.nix index 3b4a211..1e43255 100644 --- a/applications/skynet.ie/old_site.nix +++ b/applications/skynet.ie/old_site.nix @@ -9,15 +9,6 @@ with lib; { imports = []; config = { - assertions = [ - { - assertion = asserts.assertOneOf "year" year [ - "2009" - "2017" - ]; - } - ]; - services.skynet.acme.domains = [ "${year}.skynet.ie" ]; diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index b5bcdf9..ee99134 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -57,8 +57,7 @@ in { forceSSL = true; useACMEHost = "skynet"; locations = { - # this alwas points to teh current version of teh site - "/".root = "${inputs.skynet_website_2017.defaultPackage."x86_64-linux"}"; + "/".root = "${inputs.skynet_website.defaultPackage."x86_64-linux"}"; # this redirects old links to new format "~* ~(?[a-z_0-9]*)(?\\S*)$" = { diff --git a/flake.lock b/flake.lock index d9c6ef2..d3ee8ab 100644 --- a/flake.lock +++ b/flake.lock @@ -619,6 +619,20 @@ } }, "nixpkgs_14": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_15": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -632,7 +646,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_16": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -646,7 +660,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_17": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -660,7 +674,7 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -807,6 +821,7 @@ "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", + "skynet_website": "skynet_website", "skynet_website_2009": "skynet_website_2009", "skynet_website_2017": "skynet_website_2017", "skynet_website_games": "skynet_website_games", @@ -922,11 +937,32 @@ "type": "gitlab" } }, - "skynet_website_2009": { + "skynet_website": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "host": "gitlab.skynet.ie", + "lastModified": 1707154174, + "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", + "owner": "compsoc1%2Fskynet", + "repo": "website%2F2017", + "rev": "c81db388fac570a8cb646391ea461b9e60282043", + "type": "gitlab" + }, + "original": { + "host": "gitlab.skynet.ie", + "owner": "compsoc1%2Fskynet", + "repo": "website%2F2017", + "type": "gitlab" + } + }, + "skynet_website_2009": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "host": "gitlab.skynet.ie", "lastModified": 1690726067, @@ -945,8 +981,8 @@ }, "skynet_website_2017": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "host": "gitlab.skynet.ie", @@ -966,8 +1002,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "host": "gitlab.skynet.ie", @@ -987,8 +1023,8 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "host": "gitlab.skynet.ie", @@ -1067,6 +1103,21 @@ "type": "github" } }, + "systems_12": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1223,6 +1274,24 @@ "type": "github" } }, + "utils_11": { + "inputs": { + "systems": "systems_12" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "utils_2": { "inputs": { "systems": "systems_3" @@ -1351,11 +1420,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 3480a59..667754b 100644 --- a/flake.nix +++ b/flake.nix @@ -41,18 +41,6 @@ owner = "compsoc1%2Fskynet"; repo = "ldap%2Ffrontend"; }; - skynet_website_2017 = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2F2017"; - }; - skynet_website_2009 = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2F2009"; - }; skynet_website_renew = { type = "gitlab"; host = "gitlab.skynet.ie"; @@ -77,6 +65,26 @@ owner = "compsoc1%2Fcompsoc"; repo = "presentations%2Fpresentations"; }; + + # skynet.ie + skynet_website = { + type = "gitlab"; + host = "gitlab.skynet.ie"; + owner = "compsoc1%2Fskynet"; + repo = "website%2F2017"; + }; + skynet_website_2017 = { + type = "gitlab"; + host = "gitlab.skynet.ie"; + owner = "compsoc1%2Fskynet"; + repo = "website%2F2017"; + }; + skynet_website_2009 = { + type = "gitlab"; + host = "gitlab.skynet.ie"; + owner = "compsoc1%2Fskynet"; + repo = "website%2F2009"; + }; }; nixConfig = { From 5c33399d97e8a4a4dc275ea804b7297379aa87d9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Jun 2024 22:03:21 +0100 Subject: [PATCH 155/563] feat: add teh snapshot at the end of the year --- applications/skynet.ie/skynet.ie.nix | 4 +- flake.lock | 82 ++++++++++++++++++++++++++-- flake.nix | 7 +++ 3 files changed, 86 insertions(+), 7 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index ee99134..6a2afd3 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -11,8 +11,10 @@ with lib; let in { imports = [ # import in past website versions, available at $year.skynet.ie - (import ./old_site.nix {year = "2009";}) + # at teh end of teh year add it here + (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2017";}) + (import ./old_site.nix {year = "2009";}) ]; options.services.skynet."${name}" = { diff --git a/flake.lock b/flake.lock index d3ee8ab..ed93cde 100644 --- a/flake.lock +++ b/flake.lock @@ -661,6 +661,20 @@ } }, "nixpkgs_17": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -674,7 +688,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1695837737, "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", @@ -824,6 +838,7 @@ "skynet_website": "skynet_website", "skynet_website_2009": "skynet_website_2009", "skynet_website_2017": "skynet_website_2017", + "skynet_website_2023": "skynet_website_2023", "skynet_website_games": "skynet_website_games", "skynet_website_renew": "skynet_website_renew" } @@ -1000,11 +1015,33 @@ "type": "gitlab" } }, - "skynet_website_games": { + "skynet_website_2023": { "inputs": { "nixpkgs": "nixpkgs_17", "utils": "utils_10" }, + "locked": { + "host": "gitlab.skynet.ie", + "lastModified": 1696876711, + "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", + "owner": "compsoc1%2Fskynet", + "repo": "website%2F2017", + "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "type": "gitlab" + }, + "original": { + "host": "gitlab.skynet.ie", + "owner": "compsoc1%2Fskynet", + "repo": "website%2F2017", + "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "type": "gitlab" + } + }, + "skynet_website_games": { + "inputs": { + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" + }, "locked": { "host": "gitlab.skynet.ie", "lastModified": 1708103254, @@ -1023,8 +1060,8 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "nixpkgs": "nixpkgs_19", + "utils": "utils_12" }, "locked": { "host": "gitlab.skynet.ie", @@ -1118,6 +1155,21 @@ "type": "github" } }, + "systems_13": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1260,6 +1312,24 @@ "inputs": { "systems": "systems_11" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "inputs": { + "systems": "systems_12" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1274,9 +1344,9 @@ "type": "github" } }, - "utils_11": { + "utils_12": { "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1694529238, diff --git a/flake.nix b/flake.nix index 667754b..1cf7b96 100644 --- a/flake.nix +++ b/flake.nix @@ -73,6 +73,13 @@ owner = "compsoc1%2Fskynet"; repo = "website%2F2017"; }; + skynet_website_2023 = { + type = "gitlab"; + host = "gitlab.skynet.ie"; + owner = "compsoc1%2Fskynet"; + repo = "website%2F2017"; + rev = "c4d61c753292bf73ed41b47b1607cfc92a82a191"; + }; skynet_website_2017 = { type = "gitlab"; host = "gitlab.skynet.ie"; From d3030aa2d1dd869030d1a9ab83e61403935fa03f Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 15 Jun 2024 13:22:18 +0100 Subject: [PATCH 156/563] Changing spf and dmarc config --- applications/email.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index ade5e0f..5d9f41a 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -299,7 +299,7 @@ in { { record = "${cfg.domain}."; r_type = "TXT"; - value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} -all"''; + value = ''"v=spf1 include:mail.skynet.ie include:skynet.ie ip4:${cfg.host.ip} -all"''; } # DKIM keys @@ -324,7 +324,7 @@ in { # adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed # aspf : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed # sp : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent - value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=none"''; + value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=quarantine"''; } # reverse pointer From 1b848029e26f2a56d204ce2128fb16a4e6dd8ae3 Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 15 Jun 2024 14:30:40 +0100 Subject: [PATCH 157/563] fix host ip variable --- applications/email.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/email.nix b/applications/email.nix index 5d9f41a..0d13325 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -299,7 +299,7 @@ in { { record = "${cfg.domain}."; r_type = "TXT"; - value = ''"v=spf1 include:mail.skynet.ie include:skynet.ie ip4:${cfg.host.ip} -all"''; + value = ''"v=spf1 include:mail.skynet.ie include:skynet.ie ip4:${config.services.skynet.host.ip} -all"''; } # DKIM keys From 149b58ce0978f562d78d27670b26a0be4f2c9478 Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 15 Jun 2024 14:42:36 +0100 Subject: [PATCH 158/563] use cfg variables --- applications/email.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/email.nix b/applications/email.nix index 0d13325..008828e 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -299,7 +299,7 @@ in { { record = "${cfg.domain}."; r_type = "TXT"; - value = ''"v=spf1 include:mail.skynet.ie include:skynet.ie ip4:${config.services.skynet.host.ip} -all"''; + value = ''"v=spf1 include:${cfg.sub}.${cfg.domain} include:${cfg.domain} ip4:${config.services.skynet.host.ip} -all"''; } # DKIM keys From 452f33baa8d9b932e3e080d9e53746c80b9a7604 Mon Sep 17 00:00:00 2001 From: daragh downes Date: Sat, 15 Jun 2024 13:51:51 +0000 Subject: [PATCH 159/563] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e56b1d..72841cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -54,6 +54,7 @@ sync_repos: .scripts_base: &scripts_base # load nix environment + - echo $CI_COMMIT_REF_NAME - git pull origin $CI_COMMIT_REF_NAME - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena From ed331c3f08c12db361638725c2e9405271323fb3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 15 Jun 2024 14:02:01 +0000 Subject: [PATCH 160/563] Originally this was set up so updating teh flake and pushing out to servers would occur in a single pipeline. Add Relates to #79 --- .gitlab-ci.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72841cc..696538e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -30,7 +30,7 @@ update: # the part that updates the flake - nix --experimental-features 'nix-command flakes' flake lock --update-input $PACKAGE_NAME - git add flake.lock - - git commit -m "[skip ci] Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit" + - git commit -m "Updated flake for $PACKAGE_NAME" || echo "No changes, nothing to commit" # we have a custom domain - git remote rm origin && git remote add origin ssh://git@gitlab.skynet.ie:2222/compsoc1/skynet/nixos.git - git push origin HEAD:$CI_COMMIT_REF_NAME @@ -51,11 +51,11 @@ sync_repos: - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' changes: - sync/repos.csv + - if: $UPDATE_FLAKE == "yes" + when: never .scripts_base: &scripts_base # load nix environment - - echo $CI_COMMIT_REF_NAME - - git pull origin $CI_COMMIT_REF_NAME - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena @@ -86,6 +86,8 @@ sync_repos: - flake.* - .gitlab-ci.yml - config/**/* + - if: $UPDATE_FLAKE == "yes" + when: never # deploy items only run on main .deploy_template: &deployment @@ -102,6 +104,8 @@ sync_repos: - machines/**/* - secrets/**/* - config/**/* + - if: $UPDATE_FLAKE == "yes" + when: never linter: <<: *builder @@ -155,7 +159,6 @@ deploy_ext: - deploy_dns script: - colmena apply -v --on @active-ext - allow_failure: true deploy_gitlab: <<: *builder From e0a461bb0aba734e08fa381b52488fa0c05f823a Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 15 Jun 2024 15:07:08 +0100 Subject: [PATCH 161/563] test --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f98fd97..57aab1f 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Skynet -This is teh core config for teh skynet cluster which uses [NixOS][1]. +This is teh core config for teh skynet cluster which uses [NixOS][1]. ## Dev ### Prep @@ -122,4 +122,4 @@ nix fmt [6]: https://github.com/ryantm/agenix [7]: https://docs.gitlab.com/ee/user/ssh.html#see-if-you-have-an-existing-ssh-key-pair [8]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/main/secrets/secrets.nix#L2 -[9]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/merge_requests/4 \ No newline at end of file +[9]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/merge_requests/4 From c0ddc2d6a913c6406536f498b7b64a0fd894e30d Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 15 Jun 2024 15:23:36 +0100 Subject: [PATCH 162/563] switch include to a, remove skynet.ie --- applications/email.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/email.nix b/applications/email.nix index 008828e..182c280 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -299,7 +299,7 @@ in { { record = "${cfg.domain}."; r_type = "TXT"; - value = ''"v=spf1 include:${cfg.sub}.${cfg.domain} include:${cfg.domain} ip4:${config.services.skynet.host.ip} -all"''; + value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} ip4:${config.services.skynet.host.ip} -all"''; } # DKIM keys From 5933cb5dfe918dfb4a27eb2297ae5167a206440e Mon Sep 17 00:00:00 2001 From: daragh Date: Sat, 15 Jun 2024 15:25:19 +0100 Subject: [PATCH 163/563] Revert "test" This reverts commit e0a461bb0aba734e08fa381b52488fa0c05f823a. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57aab1f..f98fd97 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Skynet -This is teh core config for teh skynet cluster which uses [NixOS][1]. +This is teh core config for teh skynet cluster which uses [NixOS][1]. ## Dev ### Prep @@ -122,4 +122,4 @@ nix fmt [6]: https://github.com/ryantm/agenix [7]: https://docs.gitlab.com/ee/user/ssh.html#see-if-you-have-an-existing-ssh-key-pair [8]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/blob/main/secrets/secrets.nix#L2 -[9]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/merge_requests/4 +[9]: https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/merge_requests/4 \ No newline at end of file From 40ece2f683ecfb6073af521f4a65a713504eb31b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 16 Jun 2024 15:10:14 +0100 Subject: [PATCH 164/563] fix: originally this was a spreadsheet, split out and emulate the form better --- ITD_Firewall.csv => ITD/Firewall_Rules.csv | 0 ITD/Server_Inventory.csv | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) rename ITD_Firewall.csv => ITD/Firewall_Rules.csv (100%) create mode 100644 ITD/Server_Inventory.csv diff --git a/ITD_Firewall.csv b/ITD/Firewall_Rules.csv similarity index 100% rename from ITD_Firewall.csv rename to ITD/Firewall_Rules.csv diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv new file mode 100644 index 0000000..7978336 --- /dev/null +++ b/ITD/Server_Inventory.csv @@ -0,0 +1,19 @@ +Index,Status,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description +SKYNET00001,Active,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active) +SKYNET00002,Active,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 +SKYNET00003,Active,jarvis,193.1.99.73,jarvis,,,,,,VM Host +SKYNET00004,Active,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 +SKYNET00005,Active,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio +SKYNET00006,Retired,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server +SKYNET00007,Active,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" +SKYNET00008,Active,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server +SKYNET00009,Active,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail +SKYNET00010,Active,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner +SKYNET00011,Active,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host +SKYNET00012,Active,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ) +SKYNET00013,Active,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server +SKYNET00014,Active,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with" +SKYNET00015,Active,marvin,193.1.99.81,marvin,,,,,,Trainee testing server +SKYNET00016,Active,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon) +SKYNET00017,Active,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft +SKYNET00018,Active,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver" From d226e905a2f45f57f5a61077d55d45ff24700e67 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 16 Jun 2024 15:21:23 +0100 Subject: [PATCH 165/563] fix: cut don what we have to fit better in the original format --- ITD/Server_Inventory.csv | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index 7978336..4f4b69b 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -1,19 +1,19 @@ -Index,Status,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description -SKYNET00001,Active,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active) -SKYNET00002,Active,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 -SKYNET00003,Active,jarvis,193.1.99.73,jarvis,,,,,,VM Host -SKYNET00004,Active,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 -SKYNET00005,Active,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio -SKYNET00006,Retired,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server -SKYNET00007,Active,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" -SKYNET00008,Active,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server -SKYNET00009,Active,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail -SKYNET00010,Active,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner -SKYNET00011,Active,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host -SKYNET00012,Active,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ) -SKYNET00013,Active,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server -SKYNET00014,Active,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with" -SKYNET00015,Active,marvin,193.1.99.81,marvin,,,,,,Trainee testing server -SKYNET00016,Active,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon) -SKYNET00017,Active,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft -SKYNET00018,Active,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver" +Index,Name,Status,IP_Address,OS,Description +SKYNET00001,agentjones,Active,193.1.99.72,Nixos-24.05,Firewall (currently not active) +SKYNET00002,vendetta,Active,193.1.99.120,Nixos-24.05,DNS Nameserver 1 +SKYNET00003,jarvis,Active,193.1.99.73,Nixos-24.05,VM Host +SKYNET00004,vigil,Active,193.1.99.109,Nixos-24.05,DNS Nameserver 2 +SKYNET00005,galatea,Active,193.1.99.111,Nixos-24.05,ULFM Radio +SKYNET00006,optimus,Retired,193.1.99.112,Nixos-24.05,Retired Games server +SKYNET00007,kitt,Active,193.1.99.74,Nixos-24.05,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" +SKYNET00008,glados,Active,193.1.99.75,Nixos-24.05,Gitlab server +SKYNET00009,gir,Active,193.1.99.76,Nixos-24.05,Email and Webmail +SKYNET00010,wheatly,Active,193.1.99.78,Nixos-24.05,Gitlab Runner +SKYNET00011,earth,Active,193.1.99.79,Nixos-24.05,Offical website host +SKYNET00012,skynet,Active,193.1.96.165,Nixos-24.05,Skynet server. (DMZ) +SKYNET00013,neuromancer,Active,193.1.99.80,Nixos-24.05,Local Backup Server +SKYNET00014,cadie,Active,193.1.99.77,Nixos-24.05,"Services VM, has nextcloud to start with" +SKYNET00015,marvin,Active,193.1.99.81,Nixos-24.05,Trainee testing server +SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing SKYNET00006 soon) +SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft +SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" From 7ea813667be93301cb511a42b46ddac2db391c5f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 01:17:27 +0100 Subject: [PATCH 166/563] git: update the lockfile to deal with open office --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 0d38c4e..3e54b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,9 @@ *.tmp tmp +# open office tmp lockfiles +.~lock.* + # Test files test.* *.test.* From 897c52cc3ee93b4b048f24381ea97dafab112abd Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 01:17:52 +0100 Subject: [PATCH 167/563] doc: added the new servers --- ITD/Server_Inventory.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index 4f4b69b..81db6db 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -17,3 +17,5 @@ SKYNET00015,marvin,Active,193.1.99.81,Nixos-24.05,Trainee testing server SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing SKYNET00006 soon) SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" +SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic +SKYNET00020,,,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" \ No newline at end of file From 44c81b1f3e88e7f0712df579598077f28089e022 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 01:20:29 +0100 Subject: [PATCH 168/563] doc: reorganised to encompass all teh tickets we have submitted over time. May work on a tool that compiles this together into a unified output? --- ITD/Firewall_Rules.csv | 61 +++++++++++++++++++++++++++++------------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 7978336..2419b0d 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -1,19 +1,42 @@ -Index,Status,Name,IP_Address,DNS_Name,Ports TCP,Ports UDP,Tunnel,Ports_Requested,Related_Tickets,Description -SKYNET00001,Active,agentjones,193.1.99.72,agentjones,,,,,,Firewall (currently not active) -SKYNET00002,Active,vendetta,193.1.99.120,vendetta/ns1,,53,,,,DNS Nameserver 1 -SKYNET00003,Active,jarvis,193.1.99.73,jarvis,,,,,,VM Host -SKYNET00004,Active,vigil,193.1.99.109,vigil/ns2,,53,,,,DNS Nameserver 2 -SKYNET00005,Active,galatea,193.1.99.111,galatea/stream,80/443 8000,,,,,ULFM Radio -SKYNET00006,Retired,optimus,193.1.99.112,optimus/games/*.games,80/443 25565,,,,,Retired Games server -SKYNET00007,Active,kitt,193.1.99.74,kitt/account/api.account,443,,,-> skynet:9000-9020,i23-07-28_010,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" -SKYNET00008,Active,glados,193.1.99.75,glados/gitlab/*.pages.gitlab,80/443,,,,i23-05-18_249,Gitlab server -SKYNET00009,Active,gir,193.1.99.76,gir/mail/imap/pop3/smtp,80/443 25/143/993/587/465,,,4190,i23-06-19_525/i23-06-19_525,Email and Webmail -SKYNET00010,Active,wheatly,193.1.99.78,wheatly,,,-> skynet:22,,,Gitlab Runner -SKYNET00011,Active,earth,193.1.99.79,earth,80/443,,,,i23-06-19_525,Offical website host -SKYNET00012,Active,skynet,193.1.96.165,skynet/*.users,22 80/443,,,,i23-06-30_024,Skynet server. (DMZ) -SKYNET00013,Active,neuromancer,193.1.99.80,neuromancer,,,,,,Local Backup Server -SKYNET00014,Active,cadie,193.1.99.77,cadie/nextcloud/onlyoffice.nextcloud,80/443,,,,i23-10-27_014,"Services VM, has nextcloud to start with" -SKYNET00015,Active,marvin,193.1.99.81,marvin,,,,,,Trainee testing server -SKYNET00016,Active,optimus,193.1.99.90,,80/443,,,8080,i24-02-16_065,Games server manager (replacing SKYNET00006 soon) -SKYNET00017,Active,bumblebee,193.1.99.91,,25518-25525,19132 24418-24425,,,i24-02-16_065,Game server - Minecraft -SKYNET00018,Active,calculon,193.1.99.82,,,,,80/443,,"Public Services such as binary cache, Open Governance and Keyserver" +Rule,Action,Ticket,Status,Source_IP,Source_Server,Destination_IP,Destination_Server,Port_TCP,Port_UDP,Notes +SKYNET_FIREWALL_00000,Add,,Complete,VPN,-,93.1.99.71 - 193.1.99.126,All,22,-,sftp/ssh required from vpn to servers for admins +SKYNET_FIREWALL_00001,Add,,Complete,All,-,193.1.99.109,SKYNET00004,-,53,Nameserver for skynet.ie +SKYNET_FIREWALL_00002,Add,,Complete,All,-,193.1.99.111,SKYNET00005,"80, 443, 8000",-,"ULFM, http(s) for internet streaming, 8000 for connecting to the server." +SKYNET_FIREWALL_00003,Add,,Complete,All,-,193.1.99.112,SKYNET00006,"80, 443, 25565",-,"Games host, Minecraft uses 25565 (will have more ports in the future)" +SKYNET_FIREWALL_00004,Add,,Complete,All,-,193.1.99.120,SKYNET00002,-,53,Nameserver for skynet.ie +SKYNET_FIREWALL_00005,Add,i23-01-19_681,Complete,193.1.99.72,SKYNET00001,All,-,-,-,Allow outbound access +SKYNET_FIREWALL_00006,Add,i23-01-19_681,Complete,193.1.99.75,SKYNET00008,All,-,-,-,Allow outbound access +SKYNET_FIREWALL_00007,Add,i23-01-19_681,Complete,193.1.99.109,SKYNET00004,All,-,-,-,Allow outbound access +SKYNET_FIREWALL_00008,Add,i23-01-19_681,Complete,193.1.99.111,SKYNET00005,All,-,-,-,Allow outbound access +SKYNET_FIREWALL_00009,Add,i23-01-19_681,Complete,193.1.99.112,SKYNET00006,All,-,-,-,Allow outbound access +SKYNET_FIREWALL_00010,Add,i23-01-19_681,Complete,193.1.99.120,SKYNET00002,All,-,-,-,Allow outbound access +SKYNET_FIREWALL_00011,Add,i23-05-18_249,Complete,All,-,193.1.99.75,SKYNET00008,"80, 443",-,For gitlab Access +SKYNET_FIREWALL_00012,Add,i23-05-18_249,Complete,193.1.99.72 - 193.1.99.126,-,All,-,-,-,"I would also like to extend the outbound access to cover our entire range (193.1.99.72 to 193.1.99.126) to allow for setup for more servers on those ip's (need to download updates and packages). +I have a few servers I plan to setup over the next two weeks, one after another as the later ones depend on earlier ones. +In such a case asking for permission for each individual IP would induce several tickets and a few weeks of paperwork going through change control. +Only a few of these sevices will need inbound ports opened on ITD's firewall, which can be requested when the systems are up, running and secured." +SKYNET_FIREWALL_00013,Add,i23-05-18_249,Complete,All,-,193.1.99.76,SKYNET00009,"143, 993, 587, 465",-,Email Server +SKYNET_FIREWALL_00014,Add,i23-06-19_525,Complete,All,-,193.1.99.76,SKYNET00009,"80, 443, 25",-,"Mailserver here, SPF, DKIM and DMARC are all set up" +SKYNET_FIREWALL_00015,Add,i23-06-19_525,Complete,All,-,193.1.99.79,SKYNET00011,"80, 443",-,Main Skynet webserver +SKYNET_FIREWALL_00016,Add,i23-06-30_024,Complete,All,-,193.1.96.165,SKYNET00012,22,-,"Skynet user's server +Outlet is 131 or 132" +SKYNET_FIREWALL_00017,Add,i23-06-30_024,Complete,193.1.96.165,SKYNET00012,193.1.99.120,SKYNET00002,-,53,Allow Skynet server to use our own internal DNS +SKYNET_FIREWALL_00018,Add,i23-06-30_024,Complete,193.1.96.165,SKYNET00012,193.1.99.74,SKYNET00007,389/636,-,Allow Skynet server to access LDAP +,Add,i23-07-28_010,Denied,All,-,193.1.99.74,SKYNET00007,"80, 443",-,Self Service site for Skynet accounts – Only 443 on account modification pages +SKYNET_FIREWALL_00019,Add,i23-07-28_010,Complete,All,-,193.1.99.74,SKYNET00007,443,-,Self Service site for Skynet accounts +SKYNET_FIREWALL_00020,Add,i23-09-05_639,Complete,All,-,193.1.96.165,SKYNET00012,"80, 443",-,Web hosting for user sites +SKYNET_FIREWALL_00021,Add,i23-10-27_014,Complete,All,-,193.1.99.77,SKYNET00014,"80, 443",-,"Nextcloud, selfhosted google services, filestorage and documents" +SKYNET_FIREWALL_00022,Add,i24-02-01_102,Complete,193.1.96.165,SKYNET00012,103.1.99.109,SKYNET00004,-,53,Give the Skynet server access to ur secondary DNS +SKYNET_FIREWALL_00023,Add,i24-02-01_102,Complete,193.1.99.78,SKYNET00010,193.1.96.165,SKYNET00012,22,-,Allow our gitlab runner to access and deploy to teh external server +SKYNET_FIREWALL_00024,Add,i24-02-16_065,Complete,All,-,193.1.99.90,SKYNET00016,"80, 443",-,Games Server Administrative panel +SKYNET_FIREWALL_00025,Add,i24-02-16_065,Complete,All,-,193.1.99.91,SKYNET00017,25518-25525,"19132, 24418-24425",Minecraft Games server +SKYNET_FIREWALL_00026,Add,i24-06-04_017,Complete,All,-,193.1.99.76,SKYNET00009,4190,-,"Email sieve to allow members to add email filters to their +skynet mail." +SKYNET_FIREWALL_00027,Add,i24-06-04_017,Complete,All,-,193.1.99.82,SKYNET00018,80/443,-,"Public services such as a binary cache, open governance and keyserver" +,Add,i24-06-04_017,Denied,All,-,193.1.99.90,SKYNET00016,8080,-,"Websocket for admin panel on games management server +Denied because more information on wat it was for was requested" +,Add,i24-06-04_017,Denied,193.1.99.74,SKYNET00007,193.1.96.165,SKYNET00012,9000-9020,-,"Metrics collection, not done because not enough info provided" +SKYNET_FIREWALL_00028,Remove,i24-06-04_017,Complete,-,-,193.1.99.112,SKYNET00019,25565,-,No longer the minecraft game host +,Add,i24-06-04_017,Pending,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server +,Add,i24-06-04_017,Pending,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection +,Add,i24-06-04_017,Pending,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server From 435379e61099009bf30c3269ac7c443868c5449b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 01:24:53 +0100 Subject: [PATCH 169/563] doc: imported in the VPN Admins --- ITD/VPN_Admins.csv | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 ITD/VPN_Admins.csv diff --git a/ITD/VPN_Admins.csv b/ITD/VPN_Admins.csv new file mode 100644 index 0000000..73b1e41 --- /dev/null +++ b/ITD/VPN_Admins.csv @@ -0,0 +1,4 @@ +Index,First Name,Surname,UL Student Email,Status,Date Modified +SKYNET_VPN_ADM_001,Brendan,Golden,12136891@studentmail.ul.ie,Active,2023/04/04 +SKYNET_VPN_ADM_002,Evan,Cassidy,,Active,2023/04/04 +SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie,Active,2023/04/04 \ No newline at end of file From c197f0df85f040f97ee439af026ae6066ccc736b Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 17 Jun 2024 00:48:14 +0000 Subject: [PATCH 170/563] Updated flake for skynet_website_2009 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ed93cde..167b380 100644 --- a/flake.lock +++ b/flake.lock @@ -980,11 +980,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1690726067, - "narHash": "sha256-/BrljRmgR65bdqWgGBBWlTFiBzr0EBh1OeMlLj+xTg4=", + "lastModified": 1718585207, + "narHash": "sha256-jlCZv+KCCiI0Cx0nnMFPalBdx/fN2JgLNXvc4OAwNvE=", "owner": "compsoc1%2Fskynet", "repo": "website%2F2009", - "rev": "63e0b33c5a48cbd4e68f23dde4987959b6c8e97e", + "rev": "12712f3b3ffc80782cc520d46f91b9f5df1fab69", "type": "gitlab" }, "original": { From 6229abcefa2dc63b2b40f2ef855e9c6849f48ebc Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 01:11:03 +0000 Subject: [PATCH 171/563] fix: put teh blockers for teh update of teh flakes first --- .gitlab-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 696538e..319bd66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,11 +48,11 @@ sync_repos: - chmod +x ./sync.sh - ./sync.sh rules: + - if: $UPDATE_FLAKE == "yes" + when: never - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' changes: - sync/repos.csv - - if: $UPDATE_FLAKE == "yes" - when: never .scripts_base: &scripts_base # load nix environment @@ -79,6 +79,8 @@ sync_repos: - *scripts_base - *scripts_cache rules: + - if: $UPDATE_FLAKE == "yes" + when: never - changes: - applications/**/* - machines/**/* @@ -86,8 +88,6 @@ sync_repos: - flake.* - .gitlab-ci.yml - config/**/* - - if: $UPDATE_FLAKE == "yes" - when: never # deploy items only run on main .deploy_template: &deployment @@ -96,6 +96,8 @@ sync_repos: - *scripts_base - *scripts_cache rules: + - if: $UPDATE_FLAKE == "yes" + when: never - if: '$CI_PROJECT_NAMESPACE == "compsoc1/skynet" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' changes: - flake.nix @@ -104,8 +106,6 @@ sync_repos: - machines/**/* - secrets/**/* - config/**/* - - if: $UPDATE_FLAKE == "yes" - when: never linter: <<: *builder From 07cb42dd6597b85bcf86ed7a22e19db8755d856e Mon Sep 17 00:00:00 2001 From: runner_nix Date: Mon, 17 Jun 2024 01:39:31 +0000 Subject: [PATCH 172/563] Updated flake for skynet_website_renew --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 167b380..b686b3e 100644 --- a/flake.lock +++ b/flake.lock @@ -1065,11 +1065,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1716848712, - "narHash": "sha256-0QOzHlYyuCxrsL4A+u5zW9BoV0pvmqDB681BVTxoD3c=", + "lastModified": 1718588317, + "narHash": "sha256-nQNHu9H7oLXO7dNFZ2bSQKwCvhz01/9wzeqOVsvsQyQ=", "owner": "compsoc1%2Fskynet", "repo": "website%2Falumni-renew", - "rev": "054b04f46285ef80a3d059253f1ed9e607b6fd46", + "rev": "5c169522049c7a2dbbcbfdde0eeda3cabd22f561", "type": "gitlab" }, "original": { From 8009b7c8d11c6c89829f513952d4e96d216b2754 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 20:52:03 +0100 Subject: [PATCH 173/563] fix: some small fixes for prometheus --- applications/prometheus.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/applications/prometheus.nix b/applications/prometheus.nix index 674d161..a342a76 100644 --- a/applications/prometheus.nix +++ b/applications/prometheus.nix @@ -21,7 +21,7 @@ with lib; let ) nodes ); - node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString config.services.prometheus.exporters.node.port}") nodes; + node = lib.attrsets.mapAttrsToList (key: value: "${value.config.deployment.targetHost}:${toString value.config.services.prometheus.exporters.node.port}") nodes; }; # clears any invalid entries @@ -37,8 +37,10 @@ in { type = types.port; default = 9001; }; + }; - external.node = mkOption { + external = { + node = mkOption { type = types.listOf types.str; default = []; description = '' @@ -46,12 +48,20 @@ in { ''; }; }; + + ports = { + node = mkOption { + type = types.port; + default = 9100; + }; + }; }; config = mkMerge [ { services.prometheus.exporters.node = { enable = true; + port = cfg.ports.node; openFirewall = true; # most collectors are on by default see https://github.com/prometheus/node_exporter for more options enabledCollectors = ["systemd" "processes"]; @@ -66,7 +76,7 @@ in { job_name = "node_exporter"; static_configs = [ { - targets = filter_empty (exporters.node ++ cfg.server.external.node); + targets = filter_empty (exporters.node ++ cfg.external.node); } ]; } From cd13520aba32df2c4a9ed462a8dcb5f2e890d88b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 20:53:27 +0100 Subject: [PATCH 174/563] feat: new server for stats, ariia, danm I love this naming scheme --- ITD/Firewall_Rules.csv | 6 +- ITD/Server_Inventory.csv | 2 +- applications/skynet_users.nix | 5 +- flake.nix | 3 + machines/ariia.nix | 48 +++++++++++++++ machines/kitt.nix | 4 -- secrets/backup/restic.age | 91 ++++++++++++++-------------- secrets/backup/restic_pw.age | Bin 937 -> 937 bytes secrets/bitwarden/details.age | Bin 1045 -> 1045 bytes secrets/bitwarden/id.age | 32 +++++----- secrets/bitwarden/secret.age | Bin 902 -> 902 bytes secrets/discord/ldap.age | 45 +++++++------- secrets/discord/token.age | Bin 1025 -> 1025 bytes secrets/dns_certs.secret.age | Bin 2594 -> 2704 bytes secrets/dns_dnskeys.conf.age | Bin 1094 -> 1094 bytes secrets/email/details.age | 44 +++++++------- secrets/gitlab/db_pw.age | Bin 1001 -> 1001 bytes secrets/gitlab/ldap_pw.age | Bin 1000 -> 1000 bytes secrets/gitlab/pw.age | Bin 1001 -> 1001 bytes secrets/gitlab/runners/runner01.age | Bin 955 -> 955 bytes secrets/gitlab/runners/runner02.age | Bin 955 -> 955 bytes secrets/gitlab/secrets_db.age | 32 +++++----- secrets/gitlab/secrets_jws.age | Bin 2550 -> 2550 bytes secrets/gitlab/secrets_otp.age | Bin 1000 -> 1000 bytes secrets/gitlab/secrets_secret.age | Bin 1000 -> 1000 bytes secrets/grafana/pw.age | Bin 914 -> 914 bytes secrets/ldap/details.age | Bin 1527 -> 1527 bytes secrets/ldap/pw.age | Bin 1330 -> 1330 bytes secrets/nextcloud/pw.age | 33 +++++----- secrets/secrets.nix | 4 +- secrets/stream_ulfm.age | Bin 3084 -> 3084 bytes secrets/wolves/details.age | Bin 1351 -> 1351 bytes 32 files changed, 202 insertions(+), 147 deletions(-) create mode 100644 machines/ariia.nix diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 2419b0d..e9f547c 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -37,6 +37,6 @@ SKYNET_FIREWALL_00027,Add,i24-06-04_017,Complete,All,-,193.1.99.82,SKYNET00018,8 Denied because more information on wat it was for was requested" ,Add,i24-06-04_017,Denied,193.1.99.74,SKYNET00007,193.1.96.165,SKYNET00012,9000-9020,-,"Metrics collection, not done because not enough info provided" SKYNET_FIREWALL_00028,Remove,i24-06-04_017,Complete,-,-,193.1.99.112,SKYNET00019,25565,-,No longer the minecraft game host -,Add,i24-06-04_017,Pending,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server -,Add,i24-06-04_017,Pending,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection -,Add,i24-06-04_017,Pending,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server +SKYNET_FIREWALL_00029,Add,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server +SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection +SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index 81db6db..eabe2a7 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -18,4 +18,4 @@ SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic -SKYNET00020,,,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" \ No newline at end of file +SKYNET00020,ariia,Active,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" \ No newline at end of file diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 0ff76e1..1b07875 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -21,7 +21,10 @@ in { }; config = { - # ssh access + # we havea more limited ports range on the skynet server + services.skynet.prometheus.ports = { + node = 9000; + }; # allow more than admins access services.skynet.ldap_client = { diff --git a/flake.nix b/flake.nix index 1cf7b96..397c1fe 100644 --- a/flake.nix +++ b/flake.nix @@ -179,6 +179,9 @@ # Public Services calculon = import ./machines/calculon.nix; + + # metrics + ariia = import ./machines/ariia.nix; }; }; } diff --git a/machines/ariia.nix b/machines/ariia.nix new file mode 100644 index 0000000..f3f095c --- /dev/null +++ b/machines/ariia.nix @@ -0,0 +1,48 @@ +/* + +Name: https://en.wikipedia.org/wiki/Eagle_Eye +Why: ARIIA - Autonomous Reconnaissance Intelligence Integration Analyst +Type: VM +Hardware: - +From: 2024 +Role: Metrics gathering and Analysis +Notes: +*/ +{ + config, + pkgs, + lib, + nodes, + ... +}: let + # name of the server, sets teh hostname and record for it + name = "ariia"; + ip_pub = "193.1.99.83"; + hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + hostname = hostname; + }; +in { + imports = [ + ../applications/grafana.nix + ../applications/prometheus.nix + ]; + + deployment = { + targetHost = hostname; + targetPort = 22; + targetUser = null; + + tags = ["active-core"]; + }; + + services.skynet = { + host = host; + backup.enable = true; + + prometheus.server.enable = true; + grafana.enable = true; + }; +} diff --git a/machines/kitt.nix b/machines/kitt.nix index 54474c9..71a0fe0 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -31,8 +31,6 @@ in { ../applications/discord.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix - ../applications/grafana.nix - ../applications/prometheus.nix ]; deployment = { @@ -56,7 +54,5 @@ in { # committee/admin services vaultwarden.enable = true; - prometheus.server.enable = true; - grafana.enable = true; }; } diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index df98b44..ca3bf45 100644 --- a/secrets/backup/restic.age +++ b/secrets/backup/restic.age @@ -1,45 +1,48 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 7yvURMKPgnbCWAE2q51v3fDFuXCivslOvDuxGIi2JHc -numnCMoai7pCs0qBhsWr/CjU8FfrUeQsfq9mvMTVj34 --> ssh-ed25519 4PzZog O2zDjiWrxoqWp0QYlwXw8Oushe2wwlw1J336+QksnUc -oBJ9zPd7+Agc9KSYgA64Sbj0aZLJRRQS2MgnPGHbcic --> ssh-ed25519 5Nd93w adTzuNLU94FC3fR/uK3XsI5XZSANXZmwp6fG9ZeoA14 -7U4C8ZbZKsl3kdPMymoHc42k4i1Wom+wi/THXosDgYg --> ssh-ed25519 q8eJgg bgfuSRzrmyVG7ewvPztde7o0QJyQXXBbvK+Rs5JdN3U -2wABMhVimVi4Nyrfa7EWji5YClqh6GhOjFUKzcJqJcs --> ssh-ed25519 KVr8rw xQcp6gQPq/AxA8cEKjhgvQ8NBmSmXd9LN1ZBxxqSlQU -gy7wbZiCsKdCUAPH82xgnxWXc/sxY2S8JKcnzzypyOY --> ssh-ed25519 fia1eQ Xh2ErHfrIvHTvUyDHmDD1X0Dxnz9bUnnRne0RYPIPk8 -V3+5H/8vMWV3lriiiEd/C7lg8IcQSKkO0JrhD8KrNGw --> ssh-ed25519 /Gb5gQ ftm+TgiEOPimzA+qsus9/rFUqTjWn/VVORIs96Lgy2E -mzRiPpqZj/tkFvdphOWn15IHv+GhTd4vj+T/lpsXJtA --> ssh-ed25519 NtlN/A 2t0YPeV7uzYhrIZU1TDi8xxPGvpCReUL5Rxt8sflK28 -r61bhrJj6irlo2xTU8iCJj8YzSbYWFjH8iiC88SOrAA --> ssh-ed25519 v2Y09A BXWbnz7DUn5tssTCFkM9cFzF4M5oj3rcFMrfhFzL5lM -2GVsK4gq4HIBVJWlQVd1G0kags2peJ63AfuBdOxbY70 --> ssh-ed25519 XSrA6w OJ2j5EQe69sPH+wTsiMBlopI4QmHiLsfJDQj+F9rEiw -u/9MNFViy7TvNTA7lvBKnL/qYWlkOJrJKcSG563Btnk --> ssh-ed25519 DVzSig 6djjmbfge5li1ZTlaA4Wc58xfk0Kb4EdXPxX1bPdJAE -HMnnH5Cd5ffp9t+tJdhagDLoGk9HKpjI28SMQGcMvIc --> ssh-ed25519 uZzB3g NS2dkA9o84OuCTUSoHU7MaUMJG85vr2tnCq3rSKtTGo -6+7gqBrSIogz7nYdDUmtS3650x/y4rmgy4ru9sOf7hY --> ssh-ed25519 yvS9bw /CoelQvArSJCFKTV8x/OHVWTYEsNTkbRqweqaIvlykA -TGuI9tt8EnEThL3l+wgipOtDMPPTkVTdFLpRKHGFMpU --> ssh-ed25519 IzAMqA Hb0cVXd+8WrWJWVs6j/qxBUCOv67M+Se+v2y7470oB4 -i8GWMK8uXbaODkQm02TqCn79+b1zu9Zq2W7c7Rg3FHE --> ssh-ed25519 Hb0ipQ 3Gr6C7Q1yfHWcxn0pImpI4mQjdIHJKyzSZDv+5Eo1Vk -8WFp3fNRKFb0jxmSDNVlRM+ec4bd2O5POeY69T0bVz0 --> ssh-ed25519 3pl/Kw GCks2XrtAKpVRl7nC2g+q7c+Q1gqh2tSfPDHHI+wxng -iyblirNv3byNgI27599Dq6kc0ae2xaoMh7thSIoVLJ4 --> ssh-ed25519 SqDBmA FxJJFJboiAe5T4TTcx7VY2brEQN5DqlQ3Ak5C03MKzw -yLYdnZHSftMTwruQYJy1I2oWmWZNPykqxe6nlAdLTDs --> ssh-ed25519 UE6fcQ Y7XmsyOOMffkb7GofPufJ6d/JdVi9fg3LK17C1zL1wo -hfo5xZcNpVSOiNuZFe1fJ8o4mPF2cHoyAoyc2LO6XhY --> ssh-ed25519 YFaxCg 1t6GiHkJUaJ795x9PRVkDU0P0FP+RC1QEedl4qHgNAE -o9hxn0jLFBqej4D7xJdtVCB9UnUBrCXZM5gpFbibldA --> ssh-ed25519 elCEeg TunOY5HCLU87gGej0HWFm775FLsbtL+41HqYS3hgLyk -E6rAZdQUj/Zia6i0Q32SfqugEJ3rrQt8OM9sPQ+ZXOk --> ssh-ed25519 8vZ9CQ Pwqq6eKEIf/fLLiB+j5IQTFxRXrEi2ajORzH8GQpHVY -nmrnjLLmUPPOgk1y64Zcfhhhm87dRg5V8GM5GIfB6oE ---- dBHJ3bG+te1AZd+FHj/ssxBbrCBiyl3VARjnd5F0yz0 -8|ÁÔÌåp™Èh1DMZ ê¦À‘Os+^ƒ:ËËŒ¿øÇ™ÉækâLÃØ°çùãá¹»¢]gžši`í™jþê;JÄp/€·• ‰^×a<@Ï} ÚÛ¶ÞÆä  Ÿ¢J¤\P¬Ò7çK7÷Ö òâçÎ~ µ+6NõýüÜä2k<Õ<ç^§³„9Pôi/X4uË \ No newline at end of file +-> ssh-ed25519 V1pwNA WdpvBu5B0F7lNrhIDN4JnSAGxwerkNfuMtxBmqsSbFQ ++yqqHmppGkWlfUT1jf4xywUKCsxlklUVjFq0800bK+E +-> ssh-ed25519 4PzZog IGKAk6Fz/Do9GVZgRq/eFtKYMMFXvgeo+ZSHmecfUz0 +ggd3H0ArigVeax78Xx5LnFHfBuHwHGeWiO0pm9oycds +-> ssh-ed25519 5Nd93w ezGlRW3CBZfmIwvVOt8owMbc37ezvSxj3How4g5/l2g +Xyp4Ix7SI4+5SyDjueM+sNTu3v2YrFLX5SrkXtqqcT0 +-> ssh-ed25519 q8eJgg AEEj4tf7DQeJKK1uYFSqYt0QYRJGBMMceClF/NzbPlU +qgN3HtLARKVjFE+hq75Iqt3Lis7iNllCSMIM5CbmMzo +-> ssh-ed25519 KVr8rw CGF24atSBzYxmsVZ7MIVqxq4krD0PS4cCc+oagUYamo +xNsVbh5YVwWXrSGNoN3puJTk2R1G93etQmOo8CIeK9Y +-> ssh-ed25519 fia1eQ 4h04u1YB75cibHXF4R1tR2TQ1XJzc7j81nuTgrSSICI +HU8FBGgrMBYHEC3mkWcejrfIr1QU6KkvnPhF3lOVFg8 +-> ssh-ed25519 /Gb5gQ MBw9NTSoMoBdf386nDipc8yEgEh2hcDPWaZlSygMLEw +FhgEto1Vv9i0CgInyvR1B6p0aDRDN24Nrhi9t/QmDRw +-> ssh-ed25519 NtlN/A RiUoN4Ob8wL9fDdaJoJNbPg9U+7pRZNJgiNRoZ5QDWk +SDAUVwONhx9HoOck2Qma3ZttGUvHJ2Ck8UEmQvSfYyg +-> ssh-ed25519 v2Y09A mf03fGORjv4EF6KhJ+GHz0IdV/Ej5hhY9ST+PwVgOko +hRORqRlCLbuGm1m/mN4i0tG7CmHWNXF+wCvoGSEsEcI +-> ssh-ed25519 XSrA6w K6yI67N15RFO2y8axsZPRKd3J7IQ9w/0yd0s7MVoVD8 +Vyrt5VnqiDw1bE2gpWBkQfjOIaUC3nQdK5F9jcz/+B0 +-> ssh-ed25519 DVzSig 1zqb411u/ru+ocwVE1UJn+0+cSl3s7924LZhPUUWkTo +NpyMPxbB7WzBLFP8do+dhJ3fNMSv25ieICBp39zrd64 +-> ssh-ed25519 uZzB3g K6DWPq3lYJVfhfnTDfwe43MOLMYp/gM0uoQDldW85Ec +A6suKVUDuLX81qhN2C3DeqvZtQAySRkp2XSBHO7jue0 +-> ssh-ed25519 yvS9bw cwe5oeORn21s5ktm3KXMZaY8reJXAlqAmtWuyoy7uQE +LgODRokOzmaoxWNC4I9kaQ6O6ZLlif2eKQtfWGBBM9c +-> ssh-ed25519 IzAMqA ofZfWGgErnXxGiV1iXuNQMYwuRC8fPexs+Esy3aygSk +U9LzM2iwO4Fp1Ody8Zh2Shl5L7tYc6LnUgKrtHgOhbk +-> ssh-ed25519 Hb0ipQ pQKzbZN5sSrYYTSF7WdsLj2aS5LlaxM/1uVl6TyZnzY +aNcXRvhjqdrkaVGOdbJEPmCS36lQLfoFeww8ENA21g8 +-> ssh-ed25519 3pl/Kw xCC/77p1FWABov3UxIUxS4XD2JSiJXI98ljy6iO2+mk +XUKMYrjZN13TPH7utSzm5ESyyJm1Zz1C1mQA79fz6W0 +-> ssh-ed25519 SqDBmA JmZ6CJCLuydd/pwkIMQjh04Kl77mfnzX/LbJoujbCDI +5mzTyEZ6ABDTMud8R0WAfTnOFnsXIvlXYqA5aU1ayZM +-> ssh-ed25519 UE6fcQ N/uzTyKosxblLbPHkxMFZbIeg+C/pD4o/U7+xYhhCys +oyPBYf7Vvf0cRlElGRbai5Nar/FfzIlxCrBqnlvRzRY +-> ssh-ed25519 YFaxCg YVgmf0i7fAkwvXF3WUy3DzZq+0N+1T2Luhg51+2KslA +/uT7MDEd02k8R+OF/0DyZvQuqq/du9drg3V2qe5MIsg +-> ssh-ed25519 elCEeg HF9Ua3oMfKhm/YzWpXRN4B1LiaC7Ss/nXMSQCZ2iqVc +RbeYqUX3qJpCcupg2dw+gcgCx8waKB9xJhSSYBkjh7U +-> ssh-ed25519 8vZ9CQ HFNS1Z+N1xH1+XcY+xbAIysDIdRHqL2/h8d2Uo2ryAE +jiBSRN7RMEnt9/3Xyf4MnMDeAEpLlu3B6ORYWH+4L7k +-> ssh-ed25519 rmrvjw /+gpmIu5L6kWmiNoVRym7zYm33xEoJgz6bkYACRog0M +maTKfbA/oxOi7AkFlyz4+8ZhCBsNXtHQaF4SJTA683k +--- xo01QzRZ1aT+v2/7cJskTcWTWnG262iJE0l8Jt4tEvk +¿àG$C _Ê+¢TFAèUþÍ QöD1¸NzŸ®'É +b{ý½)ÕÃ÷ÂfEMx&‰¥Ÿ‰ÇhœÂáœËA9‘"§'å'v¸sLä(kþa?ñ]5j¯ßC§pï9/|Eƒ^zõÖ椀«ì);2Ô'M%Ò–:Ñ "3æìÖB`Àô °ÿ²¥˜ó Äø·0LJ¡ï% \ No newline at end of file diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index 31c2bbf52960b0d87f075fc89636fc497744d38d..b71676496674039751db732f353b62dd4119f700 100644 GIT binary patch delta 849 zcmZ3X=;RiMM=IvK}c|ER+)EHg@v2r z#E;_P6%lFqz7=lzt_B%~PMNOSArby%X%WFmK?VL^X>J+GxvAlnQR%rML2lVxWd+)9 zsXpfVE`}jy;qG3h#TH?vx#p!uL`nl!hNx9|4UVh1w;~B-nbKEWRd@?P< zwIfZk4GL1jEQ2B~Gn1W5lP#S?ER)Q0{f$B*1EVVQOv;P7@>7D7D-0qm%7b!K%gfSI z0`dZa%H6#Dy#q>(%2M*&gDSi--AZy2b1EYzpJf!U56-bPDGdtrOscRf_jC4j3ir3H z$SL=94K8*}taLNccXf?$%n$I;_i*#&$}9_wDhRYRC@)M7E)H}waI-XYvo!RmFo~?l zG%e26HZdy7aWyE?4~j5BkAbwzM8niTg{mB51Iu#Xoc!c;ZPU_>aP#_*tO6tL{EXy) z)Qm!dl=1-ML@$4RA2;XpP_96yT=&!v^MK^2P@kf5QxhNW6i@H)l%m|g;?%T=M010n z!YKD_i<~S^Pju^y3v%?m%N6_#QuQq}+=3$mlZ>O%T-+nQ^xYGUDzZ%~!=0)eGtCk$ z>#O|p+ylM6a?-gnLY<;4LIXTq(mg}7D?$>JQndq$5);ELi_(gVjSS67y^OWfJu(cv(n}*Mjgoy_aw1CH^&PXbtHN`FQv7`kQbJq}9J9IZ zP8XcV9xD^67ICdTUxML~*wO{R_!b;qE9J4l<ewlZcQKeC$YgMG9QF57M zF;}vIqp4?VsiB2Mp{J{Hpm&+GwwX&|mP>`Bvx!Gxnp0>}K&f%AxshLpBbTn7LUD11 zZfc5=si~o*f=NJCRDQaGV^v^cX-;9Hc7$voGh9>2c;~B-ni_NkeJ(Da= z0}I1lyxmLG08Uc&#Evi3H6O|jL0tLGIYua%{0#ra*hhqPPPmQ@(=WMOZ6);3J>thH1O3dztcXCgOj~-OcM1S^^GFJ1FO7~ z9JzFLbrsw*%F3dA(>*Q1s#4wkN_+yfT|+$sA`61dT+@9DDl$te@+?COO3m`k)4A9_ zcxPrj4hVjIC8e&QyIQp|;6c)=^-YV9CFvf3G>XUUp5WZoI{F zOiiUEyz8}I;~b^m$0BB=$t;c0?Jo2D>r-7HJLU7&Sz-(MM6ViJ{}%bh_$PGPTmVq1 BB(VSh diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 9cf7d05126dae1c94f96c3e5e77f81a73afa65f8..3627423f1bdaa10514ccf24acf404694bad1f03a 100644 GIT binary patch delta 958 zcmbQrF_mM2PQ8DUQF6X(xL1U`MMR;QXJENYZm4T|fJb6paJpf3qJB0zySZzHg=uz}u|bGMGMBEMLUD11 zZfc5=si~o*f=NJCRDQaGNkv3PX{NrvMYdyllv{p&p<7V7sfTAyKzf>6rlC(prdNKc zQ>J!KX=Gk8mt&}QQh{S-pnrv>r>VJVzKNr+UrwUGslS0sXr@!PlW|c&dZ49wdXaPT z#E;_P*+pqit|neVk>+_W#U^T>18b__H#bu;j&Oi3!U^fe6D z4$Ka;bPdjn%JM8P^r^^3kAbwzM8niTg_P1TcN2f3kg7_b|FH84yKgZl6FW(@ibgt6u2vZY}>{2J^f?N;7{FJ=HVuMg4gJS3GLf?!4eQ&p5 z1LORF!~oBvP;~1&s~mj`9Tk$Y-8?gW0#g(7gOW3yjPufbGCZ`s(=5XivrChG0n%deGm`c59h13IiV~fS{WFR@Gt;v3LtT7b(u{J-s`AStgAI)e^F5M-!b37D!$Vwh zvn{xEb#)c8i#)Roe9N*zNuvsV zQ~JELLB`a!v__Hr`y`LPEO{lQc1z}(;29^i4So7WvS&GN3O-u&$~e_6V`Z%-jdN%r;U OkNRh)U7a4G-3kB?^4zEN6w zF_%S-n^9)6WxkWXMO99|Q(;bMh)0QcaduR4PGGvZc49Nuoiqr<+G!dS;fdabiibv1L$YWMX(; zae0MVXj--_SF%y1sd<#PfkCigYE)!WqGyhAPOzh?XfRRz) z#E;_P<^HA_CHn5Zd7hRY>3O9=5f%RCSy^Rn$q}LDmFX!tLGC5_c>zYD?&+>v8D-&B zX<-3w6`p1J!P!Yssil=>S(OHPj!EUlPKN1070Fpyf!?ke-sO&y;~B-n4LmYDbHkG& zT%5B^Jks(EdBk zBfZTmGn4$Y(_8|BG7Z9t0xWZ!GCh4uD?{=ppJf!U4~iNDu^^J&ra74unf!a&Z@|DHH|EEG;#C` zh;%W@^v`m3&T}fM(oQQ!kAbwzM8niTg;K}xfXr+!OH1>7(@@Lw!lHVwq^h(q-^!3Y zKSxK)0AEM_@~|Q&?d(!RS1t>;vg}d|{p?`Vz|t^(%Tkx5$n=VIZ==Xm{}Qtl|8k3* zO8qR~#K;K8P;~1&s~mj`9TftK0wZ%gvXX;?0?bnLwNspv15CWLLQ=wgGmJbPL$ia+ z>fQZJO1#Z;f(^J_4RQ>UOH*?)Ov`-T1Ilv)yuGr*3!VL|a{XMw3QN2_{X!j$L&D91 z%F?-Xb#)bdQXQj`(j&_)osyFy%S{S%O#OZHJu@>ROiYtaOe~FjO$*)K%PV}MT#LEp zSu9Y~aVdXSyhBr?{bWw{_QmIJES&jpiC_K1bHC3Rh)j+7+`BkANUTxD|9jBC`YG&- zo+j~!o!H|&|LgS=d}#?nOBk#*m382o ODkmtmTg-~pKnVa?-dp|v diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 80ce23a..81fa3ae 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,17 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA abYqfp05DkkiK7wdTOn+E9+FU9iX8y/UcoVNUJQ1wwQ -BLIH6HkjumaaeKntAMm5BXC4ADfqLRh3vsq26gVB470 --> ssh-ed25519 4PzZog gNCidb7IlrQLJah7iqpLKLFzlhe/4RLk5hexSq96My0 -ynnNvbbit8U8CNel3cBEeel006ftNPArV+oAFNdmv/4 --> ssh-ed25519 5Nd93w YnGe4yzhVDQD1z7Mq58KgnF2GJjkBLyiOZBmCygazRU -dZg81Rb+XSoeho2Xbth+pIza+6F4TbAuN6s5BbP1OLM --> ssh-ed25519 q8eJgg H9L5QhInkMWBndRYQHIQTmuMVBrMtaXqCrpEXV/hpBE -QL24qbdGbfdmv2bgS1uYjRHB5fKPrfmbmMidjI9dEIg --> ssh-ed25519 KVr8rw GqmHdNfgOFKcZ6+zxKDWg/ImAVEXHTSpzDmBe8f/vmo -4u2ek5DHeDuBizYx0nRee02Gf6492fjWM8U7/HL2XwQ --> ssh-ed25519 fia1eQ zYA2FI8k6675UAQn1AlwWzPV5e52dAmv/ESDFMmSQlA -rup+vtydMspXXeQQ9In4s0HQnBNY4IvqRIlIdKPVaZk --> ssh-ed25519 IzAMqA QOiOSUOx76IICb8rSo0OxTtyZnyyA8nZ/pvuDZcVfUI -vDUSgB6dfzKNIpA4/0PbvJ/KzcVgW9l5KqqV6rKbyhM ---- 7Lo9nyTOtFbzsGyr/5Kanvj+yoszus8bUMWquX2rG90 -¡Çä4†ª+¡ ¦ÂÐQÍ–BFY2°“$žÄ8sñ¼Ñ„qš.U¾Èª5õ†â–Q·yKëog§ „­8^ÏËhîú.±=Î柳ŒÉE \ No newline at end of file +-> ssh-ed25519 V1pwNA pcFat8+oFhOWSZyYBM1Ij11K5vLcrGSWGcopZTIUv3M +NDNVRUQU3SqOPRm3N/rCMhf+DyMg21d9uAJkrqLrKcc +-> ssh-ed25519 4PzZog xwjC1NO/yqurBivCPbTQgtsavmBmOcHMrjcB/W+wy0o +zdFH8I0W4ItbKVlAW4mHIPNDPPlIwdSLnIIu/1kEXBs +-> ssh-ed25519 5Nd93w ojB2kKZWtrcbf34sdYPNKIUJ65nGskCXU4wOq/SbH3A +hhr/RyiTv0tFC/pvNHBFxFenHuVWpiW1hzVcyH8Iplo +-> ssh-ed25519 q8eJgg DA1GO1/lDUAnFI9lPoOUQ1C33SHpNGVvqAF6aZCoLlU +9Cyl198clJHzc/pYmOe3hMM4EZVi/EE6XjSlSnLeRdc +-> ssh-ed25519 KVr8rw NNeHe1ExbX5I4CdibTc1772nJoiEHHcC5gs/t4v6/wE +FeSYrhUeMxCWJ/DOmp66w+KJlhKnXCsBqCJ+lDGT1kM +-> ssh-ed25519 fia1eQ yZVFUGXdWqNW1fnNRHTrBGN1WYoXemIkGdRwKPF613U +k/7eulnPGaePxUzXtt9tHOfhOyhJlTT4pQ1KfhzTwfI +-> ssh-ed25519 IzAMqA +TNjvQx4ee/T30kv/UyFu1rCf8aG71T8WUJj3WBnVzg +3ooxsLz09cBO88/BRChFrMXpx7QjZVFfopgSEcxlfpw +--- kRZI09vrkArnL0mRQaSvoY6bpH8OTV4nT8JbDzP8nWo +î+ó PçüÉ×:( ³8.Ðm(ªe+ÚigH ªWzqRvMø|¯–ý$ízâµ<דí}Cˆ´{·)qõõ¬ÂAgþÑþ`¡á*Å \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index cfdd6e450f349b84624209cdf043f5bee49bb31d..29637dd4d368a555ca7e25d7805068d31eaecbf7 100644 GIT binary patch delta 814 zcmZo;Z)2aJQ(u*zTN!3y<`te&Zt5K#Ri&R%;2CJ*V;L6V8g5b^;!@~olI-JN>{py; zz*Sjk9^#!@o>?5=of8-s8txzAT$x>w6d7Dp?rNIq?(ORrVBzoN7@F;Gz@=-aP+Xj$ zo0?)|YHDbyU=mOjm7lKQXi{Mr=^dya=^T=t;~Nxd?iOJl5SCq7o}FFdZx&=xnONps zR1{E_?v@$JRb=EI8W@lr=;9P)o@nXkp6wc$k?v|5Q5o(Pn&cN5;1rqc9_s6q>uqi@ z@uPTnL8w=zL1tcfRj6fEkzcB-kynzNi*HVeQ<`s** zzDJUCRA!~ISwvK3K#`|$WvX|0sf&eCM2KaIn{jw?VN^(&XL0)Ect-JXbF+xV%wmfy z-xOoVuu{vkti0@;kgWVjM{Sc7pD^>x$c%DJSF@C?%t{lkbWiu>O#KWC)10u1K<9$I zs^r}COnnQNl+-j6uSjz*!%{;J|IlnFcgOU}XBoxo6Magu$RTti*Cyj-=t^Rx|1E5b5e0<*L&d=10O{0qJG%L_cK z{BnwYEGvA?(~EpdOe@RLV<0Uv(J(bop`;?pz}d7aMcc?XB*??GxV+xXKd7{#tkl`P zv?44w&&43Wz`HEew<;*3m@6wktjr>}(#tX2IVvwWBFZqJs<0w3#mT5NB(x~3D%~?A zB-A*{Gu^`#!#d9@N8dt61;1jmhyo9{>>{VE{4}SqNVB4dNXrcUlE8q(6feu5^hED^ z@5IpXtnlKnd@kcaed987lk(KuU{n2)^qg|D=0v!nv|WK)w2{gldp@bEGt%Osc5iqN3oP_F;o z+qPW&nY_~H^r@aXN0ZW@o_DmEzv6+_Bh}4wzGmA@3z)pguP$Oy4NsHUi#wk}3O8Q- RQX5qw{a)`&)9VdiX zoK%)sSQ_EURhgS@9-d=jm~Uv5ot0vlo*NS87-Z<>RqkVwlbxFxY?A37n(Jz;9b6PR z@uPTnUYc{3dzp`ONxo%nc~W_DURFrHyM=p>nL$WcUPNwHpkxZ|8^#N6(bR^2qR_LT#hWh_HMv^Xzmp|H5oQk!?C_7GCeBEBGRQK zD?cx?u)rrNE8WAx+b=3JlFK~Hz%L~?HzFm=wJ6xc!Y?x4BBjK<(yu7Zyv))oDl#oA z$2~DP*~p_Z5ZyY@Do5W!M+M_3vkKo}i!cj6%VO_>H0P>f_fYSEa_uBbXP;topP(qu zddCW*l1PK%>_D#kpsex|qe8y`?@&(zC+!GxixiW}B&UEf=llXoBTq~1h@33vJSUSZ zlXNa!U0nrdld!U)(qvEVB$Gr7pJLCT{(4*=by65jv- diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index a72d82c..5626a56 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,23 +1,24 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA FJbuXA9iZkVimh/bRdl2MnswKZpHkF6HmIqG/cmE62s -2vP3FNg2f1ijAMwWGcLa7aZQD7/Tq8iXwf6+/bMEgb8 --> ssh-ed25519 4PzZog 75e7m7A1i4/XjB+b9OozGjKttQ3VzJuoNwKV6z1xYB4 -9/czRQ3V/Kb/8p9h3cdiXXbNBECeZfLLEWg8gR+WBE4 --> ssh-ed25519 5Nd93w Kier0iAHycxtmgq9n5Mq/eLR2akqKB2Z/JBA2ACjaE8 -HokkZ2jHa7DV6KqODEH5rF+YprwNwBIjLLFGbfXdkrc --> ssh-ed25519 q8eJgg cFNBrJQ1R4tDi4HTI/1lGEy44cjCDpnUXGYsXQ4daA4 -GPJ3fX/AxxhUjvfnAJNREQDEGp/Bz4zvfiTWHD5bwMI --> ssh-ed25519 KVr8rw hzHh/c9qM7v7eFFpvD/uvCcDD12kSaTabVVA8CKosgI -3bwDd/aWeYWmYf8b2ko4N37XXgTP5LeP98qYXSlaxwM --> ssh-ed25519 fia1eQ gol262stWS/VMaXgAJNC/VK5QkNb/UHN8X2khm3PHFQ -3eBj1/cUkTSNBGANSYp6S7IvMU+8dKKEtZxqo7kMzxY --> ssh-ed25519 IzAMqA Z70Jqsw7IR9vk4uLef56F1+YCQtK2YvDC950d+WVNHk -nXqGHPrbh3VS2DMToRKs9FxBsn8PftR6HTkeA2KXRLU --> ssh-ed25519 uZzB3g Zrc8idjRB+ZPHq9ScsCnXDqipGM83pio/V8mO6YYa0I -JFVQ8V3Jkn8vxklAZzwGpmOcaKUd8QBDFO/+gAyb3Ug --> ssh-ed25519 Hb0ipQ Yhn/pwNTNmMdW3L2RV2MJECEYRlAzNTYztcA5MfRCjk -S3rkfwU9Nln8WFPSr102lX+H96wnHWVZa6z8upTRgvk --> ssh-ed25519 IzAMqA 8SVaC/2C2+xmeCP07Mu+/xGFSB1UXrIlVJ/i8YfQXUU -y4mt/hZRuc0+5OXFs3VjYH/Q/nEACAd30YlyUyNzSqw ---- M8Emn3XUVeSu5qTgSbR7/93DjFawmR5iZ2qxQEJ9gd0 -zg*õFŒô·ç½xÍ?¬7,¬ò”‘ïaƒ1'Ü¥ôtmR t[øVFÝl=ç+Mç¸îm᜴ÙÑj;¿Ä”Fy6—O\î™Ó¬µ²Òªo=¹UG#%{®ÇÛoæÛ<²Àèi*à,RO;L2Oy¤ðŠð×NŠ”¡`g‰*î$‚yÄÜ’R]-õo¼böÑ05Q/ÂXˆýk[dE’Õ_…i é’ å­ï+KP8Kÿ \ No newline at end of file +-> ssh-ed25519 V1pwNA oKU5WHTVFbMzlj3VCOz8SK6HUXSMx/+O0GRBgrHz4SE +UhAfuzpx+3pVzaADb8IboXPrVdjc+6nTBs58vl6UM5Y +-> ssh-ed25519 4PzZog P8oILoh4jxjLWlJ/8P6ZFo3gVnPLf/5rCXKt+VNbwno +Z2LPtqT7vxDVXo67vUE++kZsgR8EW/g5p6ukannudWk +-> ssh-ed25519 5Nd93w SCPXtK32yRY9SHlXW37lWn5o3kVyGLvE25JC7OYrqgY +jXDPZBtkFaQ0zrWQ+q4t7gPXdzH3FXxi/GoGQ6A5Xp8 +-> ssh-ed25519 q8eJgg c0Pm3CbI20Xx+ZDG21YFBBYcRXhm7XJtL4upmfQk7Sc +zoj5rfYv0LlKNcqxPCEmgn7Q9fC/zglkacJ+RdRGFAA +-> ssh-ed25519 KVr8rw dlnvbfFVgq8/fCJ+VVNt82McHYcCYOyej2q4Xw7lHQc +7GvA1OChHOY8H+tNtBc7t0dGX0htnwru/xiOk22uz2g +-> ssh-ed25519 fia1eQ WkNk6q+ujMGaMndfrj4RCUhE2UTkYze9Hj7iDueXqgE +70nqJIlhPFLAUCt8p4c/GulYOCc45hvqKDFuh1TkaP0 +-> ssh-ed25519 IzAMqA 4ribVEiuHMHX7rZYHi6iiW/5BwvVvydrsBzlVgRjT14 +OaEvZPbPJKAbOySo/7DcIuwM7F8Lowa8mnYSkXmKMwA +-> ssh-ed25519 uZzB3g HBpDQeuRn/7ST7n+K9V1O6uLNnbu6qinqrjO000lyDg +ACVdyMFSsJgRcHxU85ns7RVTWlKTCRbUqkvgmSr/7CI +-> ssh-ed25519 Hb0ipQ zThy7Iiq+mfgOic4F8FN94LfUvxqFM/k2Z3Qrs4NNUI +E8HEerENg4ypEiV3PnvghUzBuL85SkWSBeEdQw7xUUo +-> ssh-ed25519 IzAMqA hvEU3NLfxGsQkA1hlwkumtgEgscd0HRcBKHbavr22Ro +omEGJ/nRcqeXRI8HQkWD1lnabodUNSipnmedtZjNyfA +--- OeFgK+AG4MnUHFFRjJYmDKDonM8qNnGZ7sQzdv9GZK0 + ³{J7¦¨bWþ")«û{Nð62þl”8íQ ¥A«ƒ +-¤'qGr‡}ÁÖ¤‹#¸, Œ B§°ÄÞž(Â~IÇm /¬FŸ>`­°RœF+tC-p—û]Í¡#òù Œm |Yó7Èã*„«+ô¼f{°×·úÝÆÊR­ô*X»UØl:ÉÏy²MÒ­ã–;my9­&ñ1Ëég ¬ßÀÓ‘î+1=¥ÜOÉ¥B˜IØ6µÛ \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 5d092e209af13772cfe3ba659a2df6403ed801cb..ddee942460ef6797ae238dce82a9bb0eaec627e8 100644 GIT binary patch delta 938 zcmZqVXyllnQ*YsGRF&=RWagEhqaB=Gn46=jrL}m06T&;u)12 z$(0mn5R{%$<(2M~UgYjunip2!e& z7~&Z0W9V+cRb^)6t?v@*5u8_6;qO_MpYLaqQ{k6XW*HokWtd~>UX*7RTpVEG5*|=K z@uPTnUS4>Smx*^oaFMT(c1TXTOJ-T3ezAc^m1~u+hfkJQUY>DLR7p}wXjMK}u6dZB zxk;jTN>X7!riE9kX;8kofwpm&hpC~tX?UWyi>Xt!$4#Gqzu>O2!mWtkKEMs0=I&)6jw)|{Gf6!^NJjksER`8Dt~|1V&?$k z%;bpt5Z5gK%t(Fhq%5yOza&2k&+L+P=dk?AXBoxo4U4k^-HN?kii$Jc3iN|A6Z1Wi z10(X%!c0?4JzWfn(gWP{(@TOp?SKz)PM{31g`f8S)o0{1Ex1J9uBsvNfh zcLOe6U0sFn?h0Bitj(OEDiZv60oj` z!&B^7-**#_YL4}2djQwlhg-!eFeekL4h3-a<9a~gA8IJ4D_f4I;VDAnG z7a@_Bqp!ZoL`(NNR6IYyYXj)W!-wVJy}o6zp?zAcPsf}cF*%I9RP55Q-A;f delta 938 zcmZqVXyllnQy*&NpJeY-;K0l2+_zq+K2u5}}{xWp0}5=we}M!KG`bP+Xj$ zo0?)|YHDbyU=mOjm7lJVQ4;Q-Q*7XoADI?ZVD4I(;g(x$UaTLO?pzt}Rcz^&=o(mM zkm(+rZI+SGWt>`EUQ%9BTv;CJ<6@~FZ0_t4=veGknO_>Jp%(wGja{m0xEpD{HqKz&GHSS!m=#Q%!-rEBSS-7)AJ(?Ei=uW z9J8|ulERb9+#U1H9erHUV<0Uv(J(bo!7#+KB1AtmH!{7{GN351u(;l^D9S7%{U}GUEk4P+p)yMge%Is(#PMw(#*}tGC$q3JjAcuveLIQE8i!t(9JSEt0KtJ zG9W88#Jt=m8{In3Do5W!M+G;R2MQ=W2VAr6e2sa=1pwOh0D(|3llbo=87Z+Dw{VbnQi*Vmae^0J| ze79!S@c+1cw>Hsq-Ny&)+jP2kr>09ks;$?nx~rSGA#-1Al^%y9-}?0epRXL7`sdY` zPd@}B1kad+yBY7*6A80!klX+Bg5cw+PW948(`Ab@-@jdE`cCtyb8Eh}@!EGk`2S=@ zd|le$xfxt;uMLudvTOxId|IZ8qnflK*L~^Nj-@0sx%OPn-Y% diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 8b370a8c5876a92821f28bd6c6095290a4a1365c..4a182f375cc0a698313b6937b36dace2a62ad82e 100644 GIT binary patch literal 2704 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sb;wa7Lz zst8OA4ROh`a5gFptVk)cH1i8h^vNpC4iEG-t*mnKt_-&{Napg&EH6xpDswN%%C0a9 zt@O_;HZIOc@yX8c&&sQ)EU?US^>r^!F9~zYa74GwB%mrPKV2cxJh!saNZZxG-MykT zB{RKPKQ*hwKQu8Z%*oH+GqJ4HQ9C28!m+?9$AU|{#4pd&BFxCc%)-MYD960grz{}E zyv!}x&A7_RHN7;i(ksOyD#)}T$P?W*Q@<2T<8lSpEdQvme3v9IeUGRDA7k%|LeETt z6qhoWprWWCSN|YW_llC@QvE{LkbJI6pNQbHKohgFbOV2F?WDj^?+VL+2oL=-=Ww5b zNXP6#ANSH!^Qf$U)xtkC(Lbu#BP^RM zx42!bH@ym!h%%u||50_%!)z0uOFDc1OHIE8Rjzka1h~OeevvP%kU<=pcijZ(4mx^3J&*D_a2+yeCob()R zcaO5*sK}hcQsaV>l9J#wgJQ0f^m5-E^TLpHr=p^$QnXX{s85U;YnqOLJnQrc4?v!hyogHNEtRJ457ZDufrSDVe zT99dyS`rpkWxz8kynvtkeQrinpohY?_yf+nrNP1R#}wlSj^>{o|c@Glc}9t=A~^`T9Q`i9Fmn) z?vYaH8Sa(p78IPClAD?5ZkbXVhLHn|3v%?m%M}c~JwYX~OGTBVxtqCrwq1_qbpSB4r} z_!dV77*zPVIY$}>av2wy=UM3cxR<47dU#nln}nt%r-kLa8z?c7?UtFGr*E3gRS@ND7-nRN5pR)h zi51T23dR13`EG_4Ss|Go$(G^yhG~XT+2*cMrTJcN-WKj<1wN_zmi}o;T%&F)urk%g7}_-`(9`KPW9Z z&%~s(C@RsgqQJzzq{_1@)iTvE(<{m|D?BhHB+LgRzgd(;Svm(QgqnwCdItNJ=Xw;B z1sS`AJ6Q&l>j#$P6uB9dnkJ=YmL%o51RI!S1iK}3MWrS=re%2>6y^t}8s}LCdYR=0 z=v(^eI~t~znmKudn5QO&q-5lH`6OYalA_$AvaE82f|4*}6R&dLNFy&tZ+)MP$TDAx zQUm8G6St@cuh7t>h~h*`3y+{OpNL{EbEB+mH}|CULXZ3`{R;i$l8B(n@{A0R-1O{> zp!|q{j0o>!|FS&GN>C2a)m1P^4-d>W)lN#$4$loQHV*I%DfKdP4^DG83eR&caWZyx z%S?3j3C>NnjO4P|$6?}@T7U0y*uRK5M=q}3#+~Q%IHx_N#K^VCCD8Eu=9>xiNp*sn z|B^2McIr|1Fn@08HvQv@zXD~tL}U^UKh66+IbzyrCDz88`}ZFhXw|jaW*qIn$G%fy0q*m$hasXwr3BB$2P zWV763^DK82Ni~1nw#i=f+&$w9nXAhS=h#-fGWp2q_UrueSIu1oQ#ehEMb~JG&0sy{ fwI^!b5?M=KMk9Hdrxh!2|9O17YS$r-oC((f_5O-I literal 2594 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 diff --git a/secrets/email/details.age b/secrets/email/details.age index 6e3f187..1b5144c 100644 --- a/secrets/email/details.age +++ b/secrets/email/details.age @@ -1,23 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 69RgNRqfd9pSNuJMr88rzFViy/xYScupvNucY4jOARE -KeTB7nbTiKxS7Bl1UPZ7IoL6XlTKxuEDIaUiZyjrsx4 --> ssh-ed25519 4PzZog R4dDARo9QpqRG9qKjr2ytkpJYGq/822XdiLEBDFOMk8 -N8WWraxJ0HLAgeFM0b5BPeRB1VIP5paWO12Pgruh9x4 --> ssh-ed25519 5Nd93w VboljaSRjajrkCp1ilMC6qvDv3+ROE670Hs1iNFKRXo -zUXXzywu/SwRrqmQtNeiq0hoayNDuW18EJuRZY07Z6A --> ssh-ed25519 q8eJgg VqbE/b/ddDfl4ShxeW3Id3vjXVJBP1KZKnJVUJsElws -y7uUlFXj1UlKnQxs0Xkixv4uLU9xRZXktmY2nID/AFE --> ssh-ed25519 KVr8rw dCG//gX7lz0frI48guiFNm9TvuoAJ1B9/Q/o4FQiWGo -wZ+QWN+0YK6DXHCtmdxtBDmtkHtNfOBrKac3ADIxK/U --> ssh-ed25519 fia1eQ 1s5iHrqZ/7TdhC1vU7qwO2Cgr9W1EQRdBwXEm7U+XmU -O8HYon1a/hcQyjEQkjL+uVIvD2aR90k+Ro830hy7QfI --> ssh-ed25519 IzAMqA IY4TEBaim4AtxO4N+YJApvUlDifcJkcIrH02bUP20yU -lQzfhUpnEuQdBep1ZKxdzZ6kIyP2g/BlJG1WxL8SiJw --> ssh-ed25519 uZzB3g z/mf484FBG7MNOnAV0iGksnv+NnuEzzfcCRl7UFosjM -a6fCYyU/6Rq3eKXecch64GJQ/a6bVNd5TJYu4SmUgf4 --> ssh-ed25519 Hb0ipQ rTavA3BBHDOm1oBTOAeB/E/ZfOumL82FFHbqk1c3rlM -VBPFpsqo+j6uhTwaXZtuPvzG/JNo0cS90Av1GfAsYnI --> ssh-ed25519 IzAMqA xGKLZbl6ErNlp9zH56mnN4cL/YlNakt1qFWqKhOJaxY -iju55ngxSk4IptEnRZ5435ocDloskNIENnkYGbR151I ---- ypGNmAjP0+RusrsXWCdDwWXJiqO6b1gnnzSyLGcQHLo -¶÷ÎO¨¬´˜÷Mˆ›žïhÖÆœçIt^þ=Ô½5ÒÎãìõ´!ø±1 ¢ÂŽo†-4+ ^¥à’†7Ê-„{•¡ìmªPŸôÞK†ž{T"ã…íìjdç/.  ¾M°ËÍbïä€T{Óˆüy†Æ(*ꢖyBž¦ó˃ÀU›oßû1´Ã¦ \ No newline at end of file +-> ssh-ed25519 V1pwNA fUmQeNgoFbbsFaWOuoZil65Wb9QXt0ombUUaowzGiw0 +f37D0PiBMFwmgUtsNmjr3GD4u9VjSUhRKRdRAV/m6NY +-> ssh-ed25519 4PzZog 8IbMdWcBQxNl1gJSAxDZ4wX01jU8xVcrFculOfhdW1I +qrMJW01W17kyc4+61PTUf3fYYeqiEIerzLb4Qyjomh0 +-> ssh-ed25519 5Nd93w InDd1HzgxvHNVZAdAxoeybHI3kRggQh2dTI/abS9YlA +v9ONGUDVrFSJyham1OfkxRtmPzdOBQqs9zD/u0XkHqE +-> ssh-ed25519 q8eJgg L0cOuysyQN+oBz7sG8NL8JHPvoPyKi8qSlSVan7s3V8 +6uxUttvfD6gbNLdFiGxo88ZfpNucTBpCTd7OlAYdx8E +-> ssh-ed25519 KVr8rw IWOO1WfFljVKcU6WkziAvX3KaRoBZoRT9PsihqkK8UQ +fpK1yiGhKxlUOzhI+FP1AmEP9csPhMcBjzi14spJThQ +-> ssh-ed25519 fia1eQ M+Z470oQzYWBwjQIqBgxBNieMeJRzoL6rc/rit1dkjs +xArp+UWpskcsc9q1XEzJ+1rM55/fK4/7WL9d9oXYla8 +-> ssh-ed25519 IzAMqA Iv7rCzraDezK5u7baBxdyXOMVWUQJZpQrTc1W0bWEGQ +U/d2awrDMpw6OP6Z3kEgzfpCRfmxPdI+7LjkRrBLWx0 +-> ssh-ed25519 uZzB3g Sn4Ufi02xZpJq6zJc267P9L3rlAL6Boy2YP/kj4PW38 +UWaxsni30Z3cEH+oVRv5wP6EguVAnLvbkC9zB2xG4OA +-> ssh-ed25519 Hb0ipQ IgVkXC91wdBmJcoksMSAmMVn29poksBQLMOgr2xQm04 +d+fI4goKUHwn2jsA8jJzLUc0n1vHKUplsl+zG4O+g4g +-> ssh-ed25519 IzAMqA 9V3QfuSB7mbnjnYRiRG/lznwwbAqROGXGKKni+ut9SU +nDxzIJAl7JIs+Q6YAiHbOQWXwfvQ75OATgEcp1SEKMk +--- 24F4ekcTgmg1WahdpZX+TsLycKdl6ulrJEGu7m5hr7s +íŒHuˆ5í¨¨¸ÿ¥c\Yo7t徯5“e)ðíó/”=Ä;«->kàL¦ÎSé'õÚ=—üßN­øVæ–¼¸ D=¾}KCPâ8c5Ž‰!Vn‚Üd6Ö3IÓ|µ„´û3iyI>ºJ–·Š²bðä/SsrUr°‘V´ \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index cd1ad00db2ebd9cc38199ff892105e4dbd90f2c9..1d34129534a7c9c5959e5bec7f781fe5dced0622 100644 GIT binary patch delta 914 zcmaFK{*rxyPJMn>xwfB~pHYQxkwI{xfqp@FhG&#>icx84L}`#qNI*)ZpSg2{VP1Z2 zGM7hqad4rdxo22lv1MwJM^28rv%ZVIQJRl&V76;vZdOJ`gmGa;u6bFwFPE;JLUD11 zZfc5=si~o*f=NJCRDQaGi%X8Sv73*+m%merX+V0KrCXVaQBX=+fqrFJh`Fh@kz-&; zc$QI)etCE@SDLqvagmohF&MFxra zJ{846s?prR7zR+WroF-*{Pv91%>I8;~B-n)5=XMon2DA zvkRSlQjIE{oxI&saw79G%uGWwEiJ+_{j)2LO(UXAvw~f@++8CBD$P?XOruN+lYC2( z!^2F=oJx%&3Vrjl9TN?`gZ(oc%W@6ED?$P%pJf!U&kS@l^oVpSC<*lp^~wwN)AlS* z3@|q-OEC_1b`EeX4>0vGEHlnC32=<$@-26cGVq8r@bPf3h;#|6@W`&xFDN(lGcU~W zHZk|kN{cjc%TKP<4l{E_kAbwzM8niTg$QROXUi;SeeZyr@W`}K!@T;;OtVm<4AX!> z7t50H^0YwL5EI8FPuGwj3$DsUKVK7zETdFQmvFPd(xL)$6N^0Uz}!%$Br~tvkl=#k z{E$GC?Bbx3WOVCFqpF;Y(-l1ZQ;o_}{PK!?EcLVUipvfCvYaw4GxJiClcSvdgEBHg z>m7^2gDeYubF;Zp+)J}V%UnT;FfS`C#Wf(wMBh16ze>B(uQ)xbs3fQ;CqKQy&B!z= zn@d+$S0UFYG9@`8DLu5PFfT7tKg-W`4hD6l~*o3ayckudvLLbp7^oY`Y#_ElqROEw|e|PYS}Ek9)&Wm_~n-0JH<>H z8CJYbxP8fW*-Y19-fz0WKVJMSkl6aR@2|7ep)yhV8-m*{q9?AW&AxpSLK%eVAEYLvg?-Wm5n>{eoep8d$i-u$&5$yxen*= SunC>W>7iBq!_jj(g9iZGRYbS| delta 914 zcmaFK{*rxyPJNHF_*5LLUD11 zZfc5=si~o*f=NJCRDQZbut`-=j=zOPQFuXezM)^FzMFZamrG!ob4fs6P+4SFcz&^~ zMVMbnWOjHcS7wBEl5x0EK%#MWxwdPON4|bwwsusAhpCfAaamwUns0JMil2#Rcvw{A z#E;_P;V$JF{`!VlB}uN@E=fLx7Eakgsge3&DU}&1$;PJTnR(iI#vZa=<`!9HhTb`qrTLEGLGDHs`r(E85oV#2;~B-nz0BQA0)0&~ zLyWa8Jd(WfO&o(V%rkxRO!eKJ3QF<}%iVp=6LTwzEOLvvEL}LBU}w8pJf!UcXD;gGYm4$GxCZIFHFu#PxCkR z^b88mD@qQ?^DXf-a@EfWbk8oSEC|cyaxJQIuE?}V%P27^2@kBO@^viBcF9Zf3oS`b z%B*zCbha$;ODQlcOG=DHkAbwzM8niT1$Q&ol63zHZ&MR*OLHIRP`~;piwq0%@bd8T zh@w1;Wbcw}=ZHje(*kezWG-I|vx>rOZ!dk9k}N0lTu)cS^ni@~h>*xCj{+lOOXG5b zR$qpF;Y(-riKQ;aKoOu`+#lL9KrQVI+8(=szE9WyGj^9nl?{Bb*HN!y>u#Gg30mU5%1mLoGrrjP#wuoV5K5+!K?Xwf)n=3L+vRT}#cJERq8A zoD8^hb#)ay+`T*VXZ55D27HC>@QAzhbU+r2)5DeOkUDwj!5H*0#n&X+IxEOTkGSgtr* zzrYs7PdlHlW0j3He?KisbNA5+8+-WwD*bQWIO}DJ@cL_|Dpij{W$smawezLN@9%7k z{Go1X(ioD_bSPe{C1sDQr+kx5vWmbnMV5KTR=HItIz?K@2}|p#aJ^%m_iMM;oXj>} S=0CqVFP+p{b>h+U6Z`;T8a=uI diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index 4ee36642f5e17d308fd54967777ebe87f3f1202b..fece9747145c8e3fad8d86bdc5cb3523e26bf725 100644 GIT binary patch delta 913 zcmaFC{(^miPJM-8LAg^#SgyWzNrr2-d%m`(rD>&SRhfmOaduQys;sas-NNlIRnb4pa0vu9FbrFM#bgl|}oMNy)gWpbW@wws$vGMBEMLUD11 zZfc5=si~o*f=NJCRDQZbk(rCOQ-x7#SZbh)Sx$0_wwqZ*WN~hpYeiy3p;usNkwvb4 zKv8KyRc=T+mv?$jhDD`EWU@s{SzvBxS)NgbN0_mbxqnrFr=@dFplh~Ks6kqmPpNzU z#E;_P>ET|vQRx){#a_AkA^Pb~9#uhpQ4t;yCV^=gnVI^Y`iWkZrR9~DW(I*=Rry(l zLB0hUnQq?Z?v=qQ!P#yFDaIDXmd1YJj*-Qd`TpU#CMMbbjs@wH;~B-n11hsjUEP9; zA~H-|4YN~1i_*;v^UB@z1EZ3RJzP@^b5nx?J^hU;v@<=q0yEtbONztNeZA969i3eA z!;LIF3(NvD0usvt+=I(~v(r36J;Kw&Qv6*fpJf!U_l(l_Da`aTiO9$|OEf4*F)$7Z zEO#+*$#iq7vPkpwEOs-gs&X`Q%5V?lN^vwYbuTon@QiRvE{n?cG>9m*h>Y^8swg)v z3CxZ13~}_xN-H)Kk53{U*-1Pcn1 z%#w(_NOSGL#Jq|i=TiTSbgm5l!o(t@9N$8(qCDT^GA~1;vf@%B%L1R`G`~t8i!zI- zRP#iG%IvBV4C_jxs+^3|71F%TQj)^_N+UBJT}n;7y|Z0Pl1%g54E!?-Ei8&m{C&df zD@w{N6Ai=MUAZEo!UBs8wbSzq-A%lWi$mN(qKpiqqSBKhef5*IgY%3$Jsi!03&PUV zvbl71brrmG5)IQU0!^LG{37%XQ{2p)bMo^uJu?Er%JMSuiVQP@D$DY-i?WS%ZM R*}t4Qg4VSPWrTj-1OV8*M{xiE delta 913 zcmaFC{(^miPJKa0U`TReh=F!twozGbxO-l(c0{pLxv_gmv16HWuAyb3r%OetXRw!( z373gwYDT(;XRbl9kz+`9W<^et~Oi;~B-nL%n@WD|}0n zLaLGty~`@fd~#jV(?T*+O9O+-9aB9ME!@)!4fAp$oeavka$WL^BYko#D}z15^@Ae4 zd|fP@Ec}d}BK-U-y~_)=b1VvTqs%QM&9ogSpJf!U4=Fb)FZTA&^D9oR$WAH=PERe$ zcJ)d&ba}V%O%}v*@aL-QD&+xZ! zb`0>=4)BgFPV!F;^(jq8kAbwzM8niTh2reM$n;9foHA!^1ML8F{i=FX)6{~p>=d6o z1JhJDLsPGCPlM9%qJXHZY_3S7QqNMSl!7vg$^Z-R2*-K+EsGP4r33(bAYjXcf# z>Jz;(ij4G&Lh`xXeVu*uGZI}4jhs?4oSX|i%>A>Hi_6l=OZ>}BofA!*!wuY%oHGht zE0Vc%b#)aif{ZN#y$j0IBm65uv#K)FJ)Dv%jY~}(LktR1yfd7gJVH{c3|t~ovOT#z zIOyg6cKzo3bBo$Z`vW3&Idg8*yRBYOBwhbmplQv^eLqi?HdrsOu9@U^-mhlPj`JOB zPSuH;7+*Y8AXzc{bGN)%lis3JT$L}6ZYf|mA)%jFX0n{my-(Kb-NE*yIf}R6m2TP} zw_r!~zDoyJe}1GmeZ`^Q;`dgkC^qRnb`?``c=2y8ZQ6UWp<*wzP?jdah^wLSY~#nMTLP=n15A)& zC|8kRURhSQrN56+if@KriBFENzGYfKc~YW*mv@Srxlek5g?~{_K)Qi;IhU@TLUD11 zZfc5=si~o*f=NJCRDQaGUsaKBhG%MVqH%79p}CWRyIZ7%Wub*nWplEX{Kq0uAT)>q2|f%mEjd8ZeFRyrhX}|LrM*^NP&M@5CyX$W(1}%hI%xfbztu%5eR}eA8l2ZKov9 zyihaWFk`cfVsz_DqpF;Y(-n$}!h${XGs8W#odT1c^Q%I0%frkZLp_a+lgj;~g3SvJ z>jNU9JPHg6NB>njZ6YV98KNbQY(T3eN**A4V;Sf^#l9@N-X^YJS)OWef7&y zk_@UK$L!7U#>x9fkiSUK2C zeoSvTpmJC{Qgd~h&C|TsA#1K&S!Q^YNsyO^i%WP?c(_?mVveDce}Sp1enmx^pOb5OYI%~Q zE0>$QhkmMlieE*(kwux8TSi&BafY9-qracCw{w|alWO#X?|*MQGkzWa(I|YhI65jvvy(V z#E;_PhLz^o#bN#)<`%x59>$se$u3cq#ufUhS?S67P9~Y*zLg=SIhn3Wxo+89zJXo= z>DtLjkzSD=9=_?}#lB%a5f)A!0Trpmxq(3e-lh5ZhN0#bDHbM^;~B-nja+?0iZb+r zb0dm;!iz(SEF%5$-Tkvn@`~~TEemtKJ{*m+<uK(5rJ2m@o+0R77FC5?UE?%s4|nlq5zLD?Yyu` zFO%#XQ+hB+)SMO^Fv(x z>Wf`Xiz_X2BRsi`(^4vfOvAlBgUqwCaG>OdllH7x zCFImuF~RX|phn}HHH>d2u5e9gouhrXM!GY`u;6E8L{F2Y#J~Sb88528eA<;>Ubki5 UtaIIo+c{^|o}2g9GyS0z00c2eOaK4? diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 387705c27249e7eef475f73017912460c51ceee8..13ac650790b50caae58d035f7c92ad95532d95d6 100644 GIT binary patch delta 867 zcmdnZzMFl5PQ9s5wsVQ8S8jlRVp5`?mv%)#o}<5sK~AZAP-##_evq55Yk-Agpl3?B zBUgr*xwcVBsCQT z#E;_Pj)CRAUS7_HIYw#b`l)8dRi$Oc*1HaamM|Z&g5^bBT9JkxQhdxnDq@lX<$UlYUlU zIhUhzrlqHWhgo)5X{uvIrMX2}w!Xh*R*-Xec)D@EUtwrLRC1!FOHf6kFPE;JLUD11 zZfc5=si~o*f=NJCRDQZbiHloFj<2?hcBpf{Nw8sVnOjkDRibgeXGoQAfQfUeX=1*k zQK5&2esX3qSB0aWPiBR2a#(1RXQE5KXNaF~Zfbajd%25~r;&e=SxQiqM_77}f$=-f>rWt3ns`5jPO$+?}BQuH|GZKp@pJf!UPsudZF7S#di_FMy&M&HPb@eT& zat=)ltE_NL%QDHyFEvl`aQ6yHG!Aj(a>^-)$nrHwHO%t}^bIh}F{yMZ^sFp&Ne!-W z3Mh=!PBAdZFDs4+uSg3;kAbwzM8niT1&_cClR#IGu<*#>(5$q)h|u~(;|!-Pw@kmP zl7i5T665f|v?Bi$uTYQ7NUkEMoMKDQQbS*_upGne@SNlb$5P+4?6Tm{$PlOWhzNb{ zC=>Il0zY@>NObEe%YrSF$`!O-&5es(!Xr|%4D_RtGd;^nwbN2_vr7_-@^S+6BiziZ z>Z3vfE6oZ`Ln66K^|gI0U0qWGldDP!3JOC#JtIuak}KRw@={%0qaso~Q=LNtT|6=z z3$nR%b#)b-Eqx5is`5*Xyjl;cDqI|iI zDO+m)*tBs<_FIiZ4k91BrkPCs$i5)p!1SouU;nVEyf5HAwsFEreRIu)HQvJNqSs%p z)a-t&!+oCfoQ~=8#WOP=oQ>khJ#Z_cTQlh1^jQl;qjMEh#V7E$_ug;ToDr^7% diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 2901579acabfa034ce58ccc9828422e801d15bc9..f29310fa2e2b237e83e12905b502de6747c68b58 100644 GIT binary patch delta 867 zcmdnZzMFl5PJN1(eqc&?SwX&$U!q5Na)fWOdwx~8c~YrGKw?ouP?mA7x4WUQv87>n zI#*)8Z?b1_g+)b5URXwzhpUNyc#1)icXFjcaz;dclt)p3hmn`JV^K;~D3`9CLUD11 zZfc5=si~o*f=NJCRDQZbm}Q7rnMFysrE7kOe@cXYo|{u;rk6=%V3d27V?>!>c}S{R zqCupwQ$>a=S7}h7iFQP~xrKpYuBD4tkgs>TN0N7{bBTMZfnR8dWtpdwdr@empMH4q z#E;_PZth+s$-V(qmAf-jykC&MCo`VS%Ok2A;)6E26n*^ZV;28q6t;~B-nee%kT%F;7T zL(Pm+3i4B2LnD0LB16MND$0{9{q&7JJ&avEwG9&^ecZFT41GMZz1=-B^|M_~%S(b> zy?k=QB1=lMqjJn$LZdtbBcqDLEX>n0jLiclpJf!Uukb80_IA%N33S#^it-IMPmRbg z$g|WBtMI9G4M}lJu`Dz64)MtaQcTcVK^C}6-a;-`-HY?UobN9)}@-ov7 zum~$PPc2L~N%l)m40X>(kAbwzM8niTg`8BMoHFm^(!`{QA`?e%m%#c!ZxbKS!YFMI zuaY1GpGZ#wi^}Z$;-W(5NUlh(QLEXwlD9n-n8JrdnrgN?kkGknY~i_J`Zo1Tb*0q%_z9+f3GPR{7uubjU`RBWc&+_CvP-C!Czr0BLUD11 zZfc5=si~o*f=NJCRDQaGk!NU1v2mh)n5$uCT0nN5yPI~IYqqmjj&`zHS+Sc}o>`)q zMUjVoVOnM~S5lUDV4-1fn0H=sfSHR)M2cf#R7Hk|uSrI6WubwGdt`D+iDim=Xi0wH z#E;_Pt|lqoVIc*EhW^Et<(65=<|$E;*^!~z7TV_dr55=nm6oQ3Ze_uhZtmG!xqcNH zsRf2nLFri~hThs~!9EqHMG>y1KDLmdkf^GwZhk`05)lFb|^pJf!Uj|g!~cMkQ*Nb+zo^(pl;&nU_Z zGR#jm4^DB;N+}I1Gj??}G7fbq&dqV<@(#=?cg%5$bgN1ZNht|6bxMy)HVh8%OLwmd z_V@KN4fT!kDlsfeD@}3aLW_a4%tXV~K!s8tU$+922yY+n()291Qb&_|Z7*ZP$dK@C zFW0mR<7|t}5EFB4_YBLj@IbDt3g6`5^pF5olR)i)yzJcKbPFG^@{Azw>}<;vUssQc zRG-AuLRY_lh-7r@D$9Z`lgbscJOcvrGJNwaO0z0MLUVFc@_pRH4K1BBd@X}bazlKo zD(fSvOk9o23`4WIO1w)V5(5j;B0Y;U144}>tIXX!!hFqBO(QD<(p@uh(t@-d3*Aa` z4FW>BbaizVT+7Xif|AP&GW;DYN-UBR9rca;ib68oo&3`cvfca*^NW&_Q_Vahb1W^m z&TaHmJaYf0<-!NdTWT!q81{euaL#9^*y}}6*RFr-NOd?}_`Jd6N0Vrl((WCSHLL8p zd9%1z?!8pzdADW$m09A49XD?`5Sf)A-G1oRozNNF^Q5or=-%+`(wBvziko)qxDmZ- ZZmGxBfBWC8Ts7sS^fiUvKSwtO0sys2Hh};D diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 474331d..678aae4 100644 --- a/secrets/gitlab/secrets_db.age +++ b/secrets/gitlab/secrets_db.age @@ -1,17 +1,17 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA nvvDGnr/WMta+0XVEnUlmg8KV3mO+5zX9ZlFQZQS1Bg -YyVLxI+TxfXXsncaIyi9Su6tzh5KLTbHxHxbWhplXXw --> ssh-ed25519 4PzZog zuxuhtcAiEhrr28adZrFPK5Z4399/8gbf8aWoAtI7HU -vR/0DkXhUQmbfdzMBVAFDd1S/87DDpg9v0gyZDVv2UY --> ssh-ed25519 5Nd93w CUTmUrZomxIY6wwemYIwaIBO9CFSPrcQaIWs1tUdMm8 -btVGPdTgvyxqd4rYiuIXLGJcQoF45g1hx5OnTHQgCrg --> ssh-ed25519 q8eJgg wKjpIAXn+5FAC09yengwsJmAgPVY4BSNOkzC6bdZUBM -LUifpX/UNLC0ge/ApqC0VZ6NWwug865Gtp5t2/Fbijw --> ssh-ed25519 KVr8rw 0YwXdULrmM1CaWqe4ppSvn3rI4qaHpjVFxZLtE/jFiY -GXxdfK6NU0M0tBf9Txl9M7SzUEkAoDJ6VhGQuQtDRCg --> ssh-ed25519 fia1eQ BoAjwSD4dQG+35NLGjPwYcENbtkukIoEVxo23A3mukE -1YAgdZedWip4daImkXA1UnHJNGu5LBF5g8t4FotjiTg --> ssh-ed25519 uZzB3g g/yGqYocU7fg27BOj75yUgFYHfYhLg5iOA490U7xpUY -huOnWVaBT71Li8CO/NialjSzBC0jscJIE7Vddc34Aes ---- 9iDIOye0Eass4rxrC2ZcfxXu09TG0F5SQoMAi7VOsfg -õm§Od¹åŒ½xõà·o#Ï5i‰¯¢;ËYóÔÜ:>†,n,³Qô¤}K{½)œi¨XêÜU”jvS?jú(ªr@'ó†sç@ö çáLQ…çÅÞC^ý¯w‹€XœólqŠcÑOÀ«ÆP¾ÑMnç_jÚÁÅÍ ssh-ed25519 V1pwNA 7I3aWhw7iw2mwJnswJkVfIQ246p80yB//uG+0sEyqTA +adGO+PNHWVXIlDQKyxSPXvZH5XFONNNPr9iLeVq2OfA +-> ssh-ed25519 4PzZog 1MB3obSvF4K2IHF8beEcTwZ6gisII/iXq7uGKsDK4GQ +dVPFnOW0d/IuqNtrcLdr9AtNCWV4NYXTtVHHZS+kVHM +-> ssh-ed25519 5Nd93w CNxhP+Y45tiXD7WvDbQgo7ejsWfBoq40SygJDhksCz8 +h3usonhy4UfpnSkuHw5pKEV1WS7IMvWqqd1Y6t8J1lo +-> ssh-ed25519 q8eJgg yZ7BmDxy1tXK7q51r5oAFvhM9mQYHtexwOILnq/2BD8 +dKwf0oHUUiVBNQod8Zbvxn/YfMnhXNZbqo3Qv5uIdME +-> ssh-ed25519 KVr8rw L3rQAswf0dc7Ok5AuTFlSl6fuOhcRNKI+donwmJj9B8 +BO7TsPdPqhxy8KfzPW0QU1qHWKd07fZSQ7TqS7+2ep0 +-> ssh-ed25519 fia1eQ aEskvIGIekFwG8z+jlK3VOlhhBGLYPsEnS/1w42cKg4 +phKYN4MjToHeljP1s4/gb42D4t6dlLnbyut24vBFjB8 +-> ssh-ed25519 uZzB3g lczlYBZbn3f39jfC1fp52EXXRYX3nDrQ2c7X1QlqbRU +eBjI6305+Zigh8+3esXt+qbmJOVJIARVPA9ROeedtIk +--- LOIDMgRcQ6CDPqWhDTSW0vzaTV6XggXW2/HDF2nB8fA +jtFÞ©±\ Ÿµþâà1¦1}Õ&QwÿwVÁNæG©z‹QS?Õ]êK£D:ÒKæ6ßó75GÙp·=ré‚ó‘›ýã«;$bN8Ô/F¹›V,ç!ŸÓJ¾¬%¡Q˜"²"=ozŠÔ”f‘¼T€£¹ÔåØp“~Œ‚mZ„¶Ÿf÷ŹTŽ2í岪½ 0_Ô~âôÿ¾¹üš‡” \ No newline at end of file diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 57748892d9e6094eb6ac67437de8bd0925d39e19..78007ce379030626be17613b770e4d8974ca535e 100644 GIT binary patch delta 2475 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 delta 2475 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 diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index b397015d1d29df634bf82b4dd6416021b2a59746..7b94f37219464cb54d8d1343efcb9245465d8503 100644 GIT binary patch delta 913 zcmaFC{(^miPQ685L|%G&mU*T@U{HZ~c7AYHTCz)+zo~0tm3~f1ig|Xft5HB+fs2WI zC|6QqXr_~Ict&8FvwoqkXHsfrZb52DZlIS}L7{f2lUH$iWvX^bWVx$lAeXM4LUD11 zZfc5=si~o*f=NJCRDQaGw{eAGo?}v_p{svYYCx`Qxm#tad8V;xwpY4gqLYh@c3^N? za8Oj0Yel*vSAIZ}n{S~}dPG5lNw!b1pIe$=Re*kIRbpaBgnqhfu6KrST4}ngMNU@s z#E;_PUQX$GZZ7Vj78bd|#%6(m5tW%f<>BVOjuus(#^p|qd6r2*;Z@nC`IW_7PWlBt z=^5sZeue(&krA1RNoM}u`H^OZ0e)^(-rBk5ktUT!NdW=oK8c}|;~B-n%^kD-4SgLg zy?nD%^UIyIwF4|YlQS)niYzPxjdQ&%v-J&~^TWI|LbA)b42{ctO`L=Zx8%x<&^%v@ z05e0=;Iy#tWOVCFqpF;Y(-llpvMYn~oGSdC%Pf*AlLNwYU4se(g8VEq6GL1~N^%Xg z>r-5`vl4^K+>5ykqx=iX^o#ZV+(HX7eDg9v>8vW)z#u8Nz&s^0v@kcrv%Iu8-#aoO znM+q!SHaLDr=ZNgsKBcrBHi6HC8DY@B&)X-GrmX)1pcf+r|RlQO2w!X6>*!B7O!e=KwmfSL&Ui)vY>fyMnUstZy z{J|3Ydz-M&i_WLZucJxg#G-Q`*| zHN4R7_(H#bw_X?h^w*eZZ};z$ckb15&z2qioH*lC$b!qaj;whTu;}-utka<}G1W%9 Sd{!Qg=XiQAwa`<3FEapZlv3OP delta 913 zcmaFC{(^miPJO9yk(a4yd1+Bnpi!lfld*|QnT4@?RlcXMr@v)Hfn!c)QDH$?q<2nU zGFNGCP^fWmL{?dWVY!*Nwo$UNpGi_qQczA>l!11UwsD|&Vx>z!YIAI$_)Ko z{mKGMiqk{VBC@Fbi4-H8-a`y5q ztqgF_$_**W^7PMk46Ag~F7`<@jxh4&vaIy9%*Z#(DlhX54Kz#4aLq9A3N&*x3vf=& ztZ;IxH1-HgNlvONFDo!XkAbwzM8niT1;-5M@-nB4%#!3Ni!^OB{gC>|h{!y{!oc(r z%R-kxFVkX^u(ZfXFT-5-P%ZqkPOQoV^MH z>$S5Ti(TAHbIZAcN>U8`$}`=AJE5Z_{~8pmJI|dtHoGSC-jY+FtIoV!*FU*#?v_V)tF-np>pfW->7hM+ Sk6rI)4(`=@Uk`Kse+B^Nl0TmS diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index a8fb3289cc5b124814493d461d7fccb363900471..86192458622b92c69e2cfc0ad943c9a2ebf8ebdb 100644 GIT binary patch delta 913 zcmaFC{(^miPJK?gNqAJgQ9-4*LB6xGXPUmhxr?`%dw!lzWVS(~dtOLcgnmw%L6m8E zGMBHmZ*qQ6dSPIBWMq(UT4HdXtFdEHu5(scPL8j6MY?&hiBXn*RH#pRD3`9CLUD11 zZfc5=si~o*f=NJCRDQZbs$aTUWJO3pS&^GpahPvqx?53Xo_SP8V0u)ZiIHzsSh25r zn5kKwaj=mmmt|7Ar-8GPb5@alzI%A6U!|k3SwXp{kzu8Qn|5(UkZXodh=*gMb8dRz z#E;_P`en{0#g-MuDM?u=j*i*c!O1BG*%m2L`APa!CAo=)i3Jfk7G;$tc_9{DzKL!I zz9t?%Ibl^vWvS(***Uqs#aWI{QToLO5$+z@+Ere@K8|jQMUKUj;~B-n9ZLeT{f%>z zogKrp{mKiH!aU1eUBca>qC$Ml$`XUKgA0rjbM;dTTn&=B!qW0{w1eFOT%5CgL$&?O zOU%s*aw<$*3cV@~&3to$vIBk6Dw6}UO9NdepJf!U56LL=b=LL_Gc2ew4a?T{DlvC2 zb@tXbk4h{xNKJRmE=Y7u);9DBs&LKc@((Hu)Yh+Z&NH`g%Z*44DR4{9%`b2&%SqAB z%5t&D3J=L~_YMs9i7K!_kAbwzM8niTg-rLXQV-wAg2)WZoM2CHAGi8^w}P@FPs5z_ zB#%_15)a=TeM7f=17q`?d@e`roU#%FUrUQz=R$YwC>JviBe%SA-=bV6-|X} z!hrHLuL%FVe01wdqpF;Y(-l(E%d;Fk{6njX^uv<012U7+wT+B}eas`ub3+XSElPYn z>mzb2y@N9IDkHgkQ(Qb#6N8QO3Zi_qD@~m}QVa@wEIjmsjlJCs+>%R-wS&sM&5N>9 zECRW7b#)c|-AW2g!hPKRQ?yOXgDkxRs{*`Jg9;qW^Bv1`qOyz9DkFXME5eOj3tYL( zctp&Pv2ks2mU(2(zvE8Gvb^tiqOF##$gekYJUnB2gI=?8g6PHefSDg$n8eooxS@FB zQsk`I)FXGc$DOm-A(msP;=6(A&B?iqFIK-)mF=ntaZ1c-bnYa@%lE^>nwnGcpq|rmda5m7n+U Sfojuq4mtk4uRClerU3x&>poxr delta 913 zcmaFC{(^miPQ9hCxqEI#l($p3r@L{Yw@XH4Qb3wtx=~VoT0lffvRjt6QF*>eWnz(jP;!29xk;*- zWuCvjcWGrdmxqOZXr8gJbE1B!c6eEMsArC$k3qOuV!ETVd7*EvSwv+}agIx+zDcm_ z#E;_PC7G5+?os&}DMcocMMkMri9RJJnOe%`f%yHY+YpEcf!v&vg&wGA%C(F4gzU2`}&u4>S!AH}K3f@XAOJPm44v zbO{OxF-q}Ftn>;`3kV2AkAbwzM8niT1^=M%D(7&s@ItSWlF&*kqJ*tw+BZ|2!A`O%MeO=1kLjpWQ{k?;u3Mwq}(i4-+Q_@R9f~v|wl8lQi%qz@7 zb1k@Zb#)cIqp~7P!i$mvoFem*oPvU?yh|(niwr$O%Un}Zv?J2fozsnrssenxBP_Ub zX80~(U4O;km`UP_`BM%^t7pVDF*k1Jn^!+;-G;gI^hG|rd8xSa^R?b;NhTNN*eg@s zeckq(w@=}R^{>LjitD0kdrnGRG+d`4S5^L2$*ec>YT`zL{a4;}hd&T1vsx*5;ARKg zDV9z58?W5t_b*GH%5~bJf7!_tk*p-ghFy!ca>YnUZ~rkZXUS}K|9N&Fp4fJ~|CeF> Tv~NyiAjk91AJ-hc$tef`P*_IU diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index 22587894a8ec0f3c863b7363ea42e6e9ddf12d9e..23c80a3a6b46e8bd88a09987852b69b536c7c2e4 100644 GIT binary patch delta 826 zcmbQlK8byTPQ7JGfw^gxYp9z^TE0=@o))t(hv5IDz1zu z_6ZLTaPtfGEHZOUcJ%hK@OL!~3p6U{%5`zg^ENIni}DPx@N{=g$|^R_izx9+%`pph z%dm8dDoJ-Ycg!^}NiQ})kAbwzM8niT1rOt(LgTz*W8?hnBnv0)D((7wKT{8Fm0aNLt{_JOk)rK!eXO9?bOKhQoqD(b3-#f{tixa&{ z>x-QO@(L0o^DMYBor@weigH{{B202~eR8}^s=~?)oy`o~s!9TLUHyY912g=*$}LJv zwDY-ib#)cWjZM5g{Po=fGW^|rLY!Qj{oK3^O>>;H0xJt5BdS7NT|){>oGMFFDw4U@ zT;DV2=F+tR|Jv?3Tb{c9g)>J_c5(P`$H#`Nz8H5}?sPoA`QDcGU)s!%g;W%|SjV?M fwB7XVtkx&zxAhkp%8gYwb~XkStX2BDz{CRpCS)4^ delta 826 zcmbQlK8byTPQ8z#t9N#qVTG|}K#Gs2ho!l{SBa-rT1Zrcp|4qbh=pIiMPXq`WPqb_ zGM7=Nf4EDLwo{UeXJSZ|sfCldW0jwYUwDXlP+;W|)_$xszd*0hg|wLUD11 zZfc5=si~o*f=NJCRDQaGbGb!!c6NwMYE@`NRiIINfm?>ZW0_G_u#0zCzH5-DrKO`; zNo7e^d6{uCS4N~?N|8xucyLZpo>4%#o3m4nr-5g+aj!SrQQmJ27ieq_xNoq#^ z#E;_P0jY+CC28SV7UqQ|er7J=rB0bnrhfTOKAzf%!D+$i9{GhPMuvHb=0*lw=GjRm z&KZ6l8D(h&<{7@01&Pt!MZ)DMjeN%2f_N-WDV&L}E0 zE_QeJ^Eb~ePc0AD&rP>LkAbwzM8niTg*2mx!0d3>(A;c;JWH37VDtL2jHnXJd}Hmz zfRgmg@}hhT*HX*eoW}vy^Sohvje%xgDuRQD!e`OLoB2G!wvH+BJ$1L^K&!&bAqZ$oC?fc3IhGg^ouP6 zf{M9xb#)aIE7CK)EIbSSN{dQLv`sP{eay0qbAx;`&5ix?vhv+cwL^SUJ-y4bJPo+6 z@LFE(`qsww$ZhTImWY25@$WR4?{?|+BpX&U&D~Qs^F{jE+6lpuYZ@OYSsHn-@iJ*C eHo0D^Y}n0tkN! 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 ssh-ed25519 V1pwNA gR4aFo/u2ow8mMgTInSPElO6gBhgig2s9Wzp+IkGjlY -mVWoBrKH7AihCbdrspCIzPjF8N0kQGDML6pkybH5Y4U --> ssh-ed25519 4PzZog BhiSfpYVlUgTLX6rHisiyzLOmzrqcZ8JKDqwY1lg+D4 -nSxNNHRYPy0C0ufqa2QMIylMr5IPlPUiDcg+d79KkDA --> ssh-ed25519 5Nd93w +bZMaaPc0jTIQ/eu/uWWgA41UQnKveaaVjgqoIaAGyw -elodhm0K17eQQInvae1tkkhFY1aPrbTdaRsviYDEBEg --> ssh-ed25519 q8eJgg LlaIdTPw3c2H8R5mDIIam4Ygvvk5gpgPahNJvf9UnB8 -BN901oRUt0j75RnQZnn4uFiLKEtRhCvFtKHug7Ikg8U --> ssh-ed25519 KVr8rw Bv9wfs5KP7lvH3Bpnsbzpgzduq1xiQlwVcWndWFL7Qo -LgGA4X5MOelYhpXWfsX95J+YGjcPzL6ISlPKr9ZNv/w --> ssh-ed25519 fia1eQ WaxlI+aHWQdJs2YtttcQ4TzI3aIlkmdbm21mhv71VRE -yI6QKxZ/TwXRDdaHxt6+ZVldnB7sZRGQFABnd7zeXtE --> ssh-ed25519 YFaxCg /V6Ab/BqFQ13K0qN1DOfaw8LLGR049s0S/FuK6dL6WA -fZbxvQWiPh/MH4/fOzV5trPL+B4H2o2WtVBIPuFsdLE ---- kUKnoRQARSlp+lGUNu5Zu7KztkK36VZeK9xozWZwmyY -¼‚‚϶ÞãtT€‚)ÊãQ*12wc¹ÍÛvѶ^ÁE~]ïÀ!³TÎÎB‰3?³ -§R™}ˆDÚ>º uðÃ-.¿¹9DóŒ \ No newline at end of file +-> ssh-ed25519 V1pwNA rsxHHZv+xG+iJisNaFeX5WbKBhvjd4jntP7+peGvPUc +r5WN+Sea6cecItEpql6KWiYiQL6NjIoC9LjGgH0fuZY +-> ssh-ed25519 4PzZog /DJ29u2BYSSpk3GvrKStCQZJSGkCfIJ9Li4zQwuC3S8 +S243BTRk7bfOCmQRzy5+3StzgipYEUn5GazN+lmVRZw +-> ssh-ed25519 5Nd93w CAau55luv9BjQeDY4zppvkn1KjqgE7IjAMVSac+Mmmc +9W6PtfpUx1A0q5l4Ey0gT519Vs0qqD4c36iNDwlN0mI +-> ssh-ed25519 q8eJgg zMdYGgPr7smwvTAIsgPjecuzjem3Lu3vEMrS37qvyiU +rgm1RP21BDXYnARlxlpR7ANN4dN7BW1M10fRR9+K4pI +-> ssh-ed25519 KVr8rw VB5vgPySOPVoZPoylXo+rprkWkUkdEfk84NWdGyQ5lM +cxbbOQ4XpTbhHCa2p5mZ583A4JJfxGn+OMuMdhaB7iQ +-> ssh-ed25519 fia1eQ 3t2LnYQB9vgsj0d+Z88aiyNsJRLlM/iGpv8Eg/NUyho +Qq0zuWYCI3bYzmTSdc6TsTy8RfdeYqnlHVuQiKHly4M +-> ssh-ed25519 YFaxCg a+E0mXvB794agVPpk2uCKl3UHzytGijvXW1LBzLJLk4 +VgqnvihuBnBuJ4JGx9Evu+gaKa7tE43Sg41K9rUs9/w +--- hH0UWx2WXfw7HeDUfLAVfpKFwHpJR/fjJhbt1U8euIo +úúþ¾5抈áÐsä&±kG}Ê”Eé»'®àá~žÑ5?žAÁk\ ÖÌï’üòl24ùÚ¶#³ê:~‡zñÖ!8ÿÿ¹*PÝ° \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 07213ca..fa93261 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -30,6 +30,7 @@ let cadie = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIACcwg27wzzFVvzuTytcnzRmCfGkhULwlHJA/3BeVtgf root@cadie"; marvin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAme2vuVpGYX4La/JtXm3zunsWNDP+SlGmBk/pWmYkH root@marvin"; calculon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsmeBfh4Jw2GOL7Iyswzn4TVNzalDbxDgh7WuQotFxR root@calculon"; + ariia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4kV6W1/tP/nf2ZWNhRoV1mK04R4pS+c5vdsA1n5gpN root@ariia"; systems = [ agentjones @@ -47,6 +48,7 @@ let cadie marvin calculon + ariia ]; dns = [ @@ -74,7 +76,7 @@ let ]; grafana = [ - kitt + ariia ]; # these need dns stuff diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 85b35f3c94d729cb633403e689a9458ddce726e0..032841c4e0e94855e04c45f68fceddd9e2cc027c 100644 GIT binary patch delta 3013 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 delta 3013 zcmeB?=#iM9Q(vxc>JpV)S(Fr(lAV!UXy_ebXki*y7EodqT<+@~5gcCPlb;im?vm~n z$>p7E>Xn)jg;TsmRFe(Ws&VtXpkKoQWlY4>==?18fv5+t{)MU%%y9mP+Xj$ zo0?)|YHDbyU=mOjm7lJV?q-teZW)?l9Fkld?w=Cs=vL`cUSRB;Vv*|=R95a%nV(r1 z<{45I9^z)f748{nW|o}lVOE}PWKwKdnwae4U*T4f5}_ZJnr7%;T9}w$RcTt4Wa;EO z@uPTnWMEEqk!5g2WTJLfl4U_~S$Soyd1o}(ak86lxnXvxOIR^ih=rG@ ziBoD;s)>G3T7;>8NkNrYa&T3KS6--#n@MJbg^zP_p<}XBxS8wZct-JX$6}vQkDwgq zf*gIfLPrCW@&L#De6IqFtO)Pq4DX=qkkl&A$RdCDL`O%i+}u##0CV%OBv;2guc$PO z%&Mx4d~>~J$vuki8!qtNWhXBoxoGu*tYicPgsLeq`1{5+$|bMvd* z0{zSby?v7N+#Cyn^L;Ce!t~2Bqbkz5ic`Ha)3w8L(hN(Sy^HfxB1$}i1AHUgg8dWC zQw`H|{5y_ET>BIP~%en6u*ebV&mk*+;oF< zlWZXRwR}Nu!h!qM8a@gyc%C>{*i2Z# z@J+vPo5|P1uDZQFH5b-><Vx$*DT zW&7FnTQ=;kIq>Y~AN?(rwO_5j2^R14Jd}Ln!tTgt#(~`zRX@akE|*v>C}^DL-F{{J zj-^_Q{3n}EG+mxlCgNGTF7Dr^f0;)Y+?>x{Sv%AH|MibeZ!&`U^1hxw+x6Sp@Y!bO ze_7%mby%u7RoHg3L^%KYpLNXp=s||H^F99kUww*)z4TRmy^hvC1J2Cwpz5kJOG zAu~STDbnJNx%Z?(E-(45+4nqiVAgw^`X+^C z`NS)8kDcf}I9*M^G~we4i%%KNar+JCG_TzfrhTd7N7n%f_FtSD?UoF!myQc`lqHCp zoG<;R`6s34&g1)45%u@Gx8C~ipZc%3bAzV-x%H|G+1nrFG(OOd%YRU#qu|tgQBGOK z+4|RicfQZzdqOYVI2XV60rwG0wqUc1Z}=*5O|NhKvn}QM{iC&~E$-&Gxa>@``=Di zKmGHWS)BFv#E%jG%5Ubs3g4}{cv45bdzYE>24=gc3g#+5{=Qt<)P zN87Kz^ZRoAM_$<9mWmHyx2-n2Pp;Zr`mtj6j~dxMb`#1R*!}zF{=2+Ev3)vUvj0pS zgIV=@ZeLFS|C%5=!}R0#5c?CkzyDauIj}sntP$0Dv}&Sx&fmO?4nNNE>6~eQ*IdAL zCo|bqd*8D|TvsPbfB4LwHM6-)MEv0eUzQ0WAEGw4>zs5<4?e;al)gNxu%>47#zR%V z-Q_BJQI#dTekGrqk4%sJR5c}vw0`hX-slIm8W9% zBJ8N(`S(lqid(8ye>Qz6 zs;t^3(tcactz~8PpP9#B^p;2WKQn!I)aAAHR*4Gi)~&oL>b0x$dcRyUguyl;PeCTi&URg(v=o zTd(}f*2{W)dH!Vvr@~`LZQpM(O25_P;-)djJmL1^0}STnchN3Cf- zPaaG=VEShgzmLhA1#{-N#>)dXXDe&#`}<3BB7{z@acX-}cP-(6(3d^`FSWfAT5vvfJ^RwedED3BQ*;+@ z?cS2T=+5?%?AFV|rImB^x-)XB4(*>Gw&lQv2)B@Qmc*pR!uER-)|~xt()L?fZqti9 z`c2O^-|4EfI#?%uS!lb(-$FB%l<6n@i|?#^ouR({Pd?xK{m1TjZ!4{j>|>OQPfGHR z`6@g)yu|F$>dRB|Y7ek>h;Gy^T(e-i`PrCR`Q|^+t10*VIoPuB@|OFt#)-1;wioYtIOERakA1CC z&l2CxD5*Z3wp-yxRHG7mta8D+$|;TyH+|hbOTt8!NBtDz%jZ)Ii}P0d=9WDFKfm8* zN>K7j4nMI6NoC9XJGtJ6s4h)P(GmXr;a-+`L0Ki^7mNFGWs3JUg_L@g+^W>HxNTEE z$Lij@X(uNh?7Z4@Qm8>9ppJEBL<-l2hsU2=JD&XYeB0^VlOfAkDnhy?PP@LlEU~;f zj_1;jRr?J#+->iVz39kk>ns0D`~Qh}9n-sq;sXE4vSn(g*sMR$IxWZJ%s~_0l_yOX zIPMcaw8rY3u#a8Gbnef$Y8nE!3$H5vwlC%Ct~Q%*t*1l8-eq67a7?py?JMDvTS^0+ vBkFI&et-KXH|W{7gABZ3@n!2aKYK3{dNx>Wh10JZ@jUBr$JIx!`&a+~o~vsS diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index ef6a233156fa3c57b745fda01579d7064611b832..c886fcff69f005cfb471a8d2acaf6bc4937ae9c4 100644 GIT binary patch literal 1351 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yW2bocf5 z$P5aLDu@hl^vy{$*G?|5$gIcSGjPgo1 zHTO%ZG))Z;$}}`_E6mDqGV=-WHE=U=atb!{&PKP*B%mrPKV88uDatgsG%zRGEZ3sS zBrMw~qa-^p$sonez&|4+#N0e3FR;=gJlr_SDU>TM(X7zXTi?^gC(ks`FDu+FH89D~ zEhoY!D!@G?EVa@gAV0^)+cPpf$N=3oQ@<2T<8lR~WPj)Kv?~4VG@m3R?Z8YkZ|~g7 z@Z7La=X6igGJW&Rbnk*pvx+RU;AE~mKPR&yZ-Y!Db3fmTw6J1#zapcItQ@nd!0fDm z-~z);%dFD8s>;M-!%%eF3N2E-($f|EBOSvc@=}9+vmE`h@(Mi-5-p9YJc|9Rf=#^B z)2f2?LxOWE$|8JxgOa(NGgI6GT)o4S^9y~GqXJUQEIg9+b3+T$qMXf2JR_4VTtmH# zvRpzdk}S||^A0PrC@NP7Pw_SmGWQDcj`Rrebu)-CkH`=3OwM+5bka7@EcSCO&9u<> zFH25!%?;(s3XaGza4&EPvrMjXOEpccC<#j|H!e?cHz;vVH@4JIO{@wk@JcE3if}}? zEiE(AFf~x2G&#R4+$AI}G}6@F*V!*WEHuEq+|kk}uQ<3Yuhh>d$-A)F#VIW~*D#Vx zzaYy$Dm2?K-AF$q*~BO{*S8|O#5dQ+RNtiBBPrB5KQqZ+KPb&5#~H&m&nidXLPv!{ zU!$z_Qr~ie9Mcj%mW;t?srKSf5ReBf(=cIbNCM7zW zq(bI zgJe(N%=}3As4(-QjEMZIkYsefK|@l%*gdMmKie=h)66W{DAB_>$0XD(FvO$W)u}u< zC%e)t(Na4IGf9;syIqJu-wEXGuha~HKQQSBURg3+tSzH*WJR*G}TYPA~Gt% z&C)LZ_eR?tgS}vk6(94gc|xH|$%^F+)ge>+cuhrY pl(uiLGBsXX=5ToNie<(LZypGp;I)yFcicDisqUU1|1KQa3ILV9$us}} literal 1351 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5wB8^|UbZ ztnhNp^3nGSNlG@%4^H*ePIGb!(KgF4POeG~&G&E)&rdUUOXqU*EAw_tFLCnmj7aqi z@iEc&Fv`g`D6L8_D60zf^m8u_vk3IF^s6#3_e8hNB%mrPKV2b8Tid|g->D?OyuhQ- z)6YHFFf_!#uhQ5ov&=g&%r&hvGQis}D9bIt*^?_Tzsw@6EX^z}EG0QI%hxH-sn{na zvMjLN$T5Y zGriry$^!F)tBlQEf_%B0qRIo!!p*$WQ%sB9-E%BLld}vREfa&P-13~OBAxZ~QnQ22 zj7@XOO%2d(^A0PrC@NPdb_ys+vP^VKOG?j3a<+60Pxg=04)k$K%XjrGP4oS%q-^8Pbo+>F3ipKtMtuE3`_A!cPuvaEH_U!bSsMR$Z^X|^h^#73biOo*Uv_` zEiE(AFf~x2+}*{a$UiD6xx6&W($Ce{GO5_yF|pDkCo8EkJ=eV~#lXiq*;3!9+&z%X zz}+`1Fxj}k!aKvc*g4X>$j!~UEG*b7C@CY$qP(g&xv;PxGS}a?G6KVIo>h*%g^mhE z89~0D!BNSXsj2RXsU?1u0bVIC#zj@yE?J>YuG*H7MHZPArG=^KIR;!tei^Cxkxn5M z72zf&`lXctp?*1eiDpT8mO<{0$zJY`g@LYB27w{2K_=*aD~+mhGEP@Wt91AD%Pi7P zOmZ~U&d;kbbMbd{4>phT$*S}&3o|b?%=N2Gj)<_VGB)9I%kt2U^3O3(GBh%aaxV=E zHgn7M&9AaF&vQx(E-!ZWPj)KtbhI!{slu?$Bgr7MAW$JO#4kTGGR-n4EYQE$BFHr_ zFD)#@AX(cav?{>2Ks#GIL)$qbBFrnVBA?62-_WHZGBw06#W2jZsKBDIthh3*G_X9x z)XcK7yvoBQH8&$PA|R~1ARpat(2&e7N{-SF4fOOcii|7^NQp|yO!o*dH;oE+4hl7K z^DH&-%Pp%acd1OPu;2<#cK1)pD)vltEHU;o$}lL@H!LVgiA?q@D@f8d47JP*@yc^E zOmZyFOXt$n)m6w0^$RP`EUk1gFbOV84E1tO&hR(PH!$}1sR|8=@O1VpE7Uis49jrO z&F9+m`^jSthRD@V@5;7J-m~eFqO4N=yeE_RI@skbH`~Qsbk;s~qff%KATvLMuRON|^NZYnL_cLmOV+ zSe@m5E;{G)Oh=y#pBC@C&w~~m(%dkAiS_?uAA0%ABhSuQocmCaxxYnr#nd0CvTrD# ryK|7?%T%=;>$Q{ER_f2-_tE^OzJt|okLR2#%#+vhH+IM8mrVu$cVf}F From a0215b227197b82e0d37a1d226de3883abb6468c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 17 Jun 2024 20:54:17 +0100 Subject: [PATCH 175/563] doc: added a new page for names ideas --- Possible_Server_Names.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Possible_Server_Names.md b/Possible_Server_Names.md index 435cdec..27c5d1d 100644 --- a/Possible_Server_Names.md +++ b/Possible_Server_Names.md @@ -1,5 +1,6 @@ https://web.archive.org/web/20180815150202/https://wiki.skynet.ie/Admin/SkynetMachines https://en.m.wikipedia.org/wiki/Category:Fictional_artificial_intelligences +https://en.wikipedia.org/wiki/List_of_artificial_intelligence_films * agentsmith * skynet From 9583eaa9be0cbbf223a6e88ae2a38aefa24ef85e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 18 Jun 2024 10:14:06 +0100 Subject: [PATCH 176/563] doc: update the firewall changes --- ITD/Firewall_Rules.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index e9f547c..0dbf7b2 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -40,3 +40,5 @@ SKYNET_FIREWALL_00028,Remove,i24-06-04_017,Complete,-,-,193.1.99.112,SKYNET00019 SKYNET_FIREWALL_00029,Add,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Websocket for admin panel on games management server SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server +SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel +SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server \ No newline at end of file From dac45073d626a49cf8b2778d0f94dfa762e44743 Mon Sep 17 00:00:00 2001 From: Eliza Macovei Date: Tue, 18 Jun 2024 19:22:29 +0000 Subject: [PATCH 177/563] Add entries for modded minecraft server --- config/dns.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/config/dns.nix b/config/dns.nix index 0dd6133..46702b6 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -87,6 +87,16 @@ r_type = "SRV"; value = "0 10 25522 minecraft.phildeb.games.skynet.ie."; } + { + record = "minecraft-aged.compsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25519 minecraft.phildeb.games.skynet.ie."; + } ]; }; } From 09e7f8f0d4aae9f9e20e0b08975b060a6428aa0b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 18 Jun 2024 22:50:28 +0000 Subject: [PATCH 178/563] fix: what is old is new again --- config/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/dns.nix b/config/dns.nix index 46702b6..ef07285 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -65,7 +65,7 @@ { record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie."; r_type = "SRV"; - value = "0 10 25520 minecraft-classic.compsoc.games.skynet.ie."; + value = "0 10 25518 minecraft-classic.compsoc.games.skynet.ie."; } { record = "minecraft.gsoc.games"; From e6954d3448cb87c5d4c8ee353e89c6b9c66118fa Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 27 Jun 2024 13:19:12 +0100 Subject: [PATCH 179/563] git: merging in some upstream changes while still waiting for ther patch to be merged in --- applications/proxmox-lxc.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/applications/proxmox-lxc.nix b/applications/proxmox-lxc.nix index 964454e..9f1c970 100644 --- a/applications/proxmox-lxc.nix +++ b/applications/proxmox-lxc.nix @@ -12,19 +12,19 @@ with lib; { enable = mkOption { default = true; type = types.bool; - description = lib.mdDoc "Whether to enable the ProxmoxLXC."; + description = lib.mdDoc "Whether to enable the Proxmox VE LXC module."; }; privileged = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = '' Whether to enable privileged mounts ''; }; manageNetwork = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = '' Whether to manage network interfaces through nix options When false, systemd-networkd is enabled to accept network configuration from proxmox. @@ -33,7 +33,7 @@ with lib; { manageHostName = mkOption { type = types.bool; default = false; - description = lib.mdDoc '' + description = '' Whether to manage hostname through nix options When false, the hostname is picked up from /etc/hostname populated by proxmox. @@ -68,6 +68,8 @@ with lib; { loader.initScript.enable = true; }; + console.enable = true; + networking = mkIf (!cfg.manageNetwork) { useDHCP = false; useHostResolvConf = false; @@ -81,13 +83,14 @@ with lib; { startWhenNeeded = mkDefault true; }; - systemd.mounts = - mkIf (!cfg.privileged) - [ + systemd = { + mounts = mkIf (!cfg.privileged) [ { - where = "/sys/kernel/debug"; enable = false; + where = "/sys/kernel/debug"; } ]; + services."getty@".unitConfig.ConditionPathExists = ["" "/dev/%I"]; + }; }; } From 2a45bc4f709ee24bd03cd2e4a2961a4087043070 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 2 Jul 2024 14:13:08 +0100 Subject: [PATCH 180/563] cve: bumped system to have the updated sshd package relates to CVE-2024-6387 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b686b3e..bb0f8d3 100644 --- a/flake.lock +++ b/flake.lock @@ -794,11 +794,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1719848872, + "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "type": "github" }, "original": { From b7cb7eeadef0268c0b88fb238968a449ee3ade3b Mon Sep 17 00:00:00 2001 From: runner_nix Date: Tue, 9 Jul 2024 20:54:14 +0000 Subject: [PATCH 181/563] Updated flake for skynet_website_renew --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bb0f8d3..7b40a6c 100644 --- a/flake.lock +++ b/flake.lock @@ -1065,11 +1065,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1718588317, - "narHash": "sha256-nQNHu9H7oLXO7dNFZ2bSQKwCvhz01/9wzeqOVsvsQyQ=", + "lastModified": 1720558362, + "narHash": "sha256-fNKFqkP35tzBhBy0L8xGOJ7B3EXh+khu3bOBlGqlPks=", "owner": "compsoc1%2Fskynet", "repo": "website%2Falumni-renew", - "rev": "5c169522049c7a2dbbcbfdde0eeda3cabd22f561", + "rev": "44ab695bab61d20d6d873f1c3a702b5a8874dd5e", "type": "gitlab" }, "original": { From b6b9ae0579315f377dfa05820c85ffe78192a19f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 9 Jul 2024 22:12:41 +0100 Subject: [PATCH 182/563] feat: new wiki domain --- applications/skynet.ie/skynet.ie.nix | 13 ------- applications/skynet.ie/wiki.nix | 55 ++++++++++++++++++++++++++++ machines/earth.nix | 2 + 3 files changed, 57 insertions(+), 13 deletions(-) create mode 100644 applications/skynet.ie/wiki.nix diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 6a2afd3..fcb46e7 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -25,7 +25,6 @@ in { services.skynet.acme.domains = [ "discord.skynet.ie" "public.skynet.ie" - "renew.skynet.ie" ]; services.skynet.dns.records = [ @@ -45,11 +44,6 @@ in { r_type = "CNAME"; value = config.services.skynet.host.name; } - { - record = "renew"; - r_type = "CNAME"; - value = config.services.skynet.host.name; - } ]; services.nginx = { @@ -82,13 +76,6 @@ in { root = "${inputs.compsoc_public.packages.x86_64-linux.default}"; locations."/".extraConfig = "autoindex on;"; }; - - # for alumni members to renew their account - "renew.skynet.ie" = { - forceSSL = true; - useACMEHost = "skynet"; - root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}"; - }; }; }; }; diff --git a/applications/skynet.ie/wiki.nix b/applications/skynet.ie/wiki.nix new file mode 100644 index 0000000..a447a1f --- /dev/null +++ b/applications/skynet.ie/wiki.nix @@ -0,0 +1,55 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +with lib; let + name = "wiki"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Skynet Wiki"; + }; + + config = mkIf cfg.enable { + services.skynet.acme.domains = [ + "renew.skynet.ie" + "wiki.skynet.ie" + ]; + + services.skynet.dns.records = [ + { + record = "renew"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + { + record = "wiki"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + + services.nginx = { + virtualHosts = { + "wiki.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}"; + }; + + # redirect old links to the new wiki + "renew.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://wiki.skynet.ie"; + }; + }; + }; + }; +} diff --git a/machines/earth.nix b/machines/earth.nix index 4e63521..fadcef1 100644 --- a/machines/earth.nix +++ b/machines/earth.nix @@ -26,6 +26,7 @@ Notes: in { imports = [ ../applications/skynet.ie/skynet.ie.nix + ../applications/skynet.ie/wiki.nix ]; deployment = { @@ -40,5 +41,6 @@ in { host = host; backup.enable = true; website.enable = true; + wiki.enable = true; }; } From 3837ff2dd18b9bf29addcd4f11d7013668b01938 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 9 Jul 2024 22:16:09 +0100 Subject: [PATCH 183/563] fix: sort the domains, prevents errors in cert renewal --- applications/acme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/acme.nix b/applications/acme.nix index e4aec7a..1cf168d 100644 --- a/applications/acme.nix +++ b/applications/acme.nix @@ -40,7 +40,7 @@ in { certs = { "skynet" = { domain = "skynet.ie"; - extraDomainNames = cfg.domains; + extraDomainNames = lists.naturalSort cfg.domains; }; }; }; From 9fb45cba7efa90a6fd6259ed33175f9b3ce1f147 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 15 Jul 2024 15:14:44 +0100 Subject: [PATCH 184/563] feat: bump the nixpkgs version, specifically bringing in newer gitlab --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 7b40a6c..6b860ec 100644 --- a/flake.lock +++ b/flake.lock @@ -794,11 +794,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1719848872, - "narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", + "lastModified": 1720957393, + "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", + "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", "type": "github" }, "original": { From b1bd6ca40a14fa36db2aa3bb7a47d342bc298668 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 16 Jul 2024 22:31:28 +0100 Subject: [PATCH 185/563] feat: unify the record options --- applications/dns.nix | 23 +++-------------------- applications/dns/options-records.nix | 23 +++++++++++++++++++++++ config/dns.nix | 25 +++---------------------- 3 files changed, 29 insertions(+), 42 deletions(-) create mode 100644 applications/dns/options-records.nix diff --git a/applications/dns.nix b/applications/dns.nix index deec46d..9bb7d48 100644 --- a/applications/dns.nix +++ b/applications/dns.nix @@ -316,28 +316,11 @@ in { }; }; - # mirrorred in ../config/dns.nix records = lib.mkOption { description = "Records, sorted based on therir type"; - type = with lib.types; - listOf (submodule { - options = { - record = lib.mkOption { - type = str; - }; - r_type = lib.mkOption { - type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"]; - }; - value = lib.mkOption { - type = str; - }; - server = lib.mkOption { - description = "Core record for a server"; - type = bool; - default = false; - }; - }; - }); + type = lib.types.listOf (lib.types.submodule (import ./dns/options-records.nix { + inherit lib; + })); }; }; diff --git a/applications/dns/options-records.nix b/applications/dns/options-records.nix new file mode 100644 index 0000000..1795099 --- /dev/null +++ b/applications/dns/options-records.nix @@ -0,0 +1,23 @@ +/* +Define the options for dns records here. +They are imported into anything that needs to use them +*/ +{lib, ...}: +with lib; { + options = { + record = lib.mkOption { + type = lib.types.str; + }; + r_type = lib.mkOption { + type = lib.types.enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"]; + }; + value = lib.mkOption { + type = lib.types.str; + }; + server = lib.mkOption { + description = "Core record for a server"; + type = lib.types.bool; + default = false; + }; + }; +} diff --git a/config/dns.nix b/config/dns.nix index ef07285..931a176 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -1,31 +1,12 @@ {lib, ...}: { imports = [ - # Paths to other modules. - # Compose this module out of smaller ones. ]; - # this needs to mirror ../applications/dns.nix options.skynet.records = lib.mkOption { description = "Records, sorted based on therir type"; - type = with lib.types; - listOf (submodule { - options = { - record = lib.mkOption { - type = str; - }; - r_type = lib.mkOption { - type = enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"]; - }; - value = lib.mkOption { - type = str; - }; - server = lib.mkOption { - description = "Core record for a server"; - type = bool; - default = false; - }; - }; - }); + type = lib.types.listOf (lib.types.submodule (import ../applications/dns/options-records.nix { + inherit lib; + })); }; config = { From cb0cfbaf4a7d27403e4fef891639b00a764834a9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 16 Jul 2024 22:33:27 +0100 Subject: [PATCH 186/563] fmt: move the dns into its own folder --- applications/_base.nix | 2 +- applications/{ => dns}/dns.nix | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename applications/{ => dns}/dns.nix (98%) diff --git a/applications/_base.nix b/applications/_base.nix index bd1f017..3224563 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -10,7 +10,7 @@ with lib; let in { imports = [ ./acme.nix - ./dns.nix + ../dns/dns.nix ./nginx.nix ]; diff --git a/applications/dns.nix b/applications/dns/dns.nix similarity index 98% rename from applications/dns.nix rename to applications/dns/dns.nix index 9bb7d48..9503539 100644 --- a/applications/dns.nix +++ b/applications/dns/dns.nix @@ -291,8 +291,8 @@ else "ns2"; in { imports = [ - ./firewall.nix - ../config/dns.nix + ../firewall.nix + ../../config/dns.nix ]; options.services.skynet."${name}" = { @@ -318,7 +318,7 @@ in { records = lib.mkOption { description = "Records, sorted based on therir type"; - type = lib.types.listOf (lib.types.submodule (import ./dns/options-records.nix { + type = lib.types.listOf (lib.types.submodule (import ./options-records.nix { inherit lib; })); }; @@ -357,7 +357,7 @@ in { # secrets required age.secrets.dns_dnskeys = { - file = ../secrets/dns_dnskeys.conf.age; + file = ../../secrets/dns_dnskeys.conf.age; owner = "named"; group = "named"; }; From e9d5985adf7beca18f8c264da63b1edb0d04bc50 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 16 Jul 2024 23:09:22 +0100 Subject: [PATCH 187/563] fmt: remove duplicate imports, now unified in applications/_base.nix --- applications/_base.nix | 17 ++++++++++++++++- applications/_retired/games.nix | 1 - applications/_retired/games/minecraft.nix | 4 ---- applications/bitwarden/vaultwarden.nix | 3 --- applications/dns/dns.nix | 1 - applications/email.nix | 3 --- applications/gitlab.nix | 4 ---- applications/grafana.nix | 2 -- applications/ldap/backend.nix | 3 --- applications/ldap/server.nix | 3 --- applications/nextcloud.nix | 3 --- applications/nix_cache/nix_cache.nix | 2 -- applications/open_governance/keyserver.nix | 2 -- .../open_governance/open_governance.nix | 2 -- applications/skynet_users.nix | 3 --- applications/ulfm.nix | 4 ---- machines/_base.nix | 17 +---------------- machines/retired/ash.nix | 3 --- 18 files changed, 17 insertions(+), 60 deletions(-) diff --git a/applications/_base.nix b/applications/_base.nix index 3224563..f96d7e4 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -9,9 +9,24 @@ with lib; let cfg = config.services.skynet; in { imports = [ + # every server needs to have a dns record + ./dns/dns.nix + + # every server should have proper certs ./acme.nix - ../dns/dns.nix ./nginx.nix + + # every server may need the firewall config stuff + ./firewall.nix + + # every server needs teh ldap client for admins + ./ldap/client.nix + + # every server will need the config to backup to + ./restic.nix + + # every server will be monitored for grafana + ./prometheus.nix ]; options.services.skynet = { diff --git a/applications/_retired/games.nix b/applications/_retired/games.nix index 7ffd9f7..2f48ae0 100644 --- a/applications/_retired/games.nix +++ b/applications/_retired/games.nix @@ -10,7 +10,6 @@ with lib; let cfg = config.services.skynet."${name}"; in { imports = [ - ./dns.nix ./nginx.nix ./games/minecraft.nix ]; diff --git a/applications/_retired/games/minecraft.nix b/applications/_retired/games/minecraft.nix index 8953efe..a71121c 100644 --- a/applications/_retired/games/minecraft.nix +++ b/applications/_retired/games/minecraft.nix @@ -13,10 +13,6 @@ with lib; let short_domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; in { imports = [ - ../acme.nix - ../dns.nix - ../firewall.nix - ../nginx.nix inputs.arion.nixosModules.arion ]; diff --git a/applications/bitwarden/vaultwarden.nix b/applications/bitwarden/vaultwarden.nix index 52e0422..fad00f4 100644 --- a/applications/bitwarden/vaultwarden.nix +++ b/applications/bitwarden/vaultwarden.nix @@ -13,9 +13,6 @@ with lib; let domain = "${domain_sub}.skynet.ie"; in { imports = [ - ../acme.nix - ../dns.nix - ../nginx.nix ]; options.services.skynet."${name}" = { diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 9503539..ff80e89 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -291,7 +291,6 @@ else "ns2"; in { imports = [ - ../firewall.nix ../../config/dns.nix ]; diff --git a/applications/email.nix b/applications/email.nix index 182c280..f16a3e4 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -120,9 +120,6 @@ with lib; let ''; in { imports = [ - ./dns.nix - ./acme.nix - ./nginx.nix inputs.simple-nixos-mailserver.nixosModule # for teh config diff --git a/applications/gitlab.nix b/applications/gitlab.nix index 80664af..a65c43e 100644 --- a/applications/gitlab.nix +++ b/applications/gitlab.nix @@ -12,10 +12,6 @@ with lib; let domain_full = "${cfg.domain.sub}.${domain_base}"; in { imports = [ - ./acme.nix - ./dns.nix - ./firewall.nix - ./nginx.nix ]; options.services.skynet."${name}" = { diff --git a/applications/grafana.nix b/applications/grafana.nix index 15c076f..3bce51b 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -9,8 +9,6 @@ with lib; let port = 4444; in { imports = [ - ./acme.nix - ./dns.nix ]; options.services.skynet."${name}" = { diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index b4b0e13..180221e 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -11,9 +11,6 @@ with lib; let port_backend = "8087"; in { imports = [ - ../acme.nix - ../dns.nix - ../nginx.nix inputs.skynet_ldap_backend.nixosModule."x86_64-linux" ../../config/users.nix ]; diff --git a/applications/ldap/server.nix b/applications/ldap/server.nix index 67bd1fc..ee55600 100644 --- a/applications/ldap/server.nix +++ b/applications/ldap/server.nix @@ -15,9 +15,6 @@ with lib; let in { # these are needed for teh program in question imports = [ - ../acme.nix - ../dns.nix - ../nginx.nix ]; options.services.skynet."${name}" = { diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index 02bc5f6..e31f67c 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -10,9 +10,6 @@ with lib; let domain = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; in { imports = [ - ./acme.nix - ./dns.nix - ./nginx.nix ]; options.services.skynet."${name}" = { diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 6716146..4dcfdae 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -24,8 +24,6 @@ with lib; let in { imports = [ inputs.attic.nixosModules.atticd - ../acme.nix - ../dns.nix ]; options.services.skynet."${name}" = { diff --git a/applications/open_governance/keyserver.nix b/applications/open_governance/keyserver.nix index c507a50..7e239a7 100644 --- a/applications/open_governance/keyserver.nix +++ b/applications/open_governance/keyserver.nix @@ -13,8 +13,6 @@ with lib; let port = 11371; in { imports = [ - ../acme.nix - ../dns.nix ]; options.services.skynet."${name}" = { diff --git a/applications/open_governance/open_governance.nix b/applications/open_governance/open_governance.nix index 93d2974..1b02248 100644 --- a/applications/open_governance/open_governance.nix +++ b/applications/open_governance/open_governance.nix @@ -15,8 +15,6 @@ with lib; let folder = "/var/skynet/${name}"; in { imports = [ - ../acme.nix - ../dns.nix ]; options.services.skynet."${name}" = { diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 1b07875..56d9e07 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -11,9 +11,6 @@ with lib; let php_pool = name; in { imports = [ - ./acme.nix - ./dns.nix - ./nginx.nix ]; options.services.skynet."${name}" = { diff --git a/applications/ulfm.nix b/applications/ulfm.nix index b1013f3..d7bd97b 100644 --- a/applications/ulfm.nix +++ b/applications/ulfm.nix @@ -9,10 +9,6 @@ with lib; let cfg = config.services.skynet."${name}"; in { imports = [ - ./acme.nix - ./dns.nix - ./firewall.nix - ./nginx.nix ]; options.services.skynet."${name}" = { diff --git a/machines/_base.nix b/machines/_base.nix index 5972e49..f730ba3 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -18,23 +18,8 @@ in { # for the secrets inputs.agenix.nixosModules.default - # base config for all servers + # base application config for all servers ../applications/_base.nix - - # every sever may need the firewall config stuff - ../applications/firewall.nix - - # every sever needs to have a dns record - ../applications/dns.nix - - # every server needs teh ldap client for admins - ../applications/ldap/client.nix - - # every server will need the config to backup to - ../applications/restic.nix - - # every server will be monitored for grafana - ../applications/prometheus.nix ]; options.skynet = { diff --git a/machines/retired/ash.nix b/machines/retired/ash.nix index b16fc39..a350975 100644 --- a/machines/retired/ash.nix +++ b/machines/retired/ash.nix @@ -22,9 +22,6 @@ Notes: Thius vpn is for admin use only, to give access to all the servers via hostname = ip_pub; in { imports = [ - # applications for this particular server - ../applications/firewall.nix - ../applications/dns.nix ]; deployment = { From 15e534c2222cfe05a1716fbe5e12a412c5984d92 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 16 Jul 2024 23:17:38 +0100 Subject: [PATCH 188/563] feat: add new option for dns records --- applications/dns/options-records.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/applications/dns/options-records.nix b/applications/dns/options-records.nix index 1795099..53e443f 100644 --- a/applications/dns/options-records.nix +++ b/applications/dns/options-records.nix @@ -5,13 +5,21 @@ They are imported into anything that needs to use them {lib, ...}: with lib; { options = { + domain = lib.mkOption { + description = "Domain this record is for"; + type = lib.types.str; + default = "skynet.ie"; + }; record = lib.mkOption { + description = "What you want to name the subdomain."; type = lib.types.str; }; r_type = lib.mkOption { + description = "Type of record that this is."; type = lib.types.enum ["A" "CNAME" "TXT" "PTR" "SRV" "MX"]; }; value = lib.mkOption { + description = "What the record points to, normally ip or another record."; type = lib.types.str; }; server = lib.mkOption { From 1a07781c4dbd102a8f681d51c897b863872302b8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 00:47:45 +0100 Subject: [PATCH 189/563] feat: the right width for records will now be auto calculated --- applications/dns/dns.nix | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index ff80e89..6c355e2 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -30,7 +30,18 @@ sort_records_ptr = builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type "PTR")); sort_records_srv = builtins.sort (a: b: a.record < b.record) (filter_records_type "SRV"); - format_records = records: offset: lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records; + max = x: y: + assert builtins.isInt x; + assert builtins.isInt y; + if x < y + then y + else x; + max_len = records: lib.lists.foldr (a: b: (max a b)) 0 (lib.lists.forEach records (record: lib.strings.stringLength record.record)); + + format_records = records: let + offset = (max_len records) + 1; + in + lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records; # small function to trim it down a tad padString = text: length: fixedWidthString_post length " " text; @@ -72,32 +83,32 @@ ; ------------------------------------------ ; Server Names (A Records) ; ------------------------------------------ - ${format_records sort_records_server 31} + ${format_records sort_records_server} ; ------------------------------------------ ; A (non server names ; ------------------------------------------ - ${format_records sort_records_a 31} + ${format_records sort_records_a} ; ------------------------------------------ ; CNAMES ; ------------------------------------------ - ${format_records sort_records_cname 31} + ${format_records sort_records_cname} ; ------------------------------------------ ; TXT ; ------------------------------------------ - ${format_records (filter_records_type "TXT") 31} + ${format_records (filter_records_type "TXT")} ; ------------------------------------------ ; MX ; ------------------------------------------ - ${format_records (filter_records_type "MX") 31} + ${format_records (filter_records_type "MX")} ; ------------------------------------------ ; SRV ; ------------------------------------------ - ${format_records sort_records_srv 65} + ${format_records sort_records_srv} '' @@ -125,7 +136,7 @@ ; ------------------------------------------ ; PTR ; ------------------------------------------ - ${format_records sort_records_ptr 3} + ${format_records sort_records_ptr} '' ); From 356ac2e505d52604a69c976a1a1dfc58dde866f9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 00:52:55 +0100 Subject: [PATCH 190/563] fix: move the mailserver dns config to the proper file --- applications/dns/dns.nix | 5 ----- applications/email.nix | 8 ++++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 6c355e2..96dd70a 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -74,11 +74,6 @@ @ NS ns2.${domain}. ; @ stands for teh root domain so teh A record below is where ${domain} points to ;@ A 193.1.99.76 - ;@ MX 5 ${domain}. - - ; can have multiple mailserves - @ MX 10 mail.${domain}. - ; ------------------------------------------ ; Server Names (A Records) diff --git a/applications/email.nix b/applications/email.nix index f16a3e4..e988b0d 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -268,6 +268,14 @@ in { # set up dns record for it services.skynet.dns.records = [ + # core record + { + record = "@"; + r_type = "MX"; + # the number is the priority in teh case of multiple mailservers + value = "10 mail.${cfg.domain}."; + } + # basic one { record = "mail"; From 0b25b5ac548f9a1342c413085b0c5763f3baf56e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 00:53:28 +0100 Subject: [PATCH 191/563] fix: smol cleanup --- applications/dns/dns.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 96dd70a..82bec0e 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -70,10 +70,9 @@ 3600 ; Minimum (1 hour) ) + ; @ stands for teh root domain so teh A record below is where ${domain} points to @ NS ns1.${domain}. @ NS ns2.${domain}. - ; @ stands for teh root domain so teh A record below is where ${domain} points to - ;@ A 193.1.99.76 ; ------------------------------------------ ; Server Names (A Records) From 2a8a7cc7f4471bb54159ad79ea2ece0b2b4f739a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 01:38:31 +0100 Subject: [PATCH 192/563] feat: simplify the zone creation --- applications/dns/dns.nix | 58 +++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 82bec0e..a2725f3 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -11,6 +11,22 @@ # reads that date to a string (will need to be fixed in 2038) current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}"; + # this gets a list of all domains we have records for + domains = lib.lists.naturalSort ( + lib.lists.unique ( + lib.lists.forEach records (record: record.domain) + ) + ); + + domains_owned = [ + # for historic reasons we own this + "csn.ul.ie" + # the main one we use now + "skynet.ie" + # a backup + "ulcompsoc.ie" + ]; + # gets a list of records that match this type filter_records_type = r_type: builtins.filter (x: x.r_type == r_type) records; filter_records_server = builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type "A"); @@ -205,10 +221,19 @@ then create_entry_etc_sub domain (text.old domain) else {}; - create_entry_zone = domain: extraConfig: { + create_entry_zone = domain: let + if_primary_and_owned = + if cfg.server.primary && (lib.lists.any (item: item == domain) domains_owned) + then '' + allow-update { key rfc2136key.skynet.ie.; }; + dnssec-policy default; + inline-signing yes; + '' + else ""; + in { "${domain}" = { extraConfig = '' - ${extraConfig} + ${if_primary_and_owned} // for bumping the config // ${current_date} ''; @@ -229,23 +254,6 @@ old = domain: get_config_file_old_domains domain; }; - extraConfig = { - owned = - if cfg.server.primary - then '' - allow-update { key rfc2136key.skynet.ie.; }; - - dnssec-policy default; - inline-signing yes; - '' - else ""; - - # no extra config for reverse - reverse = ""; - - old = ""; - }; - records = config.skynet.records ++ builtins.concatLists ( @@ -344,12 +352,12 @@ in { ]; services.bind.zones = - (create_entry_zone "csn.ul.ie" extraConfig.owned) - // (create_entry_zone "skynet.ie" extraConfig.owned) - // (create_entry_zone "ulcompsoc.ie" extraConfig.owned) - // (create_entry_zone "64-64.99.1.193.in-addr.arpa" extraConfig.reverse) - // (create_entry_zone "conradcollins.net" extraConfig.old) - // (create_entry_zone "edelharty.net" extraConfig.old); + (create_entry_zone "csn.ul.ie") + // (create_entry_zone "skynet.ie") + // (create_entry_zone "ulcompsoc.ie") + // (create_entry_zone "64-64.99.1.193.in-addr.arpa") + // (create_entry_zone "conradcollins.net") + // (create_entry_zone "edelharty.net"); environment.etc = (create_entry_etc "csn.ul.ie" "owned") From 454e58b08575f17e33d203dfc73c34fb87bbf5ec Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 03:00:20 +0100 Subject: [PATCH 193/563] feat: generate the zones directly from teh dns records --- applications/dns/dns.nix | 27 ++++--- config/dns.nix | 161 ++++++++++++++++++++++----------------- 2 files changed, 107 insertions(+), 81 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index a2725f3..044632c 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -14,7 +14,7 @@ # this gets a list of all domains we have records for domains = lib.lists.naturalSort ( lib.lists.unique ( - lib.lists.forEach records (record: record.domain) + lib.lists.forEach records (x: x.domain) ) ); @@ -76,8 +76,8 @@ get_config_file = ( domain: '' $TTL 60 ; 1 minute - ; hostmaster@${domain} is an email address that recieves stuff related to dns - @ IN SOA ${nameserver}.${domain}. hostmaster.${domain}. ( + ; hostmaster@skynet.ie is an email address that recieves stuff related to dns + @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated ${current_date} 600 ; Refresh (10 minutes) @@ -87,8 +87,8 @@ ) ; @ stands for teh root domain so teh A record below is where ${domain} points to - @ NS ns1.${domain}. - @ NS ns2.${domain}. + @ NS ns1.skynet.ie. + @ NS ns2.skynet.ie. ; ------------------------------------------ ; Server Names (A Records) @@ -274,6 +274,7 @@ details_records ++ [ { + domain = "skynet.ie"; record = "ns1"; r_type = "A"; value = details_server.ip; @@ -284,6 +285,7 @@ details_records ++ [ { + domain = "skynet.ie"; record = "ns2"; r_type = "A"; value = details_server.ip; @@ -351,13 +353,14 @@ in { "ip daddr ${cfg.server.ip} udp dport 53 counter packets 0 bytes 0 accept" ]; - services.bind.zones = - (create_entry_zone "csn.ul.ie") - // (create_entry_zone "skynet.ie") - // (create_entry_zone "ulcompsoc.ie") - // (create_entry_zone "64-64.99.1.193.in-addr.arpa") - // (create_entry_zone "conradcollins.net") - // (create_entry_zone "edelharty.net"); + services.bind.zones = lib.attrsets.mergeAttrsList ( + # uses teh domains lsited in teh records + (lib.lists.forEach domains (domain: (create_entry_zone domain))) + # we have to do a reverse dns + ++ [ + (create_entry_zone "64-64.99.1.193.in-addr.arpa") + ] + ); environment.etc = (create_entry_etc "csn.ul.ie" "owned") diff --git a/config/dns.nix b/config/dns.nix index 931a176..08eeb4c 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -10,74 +10,97 @@ }; config = { - skynet.records = [ - { - record = "optimus"; - r_type = "A"; - value = "193.1.99.90"; - server = true; - } - { - record = "panel.games"; - r_type = "CNAME"; - value = "optimus"; - } - { - record = "bumblebee"; - r_type = "A"; - value = "193.1.99.91"; - server = true; - } - { - record = "minecraft.compsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; - } - { - record = "minecraft-classic.compsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25518 minecraft-classic.compsoc.games.skynet.ie."; - } - { - record = "minecraft.gsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25521 minecraft.gsoc.games.skynet.ie."; - } - { - record = "minecraft.phildeb.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25522 minecraft.phildeb.games.skynet.ie."; - } - { - record = "minecraft-aged.compsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25519 minecraft.phildeb.games.skynet.ie."; - } - ]; + skynet.records = + [ + { + record = "optimus"; + r_type = "A"; + value = "193.1.99.90"; + server = true; + } + { + record = "panel.games"; + r_type = "CNAME"; + value = "optimus"; + } + { + record = "bumblebee"; + r_type = "A"; + value = "193.1.99.91"; + server = true; + } + { + record = "minecraft.compsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; + } + { + record = "minecraft-classic.compsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25518 minecraft-classic.compsoc.games.skynet.ie."; + } + { + record = "minecraft.gsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25521 minecraft.gsoc.games.skynet.ie."; + } + { + record = "minecraft.phildeb.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25522 minecraft.phildeb.games.skynet.ie."; + } + { + record = "minecraft-aged.compsoc.games"; + r_type = "CNAME"; + value = "bumblebee"; + } + { + record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 25519 minecraft.phildeb.games.skynet.ie."; + } + ] + # non skynet domains + ++ [ + { + domain = "conradcollins.net"; + record = "www"; + r_type = "CNAME"; + value = "skynet.skynet.ie."; + } + + { + domain = "edelharty.net"; + record = "www"; + r_type = "CNAME"; + value = "skynet.skynet.ie."; + } + { + domain = "damienconroy.com"; + record = "www"; + r_type = "CNAME"; + value = "skynet.skynet.ie."; + } + ]; }; } From 4c8ebb455e7a23c057f56b2ba7067f3a955f564f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 03:50:20 +0100 Subject: [PATCH 194/563] feat: the actual bind files are now created directly from teh records --- applications/dns/dns.nix | 83 ++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 54 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 044632c..0202922 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -28,9 +28,9 @@ ]; # gets a list of records that match this type - filter_records_type = r_type: builtins.filter (x: x.r_type == r_type) records; - filter_records_server = builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type "A"); - filter_records_a = builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type "A"); + filter_records_type = records: r_type: builtins.filter (x: x.r_type == r_type) records; + filter_records_server = records: builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type records "A"); + filter_records_a = records: builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type records "A"); process_ptr = records: lib.lists.forEach records (x: process_ptr_sub x); process_ptr_sub = record: { @@ -40,11 +40,11 @@ }; ip_ptr_to_int = ip: lib.strings.toInt (builtins.substring 9 3 ip); - sort_records_server = builtins.sort (a: b: a.record < b.record) filter_records_server; - sort_records_a = builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) filter_records_a; - sort_records_cname = builtins.sort (a: b: a.value < b.value) (filter_records_type "CNAME"); - sort_records_ptr = builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type "PTR")); - sort_records_srv = builtins.sort (a: b: a.record < b.record) (filter_records_type "SRV"); + sort_records_server = records: builtins.sort (a: b: a.record < b.record) (filter_records_server records); + sort_records_a = records: builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) (filter_records_a records); + sort_records_cname = records: builtins.sort (a: b: a.value < b.value) (filter_records_type records "CNAME"); + sort_records_ptr = records: builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type records "PTR")); + sort_records_srv = records: builtins.sort (a: b: a.record < b.record) (filter_records_type records "SRV"); max = x: y: assert builtins.isInt x; @@ -74,7 +74,7 @@ # base config for domains we own (skynet.ie, csn.ul.ie, ulcompsoc.ie) get_config_file = ( - domain: '' + domain: records: '' $TTL 60 ; 1 minute ; hostmaster@skynet.ie is an email address that recieves stuff related to dns @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( @@ -93,32 +93,32 @@ ; ------------------------------------------ ; Server Names (A Records) ; ------------------------------------------ - ${format_records sort_records_server} + ${format_records (sort_records_server records)} ; ------------------------------------------ ; A (non server names ; ------------------------------------------ - ${format_records sort_records_a} + ${format_records (sort_records_a records)} ; ------------------------------------------ ; CNAMES ; ------------------------------------------ - ${format_records sort_records_cname} + ${format_records (sort_records_cname records)} ; ------------------------------------------ ; TXT ; ------------------------------------------ - ${format_records (filter_records_type "TXT")} + ${format_records (filter_records_type records "TXT")} ; ------------------------------------------ ; MX ; ------------------------------------------ - ${format_records (filter_records_type "MX")} + ${format_records (filter_records_type records "MX")} ; ------------------------------------------ ; SRV ; ------------------------------------------ - ${format_records sort_records_srv} + ${format_records (sort_records_srv records)} '' @@ -146,27 +146,7 @@ ; ------------------------------------------ ; PTR ; ------------------------------------------ - ${format_records sort_records_ptr} - '' - ); - - # domains we dont have proper ownship over, only here to ensure the logs dont get cluttered. - get_config_file_old_domains = ( - domain: '' - $TTL 60 ; 1 minute - ; hostmaster@skynet.ie is an email address that recieves stuff related to dns - @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( - ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated - ${current_date} - 600 ; Refresh (10 minutes) - 300 ; Retry (5 minutes) - 604800 ; Expire (1 week) - 3600 ; Minimum (1 hour) - ) - - @ NS ns1.skynet.ie. - @ NS ns2.skynet.ie. - + ${format_records (sort_records_ptr records)} '' ); @@ -212,13 +192,13 @@ # (text.owned "csn.ul.ie") # standard function to create the etc file, pass in the text and domain and it makes it - create_entry_etc = domain: type: + create_entry_etc = domain: type: let + domain_records = lib.lists.filter (x: x.domain == domain) records; + in if type == "owned" - then create_entry_etc_sub domain (text.owned domain) + then create_entry_etc_sub domain (get_config_file domain domain_records) else if type == "reverse" - then create_entry_etc_sub domain (text.reverse domain) - else if type == "old" - then create_entry_etc_sub domain (text.old domain) + then create_entry_etc_sub domain (get_config_file_rev domain) else {}; create_entry_zone = domain: let @@ -248,12 +228,6 @@ }; }; - text = { - owned = domain: get_config_file domain; - reverse = domain: get_config_file_rev domain; - old = domain: get_config_file_old_domains domain; - }; - records = config.skynet.records ++ builtins.concatLists ( @@ -362,13 +336,14 @@ in { ] ); - environment.etc = - (create_entry_etc "csn.ul.ie" "owned") - // (create_entry_etc "skynet.ie" "owned") - // (create_entry_etc "ulcompsoc.ie" "owned") - // (create_entry_etc "64-64.99.1.193.in-addr.arpa" "reverse") - // (create_entry_etc "conradcollins.net" "old") - // (create_entry_etc "edelharty.net" "old"); + environment.etc = lib.attrsets.mergeAttrsList ( + # uses teh domains lsited in teh records + (lib.lists.forEach domains (domain: (create_entry_etc domain "owned"))) + # we have to do a reverse dns + ++ [ + (create_entry_etc "64-64.99.1.193.in-addr.arpa" "reverse") + ] + ); # secrets required age.secrets.dns_dnskeys = { From 1287160cdf7d95a0876e76ff3f8b90d6f84dadd0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 04:08:04 +0100 Subject: [PATCH 195/563] feat: reduced some complexity --- applications/dns/dns.nix | 52 +++++++++++----------------------------- 1 file changed, 14 insertions(+), 38 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 0202922..ec32461 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -230,46 +230,14 @@ records = config.skynet.records + /* + Need to "manually" grab it from each server. + Nix is laxy evalusted so if it does not need to open a file it wont. + This is to iterate through each server (node) and evaluate the dns records for that server. + */ ++ builtins.concatLists ( lib.attrsets.mapAttrsToList ( - key: value: let - details_server = value.config.services.skynet."${name}".server; - details_records = value.config.services.skynet."${name}".records; - in - if builtins.hasAttr "dns" value.config.services.skynet - then - ( - # got to handle habing a dns record for the dns serves themselves. - if details_server.enable - then - ( - if details_server.primary - then - details_records - ++ [ - { - domain = "skynet.ie"; - record = "ns1"; - r_type = "A"; - value = details_server.ip; - server = false; - } - ] - else - details_records - ++ [ - { - domain = "skynet.ie"; - record = "ns2"; - r_type = "A"; - value = details_server.ip; - server = false; - } - ] - ) - else details_records - ) - else [] + key: value: value.config.services.skynet."${name}".records ) nodes ); @@ -327,6 +295,14 @@ in { "ip daddr ${cfg.server.ip} udp dport 53 counter packets 0 bytes 0 accept" ]; + services.skynet.dns.records = [ + { + record = nameserver; + r_type = "A"; + value = config.services.skynet.host.ip; + } + ]; + services.bind.zones = lib.attrsets.mergeAttrsList ( # uses teh domains lsited in teh records (lib.lists.forEach domains (domain: (create_entry_zone domain))) From c5c44acc8bd1cdfedf1d09067438d072e97d127f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 17 Jul 2024 04:20:48 +0100 Subject: [PATCH 196/563] fmt: prepping for #80 --- applications/email.nix | 190 +++++++++++++++++++++-------------------- 1 file changed, 98 insertions(+), 92 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index e988b0d..8b74703 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -267,103 +267,109 @@ in { }; # set up dns record for it - services.skynet.dns.records = [ - # core record - { - record = "@"; - r_type = "MX"; - # the number is the priority in teh case of multiple mailservers - value = "10 mail.${cfg.domain}."; - } + services.skynet.dns.records = + [ + # core record + { + record = "@"; + r_type = "MX"; + # the number is the priority in teh case of multiple mailservers + value = "10 mail.${cfg.domain}."; + } - # basic one - { - record = "mail"; - r_type = "A"; - value = config.services.skynet.host.ip; - } - #DNS config for K-9 Mail - { - record = "imap"; - r_type = "CNAME"; - value = "mail"; - } - { - record = "pop3"; - r_type = "CNAME"; - value = "mail"; - } - { - record = "smtp"; - r_type = "CNAME"; - value = "mail"; - } + # basic one + { + record = "mail"; + r_type = "A"; + value = config.services.skynet.host.ip; + } + #DNS config for K-9 Mail + { + record = "imap"; + r_type = "CNAME"; + value = "mail"; + } + { + record = "pop3"; + r_type = "CNAME"; + value = "mail"; + } + { + record = "smtp"; + r_type = "CNAME"; + value = "mail"; + } - # TXT records, all tehse are inside escaped strings to allow using "" + # TXT records, all tehse are inside escaped strings to allow using "" + + # reverse pointer + { + record = config.services.skynet.host.ip; + r_type = "PTR"; + value = "${cfg.sub}.${cfg.domain}."; + } + + # SRV records to help gmail on android etc find the correct mail.skynet.ie domain for config rather than just defaulting to skynet.ie + # https://serverfault.com/questions/935192/how-to-setup-auto-configure-email-for-android-mail-app-on-your-server/1018406#1018406 + # response should be: + # _imap._tcp SRV 0 1 143 imap.example.com. + { + record = "_imaps._tcp"; + r_type = "SRV"; + value = "0 1 993 ${cfg.sub}.${cfg.domain}."; + } + { + record = "_imap._tcp"; + r_type = "SRV"; + value = "0 1 143 ${cfg.sub}.${cfg.domain}."; + } + { + record = "_submissions._tcp"; + r_type = "SRV"; + value = "0 1 465 ${cfg.sub}.${cfg.domain}."; + } + { + record = "_submission._tcp"; + r_type = "SRV"; + value = "0 1 587 ${cfg.sub}.${cfg.domain}."; + } + ] # SPF record - { - record = "${cfg.domain}."; - r_type = "TXT"; - value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} ip4:${config.services.skynet.host.ip} -all"''; - } - + ++ [ + { + record = "${cfg.domain}."; + r_type = "TXT"; + value = ''"v=spf1 a:${cfg.sub}.${cfg.domain} ip4:${config.services.skynet.host.ip} -all"''; + } + ] # DKIM keys - { - record = "mail._domainkey.skynet.ie."; - r_type = "TXT"; - value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxju1Ie60BdHwyFVPNQKovL/cX9IFPzBKgjnHZf+WBzDCFKSBpf7NvnfXajtFDQN0poaN/Qfifid+V55ZCNDBn8Y3qZa4Y69iNiLw2DdvYf0HdnxX6+pLpbmj7tikGGLJ62xnhkJhoELnz5gCOhpyoiv0tSQVaJpaGZmoll861/QIDAQAB"''; - } - { - record = "mail._domainkey.ulcompsoc.ie."; - r_type = "TXT"; - value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDl8ptSASx37t5sfmU2d2Y6yi9AVrsNFBZDmJ2uaLa4NuvAjxGQCw4wx+1Jui/HOuKYLpntLsjN851wgPR+3i51g4OblqBDvcHn9NYgWRZfHj9AASANQjdsaAbkXuyKuO46hZqeWlpESAcD6a4Evam4fkm+kiZC0+rccb4cWgsuLwIDAQAB"''; - } - + ++ [ + { + record = "mail._domainkey.skynet.ie."; + r_type = "TXT"; + value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCxju1Ie60BdHwyFVPNQKovL/cX9IFPzBKgjnHZf+WBzDCFKSBpf7NvnfXajtFDQN0poaN/Qfifid+V55ZCNDBn8Y3qZa4Y69iNiLw2DdvYf0HdnxX6+pLpbmj7tikGGLJ62xnhkJhoELnz5gCOhpyoiv0tSQVaJpaGZmoll861/QIDAQAB"''; + } + { + domain = "ulcompsoc.ie"; + record = "mail._domainkey.ulcompsoc.ie."; + r_type = "TXT"; + value = ''"v=DKIM1; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDl8ptSASx37t5sfmU2d2Y6yi9AVrsNFBZDmJ2uaLa4NuvAjxGQCw4wx+1Jui/HOuKYLpntLsjN851wgPR+3i51g4OblqBDvcHn9NYgWRZfHj9AASANQjdsaAbkXuyKuO46hZqeWlpESAcD6a4Evam4fkm+kiZC0+rccb4cWgsuLwIDAQAB"''; + } + ] # DMARC - { - record = "_dmarc.${cfg.domain}."; - r_type = "TXT"; - # p : quarantine => sends to spam, reject => never sent - # rua : mail that receives reports about DMARC activity - # pct : percentage of unathenticated messages that DMARC stops - # adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed - # aspf : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed - # sp : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent - value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=quarantine"''; - } - - # reverse pointer - { - record = config.services.skynet.host.ip; - r_type = "PTR"; - value = "${cfg.sub}.${cfg.domain}."; - } - - # SRV records to help gmail on android etc find the correct mail.skynet.ie domain for config rather than just defaulting to skynet.ie - # https://serverfault.com/questions/935192/how-to-setup-auto-configure-email-for-android-mail-app-on-your-server/1018406#1018406 - # response should be: - # _imap._tcp SRV 0 1 143 imap.example.com. - { - record = "_imaps._tcp"; - r_type = "SRV"; - value = "0 1 993 ${cfg.sub}.${cfg.domain}."; - } - { - record = "_imap._tcp"; - r_type = "SRV"; - value = "0 1 143 ${cfg.sub}.${cfg.domain}."; - } - { - record = "_submissions._tcp"; - r_type = "SRV"; - value = "0 1 465 ${cfg.sub}.${cfg.domain}."; - } - { - record = "_submission._tcp"; - r_type = "SRV"; - value = "0 1 587 ${cfg.sub}.${cfg.domain}."; - } - ]; + ++ [ + { + record = "_dmarc.${cfg.domain}."; + r_type = "TXT"; + # p : quarantine => sends to spam, reject => never sent + # rua : mail that receives reports about DMARC activity + # pct : percentage of unathenticated messages that DMARC stops + # adkim : alignment policy for DKIM, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed + # aspf : alignment policy for SPF, s => Strict, subdomains arent allowed, r => relaxed, subdomains allowed + # sp : DMARC policy for subdomains, none => no action, reports to rua, quarantine => spam, reject => never sent + value = ''"v=DMARC1; p=quarantine; rua=mailto:mailman@skynet.ie; pct=100; adkim=s; aspf=s; sp=quarantine"''; + } + ]; #https://nixos-mailserver.readthedocs.io/en/latest/add-roundcube.html users.groups.nginx = {}; From 2a949f8e8211cb8ff6029af493cb4d4fc49a9de9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 00:51:24 +0100 Subject: [PATCH 197/563] fix: test the new format --- applications/dns/dns.nix | 8 ++++---- config/dns.nix | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index ec32461..155cfea 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -9,7 +9,7 @@ cfg = config.services.skynet."${name}"; # reads that date to a string (will need to be fixed in 2038) - current_date = lib.readFile "${pkgs.runCommand "timestamp" {} "echo -n `date +%s` > $out"}"; + current_date = builtins.currentTime; # this gets a list of all domains we have records for domains = lib.lists.naturalSort ( @@ -79,7 +79,7 @@ ; hostmaster@skynet.ie is an email address that recieves stuff related to dns @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated - ${current_date} + ${toString current_date} 600 ; Refresh (10 minutes) 300 ; Retry (5 minutes) 604800 ; Expire (1 week) @@ -133,7 +133,7 @@ ; hostmaster@skynet.ie is an email address that recieves stuff related to dns @ IN SOA ${nameserver}.skynet.ie. hostmaster.skynet.ie. ( ; Serial (YYYYMMDDCC) this has to be updated for each time the record is updated - ${current_date} + ${toString current_date} 600 ; Refresh (10 minutes) 300 ; Retry (5 minutes) 604800 ; Expire (1 week) @@ -215,7 +215,7 @@ extraConfig = '' ${if_primary_and_owned} // for bumping the config - // ${current_date} + // ${toString current_date} ''; # really wish teh nixos config didnt use master/slave master = cfg.server.primary; diff --git a/config/dns.nix b/config/dns.nix index 08eeb4c..f4b0119 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -37,7 +37,7 @@ { record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie."; r_type = "SRV"; - value = "0 10 25518 minecraft.compsoc.games.skynet.ie."; + value = "0 10 25518 bumblebee.skynet.ie."; } { record = "minecraft-classic.compsoc.games"; @@ -47,7 +47,7 @@ { record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie."; r_type = "SRV"; - value = "0 10 25518 minecraft-classic.compsoc.games.skynet.ie."; + value = "0 10 25518 bumblebee.skynet.ie."; } { record = "minecraft.gsoc.games"; @@ -57,7 +57,7 @@ { record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie."; r_type = "SRV"; - value = "0 10 25521 minecraft.gsoc.games.skynet.ie."; + value = "0 10 25521 bumblebee.skynet.ie."; } { record = "minecraft.phildeb.games"; @@ -67,7 +67,7 @@ { record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie."; r_type = "SRV"; - value = "0 10 25522 minecraft.phildeb.games.skynet.ie."; + value = "0 10 25522 bumblebee.skynet.ie."; } { record = "minecraft-aged.compsoc.games"; @@ -77,7 +77,7 @@ { record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie."; r_type = "SRV"; - value = "0 10 25519 minecraft.phildeb.games.skynet.ie."; + value = "0 10 25519 bumblebee.skynet.ie."; } ] # non skynet domains From a4d83fde501ea7c0c0ccc630d3eacaf22a4201ad Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 12:20:36 +0100 Subject: [PATCH 198/563] ci: test using lix on teh runner Relates to #81 Also bump the base image to teh latest alpine --- applications/gitlab_runner.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/applications/gitlab_runner.nix b/applications/gitlab_runner.nix index dc642cf..13d296a 100644 --- a/applications/gitlab_runner.nix +++ b/applications/gitlab_runner.nix @@ -31,7 +31,7 @@ in { docker = { image = mkOption { - default = "alpine:3.18.4"; + default = "alpine:latest"; type = types.str; }; @@ -95,9 +95,10 @@ in { mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root mkdir -p -m 0700 "$HOME/.nix-defexpr" . ${pkgs.nix}/etc/profile.d/nix-daemon.sh - ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs # 3 + ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs ${pkgs.nix}/bin/nix-channel --update nixpkgs - ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [nix cacert git openssh])} + ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [lix cacert git openssh])} + nix --version ''; environmentVariables = { ENV = "/etc/profile"; From 648b437767b3561b602cef54f6becfdcfcad4128 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 12:21:30 +0100 Subject: [PATCH 199/563] dns: use better date for teh serial --- applications/dns/dns.nix | 3 ++- flake.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 155cfea..8b4b8b5 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -3,13 +3,14 @@ pkgs, config, nodes, + self, ... }: let name = "dns"; cfg = config.services.skynet."${name}"; # reads that date to a string (will need to be fixed in 2038) - current_date = builtins.currentTime; + current_date = self.lastModified; # this gets a list of all domains we have records for domains = lib.lists.naturalSort ( diff --git a/flake.nix b/flake.nix index 397c1fe..91e8f7b 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,7 @@ overlays = []; }; specialArgs = { - inherit inputs; + inherit inputs self; }; }; From c5a651d98ea7328f92cce85ee69603aa6fc29404 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 12:45:16 +0100 Subject: [PATCH 200/563] nix: bump nixpkgs to get the patched gitlab --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 6b860ec..8e63bca 100644 --- a/flake.lock +++ b/flake.lock @@ -794,11 +794,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1720957393, - "narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=", + "lastModified": 1721379653, + "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "693bc46d169f5af9c992095736e82c3488bf7dbb", + "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", "type": "github" }, "original": { From 2834fbba8dcc72a4ee0c9ac83517bb7dffcef814 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 13:38:35 +0100 Subject: [PATCH 201/563] ci: improve teh pipeline --- .gitlab-ci.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 319bd66..8a5e066 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,9 +55,16 @@ sync_repos: - sync/repos.csv .scripts_base: &scripts_base - # load nix environment + # load nix environment, enter dev shell, load cache and - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena + # load teh dev shell so pipeline uses same binaries as devs + - nix --extra-experimental-features 'nix-command flakes' develop + # setup the cache + - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY + - attic use skynet-cache + - attic watch-store skynet-cache & + # push all everything from the current system into cache (if its not already cached) + - attic push skynet-cache /run/current-system .scripts_deploy: &scripts_deploy # setup ssh key @@ -66,18 +73,12 @@ sync_repos: - mkdir -p ~/.ssh - chmod 700 ~/.ssh -.scripts_cache: &scripts_cache - - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client - - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY - - attic use skynet-cache - # every commit on main will build and deploy .build_template: &builder tags: - nix before_script: - *scripts_base - - *scripts_cache rules: - if: $UPDATE_FLAKE == "yes" when: never @@ -94,7 +95,6 @@ sync_repos: before_script: - *scripts_deploy - *scripts_base - - *scripts_cache rules: - if: $UPDATE_FLAKE == "yes" when: never @@ -117,7 +117,6 @@ build: <<: *builder stage: test script: - - attic watch-store skynet-cache & - colmena build -v --on @active-dns - colmena build -v --on @active-core - colmena build -v --on @active From 5c6939bc839d94fd2a0dafed292fdd649456efc7 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 14:07:47 +0100 Subject: [PATCH 202/563] Revert "ci: improve teh pipeline" This reverts commit 2834fbba8dcc72a4ee0c9ac83517bb7dffcef814. --- .gitlab-ci.yml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a5e066..319bd66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,16 +55,9 @@ sync_repos: - sync/repos.csv .scripts_base: &scripts_base - # load nix environment, enter dev shell, load cache and + # load nix environment - . "$HOME/.nix-profile/etc/profile.d/nix.sh" - # load teh dev shell so pipeline uses same binaries as devs - - nix --extra-experimental-features 'nix-command flakes' develop - # setup the cache - - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY - - attic use skynet-cache - - attic watch-store skynet-cache & - # push all everything from the current system into cache (if its not already cached) - - attic push skynet-cache /run/current-system + - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#colmena .scripts_deploy: &scripts_deploy # setup ssh key @@ -73,12 +66,18 @@ sync_repos: - mkdir -p ~/.ssh - chmod 700 ~/.ssh +.scripts_cache: &scripts_cache + - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client + - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY + - attic use skynet-cache + # every commit on main will build and deploy .build_template: &builder tags: - nix before_script: - *scripts_base + - *scripts_cache rules: - if: $UPDATE_FLAKE == "yes" when: never @@ -95,6 +94,7 @@ sync_repos: before_script: - *scripts_deploy - *scripts_base + - *scripts_cache rules: - if: $UPDATE_FLAKE == "yes" when: never @@ -117,6 +117,7 @@ build: <<: *builder stage: test script: + - attic watch-store skynet-cache & - colmena build -v --on @active-dns - colmena build -v --on @active-core - colmena build -v --on @active From ed4dcbc75603ff3c9ddf4022ee143d11d9b475e8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 14:12:03 +0100 Subject: [PATCH 203/563] ci: improve teh pipeline --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 319bd66..2e05fae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,6 +70,10 @@ sync_repos: - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY - attic use skynet-cache + # make sure everything locally is in teh cache + - attic push skynet-cache /run/current-system + # add any new items to the cache + - attic watch-store skynet-cache & # every commit on main will build and deploy .build_template: &builder @@ -117,7 +121,7 @@ build: <<: *builder stage: test script: - - attic watch-store skynet-cache & + - nix --extra-experimental-features 'nix-command flakes' develop - colmena build -v --on @active-dns - colmena build -v --on @active-core - colmena build -v --on @active From 537863c91360d2e9a78c8a606fe10ab419b4486d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 20 Jul 2024 14:16:55 +0100 Subject: [PATCH 204/563] ci: improve teh pipeline --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e05fae..9a921fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,8 +70,6 @@ sync_repos: - nix --extra-experimental-features 'nix-command flakes' profile install nixpkgs#attic-client - attic login skynet https://nix-cache.skynet.ie/ $CACHE_KEY - attic use skynet-cache - # make sure everything locally is in teh cache - - attic push skynet-cache /run/current-system # add any new items to the cache - attic watch-store skynet-cache & From d64997991dd97b6f8aa766feb6100eb82f3b555f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Jul 2024 13:10:18 +0100 Subject: [PATCH 205/563] update: rebased the mailserver to pull in updates from upstream --- flake.lock | 122 ++++++++++++++++++++--------------------------------- 1 file changed, 45 insertions(+), 77 deletions(-) diff --git a/flake.lock b/flake.lock index 8e63bca..b2efc10 100644 --- a/flake.lock +++ b/flake.lock @@ -266,11 +266,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -514,33 +514,18 @@ "type": "github" } }, - "nixpkgs-22_11": { + "nixpkgs-24_05": { "locked": { - "lastModified": 1669558522, - "narHash": "sha256-yqxn+wOiPqe6cxzOo4leeJOp1bXE/fjPEi/3F/bBHv8=", + "lastModified": 1717144377, + "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ce5fe99df1f15a09a91a86be9738d68fadfbad82", + "rev": "805a384895c696f802a9bf5bf4720f37385df547", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", - "type": "indirect" - } - }, - "nixpkgs-23_05": { - "locked": { - "lastModified": 1684782344, - "narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "8966c43feba2c701ed624302b6a935f97bcbdf88", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -867,17 +852,15 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-22_11": "nixpkgs-22_11", - "nixpkgs-23_05": "nixpkgs-23_05", - "utils": "utils_3" + "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1696865182, - "narHash": "sha256-zyUUOA+RiwRjLP6+zi80p5pqftYK3+9yIN5wQ9VlGkw=", + "lastModified": 1721563560, + "narHash": "sha256-y+Rag94tKu8Z6ouJlfxFb8EK9fKs1TNZa4nX7MT2kZg=", "owner": "compsoc1%2Fskynet", "repo": "misc%2Fnixos-mailserver", - "rev": "14007ae0eaeba4cc0235135f872122e398f09040", + "rev": "903190561842dd9cc2e7c25dda10ea26fccfd7e9", "type": "gitlab" }, "original": { @@ -891,7 +874,7 @@ "inputs": { "naersk": "naersk_2", "nixpkgs": "nixpkgs_10", - "utils": "utils_4" + "utils": "utils_3" }, "locked": { "host": "gitlab.skynet.ie", @@ -913,7 +896,7 @@ "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_12", - "utils": "utils_5" + "utils": "utils_4" }, "locked": { "host": "gitlab.skynet.ie", @@ -934,7 +917,7 @@ "skynet_ldap_frontend": { "inputs": { "nixpkgs": "nixpkgs_13", - "utils": "utils_6" + "utils": "utils_5" }, "locked": { "host": "gitlab.skynet.ie", @@ -955,7 +938,7 @@ "skynet_website": { "inputs": { "nixpkgs": "nixpkgs_14", - "utils": "utils_7" + "utils": "utils_6" }, "locked": { "host": "gitlab.skynet.ie", @@ -976,7 +959,7 @@ "skynet_website_2009": { "inputs": { "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "utils": "utils_7" }, "locked": { "host": "gitlab.skynet.ie", @@ -997,7 +980,7 @@ "skynet_website_2017": { "inputs": { "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "utils": "utils_8" }, "locked": { "host": "gitlab.skynet.ie", @@ -1018,7 +1001,7 @@ "skynet_website_2023": { "inputs": { "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "utils": "utils_9" }, "locked": { "host": "gitlab.skynet.ie", @@ -1040,7 +1023,7 @@ "skynet_website_games": { "inputs": { "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "utils": "utils_10" }, "locked": { "host": "gitlab.skynet.ie", @@ -1061,7 +1044,7 @@ "skynet_website_renew": { "inputs": { "nixpkgs": "nixpkgs_19", - "utils": "utils_12" + "utils": "utils_11" }, "locked": { "host": "gitlab.skynet.ie", @@ -1309,24 +1292,6 @@ } }, "utils_10": { - "inputs": { - "systems": "systems_11" - }, - "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_11": { "inputs": { "systems": "systems_12" }, @@ -1344,7 +1309,7 @@ "type": "github" } }, - "utils_12": { + "utils_11": { "inputs": { "systems": "systems_13" }, @@ -1381,21 +1346,6 @@ } }, "utils_3": { - "locked": { - "lastModified": 1605370193, - "narHash": "sha256-YyMTf3URDL/otKdKgtoMChu4vfVL3vCMkRqpGifhUn0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5021eac20303a61fafe17224c087f5519baed54d", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_4": { "inputs": { "systems": "systems_5" }, @@ -1413,7 +1363,7 @@ "type": "github" } }, - "utils_5": { + "utils_4": { "inputs": { "systems": "systems_6" }, @@ -1431,7 +1381,7 @@ "type": "github" } }, - "utils_6": { + "utils_5": { "inputs": { "systems": "systems_7" }, @@ -1449,7 +1399,7 @@ "type": "github" } }, - "utils_7": { + "utils_6": { "inputs": { "systems": "systems_8" }, @@ -1467,7 +1417,7 @@ "type": "github" } }, - "utils_8": { + "utils_7": { "inputs": { "systems": "systems_9" }, @@ -1485,7 +1435,7 @@ "type": "github" } }, - "utils_9": { + "utils_8": { "inputs": { "systems": "systems_10" }, @@ -1502,6 +1452,24 @@ "repo": "flake-utils", "type": "github" } + }, + "utils_9": { + "inputs": { + "systems": "systems_11" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } } }, "root": "root", From bd96a84fe8210a441fe450fb9f79706946fefd32 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 21 Jul 2024 21:18:06 +0100 Subject: [PATCH 206/563] committee: added Emilia --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index eafa6ba..ac428e2 100644 --- a/config/users.nix +++ b/config/users.nix @@ -55,6 +55,7 @@ in { "sourabh1805" "kronsy" "skyapples" + "emi05h" ]; admin = [ "silver" From ba6d831f736bb3c1128cfe94a7b5d48693d4f16b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Jul 2024 13:02:31 +0100 Subject: [PATCH 207/563] itd: vpn users has been updated --- ITD/VPN_Admins.csv | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ITD/VPN_Admins.csv b/ITD/VPN_Admins.csv index 73b1e41..e0ea229 100644 --- a/ITD/VPN_Admins.csv +++ b/ITD/VPN_Admins.csv @@ -1,4 +1,6 @@ Index,First Name,Surname,UL Student Email,Status,Date Modified SKYNET_VPN_ADM_001,Brendan,Golden,12136891@studentmail.ul.ie,Active,2023/04/04 -SKYNET_VPN_ADM_002,Evan,Cassidy,,Active,2023/04/04 -SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie,Active,2023/04/04 \ No newline at end of file +SKYNET_VPN_ADM_002,Evan,Cassidy,External,Active,2023/04/04 +SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie,Disabled,2024/07/21 +SKYNET_VPN_ADM_004,Eliza,Macovei,23382619@studentmail.ul.ie,Active,2024/07/21 +SKYNET_VPN_ADM_005,Darragh,Downes,22351159@studentmail.ul.ie,Active,2024/07/21 \ No newline at end of file From bbcc8fc1f63a054daf313050790fd7b01e61f92f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Jul 2024 13:04:24 +0100 Subject: [PATCH 208/563] itd: add the ticket to the rules --- ITD/VPN_Admins.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ITD/VPN_Admins.csv b/ITD/VPN_Admins.csv index e0ea229..fa6cb84 100644 --- a/ITD/VPN_Admins.csv +++ b/ITD/VPN_Admins.csv @@ -1,6 +1,6 @@ -Index,First Name,Surname,UL Student Email,Status,Date Modified -SKYNET_VPN_ADM_001,Brendan,Golden,12136891@studentmail.ul.ie,Active,2023/04/04 -SKYNET_VPN_ADM_002,Evan,Cassidy,External,Active,2023/04/04 -SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie,Disabled,2024/07/21 -SKYNET_VPN_ADM_004,Eliza,Macovei,23382619@studentmail.ul.ie,Active,2024/07/21 -SKYNET_VPN_ADM_005,Darragh,Downes,22351159@studentmail.ul.ie,Active,2024/07/21 \ No newline at end of file +Index,Ticket,First Name,Surname,UL Student Email,Status,Date Modified +SKYNET_VPN_ADM_001,,Brendan,Golden,12136891@studentmail.ul.ie,Active,2023/04/04 +SKYNET_VPN_ADM_002,,Evan,Cassidy,External,Active,2023/04/04 +SKYNET_VPN_ADM_003,i24-07-22_760,Eoghan,Conlon,21310262@studentmail.ul.ie,Disabled,2024/07/21 +SKYNET_VPN_ADM_004,i24-07-22_760,Eliza,Macovei,23382619@studentmail.ul.ie,Active,2024/07/21 +SKYNET_VPN_ADM_005,i24-07-22_760,Darragh,Downes,22351159@studentmail.ul.ie,Active,2024/07/21 From 1212ecc7a1c18f7edd5894924dd3afeec7e0a4f0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Jul 2024 13:18:12 +0100 Subject: [PATCH 209/563] its: better handling of changes over time for teh vpn users --- ITD/VPN_Admins.csv | 12 ++++++------ ITD/VPN_Admins_changes.csv | 7 +++++++ 2 files changed, 13 insertions(+), 6 deletions(-) create mode 100644 ITD/VPN_Admins_changes.csv diff --git a/ITD/VPN_Admins.csv b/ITD/VPN_Admins.csv index fa6cb84..8d7e9b9 100644 --- a/ITD/VPN_Admins.csv +++ b/ITD/VPN_Admins.csv @@ -1,6 +1,6 @@ -Index,Ticket,First Name,Surname,UL Student Email,Status,Date Modified -SKYNET_VPN_ADM_001,,Brendan,Golden,12136891@studentmail.ul.ie,Active,2023/04/04 -SKYNET_VPN_ADM_002,,Evan,Cassidy,External,Active,2023/04/04 -SKYNET_VPN_ADM_003,i24-07-22_760,Eoghan,Conlon,21310262@studentmail.ul.ie,Disabled,2024/07/21 -SKYNET_VPN_ADM_004,i24-07-22_760,Eliza,Macovei,23382619@studentmail.ul.ie,Active,2024/07/21 -SKYNET_VPN_ADM_005,i24-07-22_760,Darragh,Downes,22351159@studentmail.ul.ie,Active,2024/07/21 +Index,First Name,Surname,UL Student Email +SKYNET_VPN_ADM_001,Brendan,Golden,12136891@studentmail.ul.ie +SKYNET_VPN_ADM_002,Evan,Cassidy,External +SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie +SKYNET_VPN_ADM_004,Eliza,Macovei,23382619@studentmail.ul.ie +SKYNET_VPN_ADM_005,Darragh,Downes,22351159@studentmail.ul.ie diff --git a/ITD/VPN_Admins_changes.csv b/ITD/VPN_Admins_changes.csv new file mode 100644 index 0000000..f9e4a0e --- /dev/null +++ b/ITD/VPN_Admins_changes.csv @@ -0,0 +1,7 @@ +Date,Date Modified,Action,Ticket,ID +SKYNET_VPN_ADM_CHANGE_001,2023/04/04,Added,,SKYNET_VPN_ADM_001 +SKYNET_VPN_ADM_CHANGE_002,2023/04/04,Added,,SKYNET_VPN_ADM_002 +SKYNET_VPN_ADM_CHANGE_003,2023/04/04,Added,,SKYNET_VPN_ADM_003 +SKYNET_VPN_ADM_CHANGE_003,2024/07/21,Removed,i24-07-22_760,SKYNET_VPN_ADM_003 +SKYNET_VPN_ADM_CHANGE_004,2024/07/21,Added,i24-07-22_760,SKYNET_VPN_ADM_004 +SKYNET_VPN_ADM_CHANGE_005,2024/07/21,Added,i24-07-22_760,SKYNET_VPN_ADM_005 From ba527ead3bc77884ea93a24218c99f5684c23bca Mon Sep 17 00:00:00 2001 From: daragh downes Date: Mon, 22 Jul 2024 13:01:37 +0000 Subject: [PATCH 210/563] Update VPN_Admins.csv --- ITD/VPN_Admins.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ITD/VPN_Admins.csv b/ITD/VPN_Admins.csv index 8d7e9b9..6e3860a 100644 --- a/ITD/VPN_Admins.csv +++ b/ITD/VPN_Admins.csv @@ -3,4 +3,4 @@ SKYNET_VPN_ADM_001,Brendan,Golden,12136891@studentmail.ul.ie SKYNET_VPN_ADM_002,Evan,Cassidy,External SKYNET_VPN_ADM_003,Eoghan,Conlon,21310262@studentmail.ul.ie SKYNET_VPN_ADM_004,Eliza,Macovei,23382619@studentmail.ul.ie -SKYNET_VPN_ADM_005,Darragh,Downes,22351159@studentmail.ul.ie +SKYNET_VPN_ADM_005,Daragh,Downes,22351159@studentmail.ul.ie From 35920eda0c085eb59af3ad9592d9099e9feb5ba8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Jul 2024 18:54:23 +0100 Subject: [PATCH 211/563] feat: this should put an automatic bcc on outgoing mail as well as a corrosponding filter to put it in teh right inboxes Relates to #84 --- applications/email.nix | 48 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/applications/email.nix b/applications/email.nix index 8b74703..e47a7ae 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -114,6 +114,21 @@ with lib; let stop; } else { fileinto :create "''${1}"; + stop; + } + } + } + if allof ( + address :localpart ["From"] ["${toString create_config_to}"], + address :domain ["From"] "skynet.ie" + ){ + if address :matches ["From"] "*@skynet.ie" { + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; } } } @@ -465,6 +480,39 @@ in { before = configFile; }; + # This is to add a bcc to outgoing mail + # this then interacts with teh filters to put it in the right folder + # we can directly add to the postfix service here + services.postfix = let + # mostly copied from the upstream mailserver config/functions + mappedFile = name: "hash:/var/lib/postfix/conf/${name}"; + + sender_bcc_maps_file = let + content = lookupTableToString create_skynet_service_bcc; + in + builtins.toFile "sender_bcc_maps" content; + + lookupTableToString = attrs: let + valueToString = value: lib.concatStringsSep ", " value; + in + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: value: "${name} ${valueToString value}") attrs); + + # convert the mailboxes config to something that can be used here + create_skynet_email_bcc = mailbox: { + name = "${mailbox}@skynet.ie"; + value = ["${mailbox}@skynet.ie"]; + }; + create_skynet_service_bcc = builtins.listToAttrs (map (mailbox: (create_skynet_email_bcc mailbox.account)) service_mailboxes); + in { + mapFiles."sender_bcc_maps" = sender_bcc_maps_file; + + config = { + sender_bcc_maps = [ + (mappedFile "sender_bcc_maps") + ]; + }; + }; + # tune the spam filter /* services.rspamd.extraConfig = '' From 9c7d08c153f7960ee3643cc3d95ce4166015ca9d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 22 Jul 2024 18:57:31 +0100 Subject: [PATCH 212/563] fix: slight bit of formatting and a renaming Closes #84 --- applications/email.nix | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index e47a7ae..bd03f77 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -92,7 +92,7 @@ with lib; let } ]; - configFile = + sieveConfigFile = # https://doc.dovecot.org/configuration_manual/sieve/examples/#plus-addressed-mail-filtering pkgs.writeText "basic_sieve" '' @@ -105,32 +105,32 @@ with lib; let # this should be close to teh last step if allof ( - address :localpart ["To"] ["${toString create_config_to}"], - address :domain ["To"] "skynet.ie" - ){ - if address :matches ["To"] "*@skynet.ie" { - if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; - } else { - fileinto :create "''${1}"; - stop; - } + address :localpart ["To"] ["${toString create_config_to}"], + address :domain ["To"] "skynet.ie" + ){ + if address :matches ["To"] "*@skynet.ie" { + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; } + } } if allof ( - address :localpart ["From"] ["${toString create_config_to}"], - address :domain ["From"] "skynet.ie" - ){ - if address :matches ["From"] "*@skynet.ie" { - if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; - } else { - fileinto :create "''${1}"; - stop; - } + address :localpart ["From"] ["${toString create_config_to}"], + address :domain ["From"] "skynet.ie" + ){ + if address :matches ["From"] "*@skynet.ie" { + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; } + } } ''; in { @@ -477,7 +477,7 @@ in { }; services.dovecot2.sieve.scripts = { - before = configFile; + before = sieveConfigFile; }; # This is to add a bcc to outgoing mail From cd002aec03a3f2ef6212816c6398a2896397ba82 Mon Sep 17 00:00:00 2001 From: daragh downes Date: Mon, 22 Jul 2024 20:02:38 +0000 Subject: [PATCH 213/563] fix : remove unneeded import Prometheus is imported through base --- machines/ariia.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/machines/ariia.nix b/machines/ariia.nix index f3f095c..121dd63 100644 --- a/machines/ariia.nix +++ b/machines/ariia.nix @@ -27,7 +27,6 @@ Notes: in { imports = [ ../applications/grafana.nix - ../applications/prometheus.nix ]; deployment = { From 4f87e56d639f467a55e1a044bcde4641de8c13d0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 24 Jul 2024 20:47:58 +0100 Subject: [PATCH 214/563] fix: include cc's for incoming mail --- applications/email.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index bd03f77..003580b 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -105,10 +105,10 @@ with lib; let # this should be close to teh last step if allof ( - address :localpart ["To"] ["${toString create_config_to}"], - address :domain ["To"] "skynet.ie" + address :localpart ["To", "Cc"] ["${toString create_config_to}"], + address :domain ["To", "Cc"] "skynet.ie" ){ - if address :matches ["To"] "*@skynet.ie" { + if address :matches ["To", "Cc"] "*@skynet.ie" { if header :is "X-Spam" "Yes" { fileinto :create "''${1}.Junk"; stop; From 98136e802bc6aa72de13ecb53159815a985c2c5b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 6 Aug 2024 15:41:59 +0100 Subject: [PATCH 215/563] fix: git is important enough that it should have its own folder --- applications/{ => git}/gitlab.nix | 12 ++++++------ applications/{ => git}/gitlab_runner.nix | 4 ++-- machines/glados.nix | 2 +- machines/wheatly.nix | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) rename applications/{ => git}/gitlab.nix (95%) rename applications/{ => git}/gitlab_runner.nix (96%) diff --git a/applications/gitlab.nix b/applications/git/gitlab.nix similarity index 95% rename from applications/gitlab.nix rename to applications/git/gitlab.nix index a65c43e..0d90b7b 100644 --- a/applications/gitlab.nix +++ b/applications/git/gitlab.nix @@ -56,32 +56,32 @@ in { # grep -r --exclude-dir={docker,containers,log,sys,nix,proc} gitlab / age.secrets.gitlab_pw = { - file = ../secrets/gitlab/pw.age; + file = ../../secrets/gitlab/pw.age; owner = cfg.user; group = cfg.user; }; age.secrets.gitlab_secrets_db = { - file = ../secrets/gitlab/secrets_db.age; + file = ../../secrets/gitlab/secrets_db.age; owner = cfg.user; group = cfg.user; }; age.secrets.gitlab_secrets_secret = { - file = ../secrets/gitlab/secrets_secret.age; + file = ../../secrets/gitlab/secrets_secret.age; owner = cfg.user; group = cfg.user; }; age.secrets.gitlab_secrets_otp = { - file = ../secrets/gitlab/secrets_otp.age; + file = ../../secrets/gitlab/secrets_otp.age; owner = cfg.user; group = cfg.user; }; age.secrets.gitlab_secrets_jws = { - file = ../secrets/gitlab/secrets_jws.age; + file = ../../secrets/gitlab/secrets_jws.age; owner = cfg.user; group = cfg.user; }; age.secrets.gitlab_db_pw = { - file = ../secrets/gitlab/db_pw.age; + file = ../../secrets/gitlab/db_pw.age; owner = cfg.user; group = cfg.user; }; diff --git a/applications/gitlab_runner.nix b/applications/git/gitlab_runner.nix similarity index 96% rename from applications/gitlab_runner.nix rename to applications/git/gitlab_runner.nix index 13d296a..f5041bf 100644 --- a/applications/gitlab_runner.nix +++ b/applications/git/gitlab_runner.nix @@ -51,8 +51,8 @@ in { pkgs.gitlab-runner ]; - age.secrets.runner_01_nix.file = ../secrets/gitlab/runners/runner01.age; - age.secrets.runner_02_general.file = ../secrets/gitlab/runners/runner02.age; + age.secrets.runner_01_nix.file = ../../secrets/gitlab/runners/runner01.age; + age.secrets.runner_02_general.file = ../../secrets/gitlab/runners/runner02.age; boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 virtualisation.docker.enable = true; diff --git a/machines/glados.nix b/machines/glados.nix index a745ee6..4a76b21 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -26,7 +26,7 @@ Notes: Each user has roughly 20gb os storage }; in { imports = [ - ../applications/gitlab.nix + ../applications/git/gitlab.nix ]; deployment = { diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 308bef9..35f1f0f 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -25,7 +25,7 @@ Notes: }; in { imports = [ - ../applications/gitlab_runner.nix + ../applications/git/gitlab_runner.nix ]; deployment = { From 97d1783561ee9cf4fd5203e9f08be32084f00caa Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 6 Aug 2024 20:52:19 +0100 Subject: [PATCH 216/563] feat: basic config for ForgeJo --- applications/git/forgejo.nix | 116 +++++++++++++++++++++++++++++++++++ flake.lock | 6 +- machines/glados.nix | 2 + 3 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 applications/git/forgejo.nix diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix new file mode 100644 index 0000000..fc6e19a --- /dev/null +++ b/applications/git/forgejo.nix @@ -0,0 +1,116 @@ +{ + config, + pkgs, + lib, + ... +}: +with lib; let + name = "forgejo"; + cfg = config.services.skynet."${name}"; + + domain_base = "${cfg.domain.base}.${cfg.domain.tld}"; + domain_full = "${cfg.domain.sub}.${domain_base}"; +in { + imports = [ + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Skynet Forgejo"; + + domain = { + tld = mkOption { + type = types.str; + default = "ie"; + }; + + base = mkOption { + type = types.str; + default = "skynet"; + }; + + sub = mkOption { + type = types.str; + default = name; + }; + }; + + forgejo = { + port = mkOption { + type = types.port; + default = 3000; + }; + + + }; + }; + + config = mkIf cfg.enable { + +# age.secrets.forgejo-mailer-password = { +# file = ../../secrets/forgejo/mailer-password.age; +# mode = "400"; +# owner = "forgejo"; +# }; + + services.skynet.acme.domains = [ + "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" + ]; + + # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide + services.skynet.dns.records = [ + { + record = cfg.domain.sub; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + + services.nginx.virtualHosts = { + # main site + "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "http://localhost:${toString cfg.forgejo.port}"; + extraConfig = '' + client_max_body_size 1000M; + ''; + }; + }; + }; + + + services.forgejo = { + enable = true; + database.type = "sqlite3"; + # Enable support for Git Large File Storage + lfs.enable = true; + settings = { + server = { + DOMAIN = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; + # You need to specify this to remove the port from URLs in the web UI. + ROOT_URL = "https://${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}/"; + HTTP_PORT = cfg.forgejo.port; + }; + + # You can temporarily allow registration to create an admin user. + service.DISABLE_REGISTRATION = true; + # Add support for actions, based on act: https://github.com/nektos/act +# actions = { +# ENABLED = true; +# DEFAULT_ACTIONS_URL = "github"; +# }; + # Sending emails is completely optional + # You can send a test email from the web UI at: + # Profile Picture > Site Administration > Configuration > Mailer Configuration +# mailer = { +# ENABLED = true; +# SMTP_ADDR = "mail.${cfg.domain.base}.${cfg.domain.tld}"; +# FROM = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; +# USER = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; +# }; + }; +# mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path; + }; + }; +} diff --git a/flake.lock b/flake.lock index b2efc10..a5bfaad 100644 --- a/flake.lock +++ b/flake.lock @@ -779,11 +779,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1721379653, - "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=", + "lastModified": 1722813957, + "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374", + "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", "type": "github" }, "original": { diff --git a/machines/glados.nix b/machines/glados.nix index 4a76b21..cb2040e 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -27,6 +27,7 @@ Notes: Each user has roughly 20gb os storage in { imports = [ ../applications/git/gitlab.nix + ../applications/git/forgejo.nix ]; deployment = { @@ -41,5 +42,6 @@ in { host = host; backup.enable = true; gitlab.enable = true; + forgejo.enable = true; }; } From f00ae5bd2dcaf650daeb9180a471abd06b442fd1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 7 Aug 2024 21:52:50 +0100 Subject: [PATCH 217/563] feat: basic forgejo setup --- applications/git/forgejo.nix | 81 ++++++++-------- applications/git/forgejo_runner.nix | 145 ++++++++++++++++++++++++++++ applications/git/ssh_config | 5 + machines/wheatly.nix | 3 + secrets/forgejo/runners/ssh.age | Bin 0 -> 1271 bytes secrets/forgejo/runners/token.age | 17 ++++ secrets/secrets.nix | 3 + 7 files changed, 212 insertions(+), 42 deletions(-) create mode 100644 applications/git/forgejo_runner.nix create mode 100644 applications/git/ssh_config create mode 100644 secrets/forgejo/runners/ssh.age create mode 100644 secrets/forgejo/runners/token.age diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index fc6e19a..fdf7b97 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -35,22 +35,19 @@ in { }; forgejo = { - port = mkOption { - type = types.port; - default = 3000; - }; - - + port = mkOption { + type = types.port; + default = 3000; + }; }; }; config = mkIf cfg.enable { - -# age.secrets.forgejo-mailer-password = { -# file = ../../secrets/forgejo/mailer-password.age; -# mode = "400"; -# owner = "forgejo"; -# }; + # age.secrets.forgejo-mailer-password = { + # file = ../../secrets/forgejo/mailer-password.age; + # mode = "400"; + # owner = "forgejo"; + # }; services.skynet.acme.domains = [ "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}" @@ -79,38 +76,38 @@ in { }; }; - services.forgejo = { - enable = true; - database.type = "sqlite3"; - # Enable support for Git Large File Storage - lfs.enable = true; - settings = { - server = { - DOMAIN = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; - # You need to specify this to remove the port from URLs in the web UI. - ROOT_URL = "https://${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}/"; - HTTP_PORT = cfg.forgejo.port; - }; - - # You can temporarily allow registration to create an admin user. - service.DISABLE_REGISTRATION = true; - # Add support for actions, based on act: https://github.com/nektos/act -# actions = { -# ENABLED = true; -# DEFAULT_ACTIONS_URL = "github"; -# }; - # Sending emails is completely optional - # You can send a test email from the web UI at: - # Profile Picture > Site Administration > Configuration > Mailer Configuration -# mailer = { -# ENABLED = true; -# SMTP_ADDR = "mail.${cfg.domain.base}.${cfg.domain.tld}"; -# FROM = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; -# USER = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; -# }; + enable = true; + package = pkgs.forgejo; + database.type = "sqlite3"; + # Enable support for Git Large File Storage + lfs.enable = true; + settings = { + server = { + DOMAIN = "${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; + # You need to specify this to remove the port from URLs in the web UI. + ROOT_URL = "https://${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}/"; + HTTP_PORT = cfg.forgejo.port; }; -# mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path; + + # You can temporarily allow registration to create an admin user. + service.DISABLE_REGISTRATION = true; + # Add support for actions, based on act: https://github.com/nektos/act + # actions = { + # ENABLED = true; + # DEFAULT_ACTIONS_URL = "github"; + # }; + # Sending emails is completely optional + # You can send a test email from the web UI at: + # Profile Picture > Site Administration > Configuration > Mailer Configuration + # mailer = { + # ENABLED = true; + # SMTP_ADDR = "mail.${cfg.domain.base}.${cfg.domain.tld}"; + # FROM = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; + # USER = "noreply@${cfg.domain.sub}.${cfg.domain.base}.${cfg.domain.tld}"; + # }; }; + # mailerPasswordFile = config.age.secrets.forgejo-mailer-password.path; + }; }; } diff --git a/applications/git/forgejo_runner.nix b/applications/git/forgejo_runner.nix new file mode 100644 index 0000000..cb99dae --- /dev/null +++ b/applications/git/forgejo_runner.nix @@ -0,0 +1,145 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +with lib; let + name = "forgejo_runner"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Skynet ForgeJo Runner"; + + runner = { + name = mkOption { + type = types.str; + default = config.networking.hostName; + }; + + website = mkOption { + default = "https://forgejo.skynet.ie"; + type = types.str; + }; + + user = mkOption { + default = "gitea-runner"; + type = types.str; + }; + }; + }; + + config = mkIf cfg.enable { + # https://search.nixos.org/options?from=0&size=50&sort=alpha_desc&type=packages&query=services.gitlab-runner. + environment.systemPackages = with pkgs; [ + forgejo-actions-runner + ]; + + age.secrets.forgejo_runner_token = { + file = ../../secrets/forgejo/runners/token.age; + owner = cfg.runner.user; + group = cfg.runner.user; + }; + + # make sure the ssh config stuff is in teh right palce + systemd.tmpfiles.rules = [ + #"d /home/${cfg.runner.user} 0755 ${cfg.runner.user} ${cfg.runner.user}" + "L+ /home/${cfg.runner.user}/.ssh/config 0755 ${cfg.runner.user} ${cfg.runner.user} - ${./ssh_config}" + ]; + age.secrets.forgejo_runner_ssh = { + file = ../../secrets/forgejo/runners/ssh.age; + mode = "600"; + owner = "${cfg.runner.user}"; + group = "${cfg.runner.user}"; + symlink = false; + path = "/home/${cfg.runner.user}/.ssh/skynet/root"; + }; + + nix = { + settings = { + trusted-users = [ + # allow the runner to build nix stuff and to use the cache + "gitea-runner" + ]; + trusted-public-keys = [ + "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo=" + "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" + ]; + substituters = [ + "https://nix-cache.skynet.ie/skynet-cache/" + "https://cache.nixos.org/" + ]; + trusted-substituters = [ + "https://nix-cache.skynet.ie/skynet-cache/" + "https://cache.nixos.org/" + ]; + }; + }; + + # very basic setup to always be watching for changes in teh cache + systemd.services.attic-uploader = { + enable = true; + serviceConfig = { + ExecStart = "${pkgs.attic-client}/bin/attic watch-store skynet-cache"; + User = "root"; + Restart = "always"; + RestartSec = 1; + }; + }; + + # give teh runner user a home to store teh ssh config stuff + systemd.services.gitea-runner-default.serviceConfig = { + DynamicUser = lib.mkForce false; + User = lib.mkForce cfg.runner.user; + }; + users = { + groups."${cfg.runner.user}" = {}; + users."${cfg.runner.user}" = { + #isSystemUser = true; + isNormalUser = true; + group = cfg.runner.user; + createHome = true; + shell = pkgs.bash; + }; + }; + + # the actual runner + services.gitea-actions-runner = { + package = pkgs.forgejo-actions-runner; + instances.default = { + enable = true; + name = cfg.runner.name; + url = cfg.runner.website; + tokenFile = config.age.secrets.forgejo_runner_token.path; + labels = [ + ## optionally provide native execution on the host: + "nix:host" + "docker:docker://node:16-bullseye" + "ubuntu-latest:docker://node:16-bullseye" + ]; + + hostPackages = with pkgs; [ + # default ones + bash + coreutils + curl + gawk + gitMinimal + gnused + nodejs + wget + + # used in deployments + inputs.colmena.defaultPackage."x86_64-linux" + attic-client + nix + openssh + ]; + }; + }; + }; +} diff --git a/applications/git/ssh_config b/applications/git/ssh_config new file mode 100644 index 0000000..70bbef0 --- /dev/null +++ b/applications/git/ssh_config @@ -0,0 +1,5 @@ +Host *.skynet.ie 193.1.99.* 193.1.96.165 + User root + IdentityFile ~/.ssh/skynet/root + IdentitiesOnly yes + diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 35f1f0f..6d78395 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -26,6 +26,7 @@ Notes: in { imports = [ ../applications/git/gitlab_runner.nix + ../applications/git/forgejo_runner.nix ]; deployment = { @@ -44,5 +45,7 @@ in { enable = true; runner.name = "runner01"; }; + + forgejo_runner.enable = true; }; } diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age new file mode 100644 index 0000000000000000000000000000000000000000..c30e3ba05a09a4c50671f911f4803f427ee79e67 GIT binary patch literal 1271 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sa3bh5|} zOic7F&q}ID@wW(dDs}fy&UUhJNscrtuCg?D@%0SI3{7#%D(A|IGRyYz4)o3}FLv_G za7)&AbBf5eu&D6K^Rmnh(>KgcEO&N{jPi0Rk3_f4B%mrPKV8AZKwsN1+o+(_B`7=C zG}zBGurS%fJfy;+A~C?jG%wZDBPhq$JlQ2EH-Az9~s?@YNOFuiu z$=fWfG)cRvv@q19)Y32|&@9l&F(2JFQ@<2T<8p;?$0FmP(CN z!ptfviqfJ?DqR8%GCaA$Eb5$g{*PB+uAOzslLb)i^RM)1$;W%`eQN%sC}7!r3v= zOuyXK&4kM&%-g>rIZ?kd(lCBZ&fW<_B^2nvog4CN})uM9EEFw0Kz z$*}Zu($DrQbJosJi!!P(3`sI{&Tua?G57Zm*Z0lQ4&>6+)m89J&P-0vC~(Uw&2cJD zHqj2s3kxx-%(2MuN>4QQb;@?uFV8Co4KAp1%;wtkxM{-6ujyhI-Fo7QPkR@$Oz2~j zI`aGAubl1*mFH=!Qw&UB3V)hmrQPtd;%-Nfxvu96O{2%&)yItF~$|MlI6zh^l2OU`@unr+tVqepEQt`53qbal1aMi!pnI0eC;3nH8H zSbW_wKb!2RWGL?DRs6i{G9zEjTUPE5Uu}v$@4mvRazEl(o9F7CcKNCCzYcKZ=J-5k z3gD@HJ$t*l4$qBcHpiIEK5~o)e#=kf<``8PeZ7-yAC+yw%E2NA0B@bijf%hM;@QPnp X8RjojW9&a?_8pTqiXW$(5q}B*ffMYF literal 0 HcmV?d00001 diff --git a/secrets/forgejo/runners/token.age b/secrets/forgejo/runners/token.age new file mode 100644 index 0000000..03ac739 --- /dev/null +++ b/secrets/forgejo/runners/token.age @@ -0,0 +1,17 @@ +age-encryption.org/v1 +-> ssh-ed25519 V1pwNA bGirG6sUND19fSIwyvtjS3RDjyNUc+kXmzRoN4P1bC8 +kPJr2S9BlGWWnoggce6dx1OR0/r57AB5Rcgz+qY0qKE +-> ssh-ed25519 4PzZog iciiKCHhfK38SwvSPrdoMK7C250qTV5eBgv657iyKwU +dEiSS1FuxEpovNAl1HPZk+MRCcjLGiKgTfpi5Ssi38M +-> ssh-ed25519 5Nd93w FFgxLg0NNK6Op64FHu24sjaerv3jgDaPz6uKPi/A8AE +ZvHbJ2K3T7CUJSrrpF9fMmP6FWCQ3i6m/5Fi2UNtbew +-> ssh-ed25519 q8eJgg nVm1H/mbEsGt2O87i7VKUL5do6Rc7n5nvSilUtQ4cBU +WWtsNbIatU5ZostueLntGgKD/nxcavZPheU9afRvbH0 +-> ssh-ed25519 KVr8rw Nnroz2PgUoJsd/frf+N+b7xdJDAzj3NsmJaogsIkYGk +xX73tnCCYGBNA3BRjjPMn/IV+qwjIwEUk+IZbhCCfHY +-> ssh-ed25519 fia1eQ GLYqWGKYKwkBRwQ7SxSnErmz1MFw5gPCexfap8VM9Rk +Z+dIKhk+JH7W07diX1Abr/Deezkw8xGkzXQuYn1HfJI +-> ssh-ed25519 yvS9bw Lwo77pDciewUZemyFc1EUboIlXFCBx3CY6BGuizach4 +AkWzgV1zRJzLtfRxkfhmd80EU8fW1w+5sxMAfWgdEMI +--- ac6h3StxSHr+HFsyPIBPENQRcfKzXX8fzJlZ0MER/8c +å¯ñ„üzwyCÉ>þÖ¸Æ\k¡±êu/óí{z§©€¢Õ®¼ºø£jDÇÐÒßã4õ{^mÃDsÝ妞ÂÎ#kiné“xo \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index fa93261..b0f3be3 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -134,6 +134,9 @@ in { "gitlab/runners/runner01.age".publicKeys = users ++ gitlab_runners; "gitlab/runners/runner02.age".publicKeys = users ++ gitlab_runners; + "forgejo/runners/token.age".publicKeys = users ++ gitlab_runners; + "forgejo/runners/ssh.age".publicKeys = users ++ gitlab_runners; + # for ldap "ldap/pw.age".publicKeys = users ++ ldap ++ bitwarden; # for use connectring to teh ldap From 1fb4318310993ebf8dc7e7df0c28980817576799 Mon Sep 17 00:00:00 2001 From: silver Date: Wed, 7 Aug 2024 00:32:41 +0100 Subject: [PATCH 218/563] feat: got the pipelines configured now Update .mailmap See if making it .mailmap fixes it Signed-off-by: silver Add .forgejo/workflows/testing.yaml Update .forgejo/workflows/testing.yaml Update .forgejo/workflows/testing.yaml Update .forgejo/workflows/testing.yaml Update .forgejo/workflows/testing.yaml Update .forgejo/workflows/testing.yaml Update .forgejo/workflows/testing.yaml feat: initial test of flake update Signed-off-by: silver test: seeing if I can push changes testing fix: set the url of the external plugin correctly Signed-off-by: silver fix: go back to using nix fix: update command Signed-off-by: silver Apply automatic changes revert 26c7781fad350452c70f23e0d6c004b0fe00ad14 revert Apply automatic changes test: add teh cache and colmena build Signed-off-by: silver test: see if this helps Signed-off-by: silver test: see if using another plugin will work Signed-off-by: silver test: the cache key test: more testing Update .forgejo/workflows/update_input.yaml Update .forgejo/workflows/update_input.yaml test: s[pplit up teh build and cache propegation attic push --ignore-upstream-cache-filter mycache $(ls -d /nix/store/*/ | grep -v fake_nixpkgs) Signed-off-by: silver Update .forgejo/workflows/update_input.yaml Update .forgejo/workflows/update_input.yaml Update .forgejo/workflows/update_input.yaml Signed-off-by: silver Update .forgejo/workflows/update_input.yaml Signed-off-by: silver Update .forgejo/workflows/update_input.yaml Signed-off-by: silver Update .forgejo/workflows/update_input.yaml Update .forgejo/workflows/update_input.yaml Update .forgejo/workflows/update_input.yaml revert 35887a8fba8371f31503ede3793d6de5ca67bfe3 revert Update .forgejo/workflows/update_input.yaml Update .forgejo/workflows/update_input.yaml Signed-off-by: silver fix: no need to upload in pipeline now, Signed-off-by: silver ci: initial commit of the deploy pipeline Signed-off-by: silver Update .forgejo/workflows/deploy.yaml Signed-off-by: silver Update .forgejo/workflows/deploy.yaml Signed-off-by: silver Update .forgejo/workflows/update_input.yaml Signed-off-by: silver Updated flake for agenix test: force pipeline Signed-off-by: silver Update .forgejo/workflows/update_input.yaml ci: testing if I can get this working right Signed-off-by: silver Updated flake for arion revert b6cd168c384e7d1b0c8197414df89f672dded7e7 revert Updated flake for arion ci: more changes to see if this will help Signed-off-by: silver Updated flake for arion revert da380ed0f449bdebeb87f8b44f195ed6fa095234 revert Updated flake for arion Update .forgejo/workflows/deploy.yaml Signed-off-by: silver Updated flake for arion revert f0ee4a9e690021521ba1d83c20df39237ece7422 revert Updated flake for arion fix: reformatted flake ci: testing out deploy ci: testing out deploy, new ssh manager ci: more testing ci: see if going back to basics helps ci: test a few things ci: test a few things ci: for testing ci: more testing ci: some bastardisation for thbe ssh ci: more testing ci: check if setting root as teh user helps ci: check if setting root as teh user helps2 ci: check if setting root as teh user helps2 ci: check if setting root as teh user helps2 ci: more testing ci: more testing ci: more testing ci: more testing2 ci: more testing2 ci: more testing2 ci: more testing2 ci: more testing2 ci: more testing2 ci: clean up testing ci: final tests ci:: final, fixing ci: need logging ci: more testing ci: gahhhhhhhhhh ci: AAAAAAAAAAAAAAAAAA ci: lets go back ci: lets go backaaaaaaaa ci: lets go backaaaaaaaaqweadadsasdasdasdasd ci: lets go backaaaaaaaaqweadadsasdasdasdasd ci: add the final deploy config Add .forgejo/workflows/testing.yaml (cherry picked from commit f2cf71ef9836398fa2ad7ecc7c6c442edd6d70e5) Update .forgejo/workflows/testing.yaml (cherry picked from commit e156b61105689134d4ccf4b0df545e888977f515) Update .forgejo/workflows/testing.yaml (cherry picked from commit 80e1fcc545e1df4432c67790e66ec2a6a7f1aa37) Update .forgejo/workflows/testing.yaml (cherry picked from commit 423f2dd5b369c2ccd093b66637eb60c830357a56) Update .forgejo/workflows/testing.yaml (cherry picked from commit f446ba54433d894f82c05fae4a39350e223a6c6f) Update .forgejo/workflows/testing.yaml (cherry picked from commit 44a7186a4061aeff8182db97ae9e19e49501cea4) Update .forgejo/workflows/testing.yaml (cherry picked from commit ed0be4507a29b92ac62a255ec004c9594e4bb558) --- .forgejo/workflows/deploy.yaml | 53 ++++++++++++++++++++++++++++ .forgejo/workflows/update_input.yaml | 29 +++++++++++++++ mailmap => .mailmap | 0 3 files changed, 82 insertions(+) create mode 100644 .forgejo/workflows/deploy.yaml create mode 100644 .forgejo/workflows/update_input.yaml rename mailmap => .mailmap (100%) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml new file mode 100644 index 0000000..2e9aa37 --- /dev/null +++ b/.forgejo/workflows/deploy.yaml @@ -0,0 +1,53 @@ +name: Build_Deploy + +on: + workflow_run: + workflows: [ "Update_Flake" ] + types: + - completed + push: + paths: + - applications/**/* + - machines/**/* + - secrets/**/* + - flake.* + - config/**/* + - .forgejo/**/* + +jobs: + linter: + runs-on: nix + steps: + - uses: actions/checkout@v4 + - run: nix fmt -- --check . + + #if: github.repository == 'Skynet/nixos' + build: + runs-on: nix + steps: + - uses: actions/checkout@v4 + - run: nix develop + - run: colmena build -v --on @active-dns + - run: colmena build -v --on @active-core + - run: colmena build -v --on @active + - run: colmena build -v --on @active-ext + - run: colmena build -v --on @active-gitlab + + deploy_dns: + runs-on: nix + needs: [ linter, build ] + steps: + - uses: actions/checkout@v4 + - run: colmena apply -v --on @active-dns --show-trace + shell: bash + + deploy_active: + strategy: + matrix: + batch: [ active-core, active, active-ext ] + runs-on: nix + needs: [ deploy_dns ] + steps: + - uses: actions/checkout@v4 + - run: colmena apply -v --on @${{ matrix.batch }} --show-trace + shell: bash \ No newline at end of file diff --git a/.forgejo/workflows/update_input.yaml b/.forgejo/workflows/update_input.yaml new file mode 100644 index 0000000..8a62c4f --- /dev/null +++ b/.forgejo/workflows/update_input.yaml @@ -0,0 +1,29 @@ +name: Update_Flake + +on: + workflow_dispatch: + inputs: + input_to_update: + description: 'Flake input to update' + required: true + type: string + +jobs: + update: + runs-on: nix + + permissions: + # Give the default GITHUB_TOKEN write permission to commit and push the + # added or changed files to the repository. + contents: write + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + token: ${{ secrets.PIPELINE_TOKEN }} + - run: nix flake lock --update-input "${{ inputs.input_to_update }}" + shell: bash + - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "Updated flake for ${{ inputs.input_to_update }}" \ No newline at end of file diff --git a/mailmap b/.mailmap similarity index 100% rename from mailmap rename to .mailmap From 529b0e13ecabfece5045aed038e0da6240707bd1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 8 Aug 2024 14:53:13 +0100 Subject: [PATCH 219/563] ci: give teh flake update workflow a better name --- .forgejo/workflows/update_input.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/update_input.yaml b/.forgejo/workflows/update_input.yaml index 8a62c4f..5004979 100644 --- a/.forgejo/workflows/update_input.yaml +++ b/.forgejo/workflows/update_input.yaml @@ -1,5 +1,7 @@ name: Update_Flake +run-name: "[Update Flake] ${{ inputs.input_to_update }}" + on: workflow_dispatch: inputs: From 5a21783b63c06903d4962b0862ca5562efe03f93 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 8 Aug 2024 14:55:29 +0100 Subject: [PATCH 220/563] ci: no need to run buiold and deploy on a workflow update --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 2e9aa37..ddde7a0 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -12,7 +12,7 @@ on: - secrets/**/* - flake.* - config/**/* - - .forgejo/**/* + #- .forgejo/**/* jobs: linter: From 31f54b1e921a39d54dd5734ea2b9af4ab374a636 Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 9 Aug 2024 19:56:31 +0000 Subject: [PATCH 221/563] Updated flake for simple-nixos-mailserver --- flake.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.lock b/flake.lock index a5bfaad..ff6fe66 100644 --- a/flake.lock +++ b/flake.lock @@ -856,11 +856,11 @@ }, "locked": { "host": "gitlab.skynet.ie", - "lastModified": 1721563560, + "lastModified": 1721563973, "narHash": "sha256-y+Rag94tKu8Z6ouJlfxFb8EK9fKs1TNZa4nX7MT2kZg=", "owner": "compsoc1%2Fskynet", "repo": "misc%2Fnixos-mailserver", - "rev": "903190561842dd9cc2e7c25dda10ea26fccfd7e9", + "rev": "806a4cfd2174b3941e9426d75ed09561c547e6fd", "type": "gitlab" }, "original": { From 186833f70c5829b1b6203095f5b644b79ea08bde Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 10 Aug 2024 19:51:35 +0100 Subject: [PATCH 222/563] fix: use github as the default url for actions, will still be recommending to use the fully qualified link for it though --- applications/git/forgejo.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index fdf7b97..4f35e0b 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -93,10 +93,10 @@ in { # You can temporarily allow registration to create an admin user. service.DISABLE_REGISTRATION = true; # Add support for actions, based on act: https://github.com/nektos/act - # actions = { - # ENABLED = true; - # DEFAULT_ACTIONS_URL = "github"; - # }; + actions = { + ENABLED = true; + DEFAULT_ACTIONS_URL = "github"; + }; # Sending emails is completely optional # You can send a test email from the web UI at: # Profile Picture > Site Administration > Configuration > Mailer Configuration From 9120a81d6b7ec7307ad1b051858a91abedf62364 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 10 Aug 2024 21:32:51 +0100 Subject: [PATCH 223/563] feat: switch over to using forjo for inputs --- flake.lock | 241 ++++++++++++++++++++++++----------------------------- flake.nix | 98 +++++++--------------- 2 files changed, 138 insertions(+), 201 deletions(-) diff --git a/flake.lock b/flake.lock index ff6fe66..b963590 100644 --- a/flake.lock +++ b/flake.lock @@ -151,19 +151,17 @@ "utils": "utils_2" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1715528953, - "narHash": "sha256-NWoCV1SauW8H/MibwAC+JWoomjpkIruGqfV/JTM1D4Q=", - "owner": "compsoc1%2Fcompsoc", - "repo": "presentations%2Fpresentations", - "rev": "4855b0468e1e5118d11130b164b1d57a42251add", - "type": "gitlab" + "lastModified": 1723315618, + "narHash": "sha256-03V1tJGmg+T5fvfAAwoHaDxDbrNwJHe7Y/AwNLDfqbw=", + "ref": "refs/heads/main", + "rev": "f62ddd8f0a3c59c85e62ee6e9c80e3d9e058e484", + "revCount": 70, + "type": "git", + "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fcompsoc", - "repo": "presentations%2Fpresentations", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" } }, "crane": { @@ -467,11 +465,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1692351612, - "narHash": "sha256-KTGonidcdaLadRnv9KFgwSMh1ZbXoR/OBmPjeNMhFwU=", + "lastModified": 1721727458, + "narHash": "sha256-r/xppY958gmZ4oTfLiHN0ZGuQ+RSTijDblVgVLFi1mw=", "owner": "nix-community", "repo": "naersk", - "rev": "78789c30d64dea2396c9da516bbcc8db3a475207", + "rev": "3fb418eaf352498f6b6c30592e3beb63df42ef11", "type": "github" }, "original": { @@ -547,16 +545,16 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1693087214, - "narHash": "sha256-Kn1SSqRfPpqcI1MDy82JXrPT1WI8c03TA2F0xu6kS+4=", + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f155f0cf4ea43c4e3c8918d2d327d44777b6cad4", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -794,11 +792,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1693060755, - "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=", + "lastModified": 1723151389, + "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc", + "rev": "13fe00cb6c75461901f072ae62b5805baef9f8b2", "type": "github" }, "original": { @@ -855,19 +853,17 @@ "nixpkgs-24_05": "nixpkgs-24_05" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1721563973, - "narHash": "sha256-y+Rag94tKu8Z6ouJlfxFb8EK9fKs1TNZa4nX7MT2kZg=", - "owner": "compsoc1%2Fskynet", - "repo": "misc%2Fnixos-mailserver", - "rev": "806a4cfd2174b3941e9426d75ed09561c547e6fd", - "type": "gitlab" + "lastModified": 1723233349, + "narHash": "sha256-0NqGJ+wFxmK6DEEvlZ+jGMdDkIaQ+S54kBStwkGUaO8=", + "ref": "refs/heads/master", + "rev": "a98a93cf22cd53a92143703a0a5b6f76438a15ba", + "revCount": 594, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "misc%2Fnixos-mailserver", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" } }, "skynet_discord_bot": { @@ -877,19 +873,17 @@ "utils": "utils_3" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1717453955, - "narHash": "sha256-axbeauP+9PP4qiwCiMvvGd6XTnjv12+QkZP3K2yFCeU=", - "owner": "compsoc1%2Fskynet", - "repo": "discord-bot", - "rev": "48b52f3c0905af7341e45e2b950aba43af68c80e", - "type": "gitlab" + "lastModified": 1723319789, + "narHash": "sha256-hrWDD9U0YSdvYayyDk1R6ZT7rmJp2jBx1/si3p/DuDY=", + "ref": "refs/heads/main", + "rev": "905aaa96206310a638498d91d04e16641b33d842", + "revCount": 105, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "discord-bot", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot" } }, "skynet_ldap_backend": { @@ -899,19 +893,17 @@ "utils": "utils_4" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1717782746, - "narHash": "sha256-LZovqXjhDIUe/T+bU5wtwN1RbcPjkZK6yQNhPa9Nrwc=", - "owner": "compsoc1%2Fskynet", - "repo": "ldap%2Fbackend", - "rev": "5b94811276d70b00cc292081f623b6f52a710b84", - "type": "gitlab" + "lastModified": 1723234129, + "narHash": "sha256-tfsT9VYV3YgFRUKbjFyV4o1kVJHcUY87kh2vcu6jAkU=", + "ref": "refs/heads/main", + "rev": "5f6a086e808b811095e36875fb656864cf11c5f5", + "revCount": 232, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "ldap%2Fbackend", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" } }, "skynet_ldap_frontend": { @@ -920,19 +912,17 @@ "utils": "utils_5" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1708277300, - "narHash": "sha256-Y8wKzGJQ69w375faAYGukvuTFez6YGeV+w4TOD4XosA=", - "owner": "compsoc1%2Fskynet", - "repo": "ldap%2Ffrontend", - "rev": "36c5e5bbae7adcc404bec6d643cae5fd8a6c87bb", - "type": "gitlab" + "lastModified": 1723234619, + "narHash": "sha256-jHqIg3ltestGKaR4vHr44nnq3Pv7yr9gGwkvONEJxoA=", + "ref": "refs/heads/main", + "rev": "71f5928c66a43e788a9a00b90a1326c1bb82ffd2", + "revCount": 228, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/ldap_frontend" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "ldap%2Ffrontend", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/ldap_frontend" } }, "skynet_website": { @@ -941,19 +931,17 @@ "utils": "utils_6" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1707154174, - "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2017", - "rev": "c81db388fac570a8cb646391ea461b9e60282043", - "type": "gitlab" + "lastModified": 1723316173, + "narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=", + "ref": "refs/heads/main", + "rev": "871ecc6c232b82f0e67e30cf1485250ec603108e", + "revCount": 14, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2017", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_2009": { @@ -962,19 +950,17 @@ "utils": "utils_7" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1718585207, - "narHash": "sha256-jlCZv+KCCiI0Cx0nnMFPalBdx/fN2JgLNXvc4OAwNvE=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2009", - "rev": "12712f3b3ffc80782cc520d46f91b9f5df1fab69", - "type": "gitlab" + "lastModified": 1723317982, + "narHash": "sha256-qkTYtwcPAKmdN2cJidhBbGcm6yY1M76zw9NFyqjJnn4=", + "ref": "refs/heads/main", + "rev": "2d0e20c683068b692bf8765273b3531d77005d09", + "revCount": 12, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2009", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2009" } }, "skynet_website_2017": { @@ -983,19 +969,17 @@ "utils": "utils_8" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1707154174, - "narHash": "sha256-oUOD6aIy8KvIsiAWxLApPgAkigDZwp3xZ8bmhKoWszY=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2017", - "rev": "c81db388fac570a8cb646391ea461b9e60282043", - "type": "gitlab" + "lastModified": 1723316173, + "narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=", + "ref": "refs/heads/main", + "rev": "871ecc6c232b82f0e67e30cf1485250ec603108e", + "revCount": 14, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2017", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_2023": { @@ -1004,20 +988,17 @@ "utils": "utils_9" }, "locked": { - "host": "gitlab.skynet.ie", "lastModified": 1696876711, - "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2017", + "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "type": "gitlab" + "revCount": 12, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2F2017", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_games": { @@ -1026,19 +1007,17 @@ "utils": "utils_10" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1708103254, - "narHash": "sha256-/1ElBw+oc1dzwgr7VVLkQFRITteckH1IwbZpgpz8Qvg=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2Fgames.skynet.ie", - "rev": "f43a01ef62494cef3e7f1e86d8169867e2df136b", - "type": "gitlab" + "lastModified": 1723240375, + "narHash": "sha256-kFQ3Eu2A3M8L5nyEnUj0cRjvliIYElLXVsHjQygLRaQ=", + "ref": "refs/heads/main", + "rev": "cf37628959054ad24dbc988d28ea1183aa94a14e", + "revCount": 10, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_games" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2Fgames.skynet.ie", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_games" } }, "skynet_website_renew": { @@ -1047,19 +1026,17 @@ "utils": "utils_11" }, "locked": { - "host": "gitlab.skynet.ie", - "lastModified": 1720558362, - "narHash": "sha256-fNKFqkP35tzBhBy0L8xGOJ7B3EXh+khu3bOBlGqlPks=", - "owner": "compsoc1%2Fskynet", - "repo": "website%2Falumni-renew", - "rev": "44ab695bab61d20d6d873f1c3a702b5a8874dd5e", - "type": "gitlab" + "lastModified": 1723232841, + "narHash": "sha256-uWMUKTp7rIrwYr4CWRmlPmFJo97ezBUQL7VLnAJBXac=", + "ref": "refs/heads/main", + "rev": "baa8b6d8a59fc4fd7c6abcbb7b0dda4b8482df49", + "revCount": 44, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/wiki" }, "original": { - "host": "gitlab.skynet.ie", - "owner": "compsoc1%2Fskynet", - "repo": "website%2Falumni-renew", - "type": "gitlab" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/wiki" } }, "stable": { @@ -1350,11 +1327,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1692799911, - "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 91e8f7b..f157a25 100644 --- a/flake.nix +++ b/flake.nix @@ -18,80 +18,40 @@ colmena.url = "github:zhaofengli/colmena"; attic.url = github:zhaofengli/attic; - # email - # simple-nixos-mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; + # we host our own simple-nixos-mailserver = { inputs.nixpkgs.follows = "nixpkgs"; - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "misc%2Fnixos-mailserver"; + url = "git+https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver"; }; - # account.skynet.ie - skynet_ldap_backend = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "ldap%2Fbackend"; - }; - skynet_ldap_frontend = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "ldap%2Ffrontend"; - }; - skynet_website_renew = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2Falumni-renew"; - }; - skynet_website_games = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2Fgames.skynet.ie"; - }; - skynet_discord_bot = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "discord-bot"; - }; - compsoc_public = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fcompsoc"; - repo = "presentations%2Fpresentations"; - }; + ###################### + ### skynet backend ### + ###################### + skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; + skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; + skynet_website_renew.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; + skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; + skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; - # skynet.ie - skynet_website = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2F2017"; - }; - skynet_website_2023 = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2F2017"; - rev = "c4d61c753292bf73ed41b47b1607cfc92a82a191"; - }; - skynet_website_2017 = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2F2017"; - }; - skynet_website_2009 = { - type = "gitlab"; - host = "gitlab.skynet.ie"; - owner = "compsoc1%2Fskynet"; - repo = "website%2F2009"; - }; + ##################### + ### compsoc stuff ### + ##################### + compsoc_public.url = "git+https://forgejo.skynet.ie/Computer_Society/presentations_compsoc"; + + ################# + ### skynet.ie ### + ################# + + # this should always point to teh current website + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + + # these are past versions of teh website + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + # this is not 100% right since this is from teh archive from 2022 or so + skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + + # this is more of 2012 than 2009 but started in 2009 + skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; }; nixConfig = { From c2ace73a9b4a92af9278dccc4cf7c3411fd80450 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 10 Aug 2024 23:08:35 +0100 Subject: [PATCH 224/563] ci: add workflow for updating forgejo --- .forgejo/workflows/deploy_forgejo.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .forgejo/workflows/deploy_forgejo.yaml diff --git a/.forgejo/workflows/deploy_forgejo.yaml b/.forgejo/workflows/deploy_forgejo.yaml new file mode 100644 index 0000000..8a07870 --- /dev/null +++ b/.forgejo/workflows/deploy_forgejo.yaml @@ -0,0 +1,12 @@ +name: Update_Forgejo + +on: + workflow_dispatch: + +jobs: + deploy: + runs-on: nix + steps: + - uses: actions/checkout@v4 + - run: colmena apply -v --on @active-gitlab --show-trace + shell: bash \ No newline at end of file From 0e7048be31a03b4c0303ad0b9f0c6776e3416d4d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 11 Aug 2024 04:13:25 +0100 Subject: [PATCH 225/563] feat: add a few extra useful tools to teh runner --- applications/git/forgejo_runner.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/applications/git/forgejo_runner.nix b/applications/git/forgejo_runner.nix index cb99dae..1d5f37b 100644 --- a/applications/git/forgejo_runner.nix +++ b/applications/git/forgejo_runner.nix @@ -133,6 +133,12 @@ in { nodejs wget + # useful to have in path + jq + which + dpkg + zip + # used in deployments inputs.colmena.defaultPackage."x86_64-linux" attic-client From 62115a3d93a5c8d29689af9d0c0f0697ade6f449 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 16:50:00 +0000 Subject: [PATCH 226/563] Updated flake for compsoc_public --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index b963590..f3a02d0 100644 --- a/flake.lock +++ b/flake.lock @@ -94,11 +94,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1714337293, - "narHash": "sha256-QjAnpRT/LqcjNo/ofoAjylG4VyfWMIIMVc+KuQaJOZQ=", + "lastModified": 1723391194, + "narHash": "sha256-04UThV4LZNRHg/+GbEl7M2ginWbm8FrQ5jBVmYcroNg=", "owner": "silver_rust", "repo": "bfom", - "rev": "664e5377329f8052fa7446c312ba29ca1025de4e", + "rev": "fffd69b6433a2d2fd359b92e3816ae9938b3e99c", "type": "gitlab" }, "original": { @@ -151,11 +151,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723315618, - "narHash": "sha256-03V1tJGmg+T5fvfAAwoHaDxDbrNwJHe7Y/AwNLDfqbw=", + "lastModified": 1723394877, + "narHash": "sha256-26Y1d0FvgN2BFt1EvXSgU/tBpAQoM/fobrpEsSnfqu8=", "ref": "refs/heads/main", - "rev": "f62ddd8f0a3c59c85e62ee6e9c80e3d9e058e484", - "revCount": 70, + "rev": "2e1733761b3383d75f57fedfe55f2e8943a18595", + "revCount": 71, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From f61b9c8d6d7258d1e4be05b66464342118edfda1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 11 Aug 2024 18:47:18 +0100 Subject: [PATCH 227/563] fix: should only deploy from main --- .forgejo/workflows/deploy.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index ddde7a0..cc1e25d 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -6,6 +6,8 @@ on: types: - completed push: + branches: + - 'main' paths: - applications/**/* - machines/**/* From 9c6844fed2b4c07c44ec80cac4c34dbc773b2333 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 11 Aug 2024 20:38:20 +0100 Subject: [PATCH 228/563] fix: should only deploy from main --- applications/git/forgejo_runner.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/applications/git/forgejo_runner.nix b/applications/git/forgejo_runner.nix index 1d5f37b..1cf9776 100644 --- a/applications/git/forgejo_runner.nix +++ b/applications/git/forgejo_runner.nix @@ -138,6 +138,7 @@ in { which dpkg zip + git-lfs # used in deployments inputs.colmena.defaultPackage."x86_64-linux" From 20f0c16e2f9bf5d289fea0930e03fc618991db16 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 20:14:50 +0000 Subject: [PATCH 229/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f3a02d0..230c7fc 100644 --- a/flake.lock +++ b/flake.lock @@ -151,11 +151,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723394877, - "narHash": "sha256-26Y1d0FvgN2BFt1EvXSgU/tBpAQoM/fobrpEsSnfqu8=", + "lastModified": 1723407254, + "narHash": "sha256-FSqTMznlBD9lIlC9LyXjPbajZtOvBhD4bWwV9/3zNiM=", "ref": "refs/heads/main", - "rev": "2e1733761b3383d75f57fedfe55f2e8943a18595", - "revCount": 71, + "rev": "a8460a130e7c831ea59f93c8703370a3b1776bef", + "revCount": 73, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From e76262aa435143d13dbd5c489df5a7e86889b872 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 20:23:18 +0000 Subject: [PATCH 230/563] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 230c7fc..ebf9023 100644 --- a/flake.lock +++ b/flake.lock @@ -151,10 +151,10 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723407254, - "narHash": "sha256-FSqTMznlBD9lIlC9LyXjPbajZtOvBhD4bWwV9/3zNiM=", + "lastModified": 1723407748, + "narHash": "sha256-jaoGuURV/rFccHmXN21xxIaxvV7Vl7HB29Ny/g7wPu8=", "ref": "refs/heads/main", - "rev": "a8460a130e7c831ea59f93c8703370a3b1776bef", + "rev": "e26b812749d0b0e6c03b94f479b4072b89ef80a3", "revCount": 73, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" From f49bf144aef17e59446c31977f9a47c6b1e4593b Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 20:24:02 +0000 Subject: [PATCH 231/563] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index ebf9023..d062990 100644 --- a/flake.lock +++ b/flake.lock @@ -151,10 +151,10 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723407748, - "narHash": "sha256-jaoGuURV/rFccHmXN21xxIaxvV7Vl7HB29Ny/g7wPu8=", + "lastModified": 1723407798, + "narHash": "sha256-GYDlfG0X/4RN3q0EcNvOwQMikT4bWSH5jacRcHfL/KE=", "ref": "refs/heads/main", - "rev": "e26b812749d0b0e6c03b94f479b4072b89ef80a3", + "rev": "091e5409f3962e76dd14fee12786ffebd6a6c610", "revCount": 73, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" From fea5ec177e5baa74cf90614baf276b38e5b710fc Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 20:47:47 +0000 Subject: [PATCH 232/563] Updated flake for compsoc_public --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d062990..3b81a26 100644 --- a/flake.lock +++ b/flake.lock @@ -151,10 +151,10 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723407798, - "narHash": "sha256-GYDlfG0X/4RN3q0EcNvOwQMikT4bWSH5jacRcHfL/KE=", + "lastModified": 1723409220, + "narHash": "sha256-Qwwsb/D+waAhL5/qFkn8h7mJDcRfbrZNNpRlRpPU4k8=", "ref": "refs/heads/main", - "rev": "091e5409f3962e76dd14fee12786ffebd6a6c610", + "rev": "de685b6d6f2bb5ff3048f20333cccba0f9fe4ae8", "revCount": 73, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" From 25c4007e3e52c3d70827bb5cf77e8b78b3cc6e56 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 20:55:34 +0000 Subject: [PATCH 233/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3b81a26..e6b88e5 100644 --- a/flake.lock +++ b/flake.lock @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1723316173, - "narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=", + "lastModified": 1723409425, + "narHash": "sha256-/ER7jLbpECx4Q5hry3Fng672KknG0g9RIb+xWpCkm/M=", "ref": "refs/heads/main", - "rev": "871ecc6c232b82f0e67e30cf1485250ec603108e", - "revCount": 14, + "rev": "a9fba1bb9c28a2eb7508089413a829b591084c45", + "revCount": 15, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 5cdcd97f6b88c6e5cc08225d5e2e140d94fc4347 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 11 Aug 2024 20:57:59 +0000 Subject: [PATCH 234/563] Updated flake for skynet_website_games --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e6b88e5..e848774 100644 --- a/flake.lock +++ b/flake.lock @@ -1007,11 +1007,11 @@ "utils": "utils_10" }, "locked": { - "lastModified": 1723240375, - "narHash": "sha256-kFQ3Eu2A3M8L5nyEnUj0cRjvliIYElLXVsHjQygLRaQ=", + "lastModified": 1723409493, + "narHash": "sha256-nZwNkGHL8aRlYroTfCSXYlI9Q7qzYXcnd6RlH50W9W8=", "ref": "refs/heads/main", - "rev": "cf37628959054ad24dbc988d28ea1183aa94a14e", - "revCount": 10, + "rev": "5884131ff5e2d631695b91fb4efc3253e302e7d5", + "revCount": 11, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_games" }, From de72894701732ca60d189c8df36d1623f818b8af Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 12 Aug 2024 18:25:36 +0000 Subject: [PATCH 235/563] Updated flake for skynet_website_renew --- flake.lock | 118 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 109 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index e848774..17336ed 100644 --- a/flake.lock +++ b/flake.lock @@ -107,6 +107,26 @@ "type": "gitlab" } }, + "bfom_2": { + "inputs": { + "naersk": "naersk_4", + "nixpkgs": "nixpkgs_20", + "utils": "utils_11" + }, + "locked": { + "lastModified": 1723427350, + "narHash": "sha256-iSwiK87kEBOIN2Sh7WnbYMCLaLXmrgLrhrz8sSwIoMg=", + "owner": "silver_rust", + "repo": "bfom", + "rev": "3b7547144dced3a42a65d589158fca5b89938fcc", + "type": "gitlab" + }, + "original": { + "owner": "silver_rust", + "repo": "bfom", + "type": "gitlab" + } + }, "blobs": { "flake": false, "locked": { @@ -496,6 +516,24 @@ "type": "github" } }, + "naersk_4": { + "inputs": { + "nixpkgs": "nixpkgs_19" + }, + "locked": { + "lastModified": 1713520724, + "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", + "owner": "nix-community", + "repo": "naersk", + "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -673,11 +711,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1695837737, - "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", "type": "github" }, "original": { @@ -701,6 +739,34 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { + "locked": { + "lastModified": 1695837737, + "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1711401922, @@ -1022,15 +1088,16 @@ }, "skynet_website_renew": { "inputs": { - "nixpkgs": "nixpkgs_19", - "utils": "utils_11" + "bfom": "bfom_2", + "nixpkgs": "nixpkgs_21", + "utils": "utils_12" }, "locked": { - "lastModified": 1723232841, - "narHash": "sha256-uWMUKTp7rIrwYr4CWRmlPmFJo97ezBUQL7VLnAJBXac=", + "lastModified": 1723487002, + "narHash": "sha256-lujLqN9WsskbWLYTHzGUZF0/n6icNuLtL3+kdTcCFbQ=", "ref": "refs/heads/main", - "rev": "baa8b6d8a59fc4fd7c6abcbb7b0dda4b8482df49", - "revCount": 44, + "rev": "d294ae428b6b78d9047c7d66168d5b4187393001", + "revCount": 47, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, @@ -1130,6 +1197,21 @@ "type": "github" } }, + "systems_14": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1290,6 +1372,24 @@ "inputs": { "systems": "systems_13" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "inputs": { + "systems": "systems_14" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", From fbff2a4ab2211c93925fd89fea8f373a3ae36936 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 12 Aug 2024 19:32:59 +0100 Subject: [PATCH 236/563] fix: point teh wiki to teh right subfolder --- applications/skynet.ie/wiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/skynet.ie/wiki.nix b/applications/skynet.ie/wiki.nix index a447a1f..c5f106e 100644 --- a/applications/skynet.ie/wiki.nix +++ b/applications/skynet.ie/wiki.nix @@ -40,7 +40,7 @@ in { "wiki.skynet.ie" = { forceSSL = true; useACMEHost = "skynet"; - root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}"; + root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}/wiki"; }; # redirect old links to the new wiki From 04944584c6ccf952a5a30cb5aac0da3b0d0093e2 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 12 Aug 2024 21:00:14 +0000 Subject: [PATCH 237/563] Updated flake for skynet_website_renew --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 17336ed..6367b4c 100644 --- a/flake.lock +++ b/flake.lock @@ -1093,11 +1093,11 @@ "utils": "utils_12" }, "locked": { - "lastModified": 1723487002, - "narHash": "sha256-lujLqN9WsskbWLYTHzGUZF0/n6icNuLtL3+kdTcCFbQ=", + "lastModified": 1723496374, + "narHash": "sha256-oRM9L/vuyz3k9lj6vFK5Ay1dcJLXN8stB7BdfyGp0qs=", "ref": "refs/heads/main", - "rev": "d294ae428b6b78d9047c7d66168d5b4187393001", - "revCount": 47, + "rev": "5441eba5bcf0b9ba9c76109b7307a47d40d990fe", + "revCount": 48, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 692ed8e3f020611d71cfb1ab83d627dd275fe5bc Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 12 Aug 2024 22:38:47 +0000 Subject: [PATCH 238/563] Updated flake for skynet_website_renew --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 6367b4c..8b3e4af 100644 --- a/flake.lock +++ b/flake.lock @@ -114,11 +114,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1723427350, - "narHash": "sha256-iSwiK87kEBOIN2Sh7WnbYMCLaLXmrgLrhrz8sSwIoMg=", + "lastModified": 1723500950, + "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=", "owner": "silver_rust", "repo": "bfom", - "rev": "3b7547144dced3a42a65d589158fca5b89938fcc", + "rev": "7f339f28442758ecc3f1697e3f70d441973664b9", "type": "gitlab" }, "original": { @@ -1093,11 +1093,11 @@ "utils": "utils_12" }, "locked": { - "lastModified": 1723496374, - "narHash": "sha256-oRM9L/vuyz3k9lj6vFK5Ay1dcJLXN8stB7BdfyGp0qs=", + "lastModified": 1723502220, + "narHash": "sha256-MT0cFuTtOsoAjSEWPcf7veoD8I5g3ce/oqfLwY9OZvQ=", "ref": "refs/heads/main", - "rev": "5441eba5bcf0b9ba9c76109b7307a47d40d990fe", - "revCount": 48, + "rev": "4b8ef5127d99528982171298d84ba92079e6afa3", + "revCount": 49, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 2d95094fbd3223616b5e69a218f0af84cf9164da Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 Aug 2024 00:09:32 +0100 Subject: [PATCH 239/563] feat: allow having nice links without .html --- applications/skynet.ie/wiki.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/applications/skynet.ie/wiki.nix b/applications/skynet.ie/wiki.nix index c5f106e..5e9530b 100644 --- a/applications/skynet.ie/wiki.nix +++ b/applications/skynet.ie/wiki.nix @@ -41,6 +41,15 @@ in { forceSSL = true; useACMEHost = "skynet"; root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}/wiki"; + # https://stackoverflow.com/a/38238001/11964934 + extraConfig = '' + location / { + if ($request_uri ~ ^/(.*)\.html) { + return 302 /$1; + } + try_files $uri $uri.html $uri/ =404; + } + ''; }; # redirect old links to the new wiki From 39978054063c07bd3c18328789627e144579c539 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 12 Aug 2024 23:49:28 +0000 Subject: [PATCH 240/563] Updated flake for skynet_website_renew --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8b3e4af..3c6471a 100644 --- a/flake.lock +++ b/flake.lock @@ -1093,11 +1093,11 @@ "utils": "utils_12" }, "locked": { - "lastModified": 1723502220, - "narHash": "sha256-MT0cFuTtOsoAjSEWPcf7veoD8I5g3ce/oqfLwY9OZvQ=", + "lastModified": 1723506523, + "narHash": "sha256-w2VjAs/lxV7xa33523oag96+ou0Eo2loV9gsOED75ps=", "ref": "refs/heads/main", - "rev": "4b8ef5127d99528982171298d84ba92079e6afa3", - "revCount": 49, + "rev": "aeeda00a755e2adb3b636896cd701b06f1a3f20d", + "revCount": 50, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 9a67dfee373eb7b8817dffe4c3e2dd38c101f503 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 12 Aug 2024 23:59:18 +0000 Subject: [PATCH 241/563] Updated flake for skynet_website_renew --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3c6471a..7e13a02 100644 --- a/flake.lock +++ b/flake.lock @@ -1093,11 +1093,11 @@ "utils": "utils_12" }, "locked": { - "lastModified": 1723506523, - "narHash": "sha256-w2VjAs/lxV7xa33523oag96+ou0Eo2loV9gsOED75ps=", + "lastModified": 1723507113, + "narHash": "sha256-p3l5AozrsGbto40TIoZKDUP28sdCr9graCq9BlL/J3M=", "ref": "refs/heads/main", - "rev": "aeeda00a755e2adb3b636896cd701b06f1a3f20d", - "revCount": 50, + "rev": "2984673b5b868a03520c067a4ca177d1d1f73d29", + "revCount": 51, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 8302b216e00c6285030939d03f04a837b4f8c4e1 Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 16 Aug 2024 14:38:20 +0000 Subject: [PATCH 242/563] Updated flake for skynet_website_renew --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 7e13a02..bbb0fa8 100644 --- a/flake.lock +++ b/flake.lock @@ -1093,11 +1093,11 @@ "utils": "utils_12" }, "locked": { - "lastModified": 1723507113, - "narHash": "sha256-p3l5AozrsGbto40TIoZKDUP28sdCr9graCq9BlL/J3M=", + "lastModified": 1723819045, + "narHash": "sha256-0F9lEHz/LQL45e2q+1ORa1fFvvQC22gKAQ++zfe57Hc=", "ref": "refs/heads/main", - "rev": "2984673b5b868a03520c067a4ca177d1d1f73d29", - "revCount": 51, + "rev": "2a069a12258d4bc3676d25a048fd8aaa34874fd4", + "revCount": 52, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 0e5990e563771557dee9a10bfd5ff8c327b9cc1b Mon Sep 17 00:00:00 2001 From: esy Date: Fri, 16 Aug 2024 18:55:18 +0000 Subject: [PATCH 243/563] Update ITD/Firewall_Rules.csv add git ssh ticket --- ITD/Firewall_Rules.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 0dbf7b2..b64c6af 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -41,4 +41,5 @@ SKYNET_FIREWALL_00029,Add,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8 SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.96.165,SKYNET00012,9000-9010,-,Metrics Collection SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel -SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server \ No newline at end of file +SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server +,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD "Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet" \ No newline at end of file From afa3515cd85088bbc73e5d888f4ee5908f516d97 Mon Sep 17 00:00:00 2001 From: esy Date: Fri, 16 Aug 2024 18:57:47 +0000 Subject: [PATCH 244/563] fix: not showing in preview single quotes works double doesnt for some reason --- ITD/Firewall_Rules.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index b64c6af..64f2e32 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -42,4 +42,4 @@ SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.9 SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server -,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD "Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet" \ No newline at end of file +,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' \ No newline at end of file From 39be11301a75b5ec8129021f19399375d7802865 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 19 Aug 2024 22:09:25 +0000 Subject: [PATCH 245/563] Updated flake for skynet_website_renew --- flake.lock | 118 ++++------------------------------------------------- 1 file changed, 9 insertions(+), 109 deletions(-) diff --git a/flake.lock b/flake.lock index bbb0fa8..d077288 100644 --- a/flake.lock +++ b/flake.lock @@ -107,26 +107,6 @@ "type": "gitlab" } }, - "bfom_2": { - "inputs": { - "naersk": "naersk_4", - "nixpkgs": "nixpkgs_20", - "utils": "utils_11" - }, - "locked": { - "lastModified": 1723500950, - "narHash": "sha256-t1eApFGI+JzLIW2YToLlDV20n+Nevk1q4fZBYU1m93I=", - "owner": "silver_rust", - "repo": "bfom", - "rev": "7f339f28442758ecc3f1697e3f70d441973664b9", - "type": "gitlab" - }, - "original": { - "owner": "silver_rust", - "repo": "bfom", - "type": "gitlab" - } - }, "blobs": { "flake": false, "locked": { @@ -516,24 +496,6 @@ "type": "github" } }, - "naersk_4": { - "inputs": { - "nixpkgs": "nixpkgs_19" - }, - "locked": { - "lastModified": 1713520724, - "narHash": "sha256-CO8MmVDmqZX2FovL75pu5BvwhW+Vugc7Q6ze7Hj8heI=", - "owner": "nix-community", - "repo": "naersk", - "rev": "c5037590290c6c7dae2e42e7da1e247e54ed2d49", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "naersk", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -711,11 +673,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "lastModified": 1695837737, + "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", "type": "github" }, "original": { @@ -739,34 +701,6 @@ "type": "github" } }, - "nixpkgs_20": { - "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_21": { - "locked": { - "lastModified": 1695837737, - "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_3": { "locked": { "lastModified": 1711401922, @@ -1088,16 +1022,15 @@ }, "skynet_website_renew": { "inputs": { - "bfom": "bfom_2", - "nixpkgs": "nixpkgs_21", - "utils": "utils_12" + "nixpkgs": "nixpkgs_19", + "utils": "utils_11" }, "locked": { - "lastModified": 1723819045, - "narHash": "sha256-0F9lEHz/LQL45e2q+1ORa1fFvvQC22gKAQ++zfe57Hc=", + "lastModified": 1724104639, + "narHash": "sha256-UB7T5+imyk9crwziTp+D2leC9tDMxr7mCpwx4pFpOgE=", "ref": "refs/heads/main", - "rev": "2a069a12258d4bc3676d25a048fd8aaa34874fd4", - "revCount": 52, + "rev": "e892ed9f0bc7a4fb076fc7e401ceaf8c3d27e81f", + "revCount": 59, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, @@ -1197,21 +1130,6 @@ "type": "github" } }, - "systems_14": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1372,24 +1290,6 @@ "inputs": { "systems": "systems_13" }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "utils_12": { - "inputs": { - "systems": "systems_14" - }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", From a7b559972b711ac83ff381e8067a563f084a4024 Mon Sep 17 00:00:00 2001 From: Daragh Downes Date: Mon, 19 Aug 2024 23:31:28 +0100 Subject: [PATCH 246/563] feat : adjust nginx to point at root of new docs, update name of flake --- applications/skynet.ie/wiki.nix | 2 +- flake.lock | 6 +++--- flake.nix | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/applications/skynet.ie/wiki.nix b/applications/skynet.ie/wiki.nix index 5e9530b..6d1aa57 100644 --- a/applications/skynet.ie/wiki.nix +++ b/applications/skynet.ie/wiki.nix @@ -40,7 +40,7 @@ in { "wiki.skynet.ie" = { forceSSL = true; useACMEHost = "skynet"; - root = "${inputs.skynet_website_renew.defaultPackage."x86_64-linux"}/wiki"; + root = "${inputs.skynet_website_wiki.defaultPackage."x86_64-linux"}"; # https://stackoverflow.com/a/38238001/11964934 extraConfig = '' location / { diff --git a/flake.lock b/flake.lock index d077288..195325f 100644 --- a/flake.lock +++ b/flake.lock @@ -823,7 +823,7 @@ "skynet_website_2017": "skynet_website_2017", "skynet_website_2023": "skynet_website_2023", "skynet_website_games": "skynet_website_games", - "skynet_website_renew": "skynet_website_renew" + "skynet_website_wiki": "skynet_website_wiki" } }, "rust-analyzer-src": { @@ -1020,14 +1020,14 @@ "url": "https://forgejo.skynet.ie/Skynet/website_games" } }, - "skynet_website_renew": { + "skynet_website_wiki": { "inputs": { "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { "lastModified": 1724104639, - "narHash": "sha256-UB7T5+imyk9crwziTp+D2leC9tDMxr7mCpwx4pFpOgE=", + "narHash": "sha256-Jjl8MQok6IqCsN4QlT/0zpBm3qm8Lrm81zbxAL7tIjI=", "ref": "refs/heads/main", "rev": "e892ed9f0bc7a4fb076fc7e401ceaf8c3d27e81f", "revCount": 59, diff --git a/flake.nix b/flake.nix index f157a25..6954637 100644 --- a/flake.nix +++ b/flake.nix @@ -29,7 +29,7 @@ ###################### skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; - skynet_website_renew.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; + skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; From 68d5a91b0b8a61e34ac216c6fa83a6d74e31f0ea Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 19 Aug 2024 22:38:29 +0000 Subject: [PATCH 247/563] 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 195325f..8433747 100644 --- a/flake.lock +++ b/flake.lock @@ -1026,11 +1026,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724104639, - "narHash": "sha256-Jjl8MQok6IqCsN4QlT/0zpBm3qm8Lrm81zbxAL7tIjI=", + "lastModified": 1724107081, + "narHash": "sha256-UZEZxuzSk0Ah6OsnCFxn4eimPapBc3agrU6B/iv/X4o=", "ref": "refs/heads/main", - "rev": "e892ed9f0bc7a4fb076fc7e401ceaf8c3d27e81f", - "revCount": 59, + "rev": "7eeb861097293b96f21d81cabc8093058a84dffb", + "revCount": 61, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 58800bf7b2e894ae00305936aa97cbc07373965b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 20 Aug 2024 23:07:50 +0100 Subject: [PATCH 248/563] fix: incorrect hashes --- flake.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 8433747..4c47bd0 100644 --- a/flake.lock +++ b/flake.lock @@ -152,7 +152,7 @@ }, "locked": { "lastModified": 1723409220, - "narHash": "sha256-Qwwsb/D+waAhL5/qFkn8h7mJDcRfbrZNNpRlRpPU4k8=", + "narHash": "sha256-LnwpBFF1DmvX1ejlD/EA9vyEMC0qZgl2Ec4wzczBNko=", "ref": "refs/heads/main", "rev": "de685b6d6f2bb5ff3048f20333cccba0f9fe4ae8", "revCount": 73, @@ -932,7 +932,7 @@ }, "locked": { "lastModified": 1723409425, - "narHash": "sha256-/ER7jLbpECx4Q5hry3Fng672KknG0g9RIb+xWpCkm/M=", + "narHash": "sha256-/gCNGbSSFV/cEyH4gqhcgPP/0/EBKWwR1CEd8wkwY8o=", "ref": "refs/heads/main", "rev": "a9fba1bb9c28a2eb7508089413a829b591084c45", "revCount": 15, @@ -969,11 +969,11 @@ "utils": "utils_8" }, "locked": { - "lastModified": 1723316173, - "narHash": "sha256-sluWHNA4pvhlVkJHZ8PGOxz7qqHm5uTAUWd94Dhq4ys=", + "lastModified": 1723409425, + "narHash": "sha256-/gCNGbSSFV/cEyH4gqhcgPP/0/EBKWwR1CEd8wkwY8o=", "ref": "refs/heads/main", - "rev": "871ecc6c232b82f0e67e30cf1485250ec603108e", - "revCount": 14, + "rev": "a9fba1bb9c28a2eb7508089413a829b591084c45", + "revCount": 15, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, @@ -1008,7 +1008,7 @@ }, "locked": { "lastModified": 1723409493, - "narHash": "sha256-nZwNkGHL8aRlYroTfCSXYlI9Q7qzYXcnd6RlH50W9W8=", + "narHash": "sha256-XcXpvs7go7o3kLxz/JHZlvGf5uxADzpvuskYQYR10LA=", "ref": "refs/heads/main", "rev": "5884131ff5e2d631695b91fb4efc3253e302e7d5", "revCount": 11, @@ -1026,11 +1026,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724107081, - "narHash": "sha256-UZEZxuzSk0Ah6OsnCFxn4eimPapBc3agrU6B/iv/X4o=", + "lastModified": 1724108073, + "narHash": "sha256-AL1oG6QcCNAVMVzznHGRvwWAg6bFGC1lOxQPn1UdiJ8=", "ref": "refs/heads/main", - "rev": "7eeb861097293b96f21d81cabc8093058a84dffb", - "revCount": 61, + "rev": "cba889a56fed4bfff1d23aa01f801c36ea8b67c1", + "revCount": 62, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 1638e44caaf07692b9f3c7b9c7d3f5657aa86851 Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 20 Aug 2024 22:37:19 +0000 Subject: [PATCH 249/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 4c47bd0..9100e4f 100644 --- a/flake.lock +++ b/flake.lock @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1723409425, - "narHash": "sha256-/gCNGbSSFV/cEyH4gqhcgPP/0/EBKWwR1CEd8wkwY8o=", + "lastModified": 1724193389, + "narHash": "sha256-Gy+jGGSXb0pJP2WoyToZspYJ0uay9nyN1b5uIZqI1s4=", "ref": "refs/heads/main", - "rev": "a9fba1bb9c28a2eb7508089413a829b591084c45", - "revCount": 15, + "rev": "429dc79209587bf5c984b068fb0f9fd47fbcd1f3", + "revCount": 17, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 8e57469ee287238a3969ba0da188a31957d4b33c Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 20 Aug 2024 22:45:23 +0000 Subject: [PATCH 250/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 9100e4f..f4a71de 100644 --- a/flake.lock +++ b/flake.lock @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724193389, - "narHash": "sha256-Gy+jGGSXb0pJP2WoyToZspYJ0uay9nyN1b5uIZqI1s4=", + "lastModified": 1724193889, + "narHash": "sha256-yB+CezE29d6rvBezBfdyyJo0orzrEB8YqPnoHTnJ2AM=", "ref": "refs/heads/main", - "rev": "429dc79209587bf5c984b068fb0f9fd47fbcd1f3", - "revCount": 17, + "rev": "76ef90e2111b7ce74930779362533fe0cf367935", + "revCount": 18, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 6376e910f1ed16de687603bfb349de5d873e1c53 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 00:03:07 +0100 Subject: [PATCH 251/563] ci: test using ref=main for the inputs --- flake.lock | 19 +++++++++++-------- flake.nix | 6 +++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f4a71de..19f083d 100644 --- a/flake.lock +++ b/flake.lock @@ -932,14 +932,15 @@ }, "locked": { "lastModified": 1724193889, - "narHash": "sha256-yB+CezE29d6rvBezBfdyyJo0orzrEB8YqPnoHTnJ2AM=", - "ref": "refs/heads/main", + "narHash": "sha256-Z7zTh5e1bwzE0wmqj9Eyl39QCyLJhlMetOXhQo3gd7E=", + "ref": "main", "rev": "76ef90e2111b7ce74930779362533fe0cf367935", "revCount": 18, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { + "ref": "main", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" } @@ -952,13 +953,14 @@ "locked": { "lastModified": 1723317982, "narHash": "sha256-qkTYtwcPAKmdN2cJidhBbGcm6yY1M76zw9NFyqjJnn4=", - "ref": "refs/heads/main", + "ref": "main", "rev": "2d0e20c683068b692bf8765273b3531d77005d09", "revCount": 12, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, "original": { + "ref": "main", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" } @@ -969,15 +971,16 @@ "utils": "utils_8" }, "locked": { - "lastModified": 1723409425, - "narHash": "sha256-/gCNGbSSFV/cEyH4gqhcgPP/0/EBKWwR1CEd8wkwY8o=", - "ref": "refs/heads/main", - "rev": "a9fba1bb9c28a2eb7508089413a829b591084c45", - "revCount": 15, + "lastModified": 1724193889, + "narHash": "sha256-Z7zTh5e1bwzE0wmqj9Eyl39QCyLJhlMetOXhQo3gd7E=", + "ref": "main", + "rev": "76ef90e2111b7ce74930779362533fe0cf367935", + "revCount": 18, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { + "ref": "main", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" } diff --git a/flake.nix b/flake.nix index 6954637..38863c2 100644 --- a/flake.nix +++ b/flake.nix @@ -43,15 +43,15 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?ref=main"; # these are past versions of teh website skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?ref=main"; # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; + skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009?ref=main"; }; nixConfig = { From 75740f9bae068360017bb51138c5db9b5b3cc6ee Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 00:17:57 +0100 Subject: [PATCH 252/563] ci: more testing --- flake.lock | 17 +++++++---------- flake.nix | 6 +++--- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index 19f083d..498496f 100644 --- a/flake.lock +++ b/flake.lock @@ -933,14 +933,13 @@ "locked": { "lastModified": 1724193889, "narHash": "sha256-Z7zTh5e1bwzE0wmqj9Eyl39QCyLJhlMetOXhQo3gd7E=", - "ref": "main", + "ref": "refs/heads/main", "rev": "76ef90e2111b7ce74930779362533fe0cf367935", "revCount": 18, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "ref": "main", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" } @@ -953,14 +952,13 @@ "locked": { "lastModified": 1723317982, "narHash": "sha256-qkTYtwcPAKmdN2cJidhBbGcm6yY1M76zw9NFyqjJnn4=", - "ref": "main", + "ref": "refs/heads/main", "rev": "2d0e20c683068b692bf8765273b3531d77005d09", "revCount": 12, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, "original": { - "ref": "main", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" } @@ -971,16 +969,15 @@ "utils": "utils_8" }, "locked": { - "lastModified": 1724193889, - "narHash": "sha256-Z7zTh5e1bwzE0wmqj9Eyl39QCyLJhlMetOXhQo3gd7E=", - "ref": "main", - "rev": "76ef90e2111b7ce74930779362533fe0cf367935", - "revCount": 18, + "lastModified": 1696876711, + "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", + "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "revCount": 12, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "ref": "main", + "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" } diff --git a/flake.nix b/flake.nix index 38863c2..5d21a81 100644 --- a/flake.nix +++ b/flake.nix @@ -43,15 +43,15 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?ref=main"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; # these are past versions of teh website skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?ref=main"; + skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009?ref=main"; + skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; }; nixConfig = { From fb1ef7b66b3681964a26d65a65efdf0d7edc9dff Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 20 Aug 2024 23:36:29 +0000 Subject: [PATCH 253/563] Updated flake for skynet_website --- flake.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 498496f..8ef3c47 100644 --- a/flake.lock +++ b/flake.lock @@ -603,11 +603,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724193889, - "narHash": "sha256-Z7zTh5e1bwzE0wmqj9Eyl39QCyLJhlMetOXhQo3gd7E=", + "lastModified": 1724196861, + "narHash": "sha256-0lVMcGQ+r5ieJQqe7DSAnWrGj0Fm2GnAGj6BNXmRKwg=", "ref": "refs/heads/main", - "rev": "76ef90e2111b7ce74930779362533fe0cf367935", - "revCount": 18, + "rev": "7138e6ee4a49af718d78cdc4dd7c909e074239b8", + "revCount": 20, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, @@ -1381,11 +1381,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { From 6c9df1256603978121c40c3052583c78671e3bff Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 00:01:21 +0000 Subject: [PATCH 254/563] Updated flake for skynet_website_2009 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8ef3c47..b9772f0 100644 --- a/flake.lock +++ b/flake.lock @@ -950,11 +950,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1723317982, - "narHash": "sha256-qkTYtwcPAKmdN2cJidhBbGcm6yY1M76zw9NFyqjJnn4=", + "lastModified": 1724198445, + "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", "ref": "refs/heads/main", - "rev": "2d0e20c683068b692bf8765273b3531d77005d09", - "revCount": 12, + "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", + "revCount": 14, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, From deb43c0768afaa1d9cca86f70d1d39bd9cbba039 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 01:12:04 +0100 Subject: [PATCH 255/563] ci: more testing --- flake.lock | 11 ++++++----- flake.nix | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b9772f0..02268cc 100644 --- a/flake.lock +++ b/flake.lock @@ -969,15 +969,16 @@ "utils": "utils_8" }, "locked": { - "lastModified": 1696876711, - "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", - "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "revCount": 12, + "lastModified": 1689960297, + "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", + "ref": "refs/heads/main", + "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", + "revCount": 6, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" } diff --git a/flake.nix b/flake.nix index 5d21a81..05a84e8 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ # these are past versions of teh website skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; # this is more of 2012 than 2009 but started in 2009 skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; From 6ce2a6337fe55800e1981b24cbbdbef1b97dabcc Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 00:21:34 +0000 Subject: [PATCH 256/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 02268cc..45630e2 100644 --- a/flake.lock +++ b/flake.lock @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724196861, - "narHash": "sha256-0lVMcGQ+r5ieJQqe7DSAnWrGj0Fm2GnAGj6BNXmRKwg=", + "lastModified": 1724199668, + "narHash": "sha256-1VVpX9GWgBKC7AcrwKQ6A09taogu3q/Zd712vTADAbA=", "ref": "refs/heads/main", - "rev": "7138e6ee4a49af718d78cdc4dd7c909e074239b8", - "revCount": 20, + "rev": "2e4d22b7197127a2a3d944edea06dd3efe04d2b6", + "revCount": 22, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 987db0c6aa10bf5c969d4c4fbcc0db6234a937ff Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 01:31:53 +0100 Subject: [PATCH 257/563] ci: more testing --- .forgejo/workflows/deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index cc1e25d..3c48889 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -22,6 +22,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: nix fmt -- --check . + - run: nix --version #if: github.repository == 'Skynet/nixos' build: From 961a35b990c92ceacd91c378c7d5fb3a140610eb Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 01:32:34 +0100 Subject: [PATCH 258/563] ci: more testing --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 3c48889..efee5b0 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -14,7 +14,7 @@ on: - secrets/**/* - flake.* - config/**/* - #- .forgejo/**/* + - .forgejo/**/* jobs: linter: From 4688eec1534126805fe5495f1194089e4f6696ec Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 00:35:11 +0000 Subject: [PATCH 259/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 45630e2..69e331b 100644 --- a/flake.lock +++ b/flake.lock @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724199668, - "narHash": "sha256-1VVpX9GWgBKC7AcrwKQ6A09taogu3q/Zd712vTADAbA=", + "lastModified": 1724200482, + "narHash": "sha256-puA3NcmbFQtEeq7N5P5Ruq18PJLf4M/e1AoAwNjT46I=", "ref": "refs/heads/main", - "rev": "2e4d22b7197127a2a3d944edea06dd3efe04d2b6", - "revCount": 22, + "rev": "1799b7dcb26359fbaa775e952dd7685b7bbb3bff", + "revCount": 23, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From bf939cc9414ff13a45d9041960ebb4329aa42ba6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 01:46:32 +0100 Subject: [PATCH 260/563] ci: newer versions of nix have this format for updating flake inputs --- .forgejo/workflows/update_input.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/update_input.yaml b/.forgejo/workflows/update_input.yaml index 5004979..cf2ac5c 100644 --- a/.forgejo/workflows/update_input.yaml +++ b/.forgejo/workflows/update_input.yaml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.head_ref }} token: ${{ secrets.PIPELINE_TOKEN }} - - run: nix flake lock --update-input "${{ inputs.input_to_update }}" + - run: nix flake update "${{ inputs.input_to_update }}" shell: bash - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 with: From 598ae73b3ed6d799295cd4834911e94a039ed660 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 00:48:28 +0000 Subject: [PATCH 261/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 69e331b..0497b05 100644 --- a/flake.lock +++ b/flake.lock @@ -931,11 +931,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724200482, - "narHash": "sha256-puA3NcmbFQtEeq7N5P5Ruq18PJLf4M/e1AoAwNjT46I=", + "lastModified": 1724201270, + "narHash": "sha256-GQFKLpHJi0R225lodgjFUHzTHnIzU6mopiP84HgVVCE=", "ref": "refs/heads/main", - "rev": "1799b7dcb26359fbaa775e952dd7685b7bbb3bff", - "revCount": 23, + "rev": "eb6eabb1c0e4dd828ca5552c36faf36e17f4836d", + "revCount": 25, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From aefd9bbdb09a4eecea1c3305921bd8ba54e09b6c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 01:56:25 +0100 Subject: [PATCH 262/563] ci: ``nix flake update`` --- flake.lock | 119 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 68 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index 0497b05..15a319a 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1715290355, - "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", + "lastModified": 1723293904, + "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=", "owner": "ryantm", "repo": "agenix", - "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", + "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", "type": "github" }, "original": { @@ -52,11 +52,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714877287, - "narHash": "sha256-mf1/RfkyhzwLLeqU8AdosbBfRQuQzuVMX7XL7GejoRI=", + "lastModified": 1722825873, + "narHash": "sha256-bFNXkD+s9NuidZePiJAjjFUnsMOwXb7hEZ4JEDdSALw=", "owner": "hercules-ci", "repo": "arion", - "rev": "e9945eb6cdaf5c946bacd5a330e7b5ac7b3b2fdd", + "rev": "90bc85532767c785245f5c1e29ebfecb941cf8c9", "type": "github" }, "original": { @@ -74,11 +74,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1711742460, - "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=", + "lastModified": 1724086414, + "narHash": "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI=", "owner": "zhaofengli", "repo": "attic", - "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0", + "rev": "acf3c351f8de47c6857f31948ab253f9c7ce2a6f", "type": "github" }, "original": { @@ -172,11 +172,11 @@ ] }, "locked": { - "lastModified": 1702918879, - "narHash": "sha256-tWJqzajIvYcaRWxn+cLUB9L9Pv4dQ3Bfit/YjU5ze3g=", + "lastModified": 1722960479, + "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", "owner": "ipetkov", "repo": "crane", - "rev": "7195c00c272fdd92fc74e7d5a0a2844b9fadb2fb", + "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", "type": "github" }, "original": { @@ -232,11 +232,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -285,11 +285,11 @@ ] }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1722555600, + "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", "type": "github" }, "original": { @@ -320,12 +320,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -351,7 +354,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_4" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -408,11 +411,11 @@ ] }, "locked": { - "lastModified": 1713898448, - "narHash": "sha256-6q6ojsp/Z9P2goqnxyfCSzFOD92T3Uobmj8oVAicUOs=", + "lastModified": 1719226092, + "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "c0302ec12d569532a6b6bd218f698bc402e93adc", + "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", "type": "github" }, "original": { @@ -529,11 +532,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1711460390, - "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=", + "lastModified": 1720535198, + "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "44733514b72e732bd49f5511bd0203dea9b9a434", + "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", "type": "github" }, "original": { @@ -687,11 +690,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714635257, - "narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=", + "lastModified": 1722630782, + "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f", + "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", "type": "github" }, "original": { @@ -703,11 +706,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1711401922, - "narHash": "sha256-QoQqXoj8ClGo0sqD/qWKFWezgEwUL0SUh37/vY2jNhc=", + "lastModified": 1723827930, + "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "07262b18b97000d16a4bdb003418bd2fb067a932", + "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", "type": "github" }, "original": { @@ -777,11 +780,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1722813957, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb9a96f23c491c081b38eab96d22fa958043c9fa", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -932,7 +935,7 @@ }, "locked": { "lastModified": 1724201270, - "narHash": "sha256-GQFKLpHJi0R225lodgjFUHzTHnIzU6mopiP84HgVVCE=", + "narHash": "sha256-XPh9pQh+cs3cwkA7OqPrGZq8oAw/c9T4cbDCttab1ZE=", "ref": "refs/heads/main", "rev": "eb6eabb1c0e4dd828ca5552c36faf36e17f4836d", "revCount": 25, @@ -951,7 +954,7 @@ }, "locked": { "lastModified": 1724198445, - "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", + "narHash": "sha256-Vc/IFOMHax46Ct+1/9DiAxuByRLehr99XA1c7CAVQb4=", "ref": "refs/heads/main", "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", "revCount": 14, @@ -971,7 +974,6 @@ "locked": { "lastModified": 1689960297, "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", - "ref": "refs/heads/main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", @@ -1131,6 +1133,21 @@ "type": "github" } }, + "systems_14": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1253,7 +1270,7 @@ }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -1271,7 +1288,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1694529238, @@ -1289,7 +1306,7 @@ }, "utils_11": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1694529238, @@ -1307,7 +1324,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -1325,7 +1342,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -1343,7 +1360,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1685518550, @@ -1361,7 +1378,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1687171271, @@ -1379,7 +1396,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -1397,7 +1414,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1689068808, @@ -1415,7 +1432,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1689068808, @@ -1433,7 +1450,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1689068808, From 350f4266ed1edad9f60dff2557894421f35864de Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 02:14:07 +0100 Subject: [PATCH 263/563] ci: test with keep failed --- .forgejo/workflows/deploy.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index efee5b0..6c94772 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -30,6 +30,7 @@ jobs: steps: - uses: actions/checkout@v4 - run: nix develop + - run: colmena build -v --on earth --nix-option keep-failed true - run: colmena build -v --on @active-dns - run: colmena build -v --on @active-core - run: colmena build -v --on @active From 41dd05cd365e4aa301eae4f2dace8b4c38a091d6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 02:20:44 +0100 Subject: [PATCH 264/563] ci: test with keep failed --- .forgejo/workflows/deploy.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 6c94772..e008938 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -31,6 +31,9 @@ jobs: - uses: actions/checkout@v4 - run: nix develop - run: colmena build -v --on earth --nix-option keep-failed true + - name: Archive Test Results + if: always() + run: wait 100m - run: colmena build -v --on @active-dns - run: colmena build -v --on @active-core - run: colmena build -v --on @active From 5d93ffb71fe34e5b294669cd6e084796412b7f4e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 02:21:40 +0100 Subject: [PATCH 265/563] ci: test with keep failed --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index e008938..f0305ac 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -33,7 +33,7 @@ jobs: - run: colmena build -v --on earth --nix-option keep-failed true - name: Archive Test Results if: always() - run: wait 100m + run: sleep 100m - run: colmena build -v --on @active-dns - run: colmena build -v --on @active-core - run: colmena build -v --on @active From fc78bb7287d4f02578caa509790707bec7e87f38 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 02:38:25 +0100 Subject: [PATCH 266/563] ci: test with keep failed --- .forgejo/workflows/deploy.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index f0305ac..ceea941 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -31,9 +31,9 @@ jobs: - uses: actions/checkout@v4 - run: nix develop - run: colmena build -v --on earth --nix-option keep-failed true - - name: Archive Test Results - if: always() - run: sleep 100m +# - name: Archive Test Results +# if: always() +# run: sleep 100m - run: colmena build -v --on @active-dns - run: colmena build -v --on @active-core - run: colmena build -v --on @active From 97d750ac66318cc787e2098249676d6dd7c5b023 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 01:40:04 +0000 Subject: [PATCH 267/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 15a319a..efbc174 100644 --- a/flake.lock +++ b/flake.lock @@ -934,11 +934,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724201270, - "narHash": "sha256-XPh9pQh+cs3cwkA7OqPrGZq8oAw/c9T4cbDCttab1ZE=", + "lastModified": 1724204378, + "narHash": "sha256-dXVflGm6RkLk0chZa1Kjn1ruXynCNnryMnFj6Okp/E0=", "ref": "refs/heads/main", - "rev": "eb6eabb1c0e4dd828ca5552c36faf36e17f4836d", - "revCount": 25, + "rev": "e49ee92630967440c94f427172e13043e90a6a6f", + "revCount": 26, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 36e9e6b76d7143d5b02fe3aa1b6b7f93db81384d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 03:19:10 +0100 Subject: [PATCH 268/563] ci: update input now works on everything --- .forgejo/workflows/update_input.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/update_input.yaml b/.forgejo/workflows/update_input.yaml index cf2ac5c..5cea57f 100644 --- a/.forgejo/workflows/update_input.yaml +++ b/.forgejo/workflows/update_input.yaml @@ -7,7 +7,7 @@ on: inputs: input_to_update: description: 'Flake input to update' - required: true + required: false type: string jobs: From 99b2ba14779991cb5343d9c93e4b18126647fc95 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 21 Aug 2024 03:20:56 +0100 Subject: [PATCH 269/563] ci: update input now works on everything --- .forgejo/workflows/update_input.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/update_input.yaml b/.forgejo/workflows/update_input.yaml index 5cea57f..8e13da6 100644 --- a/.forgejo/workflows/update_input.yaml +++ b/.forgejo/workflows/update_input.yaml @@ -24,7 +24,7 @@ jobs: with: ref: ${{ github.head_ref }} token: ${{ secrets.PIPELINE_TOKEN }} - - run: nix flake update "${{ inputs.input_to_update }}" + - run: nix flake update ${{ inputs.input_to_update }} shell: bash - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 with: From ac7db8f099df6296e860c8c4a89ab349026a3ea3 Mon Sep 17 00:00:00 2001 From: silver Date: Wed, 21 Aug 2024 02:22:02 +0000 Subject: [PATCH 270/563] Updated flake for --- flake.lock | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index efbc174..4df505f 100644 --- a/flake.lock +++ b/flake.lock @@ -152,7 +152,7 @@ }, "locked": { "lastModified": 1723409220, - "narHash": "sha256-LnwpBFF1DmvX1ejlD/EA9vyEMC0qZgl2Ec4wzczBNko=", + "narHash": "sha256-Qwwsb/D+waAhL5/qFkn8h7mJDcRfbrZNNpRlRpPU4k8=", "ref": "refs/heads/main", "rev": "de685b6d6f2bb5ff3048f20333cccba0f9fe4ae8", "revCount": 73, @@ -916,7 +916,7 @@ }, "locked": { "lastModified": 1723234619, - "narHash": "sha256-jHqIg3ltestGKaR4vHr44nnq3Pv7yr9gGwkvONEJxoA=", + "narHash": "sha256-6a0sJkhabJOxCEdGz3moKeQjYfqV9Bqa8Q0byPipPQo=", "ref": "refs/heads/main", "rev": "71f5928c66a43e788a9a00b90a1326c1bb82ffd2", "revCount": 228, @@ -954,7 +954,7 @@ }, "locked": { "lastModified": 1724198445, - "narHash": "sha256-Vc/IFOMHax46Ct+1/9DiAxuByRLehr99XA1c7CAVQb4=", + "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", "ref": "refs/heads/main", "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", "revCount": 14, @@ -973,7 +973,8 @@ }, "locked": { "lastModified": 1689960297, - "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", + "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", + "ref": "refs/heads/main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", @@ -992,7 +993,8 @@ }, "locked": { "lastModified": 1696876711, - "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", + "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", + "ref": "refs/heads/main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", @@ -1011,7 +1013,7 @@ }, "locked": { "lastModified": 1723409493, - "narHash": "sha256-XcXpvs7go7o3kLxz/JHZlvGf5uxADzpvuskYQYR10LA=", + "narHash": "sha256-nZwNkGHL8aRlYroTfCSXYlI9Q7qzYXcnd6RlH50W9W8=", "ref": "refs/heads/main", "rev": "5884131ff5e2d631695b91fb4efc3253e302e7d5", "revCount": 11, @@ -1030,7 +1032,7 @@ }, "locked": { "lastModified": 1724108073, - "narHash": "sha256-AL1oG6QcCNAVMVzznHGRvwWAg6bFGC1lOxQPn1UdiJ8=", + "narHash": "sha256-J7bJKQ1PzeYI4Pmkl7l7VwKpvW6qh+RrGrJQ9ia2kXY=", "ref": "refs/heads/main", "rev": "cba889a56fed4bfff1d23aa01f801c36ea8b67c1", "revCount": 62, From 39fd65d467b1f4e45fe360e5bc2d14b586b5f53f Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 08:34:33 +0000 Subject: [PATCH 271/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 4df505f..4e753ed 100644 --- a/flake.lock +++ b/flake.lock @@ -934,11 +934,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724204378, - "narHash": "sha256-dXVflGm6RkLk0chZa1Kjn1ruXynCNnryMnFj6Okp/E0=", + "lastModified": 1724210543, + "narHash": "sha256-JLt77gajtOPwM20m86Kh2JkWuOq1+kmHr+98UMzbjAY=", "ref": "refs/heads/main", - "rev": "e49ee92630967440c94f427172e13043e90a6a6f", - "revCount": 26, + "rev": "0af67c9ece40fb683238093d857d96aae2414522", + "revCount": 27, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 884617ddb7668ded4fdd9be7541b894afb8e0fae Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 22:46:27 +0000 Subject: [PATCH 272/563] 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 4e753ed..e79aa8c 100644 --- a/flake.lock +++ b/flake.lock @@ -1031,11 +1031,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724108073, - "narHash": "sha256-J7bJKQ1PzeYI4Pmkl7l7VwKpvW6qh+RrGrJQ9ia2kXY=", + "lastModified": 1724280311, + "narHash": "sha256-WXrs/9HeGAl/GFtrLR2bVMdx1TOROQ9/ekyh9i4l820=", "ref": "refs/heads/main", - "rev": "cba889a56fed4bfff1d23aa01f801c36ea8b67c1", - "revCount": 62, + "rev": "c22628f29c3fafd252f315952ca3852d67113f1d", + "revCount": 67, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 34ffe6c37f012f90533467edc25568ca96b49ab8 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 21 Aug 2024 22:53:41 +0000 Subject: [PATCH 273/563] Updated flake for skynet_website_wiki --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e79aa8c..bdb5fe1 100644 --- a/flake.lock +++ b/flake.lock @@ -1031,10 +1031,10 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724280311, - "narHash": "sha256-WXrs/9HeGAl/GFtrLR2bVMdx1TOROQ9/ekyh9i4l820=", + "lastModified": 1724280680, + "narHash": "sha256-gkxNaXe0dwfy5Mw2Rel+QR0/n0RBNEDzwiBQWNWNrd0=", "ref": "refs/heads/main", - "rev": "c22628f29c3fafd252f315952ca3852d67113f1d", + "rev": "c65d46803214f3668623d70892e46727de7ca1a2", "revCount": 67, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" From 31c94bc8d27c2ae3e48783c455567e2a378bcbaa Mon Sep 17 00:00:00 2001 From: sysadm Date: Thu, 22 Aug 2024 17:03:12 +0000 Subject: [PATCH 274/563] Updated flake for skynet_website_wiki --- flake.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index bdb5fe1..c69ce90 100644 --- a/flake.lock +++ b/flake.lock @@ -676,11 +676,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1695837737, - "narHash": "sha256-KcqmJ5hNacLuE7fkz5586kp/vt4NLo6+Prq3DMgrxpQ=", + "lastModified": 1724300212, + "narHash": "sha256-x3jl6OWTs+L9C7EtscuWZmGZWI0iSBDafvg3X7JMa1A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "517501bcf14ae6ec47efd6a17dda0ca8e6d866f9", + "rev": "4de4818c1ffa76d57787af936e8a23648bda6be4", "type": "github" }, "original": { @@ -1031,11 +1031,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724280680, - "narHash": "sha256-gkxNaXe0dwfy5Mw2Rel+QR0/n0RBNEDzwiBQWNWNrd0=", + "lastModified": 1724346134, + "narHash": "sha256-SWsK4tP4J5s09cvYBq0jw+r8YKr/8QmFDL1si8Fu7cE=", "ref": "refs/heads/main", - "rev": "c65d46803214f3668623d70892e46727de7ca1a2", - "revCount": 67, + "rev": "08862ebe5dbbd02b83596edfd05810a965fa668d", + "revCount": 68, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 287b268161d86bd44be3b35355b278cc69a2d12d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 26 Aug 2024 09:13:25 +0100 Subject: [PATCH 275/563] fix: inputs have to be quoted --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index 05a84e8..9140459 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; colmena.url = "github:zhaofengli/colmena"; - attic.url = github:zhaofengli/attic; + attic.url = "github:zhaofengli/attic"; # we host our own simple-nixos-mailserver = { From ddf5a22d8be2a68231e494329699dfb5daa95bb9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 26 Aug 2024 09:14:42 +0100 Subject: [PATCH 276/563] nix: switch over to using Lix Related to #81 --- flake.lock | 105 +++++++++++++++++++++++++++++++++++++++++---- flake.nix | 11 +++++ machines/_base.nix | 3 ++ 3 files changed, 110 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index c69ce90..622fc20 100644 --- a/flake.lock +++ b/flake.lock @@ -370,6 +370,24 @@ "type": "github" } }, + "flake-utils_4": { + "inputs": { + "systems": "systems_6" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flakeCompat": { "flake": false, "locked": { @@ -386,6 +404,21 @@ "type": "github" } }, + "flakey-profile": { + "locked": { + "lastModified": 1712898590, + "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", + "owner": "lf-", + "repo": "flakey-profile", + "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", + "type": "github" + }, + "original": { + "owner": "lf-", + "repo": "flakey-profile", + "type": "github" + } + }, "haskell-flake": { "locked": { "lastModified": 1675296942, @@ -445,6 +478,43 @@ "type": "github" } }, + "lix": { + "flake": false, + "locked": { + "lastModified": 1724624492, + "narHash": "sha256-J3COggDipocT+ozSxz96GuwSyMrT5+Xa2fGfxaIShqw=", + "rev": "b6884388a1281d70bb4e5bb12e1cadd34bb832f0", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b6884388a1281d70bb4e5bb12e1cadd34bb832f0.tar.gz?rev=b6884388a1281d70bb4e5bb12e1cadd34bb832f0" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + } + }, + "lix-module": { + "inputs": { + "flake-utils": "flake-utils_4", + "flakey-profile": "flakey-profile", + "lix": [ + "lix" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1723511483, + "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", + "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + } + }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_5" @@ -816,6 +886,8 @@ "colmena": "colmena", "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_3", + "lix": "lix", + "lix-module": "lix-module", "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", @@ -1150,6 +1222,21 @@ "type": "github" } }, + "systems_15": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1290,7 +1377,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1694529238, @@ -1308,7 +1395,7 @@ }, "utils_11": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1694529238, @@ -1344,7 +1431,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1710146030, @@ -1362,7 +1449,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_8" }, "locked": { "lastModified": 1685518550, @@ -1380,7 +1467,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_9" }, "locked": { "lastModified": 1687171271, @@ -1398,7 +1485,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1710146030, @@ -1416,7 +1503,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1689068808, @@ -1434,7 +1521,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_12" }, "locked": { "lastModified": 1689068808, @@ -1452,7 +1539,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_12" + "systems": "systems_13" }, "locked": { "lastModified": 1689068808, diff --git a/flake.nix b/flake.nix index 9140459..bc55d95 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,17 @@ # Return to using unstable once the current master is merged in # nixpkgs.url = "nixpkgs/nixos-unstable"; + lix = { + url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; + flake = false; + }; + + lix-module = { + url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.lix.follows = "lix"; + }; + # utility stuff flake-utils.url = "github:numtide/flake-utils"; agenix.url = "github:ryantm/agenix"; diff --git a/machines/_base.nix b/machines/_base.nix index f730ba3..81baf36 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -20,6 +20,9 @@ in { # base application config for all servers ../applications/_base.nix + + # + inputs.lix-module.nixosModules.default ]; options.skynet = { From 6c9a852e7814033ce609755a6c60eb1f453341ab Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 26 Aug 2024 09:15:44 +0100 Subject: [PATCH 277/563] fix: bump the wiki See https://forgejo.skynet.ie/Skynet/nixos/actions/runs/192 for details on the issue --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 622fc20..daadb50 100644 --- a/flake.lock +++ b/flake.lock @@ -1103,11 +1103,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724346134, - "narHash": "sha256-SWsK4tP4J5s09cvYBq0jw+r8YKr/8QmFDL1si8Fu7cE=", + "lastModified": 1724627980, + "narHash": "sha256-n64oKqJSXJxgchBoF1mEPPaNVTLQhMyq65NafLdaWyc=", "ref": "refs/heads/main", - "rev": "08862ebe5dbbd02b83596edfd05810a965fa668d", - "revCount": 68, + "rev": "39c216bc6c9c3a8b1be076e683caac23e338f1af", + "revCount": 69, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 35b12b57aa0a0909ccb672ee4f3a433e6990ad03 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 26 Aug 2024 09:43:09 +0100 Subject: [PATCH 278/563] fix: bump alejandra to a newer version as the existing version didnt have an input quoted --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index daadb50..ec846ce 100644 --- a/flake.lock +++ b/flake.lock @@ -30,16 +30,15 @@ ] }, "locked": { - "lastModified": 1660592437, - "narHash": "sha256-xFumnivtVwu5fFBOrTxrv6fv3geHKF04RGP23EsDVaI=", + "lastModified": 1719514321, + "narHash": "sha256-ys1nJdZ8zB8JlpUbQmnj0hZalg03bEPgQdZN30DhETE=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "e7eac49074b70814b542fee987af2987dd0520b5", + "rev": "d7552fef2ccf1bbf0d36b27f6fddb19073f205b7", "type": "github" }, "original": { "owner": "kamadorueda", - "ref": "3.0.0", "repo": "alejandra", "type": "github" } diff --git a/flake.nix b/flake.nix index bc55d95..3669f39 100644 --- a/flake.nix +++ b/flake.nix @@ -23,7 +23,7 @@ agenix.url = "github:ryantm/agenix"; arion.url = "github:hercules-ci/arion"; alejandra = { - url = "github:kamadorueda/alejandra/3.0.0"; + url = "github:kamadorueda/alejandra"; inputs.nixpkgs.follows = "nixpkgs"; }; colmena.url = "github:zhaofengli/colmena"; From 4196934565be4ad29f0d65ee1e8b8c2b7083a65d Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 26 Aug 2024 19:44:20 +0000 Subject: [PATCH 279/563] Updated flake for skynet_website_wiki --- flake.lock | 121 ++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 107 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index ec846ce..f946664 100644 --- a/flake.lock +++ b/flake.lock @@ -43,6 +43,26 @@ "type": "github" } }, + "alejandra_2": { + "inputs": { + "fenix": "fenix_2", + "flakeCompat": "flakeCompat_2", + "nixpkgs": "nixpkgs_19" + }, + "locked": { + "lastModified": 1719514321, + "narHash": "sha256-ys1nJdZ8zB8JlpUbQmnj0hZalg03bEPgQdZN30DhETE=", + "owner": "kamadorueda", + "repo": "alejandra", + "rev": "d7552fef2ccf1bbf0d36b27f6fddb19073f205b7", + "type": "github" + }, + "original": { + "owner": "kamadorueda", + "repo": "alejandra", + "type": "github" + } + }, "arion": { "inputs": { "flake-parts": "flake-parts", @@ -228,6 +248,29 @@ "type": "github" } }, + "fenix_2": { + "inputs": { + "nixpkgs": [ + "skynet_website_wiki", + "alejandra", + "nixpkgs" + ], + "rust-analyzer-src": "rust-analyzer-src_2" + }, + "locked": { + "lastModified": 1668234453, + "narHash": "sha256-FmuZThToBvRsqCauYJ3l8HJoGLAY5cMULeYEKIaGrRw=", + "owner": "nix-community", + "repo": "fenix", + "rev": "8f219f6b36e8d0d56afa7f67e6e3df63ef013cdb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "fenix", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -403,6 +446,22 @@ "type": "github" } }, + "flakeCompat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -745,16 +804,18 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1724300212, - "narHash": "sha256-x3jl6OWTs+L9C7EtscuWZmGZWI0iSBDafvg3X7JMa1A=", - "owner": "NixOS", + "lastModified": 1668226844, + "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "4de4818c1ffa76d57787af936e8a23648bda6be4", + "rev": "dd4767bf613bf9553eee6ff37c0996b9c876e7d8", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs_2": { @@ -773,6 +834,20 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1723827930, @@ -917,6 +992,23 @@ "type": "github" } }, + "rust-analyzer-src_2": { + "flake": false, + "locked": { + "lastModified": 1668182250, + "narHash": "sha256-PYGaOCiFvnJdVz+ZCaKF8geGdffXjJUNcMwaBHv0FT4=", + "owner": "rust-lang", + "repo": "rust-analyzer", + "rev": "45ec315e01dc8dd1146dfeb65f0ef6e5c2efed78", + "type": "github" + }, + "original": { + "owner": "rust-lang", + "ref": "nightly", + "repo": "rust-analyzer", + "type": "github" + } + }, "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", @@ -1098,15 +1190,16 @@ }, "skynet_website_wiki": { "inputs": { - "nixpkgs": "nixpkgs_19", + "alejandra": "alejandra_2", + "nixpkgs": "nixpkgs_20", "utils": "utils_11" }, "locked": { - "lastModified": 1724627980, - "narHash": "sha256-n64oKqJSXJxgchBoF1mEPPaNVTLQhMyq65NafLdaWyc=", + "lastModified": 1724701416, + "narHash": "sha256-7fVQ5+q6DpySInK9JaQ+WBnLWl96qtYMAddKu8/Dx8o=", "ref": "refs/heads/main", - "rev": "39c216bc6c9c3a8b1be076e683caac23e338f1af", - "revCount": 69, + "rev": "5297fdb65d695ed02bb684415a9f87c5008c543b", + "revCount": 87, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, @@ -1397,11 +1490,11 @@ "systems": "systems_15" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { From 11d4c2269c6bbfc73c144008235d05ce9336da9e Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 26 Aug 2024 20:53:28 +0000 Subject: [PATCH 280/563] 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 f946664..7a77d05 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724701416, - "narHash": "sha256-7fVQ5+q6DpySInK9JaQ+WBnLWl96qtYMAddKu8/Dx8o=", + "lastModified": 1724705575, + "narHash": "sha256-+fXOim6W7xvdpeiE4LchTJa1Fc1GgoqF4/TW8M2C254=", "ref": "refs/heads/main", - "rev": "5297fdb65d695ed02bb684415a9f87c5008c543b", - "revCount": 87, + "rev": "201429baaa730cbecd5fef67eb3074de5c32a05a", + "revCount": 88, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 9143fdc77cbde02e40e9369dbfa3669dd05b6f4f Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 26 Aug 2024 22:19:31 +0000 Subject: [PATCH 281/563] 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 7a77d05..d6fe618 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724705575, - "narHash": "sha256-+fXOim6W7xvdpeiE4LchTJa1Fc1GgoqF4/TW8M2C254=", + "lastModified": 1724710787, + "narHash": "sha256-3MsyAfDZnEm72p3FBpcN6UYt+khakzILHZvDoTwV4QQ=", "ref": "refs/heads/main", - "rev": "201429baaa730cbecd5fef67eb3074de5c32a05a", - "revCount": 88, + "rev": "32451169457cb756c2dfdbb525db12cf12a0111c", + "revCount": 89, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 3347ac8a89bb82395786944b11712b725233e662 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 26 Aug 2024 22:32:11 +0000 Subject: [PATCH 282/563] 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 d6fe618..7a77d05 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724710787, - "narHash": "sha256-3MsyAfDZnEm72p3FBpcN6UYt+khakzILHZvDoTwV4QQ=", + "lastModified": 1724705575, + "narHash": "sha256-+fXOim6W7xvdpeiE4LchTJa1Fc1GgoqF4/TW8M2C254=", "ref": "refs/heads/main", - "rev": "32451169457cb756c2dfdbb525db12cf12a0111c", - "revCount": 89, + "rev": "201429baaa730cbecd5fef67eb3074de5c32a05a", + "revCount": 88, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 31dc474c846843df82bf027fb7ef3ee6c74e5bac Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 26 Aug 2024 22:39:52 +0000 Subject: [PATCH 283/563] 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 7a77d05..35fecc7 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724705575, - "narHash": "sha256-+fXOim6W7xvdpeiE4LchTJa1Fc1GgoqF4/TW8M2C254=", + "lastModified": 1724711686, + "narHash": "sha256-AfeFS60J2kaIhp8LGnQGIDLRjZ+/s8vknkh4t1Y5qQA=", "ref": "refs/heads/main", - "rev": "201429baaa730cbecd5fef67eb3074de5c32a05a", - "revCount": 88, + "rev": "7bf0db32b3740b764357e1f2c8a50ee54c6a400a", + "revCount": 89, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 38e0322f6731d4ac69626efaf82c3988867754fc Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 26 Aug 2024 23:48:59 +0100 Subject: [PATCH 284/563] feat: skynet admins are committee --- config/users.nix | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/config/users.nix b/config/users.nix index ac428e2..fbe14f6 100644 --- a/config/users.nix +++ b/config/users.nix @@ -1,6 +1,11 @@ -{lib, ...}: +{ + lib, + config, + ... +}: with lib; let port_backend = "8087"; + cfg = config.skynet.users; in { options.skynet = { users = { @@ -44,19 +49,24 @@ in { config.skynet = { users = { - committee = [ - "silver" - "eoghanconlon73" - "sidhiel" - "maksimsger1" - "kaiden" - "pine" - "nanda" - "sourabh1805" - "kronsy" - "skyapples" - "emi05h" - ]; + committee = lib.lists.unique ( + # Committee + [ + "silver" + "eoghanconlon73" + "sidhiel" + "maksimsger1" + "kaiden" + "pine" + "nanda" + "sourabh1805" + "kronsy" + "skyapples" + "emi05h" + ] + # Admins are part of Committee as well + ++ cfg.admin + ); admin = [ "silver" "evanc" From a050b6ced7ab2d248d3f4cf88b79bdf15665d17d Mon Sep 17 00:00:00 2001 From: sysadm Date: Thu, 29 Aug 2024 21:26:11 +0000 Subject: [PATCH 285/563] 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 35fecc7..6eb7e22 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724711686, - "narHash": "sha256-AfeFS60J2kaIhp8LGnQGIDLRjZ+/s8vknkh4t1Y5qQA=", + "lastModified": 1724965052, + "narHash": "sha256-DXR+GfwTlqnERWTVgMHhGczIXmOBp7NmwfWzZi/DwLM=", "ref": "refs/heads/main", - "rev": "7bf0db32b3740b764357e1f2c8a50ee54c6a400a", - "revCount": 89, + "rev": "551bdb31653508674cf6eca6f3f952d18b6e7232", + "revCount": 90, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 5fa1bbd8181a0a54e02290cc0c29cd86940b5ca9 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 31 Aug 2024 18:33:57 +0000 Subject: [PATCH 286/563] 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 6eb7e22..fa7fe7f 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1723319789, - "narHash": "sha256-hrWDD9U0YSdvYayyDk1R6ZT7rmJp2jBx1/si3p/DuDY=", + "lastModified": 1725128654, + "narHash": "sha256-xF75eDbiCSlnZVPvBfaUWhElQrcNMQHgoygSPevBe4M=", "ref": "refs/heads/main", - "rev": "905aaa96206310a638498d91d04e16641b33d842", - "revCount": 105, + "rev": "50d2923425be1cac9f29e1e75670694507e376e0", + "revCount": 110, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 4b2720df360db215f5830e256ca29d8406e52e40 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 2 Sep 2024 12:54:32 +0000 Subject: [PATCH 287/563] 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 fa7fe7f..4af5f72 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1725128654, - "narHash": "sha256-xF75eDbiCSlnZVPvBfaUWhElQrcNMQHgoygSPevBe4M=", + "lastModified": 1725281518, + "narHash": "sha256-MC0IY+bWgHtEgDj29VBYr6OUbXsMRBMWvAYKNXTc+NY=", "ref": "refs/heads/main", - "rev": "50d2923425be1cac9f29e1e75670694507e376e0", - "revCount": 110, + "rev": "8ba92cc47eab748510adb975e3d9197b1afb4e2b", + "revCount": 111, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 7dcbf88fa4e486341a97858963a2dc8778d2dfca Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 9 Sep 2024 19:45:13 +0100 Subject: [PATCH 288/563] feat: adding my second laptop to the secrets list --- secrets/backup/restic.age | Bin 2650 -> 2760 bytes secrets/backup/restic_pw.age | Bin 937 -> 1047 bytes secrets/bitwarden/details.age | Bin 1045 -> 1155 bytes secrets/bitwarden/id.age | 34 ++++++++++---------- secrets/bitwarden/secret.age | 34 ++++++++++---------- secrets/discord/ldap.age | 48 +++++++++++++++------------- secrets/discord/token.age | Bin 1025 -> 1135 bytes secrets/dns_certs.secret.age | Bin 2704 -> 2814 bytes secrets/dns_dnskeys.conf.age | Bin 1094 -> 1204 bytes secrets/email/details.age | 46 +++++++++++++------------- secrets/forgejo/runners/ssh.age | Bin 1271 -> 1381 bytes secrets/forgejo/runners/token.age | 34 ++++++++++---------- secrets/gitlab/db_pw.age | Bin 1001 -> 1111 bytes secrets/gitlab/ldap_pw.age | Bin 1000 -> 1110 bytes secrets/gitlab/pw.age | 35 ++++++++++---------- secrets/gitlab/runners/runner01.age | Bin 955 -> 1065 bytes secrets/gitlab/runners/runner02.age | Bin 955 -> 1065 bytes secrets/gitlab/secrets_db.age | 34 ++++++++++---------- secrets/gitlab/secrets_jws.age | Bin 2550 -> 2660 bytes secrets/gitlab/secrets_otp.age | 34 ++++++++++---------- secrets/gitlab/secrets_secret.age | Bin 1000 -> 1110 bytes secrets/grafana/pw.age | Bin 914 -> 1024 bytes secrets/ldap/details.age | Bin 1527 -> 1637 bytes secrets/ldap/pw.age | Bin 1330 -> 1440 bytes secrets/nextcloud/pw.age | Bin 914 -> 1024 bytes secrets/secrets.nix | 4 ++- secrets/stream_ulfm.age | Bin 3084 -> 3194 bytes secrets/wolves/details.age | Bin 1351 -> 1461 bytes 28 files changed, 161 insertions(+), 142 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index ca3bf45384bb9096f64e60da7f28425d9ef272a9..d2ecfde1f0860b56493f2088995f2848760fee21 100644 GIT binary patch literal 2760 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 diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index b71676496674039751db732f353b62dd4119f700..ceec390623a27fd76e23d448e89458082f0a472a 100644 GIT binary patch delta 960 zcmZ34=SCy*?S8%b1eo{r1Z6uRb7p#ZRkCj} zx^*dz24z9%3MN6uE)_X$$!?ZzkvUbFc|q=}PCoh}DF(TQIeBgt{$V+$X5|Kf7LJ(_ z*<2>3l~EpsPM%)L24Nm<`9a=Mse#TG*~LjY<-VceB_>XR{#Dt25hh+4t`k3shnt1x zIa`EQ>K9do`s=58JBQ_mXPCHpRvDOkRuqM1I5`?+Sw=WnR#}Ewa24g08x(u^JLgtr znHHzIg_mTy_$4|fSr|p;rDs>_M`mW12Nzf*hWhIlPmX644-X8<&x=a0au0Schzcsn z)y@yrcPh_J%nGRVPb!Ntvoy;oj0#CL$uA1_JDJ?2D49Uz* zb~CChj_^(|%1<-OGSbh@bI;9Ao_v;3yxz~y#lNaBGRe(9AgjnN(AOfcI5a2IA~88A z**Uwa%)rPis8Bnzs<5=ukt;JZ!$;f8rzjxB&C;ka*q}5iHQc+@wW7#9B-G!_Ag$b@ zveLKGKP)d4BL>nk6Ae=X6|~DuEL^KHoL%x=0t^Fuos8;TT>W!0BZHG7!VJw_!jf`5 zeUe?u!t%p147iFy(_FKHlakBBOUu1o9doL@oV1;sG7N&!wSALQwZkfl(~~mOE%O4> zlF=jFxFAR0yIdjBD>I|2B;6w4GB`>^8uga)6%Gj4{`?MIQt?v!* z-?Q8!v`Tl-IQ zh~T840)MYGw~XZ6)NsqF^xTjjw`{Jm0&TZcA9H;d!w|D@cQ4aoi!jsjlI%kLAPb-3 z^t>Sb-173I-11^CzhrdV3N2E-($f`k+%58aGA+WjBTcdm3R1%?gCZ?6lbuVGEuBLw zlgxAdjY1*=qbl=E%8R-3Q-YH#3?eMbgK|^L%hFN;@&ba&-Msw014@m`Qu5q`D!ek? zN^%l&DkITt^A0PrC@NP7&apHp4GQ#3s<15gbM|!#_qVLbDfe^@E_O_;bTiR+b&YV$ z5Ae|UaP#HLEDMb)2(&aPFH8#iZDU9 zEiE(AFf~x2D#zHsvfMW(KRI37v@|2!JS3~YNIO3xIUqHo&>*Eez&O#%U*E^gIX#ps z&?(nFHN-q1IV#krsNB@V$2-N-J3OT*H?TN0Eh5p}AgD0PJ=-ED%hMCxHsgXEeeZGw zKZ8_#%M7>R$iO7ys5BS%NH2Z&M5Bsqlge0`4)&iOtB&$T@k8rQ~PX+Bv#P@g`h?xp^i1 ho~Z`)k@rtOXsCSPoFiUP7o(l5rLtPlbD_wOcmQ@MH8=nO diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 3627423f1bdaa10514ccf24acf404694bad1f03a..bedec27bbc1eb74bce5bdedd877342eab6fefc62 100644 GIT binary patch delta 1069 zcmbQr(abqPr@pEp-LW{?v?SZVI4{(|s4~MKB2nMdDJ00FqQEaVqbNNjSihpkCE3Fx zkjo>$&CE3DBp}06h zH#Nn`)YQ;Y!6cw6DnDJpB_h%#EF!?H+&jn6xX3j(t-dVNH_*c=)ho9+&CJl!BUisD zJ=rTD-7Gzj%d0dmD5oN-SU)(^DcvL7!Xv++%Gf(G*(^ILAgCZKIU_2u%q2J2(kUep z-MSPg-W*q;|kBb$O`A2g0y7)%&1bM^nzqRqp0){Cw=|Y6t5&xSF_NJ!oZMh zUoQ7j<6?s_)9louTsOb83O95AWFPM;vyw{V5<~s$Gy}H^S0nS%5|^aJz={iULU5PlM|F%oSs{eX%K4W9_(QlQjwG%7L=dv znr>;7RpD1!;*soKVjh{E&y{FW5@DPYmg{evm!26J6r5v{QRx_15L|4j?QiK@?(Gp( zmRRUs=2VgCiXH=LnTdv}feOai6_rMLDVC;YhS^o&X=VELW<`lv6)wT0evUaA;feV^ zm0_g?UM_Cg=_XtedD&iup2cMu*`Ah;{*mS7<@%KY#ic<}CEA5yCcdW0M(#e&E)juc zslMpec~&|47CI_8I;CY7=ayNR`WhO!hMH!lNBWdyR91zh=bD?AC6FVk# zWap)%W2O2~L`8Wnzp=1$!3 zCqFz-|H{;_N7K*m?2*4AUUj>^c1Q4+$$P)835@gex*dHfl|NQWN#wL+#p6X0+j5lq zTb7>Pt-AX}yoUO_2Nm*5#8)0y=zKOI$9dg-?tfeFx$ay&b?a7%7)GJWFP{%jQJJ7G z>LeH0Y`^p7*_rK@c`n--c;$`ocLr2mbTe_uo`1 zcHs(%zwr}}`7u`=kF_cKpv&kV^5B#EuD~Uq*aSSczh5=y`+_;zdKY7g#PqfY$(QWn HlL!U?e0PC3 delta 978 zcmZqXoXRmlr`|uwC^_FX+$+M}BBIdDGqBtxH`Fyfz#}m)INdNiQ9ma)F<9Fz$vxF6 zlFLHd-_s{7rz+U3M7zi}(KFvYpgg}gJh&*S$kHj<-Q2ap!ZbU~*dW9rnM>DBp}06h zH#Nn`)YQ;Y!6cw6DnDJpq#`1tG*jQ-BHJ-N$}K;?&@HIk)Wb6;AU(}3)6gd)(<{H! zDN{SAG%~N4%P~|tslc%^(7(dc)70EF-^9_^FDKF8)Zf4*G}9^D$+)N>J{mldFkWP^5XDOL0lIyQg<$s(Vtlr&(5MlBcCbs8f!Kg;%AIv88c3S4Kgy zp?+>@cxtGdX_~QFzO$*9M`cpETdqe%K}2bYPhv_yX;iwaWvNT?o`z0Nm6bm3VV223B^JRs86o}|hLOQp5$@?e#-+g~T>1q$rDdMU?xhtzSzf6H zRS`wyDcXi+Ii)2|sm><;`NbjmB~Cf6p1whW=)vS2R%B6BuHaMb=0wr08ITc_6UbHJ@8V?UtDokP=dSG-XlCkW;8B^9 zRA%XG7_1$b9cbwqoEMelSzhQdcB`xZjqO7kW)HWX?BFEiAQ#+lXF3?hhct7USY98sF6Xjb9SL` zMu5JzTd;v~en4V?XHqD-b)Hp@zJ-noN!f0mnLdH3iTOdvnNG%eX+9Yq+TLlF;fdL$ z$vy#Dnf?|b<{8QQ`Hsn4DMg7+#{L=gMV^^y+4-R^zAkA-Ib~J(<&nXLMuqtv$wA>E z8I|E7F1gtjT)Mit3fV=TSq8pkSs|sKxk06cCB~6CP9fz^Wu?Uh8R^d6`pK21-rR&3 zkAw9#|F|iAUfLjIYFk>P$o_qjM_-n_5>mS*b4~D!liG$p{UX`395)3YE&Al=`9b3) z_m+pNWd!3US*Mrw9{BFIjuegd!wCmt z^Pe}VtajzTzbyIEqCLycY@H^!i`y+C;B512m0$A~q%D4R^6CR8{tV3v|DwMvUEa5+ UkfS8~`twKqv(v6lkI-%f0AZ(MkpKVy diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 81fa3ae..6a78c9e 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,17 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA pcFat8+oFhOWSZyYBM1Ij11K5vLcrGSWGcopZTIUv3M -NDNVRUQU3SqOPRm3N/rCMhf+DyMg21d9uAJkrqLrKcc --> ssh-ed25519 4PzZog xwjC1NO/yqurBivCPbTQgtsavmBmOcHMrjcB/W+wy0o -zdFH8I0W4ItbKVlAW4mHIPNDPPlIwdSLnIIu/1kEXBs --> ssh-ed25519 5Nd93w ojB2kKZWtrcbf34sdYPNKIUJ65nGskCXU4wOq/SbH3A -hhr/RyiTv0tFC/pvNHBFxFenHuVWpiW1hzVcyH8Iplo --> ssh-ed25519 q8eJgg DA1GO1/lDUAnFI9lPoOUQ1C33SHpNGVvqAF6aZCoLlU -9Cyl198clJHzc/pYmOe3hMM4EZVi/EE6XjSlSnLeRdc --> ssh-ed25519 KVr8rw NNeHe1ExbX5I4CdibTc1772nJoiEHHcC5gs/t4v6/wE -FeSYrhUeMxCWJ/DOmp66w+KJlhKnXCsBqCJ+lDGT1kM --> ssh-ed25519 fia1eQ yZVFUGXdWqNW1fnNRHTrBGN1WYoXemIkGdRwKPF613U -k/7eulnPGaePxUzXtt9tHOfhOyhJlTT4pQ1KfhzTwfI --> ssh-ed25519 IzAMqA +TNjvQx4ee/T30kv/UyFu1rCf8aG71T8WUJj3WBnVzg -3ooxsLz09cBO88/BRChFrMXpx7QjZVFfopgSEcxlfpw ---- kRZI09vrkArnL0mRQaSvoY6bpH8OTV4nT8JbDzP8nWo -î+ó PçüÉ×:( ³8.Ðm(ªe+ÚigH ªWzqRvMø|¯–ý$ízâµ<דí}Cˆ´{·)qõõ¬ÂAgþÑþ`¡á*Å \ No newline at end of file +-> ssh-ed25519 V1pwNA 6tVe3xNaSixJpjbdLEH+8qjYyiPrhW/zkHUw7PGA/H4 +ldA3wsf+IP3sThSl8biympvXXA8JhdmUFTRWsb3QkIs +-> ssh-ed25519 4PzZog I48nrFVZDzCf1fh1MbyZlVRgslC2v8sH7NgQDMnP9Uc +0OB4KjT8yb/ThKIWiBZVaFfHoRHpBbCt5cqFUzutIDM +-> ssh-ed25519 dA0vRg 4Dd1x2Ei+6cV+h3s6jMFD3Btq6RXQAggvOt6LXQMalE +lJ5cCt4lsqVy6K86rwsgZoqmMJlw9IbBtgIWFMAXm6U +-> ssh-ed25519 5Nd93w 9mJtwmZeGSiYl9ICT6KaBufaFM5knv2qweHRI7gyojM +9k6EfBRmOGduu3qkI26rB1BNy1F5Kd2iFBUKCh7GwUA +-> ssh-ed25519 q8eJgg lBbdp6ys+jQhcdgF6WooCGVxHclhTTG+ayhWWHxK3QI +/MvFVmTKRSAUceL0nzyUvfhnp7PjOyQZVLupu6vSToE +-> ssh-ed25519 KVr8rw uPzjpOH1IBCrMbe7VaCfWrgHqzWubwPliBPnl4cwSyQ +7bTP9jAvsJpt0qXO5klC3bphyWB6L6g39ra/dNnjsGk +-> ssh-ed25519 fia1eQ Klz4SMU2+fKxVg+CRW9kgWN1/26dbcbVGcV6PByxZAM +ZLjVMD/RSOUzIqvEkcWTp8hSpR87DVQ2FH5gcKhAhIc +-> ssh-ed25519 IzAMqA n7rKJTg9SIhgFNEWTEWKBJ067AaavacyFxgF43LwH34 +GaxH14AKF8a+H2VAO3RH8DAEGnhQuP3lzPXktWJWudo +--- v+2lxuXwMa8MWotaPS7ozEWQ6Dukh7IRSR/N4M+07DI +ºÚ  ìÞªOøÖ–ÌŠoºn¸sŸÖ;^Ž1h´ËMZ™ (RÇJeØ+Ù*3‹Ëe¡În"TeÆsÈf¦½—Côø5wº ÌӪߣfX \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index 29637dd..54f07c3 100644 --- a/secrets/bitwarden/secret.age +++ b/secrets/bitwarden/secret.age @@ -1,17 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA zomyV86JWdw5KWZz/hpIQ4L9VXEW4wTDqI4cLGsNsn0 -yy7TKiwisPKlQQUWOXCykxbYSrwE5eGKMNP8OBAUkO0 --> ssh-ed25519 4PzZog A4x9YKQ/YCTglMRY7X7PVkqwkktO6R8yavKrrPvgFiY -r2GUQPkQDBR7a9NGkEYhgE5XyWJUbNYPBYcGUMBmK70 --> ssh-ed25519 5Nd93w pUJi0inWzU9zrNeE2JbFDMltBfMjIZV5e+aAvkX0pnc -oE06oHbCZiy36XZiPrI3yeKWuD82XT9dF3WsqZTvIsg --> ssh-ed25519 q8eJgg 76Xais8jMd3AVu9fjnklTjoYA+4dLV7iYhw9E6djiy4 -gIGci/h85lVxQCpnzcmgi/8Ddef4JY7J1u1HOUkBGAg --> ssh-ed25519 KVr8rw aLuWLwlVKlfsRetAGXib+wyewtokiLiHpg5+6PWhEUE -JE+Kn+1uxViDQj+8M1VvOqJ/wpIzNlsL9xM7grMt5yw --> ssh-ed25519 fia1eQ txZ0C5zd+2MTRH5sw6ORuxvuCGuxVmnD0opKvUMzRhs -joVv8myJAWCZnSXZ1PzqxQdB2uTUrVzgITTU3ZIgHEw --> ssh-ed25519 IzAMqA Ns6XpHFkrBjofBVY6rXY9h/tQPadJ9RgaKKaUWjWsVo -3Q/3v74wemS5/tglw6cefS8j/z/0vz1C/sDAPnf+0HA ---- AK6Yp/Zk8mqKBt/zzp6bpGc54h/dyPWWv29bDuxURSU -ÿ‹¶´Õùc©LËÊŒœÅbgåÏA8Ÿ¨à:Ⳝõk<–P“²N~X¢| ‚èÜòTq±Ñô}Ztï.ôY>§ \ No newline at end of file +-> ssh-ed25519 V1pwNA YScTD2GeXDwg6pVitdF8G3dPpPg4xclLTtb2NYn6n2A +Kv8RiNzEIELwiBnyq6S7BQlJJ3Y4tSf6qS9pvZLc2kg +-> ssh-ed25519 4PzZog 8lnyXYhDxCMVgSb9fc+eylgh4PNyiyWbkyR5qYEQBU8 +mdFUq2z4nIw+ffhGFsQnO7JTqFfS51NqyFlq1nvYp8Y +-> ssh-ed25519 dA0vRg laNNBfJdmv08S8DDiJRFMqJYJtRj/dLXqQ0yHGLhFCI +NRqL9+8AqzwfgNeVIuCAQNxzWNRHK0SlJEW4k9JZv3A +-> ssh-ed25519 5Nd93w FletvMID8uTwelny7qrjacrU4rLd2nM/CByUIZZ+Azc +Mha4WZJ9N/O7RDFw33jXqp2y28MzqC/vCY6iTN6Qf7o +-> ssh-ed25519 q8eJgg KNKT5k4Uaee2ggscZpmSnclWI+9gdBc4T+Lt2M4wzgM +6xo5fCHgbhf3rE3lErsDMhEiZ8SGI1CizTFswLfjbJY +-> ssh-ed25519 KVr8rw htxnJOvYzVzDuS0zdOCjN1HCGml6hc0M5pbA9JVo3Xg +mJE5zOMtSKshRlwo/2YRzXnGO2On20dS1builMpXwFk +-> ssh-ed25519 fia1eQ o/iDYcyxH13zQBQbxIglv+K84s3PV5aAIB4ln+4PHxY +iA/1FWOIJj3qt/s4DcfM73fMXz0GPiqwDJ5nh1Sl7ag +-> ssh-ed25519 IzAMqA P+/aiLPHi5tlibSilwOJ6FxROHjJpv2ncWYBruftaWc +46KeZ7kOY/8vkryznVvpgEnWlXDkG14PfAlLWdzrm0E +--- dQXX0WKOt6wXrNLkzBNLVipb2lZNJcRCX+nSRpy+2Tg +ó2Ûöú„I þHr ±Å}ÐI™â0œd&„«e§æÙ¹Ób]áBËÉùÙ×T]2’Z…N1‰Ò|lÿº1 \ No newline at end of file diff --git a/secrets/discord/ldap.age b/secrets/discord/ldap.age index 5626a56..fff7875 100644 --- a/secrets/discord/ldap.age +++ b/secrets/discord/ldap.age @@ -1,24 +1,26 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA oKU5WHTVFbMzlj3VCOz8SK6HUXSMx/+O0GRBgrHz4SE -UhAfuzpx+3pVzaADb8IboXPrVdjc+6nTBs58vl6UM5Y --> ssh-ed25519 4PzZog P8oILoh4jxjLWlJ/8P6ZFo3gVnPLf/5rCXKt+VNbwno -Z2LPtqT7vxDVXo67vUE++kZsgR8EW/g5p6ukannudWk --> ssh-ed25519 5Nd93w SCPXtK32yRY9SHlXW37lWn5o3kVyGLvE25JC7OYrqgY -jXDPZBtkFaQ0zrWQ+q4t7gPXdzH3FXxi/GoGQ6A5Xp8 --> ssh-ed25519 q8eJgg c0Pm3CbI20Xx+ZDG21YFBBYcRXhm7XJtL4upmfQk7Sc -zoj5rfYv0LlKNcqxPCEmgn7Q9fC/zglkacJ+RdRGFAA --> ssh-ed25519 KVr8rw dlnvbfFVgq8/fCJ+VVNt82McHYcCYOyej2q4Xw7lHQc -7GvA1OChHOY8H+tNtBc7t0dGX0htnwru/xiOk22uz2g --> ssh-ed25519 fia1eQ WkNk6q+ujMGaMndfrj4RCUhE2UTkYze9Hj7iDueXqgE -70nqJIlhPFLAUCt8p4c/GulYOCc45hvqKDFuh1TkaP0 --> ssh-ed25519 IzAMqA 4ribVEiuHMHX7rZYHi6iiW/5BwvVvydrsBzlVgRjT14 -OaEvZPbPJKAbOySo/7DcIuwM7F8Lowa8mnYSkXmKMwA --> ssh-ed25519 uZzB3g HBpDQeuRn/7ST7n+K9V1O6uLNnbu6qinqrjO000lyDg -ACVdyMFSsJgRcHxU85ns7RVTWlKTCRbUqkvgmSr/7CI --> ssh-ed25519 Hb0ipQ zThy7Iiq+mfgOic4F8FN94LfUvxqFM/k2Z3Qrs4NNUI -E8HEerENg4ypEiV3PnvghUzBuL85SkWSBeEdQw7xUUo --> ssh-ed25519 IzAMqA hvEU3NLfxGsQkA1hlwkumtgEgscd0HRcBKHbavr22Ro -omEGJ/nRcqeXRI8HQkWD1lnabodUNSipnmedtZjNyfA ---- OeFgK+AG4MnUHFFRjJYmDKDonM8qNnGZ7sQzdv9GZK0 - ³{J7¦¨bWþ")«û{Nð62þl”8íQ ¥A«ƒ --¤'qGr‡}ÁÖ¤‹#¸, Œ B§°ÄÞž(Â~IÇm /¬FŸ>`­°RœF+tC-p—û]Í¡#òù Œm |Yó7Èã*„«+ô¼f{°×·úÝÆÊR­ô*X»UØl:ÉÏy²MÒ­ã–;my9­&ñ1Ëég ¬ßÀÓ‘î+1=¥ÜOÉ¥B˜IØ6µÛ \ No newline at end of file +-> ssh-ed25519 V1pwNA 6NKUbOSUbwVjzW/ZUpl8qEiUTTegFlji4+tVJyqY3SE +fRQvaKnLMkVBboTEriQpWlGY9VBAP3ppsEbAB2QTScs +-> ssh-ed25519 4PzZog mp/+b5LpB+DvRduqAZiKWqkZq6+tlyQgVTZz7Oge2Us +OycqmZyDr3levWSfRFxypJOkITLDix0Q15Todya6BNc +-> ssh-ed25519 dA0vRg yp/4LvS9DbdatHFWFsP5qhH8CP8Bs0IjVSenUtG4+Xs +hHiJEtl1ffYXltsJzuEMLGUl2i/i3pFzv4bjbx/cbOI +-> ssh-ed25519 5Nd93w BTngmy4NGLGKhC8lPos63QEVBKoQT82KswQ22EypcQQ +OCnJMkOwwXQVbtCitUizXM4nynC6a1tiPSkm7MxulWA +-> ssh-ed25519 q8eJgg NaEjVcDBVICRgXuJchEdE4vg3qmkNmJAbDDxLq1fX0M +YFwUmEPwJIik5YJ2SV5IAmqGlY+h24voJJlrBaoCBwA +-> ssh-ed25519 KVr8rw ZnyVITZFkuozEs/rbTdxXDQNS3Nggo+JkBL1Icht2SM +B4jVVts5lK1kIlOWMl0eiN7TpsTeJZWIu7NqildxeGE +-> ssh-ed25519 fia1eQ kvzARRScl/eypC2a5cY66sXcH+TZqz4sYg4W/k9iJxQ +Ga+4TVvXiQ6i5/+fgUQ3E5tJiLqdBsEsXjenXEpRV/A +-> ssh-ed25519 IzAMqA 5sizvlhLhAhAR1bViHJtRJ8fAIO56TAuLVSOwE177QE +b9oJ8BC2xiBjvc3D0H0EF7bSNDlpvIidyBCTf04ndJI +-> ssh-ed25519 uZzB3g g9y66zNmQbqP6Rbhg2t06W3YOgy8DkRvJZbWVegT71s +2dH7E76tDMrWQJbLPefyORP66iaPHQnSjwu8NCdSyJo +-> ssh-ed25519 Hb0ipQ azOzBLXfshInlFVpV0PzIBidL/VzA/+kKRXFFVD6ZF4 +iXBF/Wcv4KWo5qUXUlyimuo0l6aClKxOCtkm3MxAIBc +-> ssh-ed25519 IzAMqA EWitYyV8RsPIB6HEFE2OI/C1zcC6WfBEeDI62rGVmkk +Bk9tdSqIjLjat21J2LM8RXAt9GwdQxYdfPzqDtCjunE +--- waY7j+HMEOdqEZs/TcLEhUY9gJs6ZSc51VNfuCmCxJ4 +Ý;dÙ9A‡vÔé±nq<“ê;TèáƒB؇$ÐGÌvï¯h +»\^Žé§lÖ¯`š¼ÄÎ?l¸ au~üЧ×yâ[ךju²üvÂ;]!œ6Ëè±ãXIs4ÇŒ!Ù@ß϶û¬‘|›úïª">eÈÿ[VVŠž´,ÿ5˜ý8N§¹Œh[ƒ×´ZD,zý&âñíó¡”õIØ>ŠØù¡|ÎézÉm \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index ddee942460ef6797ae238dce82a9bb0eaec627e8..657f2f39e38ee67b34b16ffd975440566e15f64c 100644 GIT binary patch delta 1049 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 literal 2704 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sb;wa7Lz zst8OA4ROh`a5gFptVk)cH1i8h^vNpC4iEG-t*mnKt_-&{Napg&EH6xpDswN%%C0a9 zt@O_;HZIOc@yX8c&&sQ)EU?US^>r^!F9~zYa74GwB%mrPKV2cxJh!saNZZxG-MykT zB{RKPKQ*hwKQu8Z%*oH+GqJ4HQ9C28!m+?9$AU|{#4pd&BFxCc%)-MYD960grz{}E zyv!}x&A7_RHN7;i(ksOyD#)}T$P?W*Q@<2T<8lSpEdQvme3v9IeUGRDA7k%|LeETt z6qhoWprWWCSN|YW_llC@QvE{LkbJI6pNQbHKohgFbOV2F?WDj^?+VL+2oL=-=Ww5b zNXP6#ANSH!^Qf$U)xtkC(Lbu#BP^RM zx42!bH@ym!h%%u||50_%!)z0uOFDc1OHIE8Rjzka1h~OeevvP%kU<=pcijZ(4mx^3J&*D_a2+yeCob()R zcaO5*sK}hcQsaV>l9J#wgJQ0f^m5-E^TLpHr=p^$QnXX{s85U;YnqOLJnQrc4?v!hyogHNEtRJ457ZDufrSDVe zT99dyS`rpkWxz8kynvtkeQrinpohY?_yf+nrNP1R#}wlSj^>{o|c@Glc}9t=A~^`T9Q`i9Fmn) z?vYaH8Sa(p78IPClAD?5ZkbXVhLHn|3v%?m%M}c~JwYX~OGTBVxtqCrwq1_qbpSB4r} z_!dV77*zPVIY$}>av2wy=UM3cxR<47dU#nln}nt%r-kLa8z?c7?UtFGr*E3gRS@ND7-nRN5pR)h zi51T23dR13`EG_4Ss|Go$(G^yhG~XT+2*cMrTJcN-WKj<1wN_zmi}o;T%&F)urk%g7}_-`(9`KPW9Z z&%~s(C@RsgqQJzzq{_1@)iTvE(<{m|D?BhHB+LgRzgd(;Svm(QgqnwCdItNJ=Xw;B z1sS`AJ6Q&l>j#$P6uB9dnkJ=YmL%o51RI!S1iK}3MWrS=re%2>6y^t}8s}LCdYR=0 z=v(^eI~t~znmKudn5QO&q-5lH`6OYalA_$AvaE82f|4*}6R&dLNFy&tZ+)MP$TDAx zQUm8G6St@cuh7t>h~h*`3y+{OpNL{EbEB+mH}|CULXZ3`{R;i$l8B(n@{A0R-1O{> zp!|q{j0o>!|FS&GN>C2a)m1P^4-d>W)lN#$4$loQHV*I%DfKdP4^DG83eR&caWZyx z%S?3j3C>NnjO4P|$6?}@T7U0y*uRK5M=q}3#+~Q%IHx_N#K^VCCD8Eu=9>xiNp*sn z|B^2McIr|1Fn@08HvQv@zXD~tL}U^UKh66+IbzyrCDz88`}ZFhXw|jaW*qIn$G%fy0q*m$hasXwr3BB$2P zWV763^DK82Ni~1nw#i=f+&$w9nXAhS=h#-fGWp2q_UrueSIu1oQ#ehEMb~JG&0sy{ fwI^!b5?M=KMk9Hdrxh!2|9O17YS$r-oC((f_5O-I diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 4c6b7a97c7458a75437a513408b34e47e0a9223d..b7c199c9683045aa823f80e8c62b59995fe4dfa3 100644 GIT binary patch literal 1204 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zJKNUv}T z(RcGL@hz=P_0DwC&o?fs2+s{Kb22N6aQ2QY$#ODJtTL?%_2ml8b+!x(D=2byjdHRG z3-&JXNG=G?tMD|4D)b7{aQ*N=&%m;rGS9M- z;;^*bVoxXS(yElwqKb;d)XcEV90M+|l58{o3a@fEH%E`i0>3itpsFDM3OA=DzYt5u ziVRN=3-hq_g0s28GR^%0vxCX!nK19z5TRHGeZM13XHw{LVdK0 zDuaUzN?g%xE3`=UN>5iX_R`MuN^{pwNr`Yw39!(%^eu7?whS)N_6sXYEGP*sGl_I` z3Jl9mF?8jM@Uy5&2{o;7bk_HF$}p?6@byl%@H9-#k4$k)adQnRE;aN^F-k1=GtEY~ z%{#2fqNrRUFf=s1$gnWLz|1wVq};zC$uQ6&IU>+FucV|R$D`ELtUT2xBh53>HzS)X z$J58zCp#r6BcM1t%*@9>G^aS!q@XOsJj>arxYRf?TiZ+9H?K6=BFO;VwzSMd!_+{9 z$c)0m0{Qq ztV**yCsU8mRP*rgsyzK7$3l-x(_sH(_W&;g19R7`>>!MI^DD{m(|1$|HOeAd_P6v1%?so*&37y|FLF$etjrAcHcCp) z%l0wM^vfzp*EeztE-E(GH#Ezy$Tu@dEeb^UTbWU$fu*BDSz<+~VY$0ml(%K5S7c^| zvqh4dYm#dB1e_4P@YO-IBcZqkUd6`*|rGB`hYhk`w zc1oyeV!pO_n!dSXzFAUYWqKr+uCA^^k&$_7r9r5_Tcmzsc|c`RN=k9CafwlCzFVGI zM2bt9my?sLMMa8!fMX!nYKMMre*vzf(0f~?_D0m6>|6c$aqy&z_y`s*7uXo9w_^8FKoQ;IqjPJo9?M4k{4txxD@W3Sk4!IUdh*Qk<^5h zvknPz*BbWEboJ=^uyom1&5sXccG=mUW%rE!UAgsi-h}poY;Av?9ir8N+%J{PZvIfQ QG2U%hzh_zNys9e}00vH(2mk;8 literal 1094 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yAED~+lu zk8(GO($5KtEN}~obT@T%4)Q7W%k$CC_X-XONRJ9O)K4qScI0w)HTTOhGqETwG&J}0 zuc%DS$}%h|EHU(RDJ#rKweZg}PjWSKu5vQ>H9)t`B%mrPKV6|TK-)Ym!o=0x-y_J~ zIWHrqNZ%qL*f`TGI47mjx!lm)rLr_jzbq=(Fr6zfKdj0(!Z$Um+@v_5(j+^@I3Of5 zq#)Nc&>}C}(4g2e*i1XK%FHV~I}qJAQ@<2T<8lQH*Zede7jsv$aQ|>uA6NgZ^parb z(xga({DQP>OV1R)!~oxl6r+-&EKjaLr_|)KP}iU=i{wI&R9Dlm#Jtk<3WEZl5`VAc z{N!-6oWgK#^T@Q|vQTu}3N2E-($f`^eR6UOiqg|OOMsHFL6wA z4tCE;b@An@@(T2g$S5LksnjGc86qdkP!(=y znGt9nWfAD@>~D}{;NltOXPBBDVXCcPpr6g9tE;O}7NMP=5nN_e5tLG3l4j!XUt#Q- zT2!7=VdhtrWl>qF?NsLIW>`{Dk(174&!883YVV=+`qufS3sTGyZJth#QlI%eNmuh# z#NW3M8KmWfkI&e7IN;9>re$p(lmE88dmU*Z-?}nXFl6G~g&B#9D_3S2gk=k9TDIJ{ z_j%UZ9$W2&MamP*_+7uu%bj?@Q*@fAOv&Xfb)`*`6?bH$CPz$=zL2vh-(c0RHif(; XXH%95Y)oC;$@o0A;H1XirB@jN(^qnr diff --git a/secrets/email/details.age b/secrets/email/details.age index 1b5144c..9c02ed7 100644 --- a/secrets/email/details.age +++ b/secrets/email/details.age @@ -1,23 +1,25 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA fUmQeNgoFbbsFaWOuoZil65Wb9QXt0ombUUaowzGiw0 -f37D0PiBMFwmgUtsNmjr3GD4u9VjSUhRKRdRAV/m6NY --> ssh-ed25519 4PzZog 8IbMdWcBQxNl1gJSAxDZ4wX01jU8xVcrFculOfhdW1I -qrMJW01W17kyc4+61PTUf3fYYeqiEIerzLb4Qyjomh0 --> ssh-ed25519 5Nd93w InDd1HzgxvHNVZAdAxoeybHI3kRggQh2dTI/abS9YlA -v9ONGUDVrFSJyham1OfkxRtmPzdOBQqs9zD/u0XkHqE --> ssh-ed25519 q8eJgg L0cOuysyQN+oBz7sG8NL8JHPvoPyKi8qSlSVan7s3V8 -6uxUttvfD6gbNLdFiGxo88ZfpNucTBpCTd7OlAYdx8E --> ssh-ed25519 KVr8rw IWOO1WfFljVKcU6WkziAvX3KaRoBZoRT9PsihqkK8UQ -fpK1yiGhKxlUOzhI+FP1AmEP9csPhMcBjzi14spJThQ --> ssh-ed25519 fia1eQ M+Z470oQzYWBwjQIqBgxBNieMeJRzoL6rc/rit1dkjs -xArp+UWpskcsc9q1XEzJ+1rM55/fK4/7WL9d9oXYla8 --> ssh-ed25519 IzAMqA Iv7rCzraDezK5u7baBxdyXOMVWUQJZpQrTc1W0bWEGQ -U/d2awrDMpw6OP6Z3kEgzfpCRfmxPdI+7LjkRrBLWx0 --> ssh-ed25519 uZzB3g Sn4Ufi02xZpJq6zJc267P9L3rlAL6Boy2YP/kj4PW38 -UWaxsni30Z3cEH+oVRv5wP6EguVAnLvbkC9zB2xG4OA --> ssh-ed25519 Hb0ipQ IgVkXC91wdBmJcoksMSAmMVn29poksBQLMOgr2xQm04 -d+fI4goKUHwn2jsA8jJzLUc0n1vHKUplsl+zG4O+g4g --> ssh-ed25519 IzAMqA 9V3QfuSB7mbnjnYRiRG/lznwwbAqROGXGKKni+ut9SU -nDxzIJAl7JIs+Q6YAiHbOQWXwfvQ75OATgEcp1SEKMk ---- 24F4ekcTgmg1WahdpZX+TsLycKdl6ulrJEGu7m5hr7s -íŒHuˆ5í¨¨¸ÿ¥c\Yo7t徯5“e)ðíó/”=Ä;«->kàL¦ÎSé'õÚ=—üßN­øVæ–¼¸ D=¾}KCPâ8c5Ž‰!Vn‚Üd6Ö3IÓ|µ„´û3iyI>ºJ–·Š²bðä/SsrUr°‘V´ \ No newline at end of file +-> ssh-ed25519 V1pwNA OXq8Ez0V4LJUKYl+5ql1M45ZHLP0pRg1+wpROKw31EM +VRu9/cu9HpKLzf+ChRYl+Q7CmLJotHsgtuONSiF7xI4 +-> ssh-ed25519 4PzZog wjZuT9yZn6m0pkIaEqZG8Lyhn0tDd7SWaG7CMe8axHs +g1xgcY98I7PkOGr5U7wXW1+WmKkhw0IbIjEqkpJ9qVA +-> ssh-ed25519 dA0vRg jNryFpGJIll+ShRBJfSeDxoregZChDjfML7T7GK5tQY +EKwpPdl+lsxPUOwiZejGoDhW5AtnlPb5o6pP//QdNsY +-> ssh-ed25519 5Nd93w bUK/vkl4JdDTiYjJ87y1W16Q3+UHYJydd4uurTt64lg +i9ewXjr6156XlJfXlkexxzz0e3GgR9qiRd4xGD/ET1Q +-> ssh-ed25519 q8eJgg PZgB71YUUBZR3f400P3eyr+XBxTfzzK3uW95jUkdEBE +ZE4jDg/b7RsGthpdrY0EApD2gSNnRWCUysrooiEsTb8 +-> ssh-ed25519 KVr8rw NBamDqepGTVk+fRuSRh1fBcFi+SXt5E3SdeNOHu+eTs +a99yadLXBDuyo6fVYTXW12HJRBKJe89QtAgTsw0CSjs +-> ssh-ed25519 fia1eQ AxTNqh5CUr8sLDTCbAJyv4y8j0uys4+2u8IZcdh9mAQ +ERVJjXxP1P8DGDZltLViSRUQpBVqgUPBG5rA0vX+QWo +-> ssh-ed25519 IzAMqA mG2TOePS2xp2zfN6tm3df79MbQmahP0Zrz/Wv6m9VRE +DHCR0kPJ+FYi/8cbNo1wYg9W+ibhNulhjC+4ZT+xQkE +-> ssh-ed25519 uZzB3g JZiMYvKnSx0MDl7ajstoNqdogJi0oo0o0RWYiXYdLCU +wdlxY9xLC2+CdhOq6XFCL27k6hoUIb2iB6uXVzoVjgE +-> ssh-ed25519 Hb0ipQ q3pj0zGX6KYAQt92tWGcVnpzMztez5qMD42Mf8kq+D4 +jFCtS7SLEcA8hc6rxgnCojW66HMAqKiHzyqBVs5dAFA +-> ssh-ed25519 IzAMqA 9zAaZRjN+SdSeBnn3ocISeDFcZTUFlAwIO1dzRb96lw +7T2xjV4CTcCMwm2g3nGdVXCCXzQNrNGY5fG0I3f/y84 +--- Xry5yKvldlqJm4/4WINhgNr4zLuZncxJtZNJ/ruwZOE +ºXntÊýYšyõB01îÆÈøEŸM͸žâ€·ˆœ*1F–'‰$èÓ¿ÄÞkô½Lt¦ùGÅŽ‘Å«Ó³oŸÙ5å -X2a<Ú1îÞ_I°Ü;çKz¬GékèôΟFÑšrˆa¯œc[›gOBµ¾b¢‘Ö/ß…4o€U \ No newline at end of file diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age index c30e3ba05a09a4c50671f911f4803f427ee79e67..64629716a76c9b376ee98678b9ccd94e0d28166b 100644 GIT binary patch delta 1297 zcmey)`IKvdPQ9UTc5+pPw_%!hQeIU~T4Gv}xs!>1URFe;QDJ~~nQ>BqZ@IsAZcbu( zC|8 z>TCO(Xs0KoMP-F21(~@7MEzeg37WyA|kw;qWpa7Ba%#Ag0hUW6J3oB^9u`- zyh8IzLUS{nDnhv|%gUl6L!#0{-K)$~vYe|zO!LFj%>3MpGV)Bb3tTMAJ-pKbEK&kZ ze3H?vt1Jt)Oe$9hE%8hbwf zC^2$Q&+rV%N%wS2uL?;kw9HH@h>GycPRk9-ObtslGtSD(%*r$^&nwO6TD|0`?*q5f zy>I=t34EKVW3RihF>B`DtM@ePw?0%TD7$f|Wa&mNogYtrpLJU&+}Clk?&`s>vIlO6 z>b-Ca*6~mGkc&x5yqG?-u{}g6f5L5tXP56^-m9Z~S4m&EezAql)KkC(_!N8=32S+WcU>T}1z2|8#bt)4v-^_*MpF^Gw|E za3XuM+u|^u|0=3){7&j6Kiai4XU#s(nBy%Bw%&o3t&3CpE>DtT?Oez%BD^|%Zfg(w zQt|bl4yh&VOP>Dmo@z(D@*0__3okC6U{*fw>Ld2Zlkv9P_ip#1TlwJ%TOGMnyS_FY n)m%`madVTT+$X#KK(UtBD@`8UQ$BRy@0<2h({{YLaKRh^V(;%c delta 1206 zcmaFL^__EqPJNi6lSOu5VxnhxR#HWZzeT81sk?u2wv&ZRa->;tm8H3huV+AJXo_1_ zIagMcS+pc*c8-&`Sy*Y3c2#L%s7a}%VM?G`pp#?% z z;Gh6Mvqbj-gCcVa@0`>y<8r6SWKW9_ZP&!W(t;90?MSC&qx4kQ$!8hG>#Ir%E&MEf zB1!^6O8iPH4YCSybECovwN0wZGsD8nDk_T7qD(4X0u3@exxy^+3`%_py|OclT>V0_ zJU#P^0xB$uvNMf>3_Q~!bIS5vjFX%llggbjg2_9q$fBrRA<{I`)G5fb#4RMx*h|04 z*`VIlI5I2Kqr^GQFU+FMIVCZ|*)h>fzueW$gv%t%+rJ_?QNJ?NBsbW(Af+b)xp&5Y6toy)o0(t|3i%-qsl6H`nKjk8iJ!csE~%98v8OM-o} z%!AbISDNEgoNS^Ulou9aRGDLu;gz0f?CX^6tY4m25E@)i z<(SR2>2cG9mtWJxEV}i?6QA}jW|`2(D0Srb!CyJu6)MluSf?16z7+m6!%DlM{$<78 zjv#Yg&lj3TmD8%TURG2tGKj8otC97pyty|i_+`gN_2gp_C#Oz3_ds70?ltlUPV#4qKRUVQS{-}j_qhH?HPH?4@9Xt= zC0z6kcPrhaceXzMkW}ve-oRf*zN_D@e*3ik>mlhc!gV_)a^Ib9@FqUKVrM%W$?ws&v5RSocHcE z+pN_`kJ>I=9dys=>T0u%EIh$+3W7ZsL^kEI__}3&HrY|hP~6R{_<7l7M!uT2tlS^I z+7x}>eTB1L<$lDoHqX^N?ebIOe;we+&GC886u?vYdiHj89iAJ@Y>rn&&RC`rEUVAE zmwoM(d7oCbCaV3|_V4VT;FDRIoh-`g-Bf(GeB~Gs{jDK-z z_OTZ_+g?cLPT0HiS4bE0OCHA51Mfdx;T6BIGR$A5#@K((>^mGLZxlaHIV1iQ0KTl; A8~^|S diff --git a/secrets/forgejo/runners/token.age b/secrets/forgejo/runners/token.age index 03ac739..77a80e3 100644 --- a/secrets/forgejo/runners/token.age +++ b/secrets/forgejo/runners/token.age @@ -1,17 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA bGirG6sUND19fSIwyvtjS3RDjyNUc+kXmzRoN4P1bC8 -kPJr2S9BlGWWnoggce6dx1OR0/r57AB5Rcgz+qY0qKE --> ssh-ed25519 4PzZog iciiKCHhfK38SwvSPrdoMK7C250qTV5eBgv657iyKwU -dEiSS1FuxEpovNAl1HPZk+MRCcjLGiKgTfpi5Ssi38M --> ssh-ed25519 5Nd93w FFgxLg0NNK6Op64FHu24sjaerv3jgDaPz6uKPi/A8AE -ZvHbJ2K3T7CUJSrrpF9fMmP6FWCQ3i6m/5Fi2UNtbew --> ssh-ed25519 q8eJgg nVm1H/mbEsGt2O87i7VKUL5do6Rc7n5nvSilUtQ4cBU -WWtsNbIatU5ZostueLntGgKD/nxcavZPheU9afRvbH0 --> ssh-ed25519 KVr8rw Nnroz2PgUoJsd/frf+N+b7xdJDAzj3NsmJaogsIkYGk -xX73tnCCYGBNA3BRjjPMn/IV+qwjIwEUk+IZbhCCfHY --> ssh-ed25519 fia1eQ GLYqWGKYKwkBRwQ7SxSnErmz1MFw5gPCexfap8VM9Rk -Z+dIKhk+JH7W07diX1Abr/Deezkw8xGkzXQuYn1HfJI --> ssh-ed25519 yvS9bw Lwo77pDciewUZemyFc1EUboIlXFCBx3CY6BGuizach4 -AkWzgV1zRJzLtfRxkfhmd80EU8fW1w+5sxMAfWgdEMI ---- ac6h3StxSHr+HFsyPIBPENQRcfKzXX8fzJlZ0MER/8c -å¯ñ„üzwyCÉ>þÖ¸Æ\k¡±êu/óí{z§©€¢Õ®¼ºø£jDÇÐÒßã4õ{^mÃDsÝ妞ÂÎ#kiné“xo \ No newline at end of file +-> ssh-ed25519 V1pwNA g2fcL863aQ9Fyd46ou1tLRUyk+lgmaq2ebrHtsGS/2w +dnE1XFTUYBtF/JU5WKqt5hPC+uDGWS8kT/m3JBm1FqU +-> ssh-ed25519 4PzZog DPgMcSEWU2eOVSEzznG/gRrkhJzhrZvFgJeI/nzjCVQ +STlzeXPR6YRa6iQQVOuYKTtvSRmG8u7Ne/WdWtSJd9k +-> ssh-ed25519 dA0vRg 91a3/mO9Mc8z9UXzPAHwUA+sZSvveNWMXHdKiy76jlI +sOph7DsS4uQ9lDpGSJCxUP6zz6HDQ4CCXfa5XDHShpM +-> ssh-ed25519 5Nd93w mP1uWGQiUgBPWHV6JuCif1CtR73z/nkiGEr+9WFmjDI +KGoT0BxUxlE9f2BPPnw10Tya2+SHfAigtSYTQwGFqlE +-> ssh-ed25519 q8eJgg e84g2UFFvCR0WL87MISDVeGyqS+2WJwSWx9Ei1f11gc +PrlpA8SWBLskYxujLpOi/7yeUy6q0b71sFicHcS+otU +-> ssh-ed25519 KVr8rw MEUHwxdpXsX5i5m7mcDLXK30Tmpznl18pE2U/ey3DVs +mCKEB6ZeZQRFUzaGqH8BVBNDbgHa1UocNxPjThciMh8 +-> ssh-ed25519 fia1eQ 3fVdGpKBs3gsiHWQW0hj8Z7LzgvQ3CfR2d3zAczNzxQ +xqMW2BNyTyDCT2qew5VLVi22toQ/SUnx8L3xCpWKtQM +-> ssh-ed25519 yvS9bw 8hv9OFOBacjS03cT73lluCDfbQa4U4YY0Mhb/fzXhCs +WoNTbQ72XUCtxxRjS+D7sBnShmmpoeQNvwqpNa1F7M0 +--- 1mryHIWXt0MNzqKgZlzikiIr8pfTWZxcwtZVvI0YSJY +õ>§þT%©l殓;zá䆲»ª/òL£–±bï<’V¥9«æç:}D6¾\0„’TuçÅØë‘í¦ã•óÚ…VÏòJ¯HmæFTÜyc \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index 1d34129534a7c9c5959e5bec7f781fe5dced0622..5053de7b47217ae4f0c9bcc2c999c1a5f029acea 100644 GIT binary patch delta 1025 zcmaFKew|~2PJLB)iiMkHlzCyHyP1cjx3*`LK}dLnwnwo`PGN;%iMDG-wsW9|c9?~; zCzol8xxZIvMrcZSUSM!qPM({ow`-VxUSyz2WKnUNze%uBfsspPQc+4#GMBEMLUD11 zZfc5=si~o*f=NJCRDQZbZh5w2n7gNTRb`sDc0oj-S$&?VM|p*xNo0AJsZYLVZlZg6 zo@1tISVWcqmw}n3XOUrGxp%2YMR8P6nSr^br9p0nwr5FHhO3unxnaJ4RY|6qk-xDg zx^*dz24z9%3Yno5ZvGX1Vd3fiP65RhP9?zwNlrPHC5BPnjxO2yPCiklQ6|nNZrUYb z#asoJMUHvi6>d2$&Z(JI?g0f=iP~nKSrzGCiK!M*<+(*%LpChdY@T z2IZK$xK{?7JGSR z8W{$=C%cvBdSrN%msDhVxjKg=yO||w`x;xOn}nHpPL5|356_A;buP#=GfNCIwFnRJ zbuu$9_wmgRG$_wD3=MEeFHOm_G&VESH#Dns<*JA~FpDWeHtfV~G&B;GKG^N;}%q7ypwKT;!EjQFTsv@(*Bem4U z%Q(v1GB`BX06hlMG7}9`0~I{8(_ErT6HNmGBLZ9s%c>mf-Ez#_y^IQ7OS~hB^729= zj7u|*LIN~3&|(!KJEj7vRp(;VIXN{#&73^NSNy}dHZ zvqRCXD~+mhGEP@8$V&Bg%n!{C%Zl*J4K^wdF>(s^3G&J@FAfRM4ahJJPpU5|3HB_@ z%}saYN;V4(N^|r#PLE2-G1D$~EHEypa?Hy!^$s?)@W~9wjV$sB%?vE^PYKQD($&>f zFfz=_FSYaxx3Dk?bq**kHB56VFpCHePOS6|a?8mIt#CD|Ov}%;$SLvU+Teb7&+2;@ zzMr-5jEcT`K>eGbxqD-W=p)N|!=sORf0`dNsy(B%_!7S&>+6$ld1<>D5?deYY)ra* zV%-MI8!LVA{Wo92ivnt1Ea2|IHiOLfi( N603}_A7;)t4gjs|XexwfB~pHYQxkwI{xfqp@FhG&#>icx84L}`#qNI*)ZpSg2{VP1Z2 zGM7hqad4rdxo22lv1MwJM^28rv%ZVIQJRl&V76;vZdOJ`gmGa;u6bFwFPE;JLUD11 zZfc5=si~o*f=NJCRDQaGi%X8Sv73*+m%merX+V0KrCXVaQBX=+fqrFJh`Fh@kz-&; zc$QI)etCE@SDLqvagmoxhv(SK)s?7XMCr{TLr>x|Pl{++=g#z%s+)%Iwt8oPxsi$!8hG>(k0jDxFOtXSrx!heN11il^D@>zI3X^$0SeJkRS`L%0xe36N@aPR7;m|v%u1#0&^3KJng{TP^Tm_ zuiTK}g5>;=K$Gm^pps;C>q?`loQ%^IJpEIR%2NFDihL~fv+|0|4gIp5GA%RnQj(LS zoc)6`GD01T!hXJ*ucAs3<2t zy~54NG%A}*S65dd*C#S1IU*@Nw5TvIFH=9u+|tXk&?(oquq@Ri&BZai#NSujBq}I5 zDYKmG;o`VCvnBZxwCwn*96 zR5HBs=A(`bsTaRr{8d<#yoqmF_2FgwJw8|Emi}PVT`scgmg<#_JMw-_ztMZN%e{ln37I)euQ4}?j0 diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index fece9747145c8e3fad8d86bdc5cb3523e26bf725..9998666e77223fcd96857a45e96963278592d1fc 100644 GIT binary patch delta 1023 zcmaFCevM;-PQ9y9zQ3baQMqrDMW}Y5S(%e>en?lbicf)OQfWXzLB3CRAeXM4LUD11 zZfc5=si~o*f=NJCRDQaGX=zceaYS-uN>X5ocWGr}Wqqh|n0`vRg|k<=g?pJ(sb6_o zQj&pRR9Sj9mxoK0n`@YFR%Ky!P)UV{tAUGIaFnBKNVZEzk#lNsu1iH?xJyJ-VwQmc zx^*dz24z9%3ckrMIjK=z`er%iMP+{3$v*BmS^B1~p=SCKC7wx9h6S#s`sD`sCK=Az z$y}};$=Mm1xdBcQft3Me=K6^tRS_<}xsKtE{QVXH{mGS>$DyB<7{0MVf?GgrplAOpa%i2y;(Q$qC7J^Nq}mFbFc$ z&rYl~^$o8u%L;NzE-BYe3Mm!*vrgOJ2%_3II+Mzqs%wUqueq)(mS*`Biu>f z%O}DwF(};?Jp$4)6Ae=X6;j;&TywKa-7Q0ni}FG%{B!DE0#dRvBYm_}N~!`pgF{j* z%sk!0Q?hz#@1^|drNjf^m@$P06GGBqzOs0^uyDDiMEtoO)pwv05$ zH%R8H%=h(<$WC_kPBeCRcJVhcv2+eKOZPWPDJa(V^~$#h4@otyC`(EWD>vZM)zwuf z4$90fFYwSWC^1W~3d;6yG_}mijLPvU3klQDH1$f=k8n&34^Jz}^!MeeJhR^Lcl*4A zwuDrtDN6T$t#WeIQs<~Vw!QwGVeS=g?$-)$CtVjPmu=nYX#KQMr{8OZXrOse;$+_| zRr|LW{@zx7Ws2?bq~ar*RCQf}r&SRhfmOaduQys;sas-NNlIRnb4pa0vu9FbrFM#bgl|}oMNy)gWpbW@wws$vGMBEMLUD11 zZfc5=si~o*f=NJCRDQZbk(rCOQ-x7#SZbh)Sx$0_wwqZ*WN~hpYeiy3p;usNkwvb4 zKv8KyRc=T+mv?$jhDD`EWU@s{SzvBxS)NgbN0_mbxqnrFr=@dFplh~Ks6kqmPpNzU zMOHMUEP9; zA~H-|4YN~1i_*;v^UB@z1EZ3RJzP@^b5nx?J^hU;v@<=q0yEtbONztNeZA969i3eA z!;LIF3(NvD0usvt+=I(~v(r36J;Kw&Qv6-fL&-a=$fBrR!81zVr!dpYBqAfHzr6fnXAiTifZX(C1%#w(_NOSGL#QMC7Am>v5jC8IH|H8x~qa5EtucAEPsBg+Dx;xxZX zAB!@Js8sVrgUalx5)A7~qpF;Y(-qRZ%~F!W{7NG;9bHOIyuGtsN|H?T+zk9P3oR^) zO#FSqD@w{N6Ai=MUAZEo!UBs8wbSeK4BbtvPQ6NlYbwMQ_h#Dhii9+^5>J(9mGxzkcO#=PYjbnP>M*E;)6ojI-S? VIr3TV+S$LHgVwbQWrTj-1OW8IOW^ ssh-ed25519 V1pwNA a4NtEaRWmr9kaG//BjsnHUViki8x0BVOzhCxs+LPNUU -rNnvjk9OL2dMhNtLlM/9fPwba0JKdF7Lgp8OrlPg0+w --> ssh-ed25519 4PzZog NzrMhIesa3mh17B0GY89q8LykrLZbs2ZbYYKpDui3iY -R40VQvvVK+qkL7z+JYG3/GShIS0NgWhn+gQ5VCJ8/Lk --> ssh-ed25519 5Nd93w 07HrZszUf5f1EIpBU7cGyWx4FJes5NdEwzPBHENjWH8 -wkpbLH4QJxN+Vu3JTG5jlBLn3QRih4mC3vHKABuRil0 --> ssh-ed25519 q8eJgg HYQ1pJ7UZ/wt/dzgaNOW+YCYV0JR9WjeTu1jtT8sNDg -WDqCEkt/zXkLbYRnqqdGF4yKy0bVKO937BADdp1wcGk --> ssh-ed25519 KVr8rw gvJBgBa/1llkpO7b/Mu6EgdujBYOldYCln0wIsysyXs -UlizPe1iqUaci6Qd9EGmpoV5BUjYCJ6BL5pOqBEoK3k --> ssh-ed25519 fia1eQ uHt487+wluXVQNoB+v7ED+VfUjedj6FPCvV3o5cjHyE -tqMzgDKazDYe+79uftPwazyW/ao5sI+BbInU6MV36hs --> ssh-ed25519 uZzB3g rrVSIoiWI+BQcCozUmwV6AUI33bwNZS7q1PXZHp04W0 -WaRnO24QTA5GFexSQMe/U0Br//PNPt9OPIxWuM/vdb0 ---- 9CleuN83VCsUUIsMLbU8274FdYLcy0IWe57C7ffU8sE -ŸRŒK{aØ ï:@ÏÑHËÂÐ;÷᯽ oîhÙ¬Àû|wé‰PPq7fŠ{]Rï%Í‘rÎy±s ëÐÛÉøPû%Î.äă-±5¢DOfuFÒ ÚL.F×ýj4ø—€À$Ã+Y)«f<ånëT¬ÔÑ ¹…^$QûŸð>¹­¬vØDÎ0/Y÷}òŽUTlÊ>L³";Ÿà \ No newline at end of file +-> ssh-ed25519 V1pwNA Og+Yx3IddAIK5EXVRkGkGQo1uLTbHIe0PqOsbc8Zhhc +8cRXulCpUe0g0d9g+1Rco3KSDv9SsnZIPZpCURJLhjM +-> ssh-ed25519 4PzZog 2QPPJ1aHcSGwDAEsZDoul0i7gNhrDUiTnTMZDIkZY28 +q6/hLB31d6bZBb1cyMFns5DZA1w/cWOnAfOCnSD4+w4 +-> ssh-ed25519 dA0vRg q3E6IEJnhmyBspbZZkN0AzULmhosvo+3DfskLI8SoiQ +9zzEGaEQA4244oT9M7gSf+x9JR4tpRyigrUm6VtjZw8 +-> ssh-ed25519 5Nd93w k+YFpnrg3PelZb6VkWU3jNIRbcdVefDulVcB97Ty50A +H9oIXUHfQmBOyrUwCD4wecdieZ9r68BKll5LiSq8gpI +-> ssh-ed25519 q8eJgg YuI+KWmKVOb7nAxYfBcDpw8w3yAzr4zbJx9XmAosbyM +ulG7By5LTkTwRsizDy9Dvbo0Aq9hvkR7OYg0k7x3c+4 +-> ssh-ed25519 KVr8rw 9rGKrg4728MIyCTvpZujfb6MerMvWAcceEVJqkrhjgI +XwEylc2XK6IbPKa1KbnmRpxOBocaJA3u8GP75ZtDkDc +-> ssh-ed25519 fia1eQ 304jqcYsqS0Zv1bPBVryRtUev8LNy02Zh8X+6QiV1C0 +LoUFCs4oRgcUU9BIImEBY4YPa7IR16b3uU2a3fUv+nM +-> ssh-ed25519 uZzB3g 6ChChOsFGTpa8ndrvfx5SEBHJJxSPyy3GDmBMwABcXw +c+p3NG8gHiekqiiVesAtXSInzd4PIQDsHEsnTnDcmDo +--- hOqrvD4RR5WmtwXSZvjH2Xs14ymC0hECQIXA1vaDb54 + æ2½§ñ±P½[cåÀÍ…ž ùvâ¨[Õ_˜a€FÍýyÐ\öÌÏPÓÒ·±«Bö;ûuµ€²rpàPk™_‰€EÜ ³ä@Íd8%ècúÔGû¸žó”Jm2ÏE +âìL…ÇÔ\šû§ .-·jqO;0Z;p¾»Ÿº`(–€M~ù¤ËõWÉæü¿ÔÎ1ªWâ¯]Xo0vuUN2R-GB!*-q8bl>)2UcaJWokzRa=DpDrMr3rRGB3O z6sD&XW%!wfzhXNi5Kha?kK{$=h1&dW>6 z$_mmiDROfSFU>5@D7AFX%JQ{HpL~{4ygt*_#5p9x-#yc#%EGWJxXLm|KP#&&JTk-5 zG%_^Ixme%FR694NLOaVflq;~zAS0+SG$gk&(=a0q@pCF(z(Di$jsRz ztHQ6yAiymt56`@G(yd z_jdB-G7fYsDY6VN^a%0I&@T$EEDNkO4|g>$wMf zFe^2TaEvf7HMP`EE=~2$GR-lqFb*s)bg48h2{AMX4o$W+3N!REbqmYpI^3cX)xY?J zrjSrhHh;h=-S7+Rrf{jA%G8cp_Wskp&>kz3HwP>Y59j~B&s?3F*!E&Qi_f~Q(B8R! z-tK8W^6$oDO_$Ogwz{7?k38$!_~6madxD;o2bu3F?fEA1Z&s`Cwy%?26`nD^&)>&U PpXl|9-HrK;W%eHcQ)5vz literal 955 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t<($#yO= z^~w$KPfSYm^U|&;$aC~JF~})(4=N3+$PaS!bq%m^4D?J1cjU@2GuJjM3H8p5)HW>4 z_H@s!%5n4vNeqcn57zpqz@t zQd1ZI%#;#;Km9z5fOK@*3N2E-($f`Ob4v580x~^{y-Sn*y~=ZZ!h+KcE%H(wGhHlA z(k!y{U3|5Z{ava|)62QC@*~SLO+!k&qH?lQinA-7O3kw)QnRx%@`{3e%{?pqJ%Xdm z+yYG^0x&|-JFLi}s9d4g(la0`$ z+%=;(*n%rP)X62)I6W;Xyf`4z!pqFfBg?|V!_CChFDT2T$i=6;JlV)B%Q7v;(E{CX zX_<+JseuYPX<5cj#%WH@73Bft!RbCBj+I%CsZ~aPsl`4PIgX`{&Z)(oP9bhd2BBPO z;fCgBo`xZb&PK_OsqR(A9u*dDZUOG5fkEj$Ze}iyiN2Oa5l$Y){us7ZmIYfTl`FXA z`uXO#S%zmun&%svhvpO~mX-PxnOYhKdHd(&2c$V>1>_nOM+TRcn{YWt8n~vrMR^67 z6_#oHmm38KX1W$t`kN#tYloEMHn@7kOugy6Wc}WVn^( zmm8bw=ZA%aWLD%E6sGux7-pnrCI?oP7*tx68gO0Kw|m~ov$Ey;z5f*}&f1%H#qBw4 zeV6sV#+m&}4~3djd@`JbG_J8r{rmdJ_-vktV!Z diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index f29310fa2e2b237e83e12905b502de6747c68b58..6bbf420a39d42a269a206a3d421512412a2234e7 100644 GIT binary patch delta 978 zcmdnZzLH~tPQ9s*ab#q&Uqotofpc+*k72NPRA7LsmqnsUnRjlgK}cR|m1S6RU`3H( zHkZC-h<;#Bp?8XTq+y0@Vs28TucMcjxodK!VVQo4b45m>zl&c~ZiIK9BbTn7LUD11 zZfc5=si~o*f=NJCRDQZbiFvMfKz3TDiBC{cp_{(9NqwT3Usz^QVQ^Mbs85zxaENPu zQL1C6cTT!1S3qKlt4CExx<_VqhObdngtM`KL~2NOW>IN&zKK_2ns= z*<9hyP61)%j-~}sfhFk`MZU)RKIW08USZ{aVHS?sSq5%7IaO5^#qQdr=@UPShZh+H zJ7?>c7lnl6nR!H{7kL_+ItNvyrj(j^riEC9=I2_J`DQwoW=93(b7dN38>IRbq<9)d znWjc1g}G*#N4UCWduI8hX%~2Sl(~82x|=zNCRId+PL5|35BGBoC^yYD%yaTc%1g-$ zcJr^y&a}w2^bbpnN^#LP4ogl=HE{C?4oS}QuSIws0)Y zh)i=Yafvbr4hsm%DX&b*jCAykoP3s1yxt_J)Yz{)AkRCctklxqrz$YeqNuXm$GxH| z&7#bxAhR^UJv~V~G}XgBlq<=|!!Rq&(9fha!^b4t)vUzRC^g;NGTYFkGN&*vGAgjb zHOo9J#W2~$fD0|c(=rncQv(%3f-}pLlLL}V!mIoXlRd)9>zz$3O;gK_s-nWR3(A5l zjVoP4(jzKzw8I0r49qGsOtVwd4Z?FQER(a$@?AVFvU~y}19MDW6SLjTQ%zlrebaMY zU2}`kt*a~xwoEEl@Q=*#G|CPR)i;VLGtTe{4~oc%2rJajEeiB$px6fgcHkf?V#ot>o%BDp1@}*qX+#gd@cqYtlk}haJ+&2G{`kUumQfi^U zir4LR*|zZO`H0nNlI?uAu79+DKlgy0&)Z{GVdvjyT9gF2Ub6b=6eYhe>eR$1CLhDa QWR7u!gvZGTzWeY907zI+EC2ui literal 955 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uz2(hp1t zFDuA5@=NpxPmb^{cF(U0H%}_H2uLi72+A_f^>#P(HMTSiPv=U^_f7T;uCS;`$qUP< z@^Cfr4^J^j@=mTaNY04JkMbxA@G$c7b}UM%3PrcgB%mrPKV2crGQ_ORq9okXH9y2Z zB|<;XsWQ{cBr-6{J|KQ@<2T<8lQzcdwFU-+-!0-&E%aOLNCSW6PpM zLq9`5i=v3!#LBQF-@LSxg3N5+JPWQ;FE_)aGJg~A$`m)}lwixSz*2n!&tfB&phyd^ zg7CCR?{M#IN6RFGL|=5<3N2E-($f`u^2&_L(lbm$&5TnD@>5(xBYfN0|j9omn4HF}M+_Sk1eLS+g-90k(vt3QgOM+azd~(7fOG>k&a?D*qqdWs6ql&{U z%+oWB%>&VG^A0PrC@NQ|@GLX-cF!*fbkF)5+rz6Q$iOGk)4-xKJHNQ7&^eN; z)FV>cGPJ5J$ji~KFkIio&pXxBT-!9*urSTV$jvOVq^dkAz|>zm*Ub^#w#u?#%cOFJ zbko#w!|;IYlmMs1V3RO^Kl5}$x1gM&LXWikvOupu&k}tP6N|EZbH{Y9Y>z~D*I*-W z?F=7t%VIOrsGus3sIm-g#|(c@*Q`=6!!Q$nXP2b>FtcnfU0q#;LSyra{9=>Js1TDR zqXPfjT;uQvzu+|1e)J`}Q9%oH}ZkbzLd-K7N8JV1oM* z?}c_MB^zZ={`oHAvphc3-lulkZn??d*W5bJ(%JUss7VuJHN)Tfn;zHhy!mFcXJTPn zqQA}4T1$&luNd-W6r$Q})utTaezM`3{56kGt_yAQxks0+u)qB=-e{VB$*WwZRsbh# BLazV- diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 678aae4..6064f30 100644 --- a/secrets/gitlab/secrets_db.age +++ b/secrets/gitlab/secrets_db.age @@ -1,17 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 7I3aWhw7iw2mwJnswJkVfIQ246p80yB//uG+0sEyqTA -adGO+PNHWVXIlDQKyxSPXvZH5XFONNNPr9iLeVq2OfA --> ssh-ed25519 4PzZog 1MB3obSvF4K2IHF8beEcTwZ6gisII/iXq7uGKsDK4GQ -dVPFnOW0d/IuqNtrcLdr9AtNCWV4NYXTtVHHZS+kVHM --> ssh-ed25519 5Nd93w CNxhP+Y45tiXD7WvDbQgo7ejsWfBoq40SygJDhksCz8 -h3usonhy4UfpnSkuHw5pKEV1WS7IMvWqqd1Y6t8J1lo --> ssh-ed25519 q8eJgg yZ7BmDxy1tXK7q51r5oAFvhM9mQYHtexwOILnq/2BD8 -dKwf0oHUUiVBNQod8Zbvxn/YfMnhXNZbqo3Qv5uIdME --> ssh-ed25519 KVr8rw L3rQAswf0dc7Ok5AuTFlSl6fuOhcRNKI+donwmJj9B8 -BO7TsPdPqhxy8KfzPW0QU1qHWKd07fZSQ7TqS7+2ep0 --> ssh-ed25519 fia1eQ aEskvIGIekFwG8z+jlK3VOlhhBGLYPsEnS/1w42cKg4 -phKYN4MjToHeljP1s4/gb42D4t6dlLnbyut24vBFjB8 --> ssh-ed25519 uZzB3g lczlYBZbn3f39jfC1fp52EXXRYX3nDrQ2c7X1QlqbRU -eBjI6305+Zigh8+3esXt+qbmJOVJIARVPA9ROeedtIk ---- LOIDMgRcQ6CDPqWhDTSW0vzaTV6XggXW2/HDF2nB8fA -jtFÞ©±\ Ÿµþâà1¦1}Õ&QwÿwVÁNæG©z‹QS?Õ]êK£D:ÒKæ6ßó75GÙp·=ré‚ó‘›ýã«;$bN8Ô/F¹›V,ç!ŸÓJ¾¬%¡Q˜"²"=ozŠÔ”f‘¼T€£¹ÔåØp“~Œ‚mZ„¶Ÿf÷ŹTŽ2í岪½ 0_Ô~âôÿ¾¹üš‡” \ No newline at end of file +-> ssh-ed25519 V1pwNA kJHAcriJ+sFCzoV1VVboGB0/1xRlwl2mH1cV8Vy1mjc +Ry1QA7YlBU/t5nfoi5s8I+wy1HTU3rVAFAr6rUabYpg +-> ssh-ed25519 4PzZog 67l2OiK7ENJ+HsVrXSDCRe7XgIe/dFDj+Ms/Rm+ueUY +EEIiyD0piXb+gj0gy0oW0X2kN9mdMZGN7Avi7oclSnA +-> ssh-ed25519 dA0vRg hRHg9X0Gb92TYsY7eIZNPzt1DZQiKHiqOpaHK5nKPBY +qp5dEMpv3WpFnSesd0Arq9aKDnMxdo+wDXi2fA/U/9k +-> ssh-ed25519 5Nd93w awByDyEArWq75lcY/3uvlIlGx83boSnWLMQWcPSyuzU +C4L9KT6Bo9kc1BJO2BgRzGCQK4PtsFXgkfgO4VO0W9M +-> ssh-ed25519 q8eJgg 3JAmUOYLDgLChFBadKXfeFYSAYWraiizPw42XOziBUs +KvATsOkmpg0R0umowi23ZRcATUYsUM4SMqU+OTP7dLw +-> ssh-ed25519 KVr8rw CAh+Am4nDLqeGfZdWYgQbUOXrh0RRdCepxCbtNqoZl0 +uXuSAtx2osOXSSSnYzuXaNW9lvoKMQwcRgws4NP0kzw +-> ssh-ed25519 fia1eQ NQsgR5u4GIzBUFJufkDFdSifZO2bUhuUMMxtgRLi0Fw +jkOAECCGrTKuwu1etx2dfQXxaGOBs5RtY4IKHhebagU +-> ssh-ed25519 uZzB3g WUh+ofw2E45Ch0GnLFkuXizAIUJ/MXGWJkt6BQTD5FI +ScfYZzf4U1E105vqLEoRCpSbluyimcKXm3tlLHQNr4M +--- cnStsCjzqGq07hOA4OlSZ9Zz2PE+WTyzmfZlDjost2U +Ö…rL ŠrÄE—·W…ÿ¿潜VÎn¬ þÃß_ßOÉBZ“•öjÐp*ÙãØ­ÊLŸØV ÙŽàÇÍÊÉŠ”Å7¥Ý«ØhÀŒqŒdto y]²;²%ˆsê æ‰.p+&8°ªëßÛ)æan©/À¨„Q&Dš¬Ãü¢È;xøŽÁ-½ÎF£'¦_q„Ù`×A[×ak¦.“„ \ No newline at end of file diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 78007ce379030626be17613b770e4d8974ca535e..50d3bc6a86a7f872e3f1f3846952ad40e828b011 100644 GIT binary patch delta 2586 zcmew+{6u7ePJMDnxp7iNaAa9ZL}qTTzMrX+tDAdvcu8iUZ&j#cwsUTNq?u!|c6zCE zF;`-^aiVshi+^HvXkbL7sc(d@K}CsCTBKoQNoh!ae!5S3ibtkbUYe;{D3`9CLUD11 zZfc5=si~o*f=NJCRDQaGXNFgDL9uqQer|fYrF(IHWqp1~uD-d2SyE7PWmc}Xi%V*D zkW+?VRf$_5msdfhd0}{VXl7-JbFo>3d4yY)eqMS?cwtnbccf)OX+>C;qhpn$sY_@i zx^*dz24z9%3eFY!mLYkDX_+ob{*fVmsV>E4+PP&0m3|cwMX3euUM7L2rn%k`W)yp!(qa-lTEZoJzUppr! z(8a^a%{|4(6FmmfG7}9`0~L()E5n>TQi_vG{nLtawX+@T-7U1ujKfQk)60U3le5Cz zQw__rqXL5~Gc350^@GCw&jtcelHBHTPxAct+GtWygE>6xUPja(J40QGLbFGicFQ|<2 zcMJ~Xa*gt=3NbP>@C+#PbV~A0aw-ZnDff0w^YsliFHFhK%n$X?bguHXaLO^@($&>f z2+B+;Gp|bV4)BlEuJSW2HFK*fOiOe0smf3E@^&mw47DgT&Nk1n3`)x83Z5ukba7MW zl6jwk>aQI4J0CaUA#eU`aVEj~)BahDCrxz@zObTD?()OSxvZNXZ{nyguTaSitkq4g zD?ROd{rN3}vRiL5MemxWT@O*UdN|{q;pa?8`-4d*s^re}mdNF8sNC41B=AVcTEST9 zP4D zkhb^V=`U|r2JFwi;`-$4x^-U_Uzqv5TFA;5-hDo}YMJ1^RWE97Za-P~B_&Qi*FRy$ z#aSy;yPWmdR|$Mrr<3M$|Ek_GnGomM46C%x&Z=i$xU%Adv5sSWn)|of)B@|J|C77_ zmWK*U?2;{ZdGsmDY_CcoV_x*7&F%A+9FlvcJ#&U2U-(wf!XPu*otdzl>ynu+_onm(wP$QP{O$hs zB`?E!8HCHU(-A6)5kH@HMP;u|@%neO z=Uw!?#A&tKW(V4r%$J$LDZ5|e_BHMwoyToz!c>{8<=%G71+L8 zLx)?rqGnuQH(5#48ZUe*TEMh3op;ya*puB47lo~G>#}5XcAT8B%R%i-*7dxWAC=oC z@hne1DVgb=oHV=eRI;gLVcx}8>_&W(KQwyRyZrN z%+>dfYh{zl-WsC`k4`N=QKO;GwP4QfwF&bQ>z%x89hVQc zO7FI)wnDeuMhV9om*MTLYwLO+U0_GP}H)(q%v4yS7Fg{p&Y*%iWx% zywrSY{>n!k4;SnWR-AKJw0?7wyuyJ+OWPY>78V-uH%(g?WVqsTf#oW_qsQ$NG}ESR zH~Mi*?)}CP;pu7}EdhDenZ5lA3sWm4-MG)z=QJO_!r=Vag?(!+hkaN5AuI2T{};#c zm@vrBeW)%X!^k1k_?t0fi`>e?JYf-jm9HCCI{fy!c_wf|q_Vuq%!u1@UkmFuUA`L5 zx8gJF^*=1)Vp>o9x)~qTopsdMGe<2dS@~b-5-y*hj9ZG*(z0FI5pn<3YPNChSb6M} zWLs%%qixI11Gjj;g*&bNA!u`c!{blOj;xIhHC?+P?Gh*BD$V{RwWc4Y_iTixJFE=( zeU>wfRe$fR{E7+6Z>C*nualfDxHaT(N4<;Mo>#hgd5&wIUf!^OeUPOx)AcM3gAIM| zHy8_7PM(_M7^o4YyEw;Ya?=Uca~E%F?QLKCt4Z8y?a^3{8jD-2*K7llAM=&=d^v8 tyQa@gX-bsBY|GlSs}7!8uzF(#m+F$o-4BwlFZ%T3@a|xjp28fPa{!aBYC`}3 delta 2495 zcmaDN@=bVxPQ9^zS#EZCW?+^_L~^ECenv&UVTOrIaY(kGg>#9ad!AujNM@^r^ivnW5as;ID1Ul+qrt_;8Q z$dn9olN9ZcvWRpur=Y5Wl*ouG#{ieS!qAF9!z@2-|01KP$jlUj$!8hG>wP_PD@`i2 zlXFZ1)3XDO(wr@fDzbgjleMedyj{FP^PEk*+>J_#)6>FCxSV_~1CyOy+#+3yLiE$T z3mhv7je_#c&4bfR-IB^v+_Q`FO-l{Ra{PP@(1Xc4tjMCMT%kC`InmIkBG zJt@r8Ik(g!v%)ncEZ?lCz`)Hk9mBe`%tXV~Kn3&6yt1$y%c@GB5SN?)ub|@efbc3O zGxLzVfWSPrf^xs0`to2e=TPU6a!)R|vLJKIlF(caGvBbR^g!>ZtRzbl{V*fnfm9cbYxm-7W|j?ws3t^1;n!z1WuNtc}_^5qhr* zl=V&-U;6GK<^TCH-=AY?=8^Yezi(zx-z`7)gVFo~@wjIuWeN2@+xV|Z-d;R$oI0SgvSe7HM=+ubMW+9Vh4ieLHp9P1BD zK1lQNEz-Y`ZX)5k@t~V;SLOlE7NMnwy-#`e=`Uwyy<}jdwO~2h=Pet)@O>#flbGl{ z?a;y-o%LI{IeM&|>pI6UL^h&kw`%hDOJR#K`WIc}Qx^uzYn?RWM@9+=1YL1@jLu$mw-kz&PQ@8z?&c5jM!+Hgq7hA+` z$Q<}2Bl_-EwfgPTs*ktrxpd9st5US`p$_E_Url6_vh}wq8A^A4d-0a>`?`YyrZW>} ztU7SZO?dMMnH4wBiay!r&8qM4=;n6K)qw{*-k9BIm%foVDJ|2WS=o1sqgc|>-8{2? zeypDVY3b9KWm}Fukz4mW()(h;3utw{TN=tz+qHmAsGB!&uS|FF z`aaIt_39Hjji2r{GcA46p;SF}26OqmX-t!zopriVr+314*9i}gmFqot=6%f#nALs$ z^4(9%-uHMZ-!v(8j46A?d)YnS==d@FylGg>M8Eg#d=>o6EL=@XC!5r>iuJFpuUNzCo}m?7_h9j# z_^h9b8z$}b>dLUd<`02RWh07--?mQ@aw=hnBWy|^6ABVCg_`mW}vblR%P2PW= z+W*v)>p_?9x2Xs12yWhyIZyku(V0bslcT?|JZ!nPi6LdG2bZgdqwF(VCf)el-P~Fa z6e=atUG}G5vopQDtp3m@&SmwX3)O1hDynmGt}u+}e)asohoA9%KKnEERP;R30+!AC zec;EPJ#`Zw+~;sO;lKP|#N$UgYnb_2%>*CEnqRl661p0Dc`xINfBlvpUVN)|+;}`d z^4fpnnpU257L$G0nE!~rTjaV~oGZ85@%(%5qwd$cwmP%^DCX{du-k84{j{m#@2sEe zS}fWjx%H{Tvs+R2RrN=1PE<7r^2kw4Vfw^p@y}ZNK4bJU<{JC;Yb8I5=S`TnOZU0< znl`?KaN*NAJ+pNLx!z@6WX88yb?w!!n|_-;_BK*_d}+?|8pGn-^%}*0 z4?W>L`}Eh#V6XM}EO>cT%p?Nsi|zL73!GHbtY0?0ysiD`CWAw>wD<0tcl42t0S~L) z4>{XmzBZtI)%x3i@39NZ1uzD6AL}mf^O)k+wu3ch+GobaH_n-vU7gPrfAmkKzs&om z_ASoq|M)zUJhLG4^OYl4H*RD*{+BniUS(ayq%Hro1?R8&y7>$5?M5}x%^cwy ssh-ed25519 V1pwNA 8nXnggj7i0QRpKkoSjfcDVO5Eaz/ltd7kmE2PnpD4GU -baUiBMWhQfC/qMIbeimpeTmQJJpq+UBJsgye+tYwE9Q --> ssh-ed25519 4PzZog K3x1nAby1EOzePmEwyu7i35kJg1aBDD+QSfSRZzExgA -oPbFMq2gXpX4kLsNFfNzP/UzaahX/gEmKhMfugE8ljk --> ssh-ed25519 5Nd93w JBgnFDGU88mS36QQXyiLwW7MA8zI3wBAn9bRWzkuoys -B/pLgh7ANqOgYXiab6OKoY61PNFzK+m7Y4y2bPP7LaU --> ssh-ed25519 q8eJgg 7AkO1MA9JMkeowB++P9Ici8br89Q3mK9k/1CoVKhTkw -13vM4CR7IqrJlpASgikdGJRjrTeKrPuM6j5xB97M8q0 --> ssh-ed25519 KVr8rw CEohiMguUTRoc2YssHIT4IqgsHfM+Au3BI2TS01ZfAY -PFodBpRdFwl5FebHwkbZuVP1GI3BsqCipw3hZc+ELek --> ssh-ed25519 fia1eQ 5c7MWZm+CCoJKGnnpJPzAozuknYY7PkRrwVwueMOkz8 -6duBp+UaZSIvioI2zl3nBLAcgjFcyhUnM8P615SfVWc --> ssh-ed25519 uZzB3g 5dkyRnBxOCv8bycPWmERqPRN9iaTD4tm1+dD+jaRvGs -1ZOpv/s/NFUphMniQfC/zS00bmp7diUqmhIwusoKYPc ---- 1HlpvOrpJpXgGIdXzqTjt2gUMT5lbb6i4MKcvbozJpo -Ú>í©Ü—Ũö•ô¯ 9y‰fÝWÔí%Øtí‰xSEçÏqæÈñtÚ1—}þ­%Ã^Õõ©«)ø]øó>:ƒ£B–Ió{yéÊU D»Ÿ?-\Œè|hˆ«?‹M¤`É2æ`GºEr•Wq>Ç¡NþÚërùO(‘?>þòKmÕÎæ¦Åóa˜òT ÓÚĬìP¢û²jËU\\{2ºL©Ã_åÞeqI½ \ No newline at end of file +-> ssh-ed25519 V1pwNA Thv2F2iFu5tsMShYDWtpOLV9QInGpSQ6ULAU0Eeu/GU +VWR38aDNoRZvlNmUo6THY+079E/AVQR55jQGqlauoLU +-> ssh-ed25519 4PzZog jz1DS0Dai3ZAyVy+GIz32ratqEmxa8lHQWaKPt6bDjU +8RV/HxJmFGgnrhHuwc9gx7JHrjaqyYvye9chB+GE9Es +-> ssh-ed25519 dA0vRg VP3uZNMQS/F/1gvoGz1ICRvnRkPsVOv+4loYQohWsHw +yiS2tHhxHgNvXmVXxI44TPPn+/jlvihPHno3UMve6Gk +-> ssh-ed25519 5Nd93w 0+7d32Me3wym7Z8cqyRwqKtp46HL7DNS638oFj8YvU4 +v6h+tzKdcinPvnLmuKQ54JhB6m9Gs3I6mPNt6XiWui8 +-> ssh-ed25519 q8eJgg pOCYtaW7RI14JCI3PCoYe+5bzXeRityNIqn/MFOIXSI +mhnxKW8omo8klXzfGwPzYJBr4oA9WLHuSe6be3CovU4 +-> ssh-ed25519 KVr8rw mZBMV+ZP0Y7ZzXtuBzB6AeV+GqKaoWh7HqOr4I4zaAk +JHJvpCrxL5qDNlIRNopTzH/aHZoajc6cH5dDBIAfQng +-> ssh-ed25519 fia1eQ HIZp+I0j6Qbxv1ub/EWTWGJ8EIfZUO+p6BAE/o+FdCE +16XYxcj24vdk8+PD/inZQ008NcAE//2YiEYBaGG5yZ0 +-> ssh-ed25519 uZzB3g r08ZTT7HTZFmC3A4ZDG+wyGp+9+Uw1bDINNJY6sTqA0 +o0+xylKkAnINzfJZ734vd77WZ1tl3Y0sTIOSE97Nb5A +--- xqKxcy+L90hIZu2sbU74rBYE9BD4DfzE+GnvqBCHnMY +}9™½›ñ’t1-†J‰çt0ÐkÅÜàî`ç×óIwü_˜Æ¢i¦Y¨þœd{¼®FJk2uåÐÕ› ŽÞŽ Vç½&ÁÀó_ÝζØ,ÀÑ÷Ýn&Ÿ½~Ò‹•“Ž )!µ }°Êlk*¶„0*®×Ù+Cuoƒe2Côö¾}Xð˜Nª"ÚÃxýG±ƒ´ì3bzŸ4;‹˜Ï1â \ No newline at end of file diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index 86192458622b92c69e2cfc0ad943c9a2ebf8ebdb..ed1e37cf51b929612ebbda54ba9336458b609145 100644 GIT binary patch delta 1023 zcmaFCevM;-PJL05X=rMOXGwWtURqdSzKe5aevqejSY%;9vA216WoTHLNwJ@Yc8Gai zC|7c+Wks-mxlg81UPWP*XQ88KTC%p0cd~J4oK?Wf_j4}{$@j>ee1=h?zSJ+bvN+H$B*4(vBFNR*G%wLPUE9Dd$Jf%^ zC_A*O$loA1JU7iS%_pOr%Qq{;B|oq{z|+LMC_P8t*tonrC_Tj3)it%$H8j#lyD%)x zB*L`7-!r)!Jp$4)6Ae=X6+-=t3LH%=GW?VEBTId~3`*-Q3JtR(UGf6+j9mOe3rw>k zEJA(rebTZ#Jh{>$N+K=1y^B-JObP?i!Xlh~gNsbeOI@AJj6Dkr49rUsy*(q+!rlFh zv(c?9jjD1oPFKi|2s5g*H1P>G@=H(22o7>CN-Zx)bIU3-PPNE23-b&MuP@88DDp~A zs&wQ^3=YpMbJ7m*2#NI94=gY*wx~4n3^eh}HZ@81$Sm^7$;^ogt&B=@3QgzI)zwv~ z$Vkc#b}aD7a?Wz{v@ACF3yAc~Pc89^bPaa$@Cq&S$#Kecb;)oKDly=*LhQK?W?tDlr-GeWU%*T zq0ip7r=5Aed}gnXI~d7!xEJ?!GYRl#haSJDAG)l?Kzqx~vll)u-RT(RDYAE+D9!^DD!9E-9_le`cMF5g5q z178ylpPaC&q_WiV((IgE-{LGsrzrhmg9vwzZ0#y9Umr)e#3IMy$!8hG>m5r1vi*&7 zlbs#IwEfBplEOU8U0uT6qM|~4&B_vkvx5ta5_9!a3tSD7xx&)&bF_oq0$iN4eM7bV z%S+773UVq;TnfD^4b6OWg0cgB(khb!vP%P9(Syl5tjMCMTp=W*%-31lGt97{$}}un z+pDDB+`ZJq?`loQ%^IQqs$_96kI)tBUl)lC%RdlhU<~jDvm5Bg%6_ z4FfGod_5y_E4_m<^C}~`d{bOJQxk*hjq?hke6=f0ojpw3QfX&-2GFuP0NEUy#uQPyiivNYH^Eizo+EzGbaGQCXOH%;Fn)j2a8 z-MSP1&@#rQ^)euWK&~p*L0K2l5+R(B43Me%VJ~wG`Ez3K(8cIKaZkHKg&YL ze6HY#Pl14-d;k$B7@s!^1LM ziULA{eYL|Zb3y_NGOJv(^Yh$&^@~i)qQc#b(*qp!GxN(#vct2|xxC9vL&M9Xip=$m ziwr|5+#D?|&9(j0vm>%2^oxUi0y2}GT>O193SE6eC&x2NggO;O7N+NgrzDr;_-7gT zc~m$$28WbJ2Bj64C8s4@`a6cE`xSfpS7t|YWtMpuR~1{9S!h?5Ruu*o`?wld6gyTq z7N_WER=IhYCz&~hgcX~5cv?==-0 z;#%UCZ5HY8pIew-;uy+h8W!r2l$W02Zk|(~lx!BA{%M(shN*!H#-aMANfz3P{*KP675@H(!S!a^u2m(;nI)c?A?_vyQ6=SB z6}}ch0U?f_T&9kBCf5@9`3;@hR#_g0g0A@ z=++hG7L{d{D}?*H`go*=l~r1%7U_qX`k7f;gt}Qqxn-6orlzL&6<4^`dzpshWEn^0 z1ajq+YZrTj7a5m&gc&6n8CCdIt_~PL?jiMMMCf5 zdRUZIrWPbtgnNXRWja@S85N~_nfWIN2IV?A8yQ6z7=$^Qhv%iZxpMvdXqP W9C9mE?d#@wF8(QZHD-oH=@I~|V>;Ua delta 845 zcmZqRn8ZFor{1!pz}z&;HPp={E#D}w*dx6#*e}<$GRjRm)YB)>IlDA7-LNbvJv_WT zkSj4=JH#ioI5e@i*v%(6$kHb_H?cIaGRrG8$|W(ywLB@u#5u#YOyAkfgiF^>p}06h zH#Nn`)YQ;Y!6cw6DnDJJG}AP{Jf%3TGR(=}Gb`82)6KjvtH3lp*w8gO(=xl#FxR=% zE6=Fh$0f{wE6B^-C^FYn-ykEbG9%sJB+WB8up-neASu|{(y**D$*eT2)HgpV$v7f( zay+AWxTTk6QHY_NrDIjFe`2YtcUq`-l973$Q;}CyNo9d&T0o$mi+(|=w?UWzm!F5b zYi?O~KvbovrEg|LYCx)MptGfOQIbJeN?MAcc}QlSaaCk?j<%=gRDvwnC$57W8v>=7#3($&Xw!pn&)j?To&aSVBzWRnv_*+oEK5z zmzrZ1?3Q8a7FCk&Ztj?CUXosHfNot{W};zgpn`{SP@!>Nv9WP}c9MmYc9nL%pQ(pa zPI7rjl!c*(zH>%yWxYkVS(vs@h9g&*mzP1Mx1q78W2Ui(e_^pvpmu6xdZ}Mxwz;91 zuR(@ch-;u+1(Nv3`VMg_TrrhdsO`bC}@No6L5nWfs9x#3kw z#l?wUrNzzxc?F4)c@|um&P5R!MLDkZCJ`pNxjs2wCRJf&hR$XNZdE0Lxvu^}m4O+4 zUgZ`gCffO2y1Kdw<;Eu79{&370U7@8J|Rvn&VFuQhNd~rS%H-Wkr7oPuC5`4B~Fzk zDHX|FYp(B^b93q1fPZcGoGnjX|H7H0C%ZWOx8vhgUyM5~cRHTmd~eJ8FKy<>LMr5o kT&&|;AKGquc2?_?^V|B14CThE8#@~V3f3xpU0~t?056aqj{pDw diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 954ee5bdf97f3520ab16a6932f8ad472f3577dcf..d79875c625e9895fc7fedb493850065ee7bb97bc 100644 GIT binary patch literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!thD)aJm z3=j1*D<}_4)eou4NOml;@C`2V_i;}QHZ>{tsB&`+aCE8&&*t*ZPIfJgbn}la&JME- zN-s)F%uMmtPb;v9bn-Ov&rho?$V>Ffb@$3EG(fk_B%mrPKV8AZFQCw%Fx|M+(OEkw zA~)a9HzhRHE7HqIJIB#6*T~V?(b3dHKh4p_IGxKoB+J<-%pzkUCJG%M028a1Nnk0Ez zmPD3#q?#KVI+qt#xpMitSfrJjyA`*~zoSG%DFV!Zj=0G$S*^ z)i|P{DwNALJ18*9psdKx#VpL}Qe|RbZKsSD+spnvZUqXO*LGp`(IxL3Xf*n?-tx zS%|-%slTOfhqj{Q1Nq%ZsLArZ+Wih&KrBPK*#_0;7&S6QJscxQ?NmYjV`Vr-3 zCFzzHex{+u7RA{C`bkNSiRFGp&dEM`~qE1p8Kn7w9KiL?&fBS2=}6rlq7= z1Z8Drq^GB7n_#3#XhUHJ+`|2*dG-G-p0&-aOK#owQ>Ybi_A<^Lfn}j!0(sowWO8=i`Xw0*fyJVr8bfn?c o%A}!s> zFDf!K!#}t(!ad42)63PeB;Ct7$+IlcIKwF2z<{gVtGKkd*tI0tBg?74w9+6uRok$z zz|_|~F|x!p$kIL4J5t{-Gc!BUzy#ekQ@<2T<8lQ{mx?@RZ>LOznsWLsQH0kVuzc?~tIpplpw_K!XT_ zg7Ex&BUj7Nw8AW(v}|LLCDQWj9s~kGg8b#&GI60J-w6tQ!<@h62r9iSN^Vt!qgT0WXiA=bUZP7tieYY)S(r~rNtC{Og$b8q zK$T&oL7|yAcBQ{Xfn%CcNm{ONWMp7@Zm>z2vy)>Irr$iP9DNHN6+Aqn z%Dof){6ow0(-OV>%?rGpk}G|Z@^k#0gT2eLDt+@@gI&w=(~6BexhzsE!me7r(a{G!4`T#G|2&_l8`s>;bYT_NARMBgdj)!Q>9 zGdnFSIn&o5wAjQj$kfur-7L%7sHie3pfat%r!uE1kju!?$J5l?Fh8O^DZMJkJh9v- z(m6l9AjLJn(4{QMS=*_i%E>4+JS`v(BTafF8Dtg&Dp+RcB^hM6g*qCBROFRqWtAK2 z`v-d#1h_ishZv+9CYOh~7X+1+W>|!zbD1YqgheF!g`~Sw6$fURha{C7`-SEt=Z5-~ zm6v8`8x}iOdWAcB7I^xVqx%gSl13?+!BKuL?%6>GB`IkU7EZ>_Ar{UV>4|Ak8Q~Rq z8K!1o#m4zbqp>4vV_K0!IbCPnFf zNk)+-IBYZ5FV)Y~kE$&2%S`h#4lzqH3d%@#4)hK*FEA+6cXIa1*A8*aHt{wL@#QKi zN;eM9HZsi$G0`r_NzC){&+zf_HYl$&3Na}6PW8;o4-WB7&q<3259HF-)m1R_jL-tGA1CPOV9`nUdjlpUs}Jef9MF3_09) z=O@_SIAz22?%&F#O3@i7j?O3uZkk^#|H2@m<40}T_kRaD>sO{I#i(*5R^`=+%JzRg ze*W%fzg13kJ)iUruQ(Z6B7Y+CMUL#3@Ll{>ncBzX4l|$q?-4zxu;{jg@XZPcfOz8EUVihH(#uo$+b;7-ZVPDi{ryUu>(Jw%nS}sO#Ss<& diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index 31f173e51dc269f6c57990f9dd02eb81531d2455..4853aac4808fbfade31525d8e7951d835369802a 100644 GIT binary patch literal 1440 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tlOF-bEC zGfv3}cdjzX%}>h7Dm2dt4lC173oOiv$d3%K49WBHb#>H_$mjAaPB%|3HZBSXbjz&F zPcbPB)V4?q&-C_jbn!~j&d@e34M_8=GDr$daYeVyB%mrPKV2cPFeN9++1xTSz%1P- zH!-uoB_pNWqcAKpBeOI;RNE{nH#E{c!#T0iIFc(rrNk@1Jj&3ws4~zmv8W(9*VU^u z-6+E|)IH47v)t9f(9}6R*vu%W(gfYM6i0)ypmYVlvOKe-v>^S!#H1>x(j4RPME~&g zg3O>&^U`$JGRI)c+)$IWya@f$z$` zsKQF~97~q~_oxCtb5C^JO#M8Ui}Lc^Gt#+S!>fWl{GvQcLdt{8oZR#LDoZPaBFs}$3j$pH{3Bc=Qd1nw zibC@9LJZJtE3`=UN>5iX$aD5EO!qJ<4Knl0b1n193kfkS3W+GyHYnB3E_e0~(zozQ z3r#EakI3e#Dl{(f^h_z#E{QU-EQm}>EH=qWcX0}=46f8q(KgbLh%nJkN)GU=iYiC9 z%{#2fqNrTKJUy$#KQBBWBqLux%OW{E*geR_*v-!IuD*f=6RF(MG%wzSMd!_+_p zgQASkq^KOnEaN0I%lwRB!!)Ddu*&3oeG|h#x1x~zY}eFC6I0{z(uzQ?lG4=7?23|- zg353wQ|Gea5RXce5XsO&rrJ{L0Eo3Mwsw{LGCFP0I`_4RVXoZ7YqcaxzX=@HO*xcPp<9tt#-!NG!;7 zb8_QHVjKfx6LETAhRG)!PT)eB;UlX(#X8hHzg>mG|$p9Aj2&z zr`*8B%stW7HKa1lzp%6bsH#K+&VJjuu<&(X;_ATZ0% zyUgD-y}T$h-8&H@-k>4r=3$nY?pN%d<6~@OmhWYrTxpo*UsV>C;pQErA6%N{lv|h_ zS!Pm^>Eg*%?%`yT9Gc}=73yuE?^afn;g?sQqwkWD?vb2iQjuHk;S%O*TA}ZlSK`T~ ztE;Qv?(Jq$Xl$A7?_})j?^s??T5eKR7;fm|V(O$FSY)OhT9K|@Vd0eOVQj%wcx|Ft z)Vr-~Oc*DeHQW`De7WKO&RvZ7ROBLHYc#c2R=?ih#ZBns# z8Rw~Q!Z+pyvs5be9I%|MWGpjB^b(I&ysS)Z{E@b%E1ws78o3;p9;Ybbb~xac7x#L; zqNQ8(-PQiM{hc*s+4hdrYnSHb#iqAU?KQgpvu|I*HRB~Yz5<(Cx2ZpJQ(n>aNFnWB NrQDfQM^`-m2>|b<>RA8) literal 1330 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zK%%ulm4 z*7hn0cMq=&c5?SMDJV*D2@Xy14=VC5GLJIOH*qzt3@R?pjN}UOFUtz8^6@Nkjmr1e z4oKH8)OX7*F3ipLwJdhmFETAlGdD}A^z_a!$ws%$B%mrPKV6|REIcyEHQ^-4oq5Q@<2T<8p-p&(zd(4{xXRz?|YRZ}ZSl^W?Mw z_rMCzM5j`ZWZxXG4D*1>@PMN5%s_P83N2E-($f`+BFp?r{EG_R0$t5211-{WN-_=0f-Qs0ywlQh zEqt=VOCw4OLy8QXjMBLxjdDyPLM-y#LyL_(b21Ggj8nbSv@P{LO#{9C%>AW|6G%L}tD9t0w-8?zm$f-Om%{p%-qzwGAKDT%_%D1wJfCA&(KWY-`ub$&)lS>%rD%{*}%`JDiYmq zX_<+JseuYX!LA(jic~NP;QAzI3-r5;yhT&nE5x%AQ8J=8j z`kCqe<^I~f-o8l{7CAxr;VEgwj)BFg-bLmWWl^OmY5tWKdAa)KWf-=3Ryq0>Ix2V+ zRR$&&S2$-!MH+c!hxvJy`&b5)YM1Alg=+^E8E25Wpm{ihq$`xn-^O+ z`}w&98I|R_8|E7u8#+1V7i5GO=VeCt=S1Y^yM=lBnV|cvG^)zUI9(yN%G)$Gr@SID zA~ns+C?_MWTt7)WKRnya)g(2-JS{u1IMtvss@yv?G?~jK&7&eJLqFKkE7CQo*rG5o zCA}=wz0fH)GgCV;sl?0F(K5BX(j+Q555qQ(B!kR?Kn0Jo5WkX;kVI$yV#~Dh9N&^) zldR-a(_ljv?VPH_R3pR8lyXZ;|A@@2axRzTLgS*a)L;wCQV;ErlC<22k^qy)v_%-2XiJI~wD*wZ(? zn9H|3s4B$V*RtF-!??iLILWlA%u+u+EH}y`FDt`LKft@l+0fA-C&1I(mrK`9p}06h zH#Nn`)YQ;Y!6cw6DnDHzE4RQjET_1{*didwE!Zg{vOX!g*4;xNQ=V!6i@Rs|I8GNz${mDe_!K_j5Lc}zvO~!KT`vf;9^6t9BHi611wBfQf* z91AUrgY&9N!wiz$QnON=Gc7aR64NcJ3@wYjN9sy~YiH50x3jTrK8Ae6gZlML4ewKmW+4}W4d0}Rb+K!1qE>!_(CQ+3o zsYy8|KKiZ|23+ON`oYC%-X30IrWVPTsjdbgmIYp=LHVwcmTuWme&!{?mK9lsE|%U! z+340qx+PXPrz@D3Mfe9qx`Y+`ItJwX8kv-ZXN3hCOZ~nWqJh})hC8KnifVB zx<+!jRYrK0dgr(%x`$PU`sQW@_gp;) z>bn{kCZ-uBns^wv6b5-`B}F(YsHr?0maR XDKGlp+RY9VW3Mo5IBLI1O?n;xAd5E@ literal 914 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tlQuJG`P zD$}lT*Ut3HEcQ!uON}rMPx5xkD9cJQ$;vAUFxM_fbuSADP39^x4foRyPE9mRPEGbK zaV;p!G4l@3jLZ!5G4spv%y+i*$#PHkFi0znibS`~B%mrPKV3oJ#mmUD)W|6^IJh9& z*uAXCJGjI-Fv=^~J=;0W)63E))1)e}ywuq^*n%tA$i&zwBq-ZFDb3$GH!!HG(p1|x zxTGpQvmnwnG|$vMvC2<7CpRo8svO-mQ@<2T<8lRO$HY=o)11;WOQ)>BRF_DTs)B;D z>^wv7tip6xbI&YC->~4sWNqKv++;4xaI=7tw1UtILq~%`(;O4mN`v$eQ$x$JVuQj$ z7n5XTvrIpi@*F>dTu*e{3N2E-($f{Hd{ZLb(*ugki*w7%LL5Dd(*v?nlS`|zQge-c zN{!20eT#yP%?ryaGefzG(sK=i0*nluTp}X#9D{NyateaX9sT@FQvA%F!VP^54bp;w zEVaE&3NUQ*4lA-KDpv?|GA&CFs0{WG2+NNO$gj+a$k#3^D9R4c4$V$+P0O}0@e5CJ zuM9NJ@#RXcNJ{b#G>Iq(Ny_kWPBbbo&5bg(Fm^QY@=B|4&(rqzE%i;wNOUsK3`F-^ zT4thQYM_E~iIGoUWT2B}S$c7nL5g;ig+*d!rC+gEkWY@Uex`dtnT2b*zF%l%Mm|?y zp+Qw?c%-wZaZ+SeZb)!SvRO!RNTo$kT1skUVP1|$SZQFUw?|H;i7&csk#30<&glw? z+O7t<5oJ#1mL`emVF3l%My1Z)ImV$LRh1>~nOS8K;f6j=RX$!m*(O|J>4kY^nHi-{ zc}}HXCSL9pmab)`+UbejiRLA)CdR?(CWhXYMWMx(`sG}@y1EJ(9tNS|6-MC^Y31e~ zsV<>uK8|5&1>SDu9tB=O`e|8S8A&CEp%$s7p7~tAe*N2L`mC$t;f3NSY8$iNYfnv) zbA7p6ecgkHb@MKo+Rt-5m>sj=+L`y0g#HLk_>^O0^7Ga<<;{Yxtm@jUK3-E4u=vmP Kf2UT!-3OgN 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 i>9bEtp8C#ol2#?uNCW^C?Dly8 literal 1351 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yW2bocf5 z$P5aLDu@hl^vy{$*G?|5$gIcSGjPgo1 zHTO%ZG))Z;$}}`_E6mDqGV=-WHE=U=atb!{&PKP*B%mrPKV88uDatgsG%zRGEZ3sS zBrMw~qa-^p$sonez&|4+#N0e3FR;=gJlr_SDU>TM(X7zXTi?^gC(ks`FDu+FH89D~ zEhoY!D!@G?EVa@gAV0^)+cPpf$N=3oQ@<2T<8lR~WPj)Kv?~4VG@m3R?Z8YkZ|~g7 z@Z7La=X6igGJW&Rbnk*pvx+RU;AE~mKPR&yZ-Y!Db3fmTw6J1#zapcItQ@nd!0fDm z-~z);%dFD8s>;M-!%%eF3N2E-($f|EBOSvc@=}9+vmE`h@(Mi-5-p9YJc|9Rf=#^B z)2f2?LxOWE$|8JxgOa(NGgI6GT)o4S^9y~GqXJUQEIg9+b3+T$qMXf2JR_4VTtmH# zvRpzdk}S||^A0PrC@NP7Pw_SmGWQDcj`Rrebu)-CkH`=3OwM+5bka7@EcSCO&9u<> zFH25!%?;(s3XaGza4&EPvrMjXOEpccC<#j|H!e?cHz;vVH@4JIO{@wk@JcE3if}}? zEiE(AFf~x2G&#R4+$AI}G}6@F*V!*WEHuEq+|kk}uQ<3Yuhh>d$-A)F#VIW~*D#Vx zzaYy$Dm2?K-AF$q*~BO{*S8|O#5dQ+RNtiBBPrB5KQqZ+KPb&5#~H&m&nidXLPv!{ zU!$z_Qr~ie9Mcj%mW;t?srKSf5ReBf(=cIbNCM7zW zq(bI zgJe(N%=}3As4(-QjEMZIkYsefK|@l%*gdMmKie=h)66W{DAB_>$0XD(FvO$W)u}u< zC%e)t(Na4IGf9;syIqJu-wEXGuha~HKQQSBURg3+tSzH*WJR*G}TYPA~Gt% z&C)LZ_eR?tgS}vk6(94gc|xH|$%^F+)ge>+cuhrY pl(uiLGBsXX=5ToNie<(LZypGp;I)yFcicDisqUU1|1KQa3ILV9$us}} From 31e7cca4ed8717e427d6d95d227b3552f7fda832 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 10 Sep 2024 21:58:42 +0100 Subject: [PATCH 289/563] feat: now hosting Out in UL --- applications/skynet_users.nix | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 56d9e07..d186092 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -85,6 +85,20 @@ in { }; services.nginx.virtualHosts = { + "outinul.ie" = { + forceSSL = false; + useACMEHost = "skynet"; + locations = { + "/" = { + alias = "/home/outinul/public_html/"; + index = "index.html"; + extraConfig = '' + autoindex on; + ''; + tryFiles = "$uri$args $uri$args/ /index.html"; + }; + }; + }; # main site "*.users.skynet.ie" = { forceSSL = true; From 32d534be455b08fa80fb7a0a0b2a1cec0ddefec0 Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 13 Sep 2024 21:20:09 +0000 Subject: [PATCH 290/563] 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 4af5f72..1f701f1 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1724965052, - "narHash": "sha256-DXR+GfwTlqnERWTVgMHhGczIXmOBp7NmwfWzZi/DwLM=", + "lastModified": 1726261851, + "narHash": "sha256-+m32xqV6q8NaaWoYmixWK1T4P6DpydYb7zvdUWuHS+0=", "ref": "refs/heads/main", - "rev": "551bdb31653508674cf6eca6f3f952d18b6e7232", - "revCount": 90, + "rev": "e2ac80381e4f40234a777ac55fbaaba7a38138ad", + "revCount": 91, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 5d6aec46dee04f24fed1ed0d0c12501db68b9681 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 14 Sep 2024 21:40:07 +0000 Subject: [PATCH 291/563] 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 1f701f1..c033c2e 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726261851, - "narHash": "sha256-+m32xqV6q8NaaWoYmixWK1T4P6DpydYb7zvdUWuHS+0=", + "lastModified": 1726349960, + "narHash": "sha256-tUczQK8oBfD5xCHx93fPgfjH7j6HSaSd6TBrBZyuLDI=", "ref": "refs/heads/main", - "rev": "e2ac80381e4f40234a777ac55fbaaba7a38138ad", - "revCount": 91, + "rev": "00c08c4b1b6133df52f8206873c6bfaa00c8e615", + "revCount": 94, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From fdd2c24bbd56d19fba82e5c1ea7190f6094ce52a Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 14 Sep 2024 22:46:07 +0000 Subject: [PATCH 292/563] 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 c033c2e..8ce3123 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726349960, - "narHash": "sha256-tUczQK8oBfD5xCHx93fPgfjH7j6HSaSd6TBrBZyuLDI=", + "lastModified": 1726353796, + "narHash": "sha256-rhJpfoN4k6zHIzXwpDmaTTsYh4kKzHxmZA/Kg2s+Zwo=", "ref": "refs/heads/main", - "rev": "00c08c4b1b6133df52f8206873c6bfaa00c8e615", - "revCount": 94, + "rev": "1bd4ae2961b3482e9bbc02dcc36f19dfc637237e", + "revCount": 92, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 37c564be749d7e05369f730eee3eda615b1979f6 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 15 Sep 2024 00:02:53 +0000 Subject: [PATCH 293/563] 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 8ce3123..7669399 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726353796, - "narHash": "sha256-rhJpfoN4k6zHIzXwpDmaTTsYh4kKzHxmZA/Kg2s+Zwo=", + "lastModified": 1726358529, + "narHash": "sha256-D9DEgXEaF37DHlSBdrBSBF1OcQQGzvRvk26iXf1t57A=", "ref": "refs/heads/main", - "rev": "1bd4ae2961b3482e9bbc02dcc36f19dfc637237e", - "revCount": 92, + "rev": "92ea4b1319cc533dc0d381ae026abfdcc99fe4c3", + "revCount": 93, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From c692663e0ea17bd7c05473fb6d4a5ff6309d0464 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 15 Sep 2024 17:28:26 +0000 Subject: [PATCH 294/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 7669399..17b9294 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723409220, - "narHash": "sha256-Qwwsb/D+waAhL5/qFkn8h7mJDcRfbrZNNpRlRpPU4k8=", + "lastModified": 1726421229, + "narHash": "sha256-pFqb2sfMCKUnBi/9fM9A4Q1GhSzNYTSMPy6xeF1jVWs=", "ref": "refs/heads/main", - "rev": "de685b6d6f2bb5ff3048f20333cccba0f9fe4ae8", - "revCount": 73, + "rev": "3a9b4d12c6dd833be88400bd4acbea72362eafcb", + "revCount": 74, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 97ca87ec11f3a3a49c990614aedbf3f073c0d193 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 15 Sep 2024 17:57:44 +0000 Subject: [PATCH 295/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 17b9294..7669399 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1726421229, - "narHash": "sha256-pFqb2sfMCKUnBi/9fM9A4Q1GhSzNYTSMPy6xeF1jVWs=", + "lastModified": 1723409220, + "narHash": "sha256-Qwwsb/D+waAhL5/qFkn8h7mJDcRfbrZNNpRlRpPU4k8=", "ref": "refs/heads/main", - "rev": "3a9b4d12c6dd833be88400bd4acbea72362eafcb", - "revCount": 74, + "rev": "de685b6d6f2bb5ff3048f20333cccba0f9fe4ae8", + "revCount": 73, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 7c8d9641b5e7ccc168b6088b524d30d109d32335 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 16 Sep 2024 23:37:14 +0000 Subject: [PATCH 296/563] 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 7669399..641df9c 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1725281518, - "narHash": "sha256-MC0IY+bWgHtEgDj29VBYr6OUbXsMRBMWvAYKNXTc+NY=", + "lastModified": 1726528867, + "narHash": "sha256-Y6HYt4exntAw7TJsGEfs+g+6WBXWeemB/duBDixZrCw=", "ref": "refs/heads/main", - "rev": "8ba92cc47eab748510adb975e3d9197b1afb4e2b", - "revCount": 111, + "rev": "9452c0ac2ed84f31e9dd1314ac1e6e18c98bb07e", + "revCount": 112, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 8c828738ca3ee6564519d40c58e7bf5506cafdf2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Sep 2024 00:20:48 +0100 Subject: [PATCH 297/563] feat: updated the inputs for the discord bot --- applications/discord.nix | 4 ---- secrets/discord/token.age | Bin 1135 -> 1141 bytes secrets/secrets.nix | 1 - 3 files changed, 5 deletions(-) diff --git a/applications/discord.nix b/applications/discord.nix index df8f934..27c1bc9 100644 --- a/applications/discord.nix +++ b/applications/discord.nix @@ -21,7 +21,6 @@ in { #backups = [ "/etc/silver_ul_ical/database.db" ]; age.secrets.discord_token.file = ../secrets/discord/token.age; - age.secrets.discord_ldap.file = ../secrets/discord/ldap.age; age.secrets.discord_mail.file = ../secrets/email/details.age; age.secrets.discord_wolves.file = ../secrets/wolves/details.age; @@ -31,12 +30,9 @@ in { env = { discord = config.age.secrets.discord_token.path; - ldap = config.age.secrets.discord_ldap.path; mail = config.age.secrets.discord_mail.path; wolves = config.age.secrets.discord_wolves.path; }; - - discord.server = "689189992417067052"; }; }; } diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 657f2f39e38ee67b34b16ffd975440566e15f64c..c7fcbe76be16c790b2ef2dee8dd38cc886037dff 100644 GIT binary patch delta 1055 zcmaFQ@s(qOPQ8b}v2(s}evn&eWT~lfK&hcmgr#AIX^xwLQidmSKNmX#3 zCzp9*NxElwewlw(Vt|KBSz=jOc5%6{S8#||g}G&7cxF+iTaa6Txv5{UFPE;JLUD11 zZfc5=si~o*f=NJCRDQZbq*<IJTxs$VjLAsftd9tUev72v^saI5bs!v|v z#E;_PVZj0Z=6-o8DITWgk-kxBxw(e=DcL1{K0c{_RbI{p2Bx7U-sy%>fq@oW$%UD2 z;V$~ACaHc|5$67R;m$dUWzL2H!I75bg>D6b{-J(m!Rg^fCb{L4;~B-n!*k6|3?tI= zvwcEL++9tKqLR`IT|+~wN=uWHO|!C#(-Tt?Ljp~zG99zI{Pe?;Dyp=d4b7vXN`1Yw zlgrIr%FBz2Gn}+DgH0TZ%#5?LGxaS^`~xBc0q?LPi=uLcjMCx~LoZLy6pyT^e7~xE@A^_t*Fxt2gOn2g zssh7^()6qV6K!o*pS;{+uF%R9*MQ*Af{cKY@{I5(M+>)*jO2h|g9=OE%Bo}^^$qNn1FbXSha||!3 zPYyQnajzdNHNMRPVxI5o&C%qKs`A|SsqAjrMIIXl2SveJ=DS65e| z)Uh&OzbMJ0I4sn{+$G)BxH8kVEF&Z|w93>yGRH6=wXi7ArK-fkv%;0@yVi4ol4A`pgt7lcEXHlVPR(5Gb zB$tI_Wp1UXx2vVLcWOpKR6usVfnQ#>U$%F$n`MBnvu{+ee^OYuxu<__GMBEMLUD11 zZfc5=si~o*f=NJCRDQZbc9gMyR=8hMKzT)#dwGgMrkk&ciFuZ5M2<;HXSeX4$^}spamOMwSsNO>)z73yP}D^Q$7cs?sY9!z?V_!m~@uORB=c zJVV2ZD?=@_^9)=9JS@yz^}P%W4az+%vdmm3pJf!UFNq3^s4VtLuE@wJG!8B{G0~4Q zEj1}IDGSM}49_U3@bL^y%nS?&G|I~6iVQPJH*?IXDE7$B@^>mq@-nw5$@0y~uQJZ4 zbcu8_3Wy3z3f9i|bPKRRj{)znB8#GOh2SC&ugdU9?M&}TC#THdf{J=)C!cUvkBHKe z;(T*=qsoHBOv5~nyoiWESFYq@b5s8m$4m=fv#bnnLklO*tmJ}>T+h%T<9rKm*W$#8 zFy}Obbn`+3Uv%rzG7}9`0~N|Fvn_ptOH;GUy(&`7^9}SX%`%dWy*Rt1FLn570!Xvr-+;S70+!B3KqP$(Ta|$C$6RSef-P|g}^0O*~EIooeiv!EO+&rsN zoL$ka^Q?08Ep${U&ofB#3=1$RFHdnwD=-VqNHK5;GxBu|@+paQPK-#*El#v3^vLkg zcFO03)2sbEYuJ7E04%8axn@sP4h1?k8(HEPA@g`OfGcg($&>f zC^yYcb2KOoPOQu?FZMF`bM?t{4J&X=vMdQU%Fn1Q3r-2HNGmBUG|Nlo>V7J%C$ULk zeufaUet4E`R0V_Nj^l3+Z|1XF$6r<7?9jo@c!>8x#a+(R^{MCA{ywRCcguo12XCHf zPwFl3sQd8FH)Trorv9x$?)E?1{{AjFW6sU)@MYq8w##e_&+Yxex-;JOEQ<-Bq85w& z*>zoy3Us|c)aw^$Xel;^Zu|A8VV~X(9?`iWuei7VI5_j>iH9>+x`|lxOy8@bNr diff --git a/secrets/secrets.nix b/secrets/secrets.nix index d0121b8..8461339 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -149,7 +149,6 @@ in { "backup/restic_pw.age".publicKeys = users ++ restic; # discord bot and discord - "discord/ldap.age".publicKeys = users ++ ldap ++ discord; "discord/token.age".publicKeys = users ++ discord; # email stuff From 2bcdfb0f83496efa2b0e9c2ab3c7339bdc3dc38a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Sep 2024 00:38:24 +0100 Subject: [PATCH 298/563] fix: dont run earch seperately --- .forgejo/workflows/deploy.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index ceea941..cb535fd 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -30,7 +30,6 @@ jobs: steps: - uses: actions/checkout@v4 - run: nix develop - - run: colmena build -v --on earth --nix-option keep-failed true # - name: Archive Test Results # if: always() # run: sleep 100m From 65d4a91fa4c0e4be9e523f00c7e52722de79ef02 Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 17 Sep 2024 11:12:18 +0000 Subject: [PATCH 299/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 641df9c..c092c65 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1723409220, - "narHash": "sha256-Qwwsb/D+waAhL5/qFkn8h7mJDcRfbrZNNpRlRpPU4k8=", + "lastModified": 1726571489, + "narHash": "sha256-4p0g6Zn0pgHnaHUdzpH7oBR8yaFj5vgOXjZbAPkrjBY=", "ref": "refs/heads/main", - "rev": "de685b6d6f2bb5ff3048f20333cccba0f9fe4ae8", - "revCount": 73, + "rev": "ac55cd45e297ade761184d1fcaf0ed6fc4c77edc", + "revCount": 77, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 2e06a80dfca05048f4e3f81ae2fd4a223b6d843b Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 17 Sep 2024 11:40:09 +0000 Subject: [PATCH 300/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c092c65..74a850f 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1726571489, - "narHash": "sha256-4p0g6Zn0pgHnaHUdzpH7oBR8yaFj5vgOXjZbAPkrjBY=", + "lastModified": 1726573168, + "narHash": "sha256-XmN6OYB1DT7c+Sumfv8gJ2SUBzIqJOCWbrRw/633u5s=", "ref": "refs/heads/main", - "rev": "ac55cd45e297ade761184d1fcaf0ed6fc4c77edc", - "revCount": 77, + "rev": "3fb2fd46cc5709fa9a2225ae81f08657de87e2f0", + "revCount": 78, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 5012dd992f0e3a7afd376423b38fab31b8a95e7e Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 17 Sep 2024 21:35:54 +0000 Subject: [PATCH 301/563] 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 74a850f..c61112d 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1726528867, - "narHash": "sha256-Y6HYt4exntAw7TJsGEfs+g+6WBXWeemB/duBDixZrCw=", + "lastModified": 1726608802, + "narHash": "sha256-HNG0m8oq240Ch6yuft+Qi+/w+qogsC9D6Oc5RoQpteU=", "ref": "refs/heads/main", - "rev": "9452c0ac2ed84f31e9dd1314ac1e6e18c98bb07e", - "revCount": 112, + "rev": "d9211dca9a700b298b08b3cb64cfb0a31615dae4", + "revCount": 133, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 5eeda983eb783cf3a8a715600c72e8d92e5ba880 Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 17 Sep 2024 22:23:02 +0000 Subject: [PATCH 302/563] 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 c61112d..1650d0e 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1726608802, - "narHash": "sha256-HNG0m8oq240Ch6yuft+Qi+/w+qogsC9D6Oc5RoQpteU=", + "lastModified": 1726611631, + "narHash": "sha256-zNZ9/Jci7WibMTV71GxqnFr0DREmsM9kGQ4gjCIqRds=", "ref": "refs/heads/main", - "rev": "d9211dca9a700b298b08b3cb64cfb0a31615dae4", - "revCount": 133, + "rev": "43c5cd2effcada4e2b417b692d99c5add88034bc", + "revCount": 134, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 5d72d1aa84007ec2ba3b846938a444fe6bedc6c7 Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 17 Sep 2024 23:06:27 +0000 Subject: [PATCH 303/563] 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 1650d0e..a541f14 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1726611631, - "narHash": "sha256-zNZ9/Jci7WibMTV71GxqnFr0DREmsM9kGQ4gjCIqRds=", + "lastModified": 1726614233, + "narHash": "sha256-B9SgMs3fpJrLXtiunCxYbm1dDXajRK3OOKXS75PWlnQ=", "ref": "refs/heads/main", - "rev": "43c5cd2effcada4e2b417b692d99c5add88034bc", - "revCount": 134, + "rev": "0ab290a8768e3fbe8e05036b2892a18c7f7f6d46", + "revCount": 136, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 951a72d0a64f61e054bd6857e1d0d62c828bf468 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 18 Sep 2024 06:17:25 +0000 Subject: [PATCH 304/563] 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 a541f14..cd22daa 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1726614233, - "narHash": "sha256-B9SgMs3fpJrLXtiunCxYbm1dDXajRK3OOKXS75PWlnQ=", + "lastModified": 1726640125, + "narHash": "sha256-pjiC2vLJVhFaGP5TATkOoK4wIRiX8LyP7vCc2Te34Ws=", "ref": "refs/heads/main", - "rev": "0ab290a8768e3fbe8e05036b2892a18c7f7f6d46", - "revCount": 136, + "rev": "5e17a98bff0d15dc34ae36af4817e585b14cd5fb", + "revCount": 137, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 839009195aebc2a984bfddb24f310abd32da345b Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 18 Sep 2024 11:04:52 +0000 Subject: [PATCH 305/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index cd22daa..fbeec0d 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1726573168, - "narHash": "sha256-XmN6OYB1DT7c+Sumfv8gJ2SUBzIqJOCWbrRw/633u5s=", + "lastModified": 1726657463, + "narHash": "sha256-/8T5K5dm6h34giXPl6QvGx8CQkUTOSJED/6t0ZV2KYk=", "ref": "refs/heads/main", - "rev": "3fb2fd46cc5709fa9a2225ae81f08657de87e2f0", - "revCount": 78, + "rev": "1181367a11365a6580042345674e7eadf26bb9fa", + "revCount": 79, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From fdebdb6cc5437647f41cae888cd73309c9789305 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 18 Sep 2024 15:46:32 +0000 Subject: [PATCH 306/563] 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 fbeec0d..efe3c54 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726358529, - "narHash": "sha256-D9DEgXEaF37DHlSBdrBSBF1OcQQGzvRvk26iXf1t57A=", + "lastModified": 1726674347, + "narHash": "sha256-x4L6nf1ephWIHhuyErlyETn1XCQkCuKq0VCG+Q/Ivu8=", "ref": "refs/heads/main", - "rev": "92ea4b1319cc533dc0d381ae026abfdcc99fe4c3", - "revCount": 93, + "rev": "88c9104dd7c178e6fc62a992f790822b7c45a996", + "revCount": 94, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 0907c36e18fd4dfcd913ae11efab96079ac50e91 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 18 Sep 2024 15:51:32 +0000 Subject: [PATCH 307/563] Updated flake for skynet_website_wiki --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index efe3c54..9a5c84d 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,10 +1195,10 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726674347, - "narHash": "sha256-x4L6nf1ephWIHhuyErlyETn1XCQkCuKq0VCG+Q/Ivu8=", + "lastModified": 1726674372, + "narHash": "sha256-llwNokioxgiBVW3SoWa+9Ygdd/UpCDQR7KHITcyFIUo=", "ref": "refs/heads/main", - "rev": "88c9104dd7c178e6fc62a992f790822b7c45a996", + "rev": "d272a03ee05e28ba1d91f8bb10f90321be5e675f", "revCount": 94, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" From b215f105136bd4a8e923ceeadb0ffab83f4b4a4c Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 20 Sep 2024 14:16:11 +0000 Subject: [PATCH 308/563] 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 9a5c84d..73425db 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726674372, - "narHash": "sha256-llwNokioxgiBVW3SoWa+9Ygdd/UpCDQR7KHITcyFIUo=", + "lastModified": 1726841737, + "narHash": "sha256-n7ugJch0sg38+FEXKj9P245pOBxLne5A1vt8nYIMcik=", "ref": "refs/heads/main", - "rev": "d272a03ee05e28ba1d91f8bb10f90321be5e675f", - "revCount": 94, + "rev": "20d3a3c6834e3205bd1d131d26862cb0f3acb62f", + "revCount": 95, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 668dd903588db799a98df81e109b462ff6cc6a79 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 22 Sep 2024 17:06:21 +0000 Subject: [PATCH 309/563] 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 73425db..7cc2816 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1726841737, - "narHash": "sha256-n7ugJch0sg38+FEXKj9P245pOBxLne5A1vt8nYIMcik=", + "lastModified": 1727024742, + "narHash": "sha256-9KJ3M5Dih1FJqWOViLxNdxSjQ1JJoBDU4enB9MWLfNw=", "ref": "refs/heads/main", - "rev": "20d3a3c6834e3205bd1d131d26862cb0f3acb62f", - "revCount": 95, + "rev": "52b8dd70da37d6c67ae5917caf6b90951f9a7bb1", + "revCount": 96, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 8725a9af9d2ad38838cfe3d62e53dd79a82fc6f2 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 22 Sep 2024 18:46:10 +0000 Subject: [PATCH 310/563] 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 7cc2816..e022e84 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1727024742, - "narHash": "sha256-9KJ3M5Dih1FJqWOViLxNdxSjQ1JJoBDU4enB9MWLfNw=", + "lastModified": 1727030734, + "narHash": "sha256-PfFXTdyI+pz/V6f1Qoy8C2yxGAgF+MjhzO+V5SaInbc=", "ref": "refs/heads/main", - "rev": "52b8dd70da37d6c67ae5917caf6b90951f9a7bb1", - "revCount": 96, + "rev": "cf3853c2dbe3ed201b934a682c1dd5050470284c", + "revCount": 98, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 103bd93772c12c5e78e784a6a15dd315b5460a38 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 23 Sep 2024 12:47:45 +0000 Subject: [PATCH 311/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e022e84..c0d25f7 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1726657463, - "narHash": "sha256-/8T5K5dm6h34giXPl6QvGx8CQkUTOSJED/6t0ZV2KYk=", + "lastModified": 1727095598, + "narHash": "sha256-Nx2vcjA0RZV5gn9Ky2hEhKWlyGa6oBTKdgwx14B0MC0=", "ref": "refs/heads/main", - "rev": "1181367a11365a6580042345674e7eadf26bb9fa", - "revCount": 79, + "rev": "7cfce43b8c3ad38e0884311d7491b8738c785af0", + "revCount": 81, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 683197680570c7095c515db40df8be7932fd5359 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 23 Sep 2024 13:26:32 +0000 Subject: [PATCH 312/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c0d25f7..297407e 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727095598, - "narHash": "sha256-Nx2vcjA0RZV5gn9Ky2hEhKWlyGa6oBTKdgwx14B0MC0=", + "lastModified": 1727097956, + "narHash": "sha256-7dljON1S2Oj67xcrv+r+A1n8Oo7ky5V5tqX8l+g46Ng=", "ref": "refs/heads/main", - "rev": "7cfce43b8c3ad38e0884311d7491b8738c785af0", - "revCount": 81, + "rev": "08c19c1a646db9bf98f18041f6461ba449c0d0af", + "revCount": 83, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 13e9552799729228522740810ac80b98f685035e Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 23 Sep 2024 14:01:41 +0000 Subject: [PATCH 313/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 297407e..5ac5da0 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727097956, - "narHash": "sha256-7dljON1S2Oj67xcrv+r+A1n8Oo7ky5V5tqX8l+g46Ng=", + "lastModified": 1727100058, + "narHash": "sha256-1HSR8dxeHgWFdYCpumiyQjNUHe+6D3mGwzi6JN+p2Sg=", "ref": "refs/heads/main", - "rev": "08c19c1a646db9bf98f18041f6461ba449c0d0af", - "revCount": 83, + "rev": "34a05e9baf1eb91fa7ebeed79804ec3028d36a55", + "revCount": 84, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 95e9b971b2ef49c06173d25088b174cd7edd556e Mon Sep 17 00:00:00 2001 From: esy Date: Mon, 23 Sep 2024 20:07:43 +0000 Subject: [PATCH 314/563] feat: add license --- LICENSE | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3283b25 --- /dev/null +++ b/LICENSE @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2024 Skynet + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file From 743f6faa446bb26d3fc4530ceb0e58ce84164a1b Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 23 Sep 2024 20:09:07 +0000 Subject: [PATCH 315/563] Updated flake for skynet_website_games --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5ac5da0..6919e37 100644 --- a/flake.lock +++ b/flake.lock @@ -1175,11 +1175,11 @@ "utils": "utils_10" }, "locked": { - "lastModified": 1723409493, - "narHash": "sha256-nZwNkGHL8aRlYroTfCSXYlI9Q7qzYXcnd6RlH50W9W8=", + "lastModified": 1727122069, + "narHash": "sha256-GOPYcXDc+KN6LmxMqobFUOn6e9e0khBW3SrFLj6+2i4=", "ref": "refs/heads/main", - "rev": "5884131ff5e2d631695b91fb4efc3253e302e7d5", - "revCount": 11, + "rev": "e6d9056653610ca12839ac6c6d699bb36e5fa6db", + "revCount": 12, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_games" }, From 7eb83514cad59ebdf0bc2f90c1367b6fc4c83398 Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 24 Sep 2024 10:07:51 +0000 Subject: [PATCH 316/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 6919e37..a70e9ab 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727100058, - "narHash": "sha256-1HSR8dxeHgWFdYCpumiyQjNUHe+6D3mGwzi6JN+p2Sg=", + "lastModified": 1727172430, + "narHash": "sha256-R342biR6aDlMpomqrBf9Lk3r3IuzncOPlMKyfk03J/Q=", "ref": "refs/heads/main", - "rev": "34a05e9baf1eb91fa7ebeed79804ec3028d36a55", - "revCount": 84, + "rev": "0103180b055be94a5547b3a4c893949321946fe7", + "revCount": 85, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From a6a368457ab5bf5d1a278b95d2bbee957a2a077b Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 24 Sep 2024 12:56:58 +0000 Subject: [PATCH 317/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a70e9ab..e52a631 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727172430, - "narHash": "sha256-R342biR6aDlMpomqrBf9Lk3r3IuzncOPlMKyfk03J/Q=", + "lastModified": 1727182581, + "narHash": "sha256-zawwjPNh3D8RhqzO4XfKs7hYQbmqfwgWYUZdMCmkqzQ=", "ref": "refs/heads/main", - "rev": "0103180b055be94a5547b3a4c893949321946fe7", - "revCount": 85, + "rev": "aca7ed10f3f00aa60a3b13f24c9995a5a0f6a644", + "revCount": 86, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 181a78286ee17fbe23f9cf399bfae1af61b882c2 Mon Sep 17 00:00:00 2001 From: sysadm Date: Tue, 24 Sep 2024 18:24:08 +0000 Subject: [PATCH 318/563] 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 e52a631..58dcc14 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1727030734, - "narHash": "sha256-PfFXTdyI+pz/V6f1Qoy8C2yxGAgF+MjhzO+V5SaInbc=", + "lastModified": 1727202084, + "narHash": "sha256-mjIqzAOPthSDG7/EvnUDdfZrWsiBmoKv8tl5Wmzd94A=", "ref": "refs/heads/main", - "rev": "cf3853c2dbe3ed201b934a682c1dd5050470284c", - "revCount": 98, + "rev": "ab0add44756d4992fc2b2da4eba163016ccb3d1c", + "revCount": 100, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 14334cbee4d5400371a9fcba59387ed33f19c0c6 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 14:31:56 +0000 Subject: [PATCH 319/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 58dcc14..b8d9798 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727182581, - "narHash": "sha256-zawwjPNh3D8RhqzO4XfKs7hYQbmqfwgWYUZdMCmkqzQ=", + "lastModified": 1727274677, + "narHash": "sha256-LPIJX+bm+44/2xheZAwOIja0YKvPjyZFJw/h3PqY56Q=", "ref": "refs/heads/main", - "rev": "aca7ed10f3f00aa60a3b13f24c9995a5a0f6a644", - "revCount": 86, + "rev": "022f8b6428ca6caf4a961eb94e433d5665737393", + "revCount": 88, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 71d6d7555b9576bfccea0ec2f21941e4dbfd736d Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 14:56:13 +0000 Subject: [PATCH 320/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index b8d9798..0a1e104 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727274677, - "narHash": "sha256-LPIJX+bm+44/2xheZAwOIja0YKvPjyZFJw/h3PqY56Q=", + "lastModified": 1727276130, + "narHash": "sha256-LGQf3pWdnsCxMHrci2Hz4Lopp+0+OyHVxg+ILk8+lZs=", "ref": "refs/heads/main", - "rev": "022f8b6428ca6caf4a961eb94e433d5665737393", - "revCount": 88, + "rev": "6e851d7d5d1a741eb99a668211588f70138658ab", + "revCount": 89, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From be4f8dbe8967fa8f906d2617b28fa1aae2f46bc7 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 15:10:03 +0000 Subject: [PATCH 321/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 0a1e104..5619561 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727276130, - "narHash": "sha256-LGQf3pWdnsCxMHrci2Hz4Lopp+0+OyHVxg+ILk8+lZs=", + "lastModified": 1727276962, + "narHash": "sha256-r4jvZImjYSgXrd2JfVI4tZGugvN5zF18aAHBmGA9HaY=", "ref": "refs/heads/main", - "rev": "6e851d7d5d1a741eb99a668211588f70138658ab", - "revCount": 89, + "rev": "84e9b71303b7b2ec504bf59c1f1bd05412248fc9", + "revCount": 90, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From d76d5acbb70e6909fae64ce81d2a2f1c88217b7d Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 15:23:37 +0000 Subject: [PATCH 322/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5619561..f73821b 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727276962, - "narHash": "sha256-r4jvZImjYSgXrd2JfVI4tZGugvN5zF18aAHBmGA9HaY=", + "lastModified": 1727277778, + "narHash": "sha256-rP2F3DJqHwi7TiZngRqJfkCTHth6eStViM6o0uTMBdU=", "ref": "refs/heads/main", - "rev": "84e9b71303b7b2ec504bf59c1f1bd05412248fc9", - "revCount": 90, + "rev": "0a59b61902b8b72341faf662622a1f782ed6dff1", + "revCount": 91, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 8275f3063b6f9e7f8d4ec69570c54432d81c961e Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 16:31:32 +0000 Subject: [PATCH 323/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f73821b..1bae1db 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727277778, - "narHash": "sha256-rP2F3DJqHwi7TiZngRqJfkCTHth6eStViM6o0uTMBdU=", + "lastModified": 1727281839, + "narHash": "sha256-ZAE++E11aghE6F1s72EEYrx6LZOKf3jbI9i1S8jy2DA=", "ref": "refs/heads/main", - "rev": "0a59b61902b8b72341faf662622a1f782ed6dff1", - "revCount": 91, + "rev": "96c18575195b6f42c77478e3a086bb96a368e68c", + "revCount": 98, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From d47abf2527162918f5fb8800a7c65dace3b1533a Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 16:40:29 +0000 Subject: [PATCH 324/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 1bae1db..5716634 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727281839, - "narHash": "sha256-ZAE++E11aghE6F1s72EEYrx6LZOKf3jbI9i1S8jy2DA=", + "lastModified": 1727282381, + "narHash": "sha256-psKmP2ZNtS07zF0CoYYiJQ88n0H2/vix06r9HrnKxlw=", "ref": "refs/heads/main", - "rev": "96c18575195b6f42c77478e3a086bb96a368e68c", - "revCount": 98, + "rev": "01bbbb681355a5e8c630ce727cc52da080c28dbb", + "revCount": 99, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 335f2f08f1e4f146d6639ecac3f8c99ae8f2417d Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 25 Sep 2024 19:46:01 +0000 Subject: [PATCH 325/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5716634..705b34f 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727282381, - "narHash": "sha256-psKmP2ZNtS07zF0CoYYiJQ88n0H2/vix06r9HrnKxlw=", + "lastModified": 1727293483, + "narHash": "sha256-dypS15lTArGNMu1Bsz936zPz7CFW+50sNJXOcJ9t4X8=", "ref": "refs/heads/main", - "rev": "01bbbb681355a5e8c630ce727cc52da080c28dbb", - "revCount": 99, + "rev": "f71419f0f579bf89c6f1e67fa2e96d7b6f6db67e", + "revCount": 101, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From df6825cb7ef34435b949dd26ea86048ceedf6f64 Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 27 Sep 2024 19:23:52 +0000 Subject: [PATCH 326/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 705b34f..20c2c5f 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727293483, - "narHash": "sha256-dypS15lTArGNMu1Bsz936zPz7CFW+50sNJXOcJ9t4X8=", + "lastModified": 1727464970, + "narHash": "sha256-j6krbOmMDxZVGZ7WDdSKrKe6ensi/0vu/QOuYGvkS/I=", "ref": "refs/heads/main", - "rev": "f71419f0f579bf89c6f1e67fa2e96d7b6f6db67e", - "revCount": 101, + "rev": "ece869efae2208dd6d05f888690aed0cdbf9b31e", + "revCount": 102, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 542ee2858eccac3684f3292b0de57016b22e0a11 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 29 Sep 2024 09:37:14 +0000 Subject: [PATCH 327/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 20c2c5f..6c8a160 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727464970, - "narHash": "sha256-j6krbOmMDxZVGZ7WDdSKrKe6ensi/0vu/QOuYGvkS/I=", + "lastModified": 1727602550, + "narHash": "sha256-xTMWzYuM2ZoTRa30AYp+10dpbflvzlF9lBCOA8vxhdk=", "ref": "refs/heads/main", - "rev": "ece869efae2208dd6d05f888690aed0cdbf9b31e", - "revCount": 102, + "rev": "4af037f195249d5db2aafc612c562f790ad91f9a", + "revCount": 103, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From e1a3a64a8d28e75138a10085f18f1bb01fdd2ab8 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 29 Sep 2024 19:10:15 +0000 Subject: [PATCH 328/563] 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 6c8a160..beaac1c 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1726640125, - "narHash": "sha256-pjiC2vLJVhFaGP5TATkOoK4wIRiX8LyP7vCc2Te34Ws=", + "lastModified": 1727636858, + "narHash": "sha256-cnibo+gNTy4onnRMCoORbrvXDMdloWqHbK0U1JZ+9a0=", "ref": "refs/heads/main", - "rev": "5e17a98bff0d15dc34ae36af4817e585b14cd5fb", - "revCount": 137, + "rev": "42f301455a18a8d3a023374b3d7b21a067c286c0", + "revCount": 141, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From c0aa5c138d876676cf5ac7b725147e8616d5f2c2 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 29 Sep 2024 23:22:29 +0000 Subject: [PATCH 329/563] 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 beaac1c..a0dcd44 100644 --- a/flake.lock +++ b/flake.lock @@ -1039,11 +1039,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1727636858, - "narHash": "sha256-cnibo+gNTy4onnRMCoORbrvXDMdloWqHbK0U1JZ+9a0=", + "lastModified": 1727651998, + "narHash": "sha256-2YtDLIxtaA/BN8g1nCx753OYs/+4R0etW//j2d5UWjQ=", "ref": "refs/heads/main", - "rev": "42f301455a18a8d3a023374b3d7b21a067c286c0", - "revCount": 141, + "rev": "80c9191eeec29ba20ef4084713eca7fe0cab7412", + "revCount": 151, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 259a6df8a7fc47db35246e2cea41beb49c359767 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Oct 2024 11:58:00 +0100 Subject: [PATCH 330/563] feat: allow for the sserver instance to sign off merge commits --- applications/git/forgejo.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index 4f35e0b..d0ff9ef 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -76,6 +76,12 @@ in { }; }; + # for signing reasons + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + services.forgejo = { enable = true; package = pkgs.forgejo; @@ -92,11 +98,21 @@ in { # You can temporarily allow registration to create an admin user. service.DISABLE_REGISTRATION = true; + # Add support for actions, based on act: https://github.com/nektos/act actions = { ENABLED = true; DEFAULT_ACTIONS_URL = "github"; }; + + # Allow for signing off merge requests + "repository.signing" = { + SIGNING_KEY = "5B2DED0FE9F8627A"; + SIGNING_NAME = "Skynet"; + SIGNING_EMAIL = "forgejo@glados.skynet.ie"; + MERGES = "always"; + }; + # Sending emails is completely optional # You can send a test email from the web UI at: # Profile Picture > Site Administration > Configuration > Mailer Configuration From 51d8a84432e13dba6d8fc7c26fb77816b0efac48 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Oct 2024 11:58:53 +0100 Subject: [PATCH 331/563] feat: initial removal of the gitlab runner For scream testing --- machines/wheatly.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/machines/wheatly.nix b/machines/wheatly.nix index 6d78395..a2cab80 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -25,7 +25,7 @@ Notes: }; in { imports = [ - ../applications/git/gitlab_runner.nix + # ../applications/git/gitlab_runner.nix ../applications/git/forgejo_runner.nix ]; @@ -41,10 +41,10 @@ in { host = host; backup.enable = true; - gitlab_runner = { - enable = true; - runner.name = "runner01"; - }; + # gitlab_runner = { + # enable = true; + # runner.name = "runner01"; + # }; forgejo_runner.enable = true; }; From ad9e434a286b5b8c997c3812b912c774f8ac2a13 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Oct 2024 12:00:48 +0100 Subject: [PATCH 332/563] feat: forgejo runner needs docker enabled --- applications/git/forgejo_runner.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/applications/git/forgejo_runner.nix b/applications/git/forgejo_runner.nix index 1cf9776..f1903ff 100644 --- a/applications/git/forgejo_runner.nix +++ b/applications/git/forgejo_runner.nix @@ -107,6 +107,12 @@ in { }; }; + boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 + virtualisation.docker.enable = true; + + # taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128 + virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"]; + # the actual runner services.gitea-actions-runner = { package = pkgs.forgejo-actions-runner; @@ -118,8 +124,8 @@ in { labels = [ ## optionally provide native execution on the host: "nix:host" - "docker:docker://node:16-bullseye" - "ubuntu-latest:docker://node:16-bullseye" + "docker:docker://node:22-bookworm" + "ubuntu-latest:docker://node:22-bookworm" ]; hostPackages = with pkgs; [ @@ -128,7 +134,7 @@ in { coreutils curl gawk - gitMinimal + git gnused nodejs wget @@ -145,6 +151,7 @@ in { attic-client nix openssh + sudo ]; }; }; From a4be5de575274cb1123c24ed499df02d1cf9462b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Oct 2024 12:37:56 +0100 Subject: [PATCH 333/563] feat: switching over the committee --- config/users.nix | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/config/users.nix b/config/users.nix index fbe14f6..2da4c25 100644 --- a/config/users.nix +++ b/config/users.nix @@ -50,19 +50,21 @@ in { config.skynet = { users = { committee = lib.lists.unique ( - # Committee + # Committee - Core [ "silver" "eoghanconlon73" - "sidhiel" - "maksimsger1" - "kaiden" - "pine" "nanda" - "sourabh1805" - "kronsy" + # Emily + # Sean + ] + # Committee - OCM + ++ [ + "sidhiel" "skyapples" - "emi05h" + "eliza" + "amymucko" + # Archie ] # Admins are part of Committee as well ++ cfg.admin @@ -70,14 +72,10 @@ in { admin = [ "silver" "evanc" - "eoghanconlon73" "eliza" "esy" ]; - trainee = [ - "milan" - "kronsy" - ]; + trainee = []; lifetime = []; banned = []; From 5c5ea3678d3b94d2a7f3ca874f16405b28860277 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Oct 2024 12:37:56 +0100 Subject: [PATCH 334/563] feat: switching over the committee --- config/users.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/users.nix b/config/users.nix index 2da4c25..659b6b3 100644 --- a/config/users.nix +++ b/config/users.nix @@ -55,8 +55,8 @@ in { "silver" "eoghanconlon73" "nanda" - # Emily - # Sean + "emily1999" + "dgr" ] # Committee - OCM ++ [ @@ -64,7 +64,7 @@ in { "skyapples" "eliza" "amymucko" - # Archie + "archiedms" ] # Admins are part of Committee as well ++ cfg.admin From 0b0db08f0108a53491145b479b3ecc839b8b4332 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 5 Oct 2024 11:15:38 +0100 Subject: [PATCH 335/563] feat: actually record our wifi network --- ITD/Server_Inventory.csv | 3 ++- config/dns.nix | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index eabe2a7..5b3d8c0 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -18,4 +18,5 @@ SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic -SKYNET00020,ariia,Active,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" \ No newline at end of file +SKYNET00020,ariia,Active,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" +SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access \ No newline at end of file diff --git a/config/dns.nix b/config/dns.nix index f4b0119..592ed3a 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -12,6 +12,13 @@ config = { skynet.records = [ + # wifi in server room + { + record = "ash"; + r_type = "A"; + value = "193.1.99.114"; + server = true; + } { record = "optimus"; r_type = "A"; From 91d76c08f1eaaba18b62f826fc94406189812340 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 5 Oct 2024 12:20:24 +0100 Subject: [PATCH 336/563] feat: limit the dns to explicitly servers we are using Closes #134 --- applications/dns/dns.nix | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 8b4b8b5..9206b75 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -13,11 +13,14 @@ current_date = self.lastModified; # this gets a list of all domains we have records for - domains = lib.lists.naturalSort ( - lib.lists.unique ( - lib.lists.forEach records (x: x.domain) - ) - ); + domains = lib.lists.naturalSort (lib.lists.unique ( + lib.lists.forEach records (x: x.domain) + )); + + # get the ip's of our servers + servers = lib.lists.naturalSort (lib.lists.unique ( + lib.lists.forEach (sort_records_server records) (x: x.value) + )); domains_owned = [ # for historic reasons we own this @@ -175,7 +178,9 @@ ); # small function to tidy up the spam of the cache networks, would use teh subnet except all external traffic has the ip of teh router - create_cache_networks = map (x: "193.1.99.${toString x}/32") (lib.lists.range 71 126); + # now limited explicitly to servers that we are administering + # See i24-09-30_050 for more information + create_cache_networks = map (x: "${toString x}/32") servers; # standard function to create the etc file, pass in the text and domain and it makes it create_entry_etc_sub = domain: text: { @@ -238,7 +243,7 @@ */ ++ builtins.concatLists ( lib.attrsets.mapAttrsToList ( - key: value: value.config.services.skynet."${name}".records + key: value: value.config.services.skynet.dns.records ) nodes ); From 1fcfc78c6b09af38d6b252122c579fccb2fd7780 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 5 Oct 2024 12:35:22 +0100 Subject: [PATCH 337/563] doc: add a pile of documentation to teh dns file --- applications/dns/dns.nix | 50 +++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 18 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 9206b75..1717a50 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -19,7 +19,7 @@ # get the ip's of our servers servers = lib.lists.naturalSort (lib.lists.unique ( - lib.lists.forEach (sort_records_server records) (x: x.value) + lib.lists.forEach (sort_records_a_server records) (x: x.value) )); domains_owned = [ @@ -33,9 +33,12 @@ # gets a list of records that match this type filter_records_type = records: r_type: builtins.filter (x: x.r_type == r_type) records; - filter_records_server = records: builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type records "A"); + # Get all the A records that are for servers (base record for them) + filter_records_a_server = records: builtins.filter (x: builtins.hasAttr "server" x && x.server) (filter_records_type records "A"); + # Every other A record filter_records_a = records: builtins.filter (x: builtins.hasAttr "server" x && !x.server) (filter_records_type records "A"); + # These functions are to get the final 3 digits of an IP address so we can use them for reverse pointer process_ptr = records: lib.lists.forEach records (x: process_ptr_sub x); process_ptr_sub = record: { record = builtins.substring 9 3 record.record; @@ -44,39 +47,49 @@ }; ip_ptr_to_int = ip: lib.strings.toInt (builtins.substring 9 3 ip); - sort_records_server = records: builtins.sort (a: b: a.record < b.record) (filter_records_server records); + # filter and sort records so we cna group them in the right place later + sort_records_a_server = records: builtins.sort (a: b: a.record < b.record) (filter_records_a_server records); sort_records_a = records: builtins.sort (a: b: (ip_ptr_to_int a.value) < (ip_ptr_to_int b.value)) (filter_records_a records); sort_records_cname = records: builtins.sort (a: b: a.value < b.value) (filter_records_type records "CNAME"); sort_records_ptr = records: builtins.sort (a: b: (lib.strings.toInt a.record) < (lib.strings.toInt b.record)) (process_ptr (filter_records_type records "PTR")); sort_records_srv = records: builtins.sort (a: b: a.record < b.record) (filter_records_type records "SRV"); + # a tad overkill but type guarding is useful max = x: y: assert builtins.isInt x; assert builtins.isInt y; if x < y then y else x; + + # get teh max length of a list of strings max_len = records: lib.lists.foldr (a: b: (max a b)) 0 (lib.lists.forEach records (record: lib.strings.stringLength record.record)); + # now that we can get teh max lenth of a list of strings + # we can pad it out to the max len +1 + # this is so that teh generated file is easier for a human to read format_records = records: let offset = (max_len records) + 1; in lib.strings.concatMapStrings (x: "${padString x.record offset} IN ${padString x.r_type 5} ${x.value}\n") records; - # small function to trim it down a tad + # small function to add spaces until it reaches teh required length padString = text: length: fixedWidthString_post length " " text; # like lib.strings.fixedWidthString but postfix + # recursive function to extend a string up to a limit fixedWidthString_post = width: filler: str: let strw = lib.stringLength str; reqWidth = width - (lib.stringLength filler); in + # this is here because we were manually setting teh length, now max_len does that for us assert lib.assertMsg (strw <= width) "fixedWidthString_post: requested string length (${toString width}) must not be shorter than actual length (${toString strw})"; if strw == width then str else (fixedWidthString_post reqWidth filler str) + filler; # base config for domains we own (skynet.ie, csn.ul.ie, ulcompsoc.ie) + # ";" are comments in this file get_config_file = ( domain: records: '' $TTL 60 ; 1 minute @@ -97,7 +110,7 @@ ; ------------------------------------------ ; Server Names (A Records) ; ------------------------------------------ - ${format_records (sort_records_server records)} + ${format_records (sort_records_a_server records)} ; ------------------------------------------ ; A (non server names @@ -123,13 +136,11 @@ ; SRV ; ------------------------------------------ ${format_records (sort_records_srv records)} - - '' ); # https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/4/html/reference_guide/s2-bind-configuration-zone-reverse - # config for our reverse dnspointers (not properly working) + # config for our reverse dns pointers (not properly working) get_config_file_rev = ( domain: '' $ORIGIN 64-64.99.1.193.in-addr.arpa. @@ -154,26 +165,26 @@ '' ); - # arrys of teh two nameservers - tmp1 = ["193.1.99.109"]; - tmp2 = ["193.1.99.120"]; + # arrays of teh two nameservers + nameserver_1 = ["193.1.99.109"]; + nameserver_2 = ["193.1.99.120"]; primaries = ( if cfg.server.primary then # primary servers have no primaries (ones they listen to) [] - else if builtins.elem cfg.server.ip tmp1 - then tmp2 - else tmp1 + else if builtins.elem cfg.server.ip nameserver_1 + then nameserver_2 + else nameserver_1 ); secondaries = ( if cfg.server.primary then - if builtins.elem cfg.server.ip tmp1 - then tmp2 - else tmp1 + if builtins.elem cfg.server.ip nameserver_1 + then nameserver_2 + else nameserver_1 else [] ); @@ -192,17 +203,19 @@ # The UNIX file mode bits mode = "0664"; + # content of the file text = text; }; }; - # (text.owned "csn.ul.ie") # standard function to create the etc file, pass in the text and domain and it makes it create_entry_etc = domain: type: let domain_records = lib.lists.filter (x: x.domain == domain) records; in + # this is the main type of record that most folks are used to if type == "owned" then create_entry_etc_sub domain (get_config_file domain domain_records) + # reverse lookups allow for using an IP to find domains pointing to it else if type == "reverse" then create_entry_etc_sub domain (get_config_file_rev domain) else {}; @@ -334,6 +347,7 @@ in { group = "named"; }; + # basic but ensure teh dns ports are open networking.firewall = { allowedTCPPorts = [53]; allowedUDPPorts = [53]; From 86efe11f8326bd90becd4d7275f81e5c7a3d0dc3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 5 Oct 2024 12:41:25 +0100 Subject: [PATCH 338/563] fmt: formatting --- applications/dns/dns.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index 1717a50..da8577f 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -61,11 +61,11 @@ if x < y then y else x; - + # get teh max length of a list of strings max_len = records: lib.lists.foldr (a: b: (max a b)) 0 (lib.lists.forEach records (record: lib.strings.stringLength record.record)); - # now that we can get teh max lenth of a list of strings + # Now that we can get teh max lenth of a list of strings # we can pad it out to the max len +1 # this is so that teh generated file is easier for a human to read format_records = records: let From 8e48b6147399d7b21784b88214055be0f99c97ed Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 6 Oct 2024 20:09:08 +0000 Subject: [PATCH 339/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a0dcd44..a48a56c 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1727602550, - "narHash": "sha256-xTMWzYuM2ZoTRa30AYp+10dpbflvzlF9lBCOA8vxhdk=", + "lastModified": 1728245298, + "narHash": "sha256-8C7ORHibvDpBPzXCUg5wC8KJXgIjK62IVG3B0Ju+o1s=", "ref": "refs/heads/main", - "rev": "4af037f195249d5db2aafc612c562f790ad91f9a", - "revCount": 103, + "rev": "1d158667a577e1b008e99d99afa60608d33e7f94", + "revCount": 104, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From cd104570350afbb734ca90c80c4e028bcab7b936 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 7 Oct 2024 19:54:10 +0000 Subject: [PATCH 340/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a48a56c..5daee23 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1728245298, - "narHash": "sha256-8C7ORHibvDpBPzXCUg5wC8KJXgIjK62IVG3B0Ju+o1s=", + "lastModified": 1728330802, + "narHash": "sha256-Vx1IN4KkERt+au/ON/29K1OuxFq748ypbxqFJCLJMtk=", "ref": "refs/heads/main", - "rev": "1d158667a577e1b008e99d99afa60608d33e7f94", - "revCount": 104, + "rev": "4868914966b837a42dbd4465dfa281243ca6b216", + "revCount": 105, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 2fc07e49aa2c07b1caccf5b8c118a7c7bc061035 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 9 Oct 2024 15:16:07 +0100 Subject: [PATCH 341/563] fix: disable gpg signing on forgejo --- applications/git/forgejo.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index d0ff9ef..c7b3572 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -106,12 +106,12 @@ in { }; # Allow for signing off merge requests - "repository.signing" = { - SIGNING_KEY = "5B2DED0FE9F8627A"; - SIGNING_NAME = "Skynet"; - SIGNING_EMAIL = "forgejo@glados.skynet.ie"; - MERGES = "always"; - }; + # "repository.signing" = { + # SIGNING_KEY = "5B2DED0FE9F8627A"; + # SIGNING_NAME = "Skynet"; + # SIGNING_EMAIL = "forgejo@glados.skynet.ie"; + # MERGES = "always"; + # }; # Sending emails is completely optional # You can send a test email from the web UI at: From 87383ccaae7d6dffff2dba70d755ed4c52552ace Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 9 Oct 2024 16:10:43 +0000 Subject: [PATCH 342/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 5daee23..7a02af4 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1728330802, - "narHash": "sha256-Vx1IN4KkERt+au/ON/29K1OuxFq748ypbxqFJCLJMtk=", + "lastModified": 1728490019, + "narHash": "sha256-G7WWtku2ubuEGIzaQTZmSOYNbc8mX/+KLhpm6z9xD+k=", "ref": "refs/heads/main", - "rev": "4868914966b837a42dbd4465dfa281243ca6b216", - "revCount": 105, + "rev": "5c4394efd5de27755f09596d25396d78041cb8dd", + "revCount": 106, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 74a3f11f9b38d1924191ee39f2704c4be88e5179 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 9 Oct 2024 16:51:49 +0000 Subject: [PATCH 343/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 7a02af4..55d696f 100644 --- a/flake.lock +++ b/flake.lock @@ -170,11 +170,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1728490019, - "narHash": "sha256-G7WWtku2ubuEGIzaQTZmSOYNbc8mX/+KLhpm6z9xD+k=", + "lastModified": 1728492673, + "narHash": "sha256-UtHjRQEojBuH7Kx/XaCYsrcSXgwfhOsPJpyvurf4P9A=", "ref": "refs/heads/main", - "rev": "5c4394efd5de27755f09596d25396d78041cb8dd", - "revCount": 106, + "rev": "4b01336503479806efefb84823f4d827f39bd50f", + "revCount": 107, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From c114f31d2e0bb978ffb3237b2a685b4702272b0e Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 18 Oct 2024 22:27:21 +0000 Subject: [PATCH 344/563] 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 55d696f..435d6d2 100644 --- a/flake.lock +++ b/flake.lock @@ -1195,11 +1195,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1727202084, - "narHash": "sha256-mjIqzAOPthSDG7/EvnUDdfZrWsiBmoKv8tl5Wmzd94A=", + "lastModified": 1729290386, + "narHash": "sha256-9A0f1RueEtf6+NhgqyJMLR6o0I2uYhSLPZM//oyz77w=", "ref": "refs/heads/main", - "rev": "ab0add44756d4992fc2b2da4eba163016ccb3d1c", - "revCount": 100, + "rev": "a32b3ced29cbd9cd26482222ce74ea725baf19ce", + "revCount": 112, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 50459f79823a893c14747761bc0dd32a6cd30077 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 1 Nov 2024 13:12:14 +0000 Subject: [PATCH 345/563] fix: solves i24-09-03_614 --- applications/nginx.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/applications/nginx.nix b/applications/nginx.nix index 254de6c..5970a20 100644 --- a/applications/nginx.nix +++ b/applications/nginx.nix @@ -9,8 +9,6 @@ recommendedGzipSettings = true; recommendedProxySettings = true; - statusPage = true; - # give Nginx access to our certs group = "acme"; }; From 5448662230eaf0a204031e40efaaff07c2829096 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 11:14:41 +0000 Subject: [PATCH 346/563] fix: getattic working Seems to have been mainstreamed --- applications/nix_cache/nix_cache.nix | 4 +--- flake.nix | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/applications/nix_cache/nix_cache.nix b/applications/nix_cache/nix_cache.nix index 4dcfdae..aead693 100644 --- a/applications/nix_cache/nix_cache.nix +++ b/applications/nix_cache/nix_cache.nix @@ -15,7 +15,6 @@ https://docs.attic.rs/introduction.html lib, config, pkgs, - inputs, ... }: with lib; let @@ -23,7 +22,6 @@ with lib; let cfg = config.services.skynet."${name}"; in { imports = [ - inputs.attic.nixosModules.atticd ]; options.services.skynet."${name}" = { @@ -53,7 +51,7 @@ in { enable = true; # Replace with absolute path to your credentials file - credentialsFile = "/etc/atticd.env"; + environmentFile = "/etc/atticd.env"; settings = { listen = "127.0.0.1:8080"; diff --git a/flake.nix b/flake.nix index 3669f39..150054a 100644 --- a/flake.nix +++ b/flake.nix @@ -27,7 +27,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; colmena.url = "github:zhaofengli/colmena"; - attic.url = "github:zhaofengli/attic"; # we host our own simple-nixos-mailserver = { From 8a85846c0d9f84584a18a8ac557424f09fe00c60 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 1 Nov 2024 13:44:50 +0000 Subject: [PATCH 347/563] feat: using the upstreamed bitwarden directory conenctor --- .../bitwarden-directory-connector-cli.nix | 324 ------------------ applications/bitwarden/bitwarden_sync.nix | 4 +- 2 files changed, 1 insertion(+), 327 deletions(-) delete mode 100644 applications/bitwarden/bitwarden-directory-connector-cli.nix diff --git a/applications/bitwarden/bitwarden-directory-connector-cli.nix b/applications/bitwarden/bitwarden-directory-connector-cli.nix deleted file mode 100644 index 85ed64f..0000000 --- a/applications/bitwarden/bitwarden-directory-connector-cli.nix +++ /dev/null @@ -1,324 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -with lib; let - cfg = config.services.bitwarden-directory-connector-cli; -in { - disabledModules = ["services/security/bitwarden-directory-connector-cli.nix"]; - - options.services.bitwarden-directory-connector-cli = { - enable = mkEnableOption "Bitwarden Directory Connector"; - - package = mkPackageOption pkgs "bitwarden-directory-connector-cli" {}; - - domain = mkOption { - type = types.str; - description = lib.mdDoc "The domain the Bitwarden/Vaultwarden is accessible on."; - example = "https://vaultwarden.example.com"; - }; - - user = mkOption { - type = types.str; - description = lib.mdDoc "User to run the program."; - default = "bwdc"; - }; - - interval = mkOption { - type = types.str; - default = "*:0,15,30,45"; - description = lib.mdDoc "The interval when to run the connector. This uses systemd's OnCalendar syntax."; - }; - - ldap = mkOption { - description = lib.mdDoc '' - Options to configure the LDAP connection. - If you used the desktop application to test the configuration you can find the settings by searching for `ldap` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. - ''; - default = {}; - type = types.submodule ({ - config, - options, - ... - }: { - freeformType = types.attrsOf (pkgs.formats.json {}).type; - - config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); - - options = { - finalJSON = mkOption { - type = (pkgs.formats.json {}).type; - internal = true; - readOnly = true; - visible = false; - }; - - ssl = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether to use TLS."; - }; - startTls = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether to use STARTTLS."; - }; - - hostname = mkOption { - type = types.str; - description = lib.mdDoc "The host the LDAP is accessible on."; - example = "ldap.example.com"; - }; - - port = mkOption { - type = types.port; - default = 389; - description = lib.mdDoc "Port LDAP is accessible on."; - }; - - ad = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether the LDAP Server is an Active Directory."; - }; - - pagedSearch = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether the LDAP server paginates search results."; - }; - - rootPath = mkOption { - type = types.str; - description = lib.mdDoc "Root path for LDAP."; - example = "dc=example,dc=com"; - }; - - username = mkOption { - type = types.str; - description = lib.mdDoc "The user to authenticate as."; - example = "cn=admin,dc=example,dc=com"; - }; - }; - }); - }; - - sync = mkOption { - description = lib.mdDoc '' - Options to configure what gets synced. - If you used the desktop application to test the configuration you can find the settings by searching for `sync` in `~/.config/Bitwarden\ Directory\ Connector/data.json`. - ''; - default = {}; - type = types.submodule ({ - config, - options, - ... - }: { - freeformType = types.attrsOf (pkgs.formats.json {}).type; - - config.finalJSON = builtins.toJSON (removeAttrs config (filter (x: x == "finalJSON" || ! options.${x}.isDefined or false) (attrNames options))); - - options = { - finalJSON = mkOption { - type = (pkgs.formats.json {}).type; - internal = true; - readOnly = true; - visible = false; - }; - - removeDisabled = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc "Remove users from bitwarden groups if no longer in the ldap group."; - }; - - overwriteExisting = mkOption { - type = types.bool; - default = false; - description = - lib.mdDoc "Remove and re-add users/groups, See https://bitwarden.com/help/user-group-filters/#overwriting-syncs for more details."; - }; - - largeImport = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Enable if you are syncing more than 2000 users/groups."; - }; - - memberAttribute = mkOption { - type = types.str; - description = lib.mdDoc "Attribute that lists members in a LDAP group."; - example = "uniqueMember"; - }; - - creationDateAttribute = mkOption { - type = types.str; - description = lib.mdDoc "Attribute that lists a user's creation date."; - example = "whenCreated"; - }; - - useEmailPrefixSuffix = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "If a user has no email address, combine a username prefix with a suffix value to form an email."; - }; - emailPrefixAttribute = mkOption { - type = types.str; - description = lib.mdDoc "The attribute that contains the users username."; - example = "accountName"; - }; - emailSuffix = mkOption { - type = types.str; - description = lib.mdDoc "Suffix for the email, normally @example.com."; - example = "@example.com"; - }; - - users = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Sync users."; - }; - userPath = mkOption { - type = types.str; - description = lib.mdDoc "User directory, relative to root."; - default = "ou=users"; - }; - userObjectClass = mkOption { - type = types.str; - description = lib.mdDoc "Class that users must have."; - default = "inetOrgPerson"; - }; - userEmailAttribute = mkOption { - type = types.str; - description = lib.mdDoc "Attribute for a users email."; - default = "mail"; - }; - userFilter = mkOption { - type = types.str; - description = lib.mdDoc "LDAP filter for users."; - example = "(memberOf=cn=sales,ou=groups,dc=example,dc=com)"; - default = ""; - }; - - groups = mkOption { - type = types.bool; - default = false; - description = lib.mdDoc "Whether to sync ldap groups into BitWarden."; - }; - groupPath = mkOption { - type = types.str; - description = lib.mdDoc "Group directory, relative to root."; - default = "ou=groups"; - }; - groupObjectClass = mkOption { - type = types.str; - description = lib.mdDoc "A class that groups will have."; - default = "groupOfNames"; - }; - groupNameAttribute = mkOption { - type = types.str; - description = lib.mdDoc "Attribute for a name of group."; - default = "cn"; - }; - groupFilter = mkOption { - type = types.str; - description = lib.mdDoc "LDAP filter for groups."; - example = "(cn=sales)"; - default = ""; - }; - }; - }); - }; - - secrets = { - ldap = mkOption { - type = types.str; - description = "Path to file that contains LDAP password for user in {option}`ldap.username"; - }; - - bitwarden = { - client_path_id = mkOption { - type = types.str; - description = "Path to file that contains Client ID."; - }; - client_path_secret = mkOption { - type = types.str; - description = "Path to file that contains Client Secret."; - }; - }; - }; - }; - - config = mkIf cfg.enable { - users.groups."${cfg.user}" = {}; - users.users."${cfg.user}" = { - isSystemUser = true; - group = cfg.user; - }; - - systemd = { - timers.bitwarden-directory-connector-cli = { - description = "Sync timer for Bitwarden Directory Connector"; - wantedBy = ["timers.target"]; - after = ["network-online.target"]; - timerConfig = { - OnCalendar = cfg.interval; - Unit = "bitwarden-directory-connector-cli.service"; - Persistent = true; - }; - }; - - services.bitwarden-directory-connector-cli = { - description = "Main process for Bitwarden Directory Connector"; - - environment = { - BITWARDENCLI_CONNECTOR_APPDATA_DIR = "/tmp"; - BITWARDENCLI_CONNECTOR_PLAINTEXT_SECRETS = "true"; - }; - - serviceConfig = { - Type = "oneshot"; - User = "${cfg.user}"; - PrivateTmp = true; - ExecStartPre = pkgs.writeShellScript "bitwarden_directory_connector-config" '' - set -eo pipefail - - # create the config file - ${lib.getExe cfg.package} data-file - touch /tmp/data.json.tmp - chmod 600 /tmp/data.json{,.tmp} - - ${lib.getExe cfg.package} config server ${cfg.domain} - - # now login to set credentials - export BW_CLIENTID="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_id})" - export BW_CLIENTSECRET="$(< ${escapeShellArg cfg.secrets.bitwarden.client_path_secret})" - ${lib.getExe cfg.package} login - - ${lib.getExe pkgs.jq} '.authenticatedAccounts[0] as $account - | .[$account].directoryConfigurations.ldap |= $ldap_data - | .[$account].directorySettings.organizationId |= $orgID - | .[$account].directorySettings.sync |= $sync_data' \ - --argjson ldap_data ${escapeShellArg cfg.ldap.finalJSON} \ - --arg orgID "''${BW_CLIENTID//organization.}" \ - --argjson sync_data ${escapeShellArg cfg.sync.finalJSON} \ - /tmp/data.json \ - > /tmp/data.json.tmp - - mv -f /tmp/data.json.tmp /tmp/data.json - - # final config - ${lib.getExe cfg.package} config directory 0 - ${lib.getExe cfg.package} config ldap.password --secretfile ${cfg.secrets.ldap} - ''; - - ExecStart = "${lib.getExe cfg.package} sync"; - }; - }; - }; - }; - - meta.maintainers = with maintainers; [Silver-Golden]; -} diff --git a/applications/bitwarden/bitwarden_sync.nix b/applications/bitwarden/bitwarden_sync.nix index 88104d0..db8b970 100644 --- a/applications/bitwarden/bitwarden_sync.nix +++ b/applications/bitwarden/bitwarden_sync.nix @@ -6,9 +6,7 @@ }: let user = "bwdc"; in { - imports = [ - ./bitwarden-directory-connector-cli.nix - ]; + imports = []; options = {}; From c648bded749c4a4b403d957554612f6acefcd565 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 1 Nov 2024 23:16:45 +0000 Subject: [PATCH 348/563] testing: to see if we can get a whiteboard working --- applications/nextcloud.nix | 31 ++++++++++++++++++++++++++++--- 1 file changed, 28 insertions(+), 3 deletions(-) diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index e31f67c..e1ca27e 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -45,6 +45,7 @@ in { services.skynet.acme.domains = [ domain "onlyoffice.${domain}" + "whiteboard.${domain}" ]; services.skynet.dns.records = [ @@ -58,13 +59,18 @@ in { r_type = "CNAME"; value = config.services.skynet.host.name; } + # { + # record = "whiteboard.${cfg.domain.sub}"; + # r_type = "CNAME"; + # value = config.services.skynet.host.name; + # } ]; # /var/lib/nextcloud/data services.nextcloud = { enable = true; - package = pkgs.nextcloud28; + package = pkgs.nextcloud30; hostName = domain; https = true; @@ -78,8 +84,8 @@ in { appstoreEnable = true; - extraApps = with config.services.nextcloud.package.packages.apps; { - inherit forms groupfolders maps notes onlyoffice polls; + extraApps = { + inherit (config.services.nextcloud.package.packages.apps) richdocuments; }; settings = { @@ -90,7 +96,18 @@ in { }; }; + # environment.etc."nextcloud-whiteboard-secret".text = '' + # JWT_SECRET_KEY=test123 + # ''; + # + # services.nextcloud-whiteboard-server = { + # enable = true; + # settings.NEXTCLOUD_URL = "https://nextcloud.skynet.ie"; + # secrets = ["/etc/nextcloud-whiteboard-secret"]; + # }; + nixpkgs.config.allowUnfree = true; + # impacted by https://github.com/NixOS /nixpkgs/issues/352443 services.onlyoffice = { enable = true; }; @@ -105,6 +122,14 @@ in { useACMEHost = "skynet"; locations."/".proxyPass = "http://127.0.0.1:8000"; }; + # "whiteboard.${domain}" = { + # forceSSL = true; + # useACMEHost = "skynet"; + # locations."/" = { + # proxyPass = "http://localhost:3002"; + # proxyWebsockets = true; + # }; + # }; }; }; } From 2c196ae87efbccd097b08d1af7d69df130e87776 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 00:18:49 +0000 Subject: [PATCH 349/563] fix: disable the document writer untl its fixed --- applications/nextcloud.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index e1ca27e..04f52fa 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -108,9 +108,9 @@ in { nixpkgs.config.allowUnfree = true; # impacted by https://github.com/NixOS /nixpkgs/issues/352443 - services.onlyoffice = { - enable = true; - }; + # services.onlyoffice = { + # enable = true; + # }; services.nginx.virtualHosts = { ${domain} = { From ff6af9916d8b0eea7aca1ea6750959d668ae4bc0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 11:38:15 +0000 Subject: [PATCH 350/563] fix: dont update lix yet, causes a pile of errors --- flake.lock | 335 +++++++++++++++++------------------------------------ 1 file changed, 105 insertions(+), 230 deletions(-) diff --git a/flake.lock b/flake.lock index 435d6d2..86104f8 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_18" }, "locked": { "lastModified": 1719514321, @@ -84,32 +84,10 @@ "type": "github" } }, - "attic": { - "inputs": { - "crane": "crane", - "flake-compat": "flake-compat", - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1724086414, - "narHash": "sha256-jcY81r8PdMQ9dCGhT0YLZzxPj3kQJXyWCmvQLXbR1EI=", - "owner": "zhaofengli", - "repo": "attic", - "rev": "acf3c351f8de47c6857f31948ab253f9c7ce2a6f", - "type": "github" - }, - "original": { - "owner": "zhaofengli", - "repo": "attic", - "type": "github" - } - }, "bfom": { "inputs": { "naersk": "naersk", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -144,9 +122,9 @@ }, "colmena": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_4", + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_3", "stable": "stable" }, "locked": { @@ -166,7 +144,7 @@ "compsoc_public": { "inputs": { "bfom": "bfom", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "utils": "utils_2" }, "locked": { @@ -183,27 +161,6 @@ "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" } }, - "crane": { - "inputs": { - "nixpkgs": [ - "attic", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722960479, - "narHash": "sha256-NhCkJJQhD5GUib8zN9JrmYGMwt4lCRp6ZVNzIiYCl0Y=", - "owner": "ipetkov", - "repo": "crane", - "rev": "4c6c77920b8d44cd6660c1621dea6b3fc4b4c4f4", - "type": "github" - }, - "original": { - "owner": "ipetkov", - "repo": "crane", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -272,22 +229,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1650374568, @@ -303,7 +244,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -362,24 +303,6 @@ } }, "flake-utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -394,9 +317,9 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1710146030, @@ -412,9 +335,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -552,7 +475,7 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": [ "lix" @@ -575,7 +498,7 @@ }, "naersk": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1713520724, @@ -593,7 +516,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1721727458, @@ -611,7 +534,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1686572087, @@ -658,38 +581,7 @@ "type": "indirect" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720535198, - "narHash": "sha256-zwVvxrdIzralnSbcpghA92tWu2DV2lwv89xZc8MTrbg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "205fd4226592cc83fd4c0885a3e4c9c400efabb5", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_10": { - "locked": { - "lastModified": 1722995383, - "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1687011986, "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", @@ -703,7 +595,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1686921029, "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", @@ -718,7 +610,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -732,7 +624,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -746,7 +638,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -760,6 +652,20 @@ "type": "indirect" } }, + "nixpkgs_15": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_16": { "locked": { "lastModified": 1689935543, @@ -775,20 +681,6 @@ } }, "nixpkgs_17": { - "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_18": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -802,7 +694,7 @@ "type": "indirect" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -818,6 +710,20 @@ "type": "github" } }, + "nixpkgs_19": { + "locked": { + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1722630782, @@ -834,37 +740,7 @@ "type": "github" } }, - "nixpkgs_20": { - "locked": { - "lastModified": 1724395761, - "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_3": { - "locked": { - "lastModified": 1723827930, - "narHash": "sha256-EU+W5F6y2CVNxGrGIMpY7nSVYq72WRChYxF4zpjx0y4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d4a7a4d0e066278bfb0d77bd2a7adde1c0ec9e3d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1696019113, "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", @@ -880,6 +756,20 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1714091391, + "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_5": { "locked": { "lastModified": 1714091391, @@ -895,20 +785,6 @@ } }, "nixpkgs_6": { - "locked": { - "lastModified": 1714091391, - "narHash": "sha256-68n3GBvlm1MIeJXadPzQ3v8Y9sIW3zmv8gI5w5sliC8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4c86138ce486d601d956a165e2f7a0fc029a03c1", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_7": { "locked": { "lastModified": 1715413075, "narHash": "sha256-FCi3R1MeS5bVp0M0xTheveP6hhcCYfW/aghSTPebYL4=", @@ -922,13 +798,13 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1723991338, - "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", + "lastModified": 1730200266, + "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a3354191c0d7144db9756a74755672387b702ba", + "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", "type": "github" }, "original": { @@ -937,7 +813,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1723151389, "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", @@ -951,18 +827,32 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", "alejandra": "alejandra", "arion": "arion", - "attic": "attic", "colmena": "colmena", "compsoc_public": "compsoc_public", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "lix": "lix", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", @@ -1012,7 +902,7 @@ "simple-nixos-mailserver": { "inputs": { "blobs": "blobs", - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": [ "nixpkgs" ], @@ -1035,7 +925,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "utils": "utils_3" }, "locked": { @@ -1055,7 +945,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "utils": "utils_4" }, "locked": { @@ -1074,7 +964,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_12", "utils": "utils_5" }, "locked": { @@ -1093,7 +983,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "utils": "utils_6" }, "locked": { @@ -1112,7 +1002,7 @@ }, "skynet_website_2009": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, "locked": { @@ -1131,7 +1021,7 @@ }, "skynet_website_2017": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "utils": "utils_8" }, "locked": { @@ -1151,7 +1041,7 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "utils": "utils_9" }, "locked": { @@ -1171,7 +1061,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "utils": "utils_10" }, "locked": { @@ -1191,7 +1081,7 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { @@ -1314,21 +1204,6 @@ "type": "github" } }, - "systems_15": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1451,7 +1326,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1710146030, @@ -1469,7 +1344,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1694529238, @@ -1487,7 +1362,7 @@ }, "utils_11": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -1505,7 +1380,7 @@ }, "utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, @@ -1523,7 +1398,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -1541,7 +1416,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1685518550, @@ -1559,7 +1434,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1687171271, @@ -1577,7 +1452,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -1595,7 +1470,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1689068808, @@ -1613,7 +1488,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1689068808, @@ -1631,7 +1506,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1689068808, From 6d4160fe65ade285d7a869a1679c1d10bfea1d22 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 14:19:39 +0000 Subject: [PATCH 351/563] fix: bump everythign after all --- flake.lock | 98 +++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index 86104f8..3de006b 100644 --- a/flake.lock +++ b/flake.lock @@ -71,11 +71,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1722825873, - "narHash": "sha256-bFNXkD+s9NuidZePiJAjjFUnsMOwXb7hEZ4JEDdSALw=", + "lastModified": 1729444465, + "narHash": "sha256-+lCi3cQlFNGAGKaVeUNhTeR40zvMy9JX4hp1JA0dLwE=", "owner": "hercules-ci", "repo": "arion", - "rev": "90bc85532767c785245f5c1e29ebfecb941cf8c9", + "rev": "94d092fffd5cfd4f09b8988aca1b857a9d37c4d6", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "stable": "stable" }, "locked": { - "lastModified": 1711386353, - "narHash": "sha256-gWEpb8Hybnoqb4O4tmpohGZk6+aerAbJpywKcFIiMlg=", + "lastModified": 1728263678, + "narHash": "sha256-gyUVsPAWY9AgVKjrNPoowrIr5BvK4gI0UkDXvv8iSxA=", "owner": "zhaofengli", "repo": "colmena", - "rev": "cd65ef7a25cdc75052fbd04b120aeb066c3881db", + "rev": "b0a62f234fae02a006123e661ff70e62af16106b", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1657607339, - "narHash": "sha256-HaqoAwlbVVZH2n4P3jN2FFPMpVuhxDy1poNOR7kzODc=", + "lastModified": 1668234453, + "narHash": "sha256-FmuZThToBvRsqCauYJ3l8HJoGLAY5cMULeYEKIaGrRw=", "owner": "nix-community", "repo": "fenix", - "rev": "b814c83d9e6aa5a28d0cf356ecfdafb2505ad37d", + "rev": "8f219f6b36e8d0d56afa7f67e6e3df63ef013cdb", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -462,11 +462,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1724624492, - "narHash": "sha256-J3COggDipocT+ozSxz96GuwSyMrT5+Xa2fGfxaIShqw=", - "rev": "b6884388a1281d70bb4e5bb12e1cadd34bb832f0", + "lastModified": 1730433081, + "narHash": "sha256-1oqkMcFQyAqCvqkjG9K3NaRLyB1qkXXiZoxe4rwM6ag=", + "rev": "834450e237b82230934b5d25ed212b5a55938cc5", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/b6884388a1281d70bb4e5bb12e1cadd34bb832f0.tar.gz?rev=b6884388a1281d70bb4e5bb12e1cadd34bb832f0" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/834450e237b82230934b5d25ed212b5a55938cc5.tar.gz?rev=834450e237b82230934b5d25ed212b5a55938cc5" }, "original": { "type": "tarball", @@ -485,11 +485,11 @@ ] }, "locked": { - "lastModified": 1723511483, - "narHash": "sha256-rT/OkVXKkns2YvyF1nFvl+8Gc3sld1c1sXPtGkbqaDY=", - "rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9", + "lastModified": 1727752861, + "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", + "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cecf70b77539c1a593f60ec9d0305b5e537ab6a9.tar.gz?rev=cecf70b77539c1a593f60ec9d0305b5e537ab6a9" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" }, "original": { "type": "tarball", @@ -742,11 +742,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", + "lastModified": 1725103162, + "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", + "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "type": "github" }, "original": { @@ -868,11 +868,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1657557289, - "narHash": "sha256-PRW+nUwuqNTRAEa83SfX+7g+g8nQ+2MMbasQ9nt6+UM=", + "lastModified": 1668182250, + "narHash": "sha256-PYGaOCiFvnJdVz+ZCaKF8geGdffXjJUNcMwaBHv0FT4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "caf23f29144b371035b864a1017dbc32573ad56d", + "rev": "45ec315e01dc8dd1146dfeb65f0ef6e5c2efed78", "type": "github" }, "original": { @@ -949,11 +949,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1723234129, - "narHash": "sha256-tfsT9VYV3YgFRUKbjFyV4o1kVJHcUY87kh2vcu6jAkU=", + "lastModified": 1727122069, + "narHash": "sha256-Dr8CxlBbw5vKL2sH0QiJPWIxKX7KFxg+pdPWSKqJ9FY=", "ref": "refs/heads/main", - "rev": "5f6a086e808b811095e36875fb656864cf11c5f5", - "revCount": 232, + "rev": "aa0cfc017d3b70457c9fc34cbb296351aa5373f9", + "revCount": 233, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, @@ -968,11 +968,11 @@ "utils": "utils_5" }, "locked": { - "lastModified": 1723234619, - "narHash": "sha256-6a0sJkhabJOxCEdGz3moKeQjYfqV9Bqa8Q0byPipPQo=", + "lastModified": 1727122070, + "narHash": "sha256-X6g3kBASjv8NZxea2cdkBQ9YAIZdPWdAButM+LjeYm0=", "ref": "refs/heads/main", - "rev": "71f5928c66a43e788a9a00b90a1326c1bb82ffd2", - "revCount": 228, + "rev": "e09818ca6b27bf98cf63c3427a7253309c39a816", + "revCount": 229, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_frontend" }, @@ -987,11 +987,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724210543, - "narHash": "sha256-JLt77gajtOPwM20m86Kh2JkWuOq1+kmHr+98UMzbjAY=", + "lastModified": 1727122068, + "narHash": "sha256-C+PD6NveB9tascXQ84rekqlDkSNwe1mFhzZXqVlNvuQ=", "ref": "refs/heads/main", - "rev": "0af67c9ece40fb683238093d857d96aae2414522", - "revCount": 27, + "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", + "revCount": 28, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, @@ -1006,11 +1006,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1724198445, - "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", + "lastModified": 1727122067, + "narHash": "sha256-AAj5tmfT8IuAvgcMjlIjf5CD1LNC/gDCvFRt1NAedPw=", "ref": "refs/heads/main", - "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", - "revCount": 14, + "rev": "a9f125fb750f33747d28271bef3b3425563096a0", + "revCount": 15, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, @@ -1100,16 +1100,16 @@ }, "stable": { "locked": { - "lastModified": 1696039360, - "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "lastModified": 1724316499, + "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } From 59855b06e3450b370eb26e26e95adf2dec0cea3c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 14:50:03 +0000 Subject: [PATCH 352/563] ci: make verbose to see what is running on it --- .forgejo/workflows/deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index cb535fd..ac25612 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -29,7 +29,7 @@ jobs: runs-on: nix steps: - uses: actions/checkout@v4 - - run: nix develop + - run: nix develop -v # - name: Archive Test Results # if: always() # run: sleep 100m From 45e9d60967ef7224e67a62c77ed11811d009436e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 15:27:34 +0000 Subject: [PATCH 353/563] ci: test only building develop --- .forgejo/workflows/deploy.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index ac25612..0d0e32f 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -33,11 +33,11 @@ jobs: # - name: Archive Test Results # if: always() # run: sleep 100m - - run: colmena build -v --on @active-dns - - run: colmena build -v --on @active-core - - run: colmena build -v --on @active - - run: colmena build -v --on @active-ext - - run: colmena build -v --on @active-gitlab +# - run: colmena build -v --on @active-dns +# - run: colmena build -v --on @active-core +# - run: colmena build -v --on @active +# - run: colmena build -v --on @active-ext +# - run: colmena build -v --on @active-gitlab deploy_dns: runs-on: nix From 50fc67917268aacce1e177aadab4e02b1e4d2e0b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 17:09:11 +0000 Subject: [PATCH 354/563] cleanup: gettign rid of the gitlab runner config --- applications/git/gitlab_runner.nix | 123 ----------------------------- machines/wheatly.nix | 7 -- 2 files changed, 130 deletions(-) delete mode 100644 applications/git/gitlab_runner.nix diff --git a/applications/git/gitlab_runner.nix b/applications/git/gitlab_runner.nix deleted file mode 100644 index f5041bf..0000000 --- a/applications/git/gitlab_runner.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ - config, - pkgs, - lib, - ... -}: -with lib; let - name = "gitlab_runner"; - cfg = config.services.skynet."${name}"; -in { - imports = [ - ]; - - options.services.skynet."${name}" = { - enable = mkEnableOption "Skynet Gitlab Runner"; - - runner = { - name = mkOption { - type = types.str; - }; - - gitlab = mkOption { - default = "https://gitlab.skynet.ie"; - type = types.str; - }; - - description = mkOption { - default = cfg.runner.name; - type = types.str; - }; - - docker = { - image = mkOption { - default = "alpine:latest"; - type = types.str; - }; - - cleanup_dates = mkOption { - # https://man.archlinux.org/man/systemd.time.7#CALENDAR_EVENTS - # it will use a lot of storage so clear it daily, may change to hourly if required - default = "daily"; - type = types.str; - }; - }; - }; - }; - - config = mkIf cfg.enable { - # https://search.nixos.org/options?from=0&size=50&sort=alpha_desc&type=packages&query=services.gitlab-runner. - environment.systemPackages = [ - pkgs.gitlab-runner - ]; - - age.secrets.runner_01_nix.file = ../../secrets/gitlab/runners/runner01.age; - age.secrets.runner_02_general.file = ../../secrets/gitlab/runners/runner02.age; - - boot.kernel.sysctl."net.ipv4.ip_forward" = true; # 1 - virtualisation.docker.enable = true; - - # taken from https://github.com/NixOS/nixpkgs/issues/245365#issuecomment-1663854128 - virtualisation.docker.listenOptions = ["/run/docker.sock" "127.0.0.1:2375"]; - - services.gitlab-runner = { - enable = true; - - # clear-docker-cache = { - # enable = true; - # dates = cfg.runner.docker.cleanup_dates; - # }; - - services = { - # might make a function later to have multiple runners, might never need it though - runner_nix = { - cloneUrl = cfg.runner.gitlab; - description = "For Nix only"; - registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"]; - registrationConfigFile = config.age.secrets.runner_01_nix.path; - dockerImage = cfg.runner.docker.image; - - # from https://nixos.wiki/wiki/Gitlab_runner - dockerVolumes = [ - "/nix/store:/nix/store:ro" - "/nix/var/nix/db:/nix/var/nix/db:ro" - "/nix/var/nix/daemon-socket:/nix/var/nix/daemon-socket:ro" - ]; - dockerDisableCache = true; - preBuildScript = pkgs.writeScript "setup-container" '' - mkdir -p -m 0755 /nix/var/log/nix/drvs - mkdir -p -m 0755 /nix/var/nix/gcroots - mkdir -p -m 0755 /nix/var/nix/profiles - mkdir -p -m 0755 /nix/var/nix/temproots - mkdir -p -m 0755 /nix/var/nix/userpool - mkdir -p -m 1777 /nix/var/nix/gcroots/per-user - mkdir -p -m 1777 /nix/var/nix/profiles/per-user - mkdir -p -m 0755 /nix/var/nix/profiles/per-user/root - mkdir -p -m 0700 "$HOME/.nix-defexpr" - . ${pkgs.nix}/etc/profile.d/nix-daemon.sh - ${pkgs.nix}/bin/nix-channel --add https://nixos.org/channels/nixos-unstable nixpkgs - ${pkgs.nix}/bin/nix-channel --update nixpkgs - ${pkgs.nix}/bin/nix-env -i ${concatStringsSep " " (with pkgs; [lix cacert git openssh])} - nix --version - ''; - environmentVariables = { - ENV = "/etc/profile"; - USER = "root"; - NIX_REMOTE = "daemon"; - PATH = "/nix/var/nix/profiles/default/bin:/nix/var/nix/profiles/default/sbin:/bin:/sbin:/usr/bin:/usr/sbin"; - NIX_SSL_CERT_FILE = "/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt"; - }; - tagList = ["nix"]; - }; - - runner_general = { - cloneUrl = cfg.runner.gitlab; - description = "General Runner"; - registrationFlags = ["--docker-host" "tcp://127.0.0.1:2375"]; - registrationConfigFile = config.age.secrets.runner_02_general.path; - dockerImage = cfg.runner.docker.image; - }; - }; - }; - }; -} diff --git a/machines/wheatly.nix b/machines/wheatly.nix index a2cab80..cbd6d4f 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -25,7 +25,6 @@ Notes: }; in { imports = [ - # ../applications/git/gitlab_runner.nix ../applications/git/forgejo_runner.nix ]; @@ -40,12 +39,6 @@ in { services.skynet = { host = host; backup.enable = true; - - # gitlab_runner = { - # enable = true; - # runner.name = "runner01"; - # }; - forgejo_runner.enable = true; }; } From be75fcb2961bffcf2f956a67cf0546d31051d779 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 17:09:45 +0000 Subject: [PATCH 355/563] fix: stop using teh bleeding edge lix --- flake.lock | 27 +++++++++++---------------- flake.nix | 8 +------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 3de006b..0026c38 100644 --- a/flake.lock +++ b/flake.lock @@ -462,38 +462,36 @@ "lix": { "flake": false, "locked": { - "lastModified": 1730433081, - "narHash": "sha256-1oqkMcFQyAqCvqkjG9K3NaRLyB1qkXXiZoxe4rwM6ag=", - "rev": "834450e237b82230934b5d25ed212b5a55938cc5", + "lastModified": 1729298361, + "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", + "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/834450e237b82230934b5d25ed212b5a55938cc5.tar.gz?rev=834450e237b82230934b5d25ed212b5a55938cc5" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" } }, "lix-module": { "inputs": { "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], + "lix": "lix", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1727752861, - "narHash": "sha256-jowmo2aEzrEpPSM96IWtajuogdJm7DjAWxFTEb7Ct0s=", - "rev": "fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d", + "lastModified": 1729360442, + "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", + "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d.tar.gz?rev=fd186f535a4ac7ae35d98c1dd5d79f0a81b7976d" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" } }, "naersk": { @@ -850,7 +848,6 @@ "colmena": "colmena", "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_2", - "lix": "lix", "lix-module": "lix-module", "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", @@ -1027,7 +1024,6 @@ "locked": { "lastModified": 1689960297, "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", - "ref": "refs/heads/main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", @@ -1047,7 +1043,6 @@ "locked": { "lastModified": 1696876711, "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", - "ref": "refs/heads/main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", diff --git a/flake.nix b/flake.nix index 150054a..e600e63 100644 --- a/flake.nix +++ b/flake.nix @@ -7,15 +7,9 @@ # Return to using unstable once the current master is merged in # nixpkgs.url = "nixpkgs/nixos-unstable"; - lix = { - url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; - flake = false; - }; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.lix.follows = "lix"; }; # utility stuff From 97a062180eac6fdbdff2fd88c5a327f3edae23e4 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 17:10:09 +0000 Subject: [PATCH 356/563] ci: make lix available in builds --- applications/git/forgejo_runner.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/git/forgejo_runner.nix b/applications/git/forgejo_runner.nix index f1903ff..29029cb 100644 --- a/applications/git/forgejo_runner.nix +++ b/applications/git/forgejo_runner.nix @@ -149,7 +149,7 @@ in { # used in deployments inputs.colmena.defaultPackage."x86_64-linux" attic-client - nix + lix openssh sudo ]; From 6d2a13cf0362e389c095c5a285f307b08690e407 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 17:10:25 +0000 Subject: [PATCH 357/563] feat: rebuilt wheatly --- secrets/backup/restic.age | Bin 2760 -> 2760 bytes secrets/backup/restic_pw.age | Bin 1047 -> 1047 bytes secrets/bitwarden/details.age | Bin 1155 -> 1155 bytes secrets/bitwarden/id.age | Bin 1031 -> 1031 bytes secrets/bitwarden/secret.age | Bin 1012 -> 1012 bytes secrets/discord/token.age | 37 ++++++++++++++-------------- secrets/dns_certs.secret.age | Bin 2814 -> 2814 bytes secrets/dns_dnskeys.conf.age | Bin 1204 -> 1204 bytes secrets/email/details.age | Bin 1419 -> 1419 bytes secrets/forgejo/runners/ssh.age | Bin 1381 -> 1381 bytes secrets/forgejo/runners/token.age | 37 ++++++++++++++-------------- secrets/gitlab/db_pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/ldap_pw.age | Bin 1110 -> 1110 bytes secrets/gitlab/pw.age | 37 ++++++++++++++-------------- secrets/gitlab/runners/runner01.age | Bin 1065 -> 1065 bytes secrets/gitlab/runners/runner02.age | Bin 1065 -> 1065 bytes secrets/gitlab/secrets_db.age | Bin 1111 -> 1111 bytes secrets/gitlab/secrets_jws.age | Bin 2660 -> 2660 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1110 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1110 bytes secrets/grafana/pw.age | 36 +++++++++++++-------------- secrets/ldap/details.age | Bin 1637 -> 1636 bytes secrets/ldap/pw.age | Bin 1440 -> 1440 bytes secrets/nextcloud/pw.age | Bin 1024 -> 1024 bytes secrets/secrets.nix | 2 +- secrets/stream_ulfm.age | Bin 3194 -> 3194 bytes secrets/wolves/details.age | Bin 1461 -> 1461 bytes 27 files changed, 75 insertions(+), 74 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index d2ecfde1f0860b56493f2088995f2848760fee21..0d7ffd893554e33043e6def7db1ec95c520042e5 100644 GIT binary patch literal 2760 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 Vf9c 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 delta 960 zcmbQvF`Z+APJOt(Ur4=SCy*?S8%b1eo{r1Z6uRb7p#ZRkCmK z#E;_PCPBt76*+FnZkBG5IaQf?LGGzeKKdak2Dyegd2SZ|VL4{y27wlinGxAsCZ?59 z9)?byUdaYw9&Y(T-chN6&KB9lNjc@dq2VPaPJ#Ya*?tiwUKy^F;~B-n&BF7XEkY~x zi>gBX_0zna!}7y3Ok6#y49q<%ib6A-9F4LpBb+R&EW<3gigL;giaq?Db1SnWvn%x@GqcNs3oH^t{q>6{pJf!U4-CoAi%PF@4|Xny3M$Ff&JWgi zD$h*J3aIo?DvL6+G|MTB3Q0A|FADbL3J*36H4FB3D=LnPiYh57Eh;w*$;?f5Gpa0( z@J=tvPczCg($CFv&&^Ioj{)znB8#GO1wTU<|Ej{sBsc$ntRlBSUyJ&{;?SH-i^Sxh zWasRvG6N&8phE4;s>0GrN3P7w3?FSTpQ3;iH%p_!V1v@6)Nt=o*NP(dkWhawgS2vs z%1Yl#|FFE!Vsz`$G7}9`0~NH(O)OliGMruVT>=aPe4UJ3T>W!0BZHG7!VJw_!jf`5 z>wS`4%EI!)G7PwiLepHcf|HWV!%NG(T^)0(yqvV1oH7i8(zSh)Q?89SS#FY)S842P9_SIOZIJHk zVZdc%7?hTooKbJ&8kufVU})qKRi14a8WLP=X*%>tE;O} zrte-H;bT-#7VXnkzeGVXXNIa=VVz}nHW*%m6Mj4S7lTjW$eqfeOe6D*7t_@ zZ_V2mlYLVn==3YS1y+~d-m2C1wf~xY|G$XVvL8ZD>-Vl_GM|?;oAKd9iARrDL_V6d vP?|%UKO&b~TY@=d{Y9s9u3~9UD$H@&g>ovdtxBK0OVQ)giL;*aW=jwN=DS8M diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index bedec27bbc1eb74bce5bdedd877342eab6fefc62..ffc2fa715987313c9e43c483631ea41a5a8b8418 100644 GIT binary patch delta 1069 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 diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index 54f07c34eafde0d6efa2c75920e3a14ebd2f7ff0..aa140a744a6a987d1e0c278bd9583850554ff0cb 100644 GIT binary patch delta 924 zcmeyu{)K&lPJLjqkA7;Uxk-wLPegF8pG!%qOKxaEiAA_kX0S^{L1=ECeu_^>VYr1; zF_&LJa#m@1vUW*nrCC{SRibxjmUgb6vrkEGZmF3?R;7tcS!6+;k7IVIE0?aFLUD11 zZfc5=si~o*f=NJCRDQaGr(dW?R#I_EX<@dDU%pwOuWM33Wv08CXL5>nKwws?cCeXa zZdhrGbH1x1mzRM_g;}a&NKtTNX?AILnM+WmS872?p0|EbRzPBrbEZc|N@|cnS#k2j z4-(;?!HJc=Zaxv^sg8juRgT(`xz6Qj0YUD?Df;=Q-Z?3`1(l)N5snt6ZjM|@=9xwj z$zGN2`Tk{@24xXpUYY*p*_J6$1`*-mF3DAn#fHY|K9-4=LD`ez8O6g*(p=4=Je)!c zvcin=L%a%-BlA6+6Ft2x%w5aPeM3xw@^cdti=4Gf!}GcP&5go+3J+u8I^NXs2%Sy6*BMtLhE6kiN^IRvNWfZTEa4(4parQ}aE;8{53HEl?5BA83 zwDgY%PpSw{4Dyc%bjmXJ3C?!O%X8&&E(@p#&PXZn3Gp!U%FA;zsxr$Ci_{J-&oB43 z$SKMwFiTD`^K~w?aPmcu0PnCOi=uLc{16}C%&f|Y+={B)WRno%#Cprz@}go_|LoGz zEW@(wuypSzr)-a$tO$=}F4M~F)I{g3L<^I&lq!Am!b;=7Bm>{7BtIYH()23rs)(r4 z42$%#^sGP&bnDVG6Ae=X6^zOaJkt_GJu)lIQv!lA+}*;Q+;h!6veP2nD^0VbLIO?d z%?qOUS zF|6~fa`Y{9RLC#!$O=pKD=-erO3N+wicIr$2`?`9s?bi&_j0SsGjVfr^>uSD%gr-L z=dv^m^(=Dot#>l?a?EgX_s;Z5OUX}9F)DC($qWp4PV~tP2?-79`dDd*DF)m1QZ zHSx*xEKYQCHMO*itn|w&h>8l+*N-ajC@)U(aq~7vcZmx1^saDow%`(t{Gg|naVh3f z)L#dwKMBv*${C+n%kVM1@FIU>OpS%ua{05><`T-h%vVJ^O2Yl`KK?X!{yx^?EyeHd JrdyxM1^|O0IpY8T delta 924 zcmeyu{)K&lPJLu>a)^tOduoJBdAeCaSY}Czn}xe^N`ue zBbRrXMNp<+m8++#PkE+OUS*+Ku(?xUj+d8lq)AC|npt76WkFe#PqI;VI+w1ULUD11 zZfc5=si~o*f=NJCRDQaGMNVF2L}Z3bg|ly1dT^3unrpIlYGqD(hDm^5WoBh~Qg&sK zXWenB4I2EjRAuHh!xmR?b1#*UNY8O6iha#Bmmd_7$( zN<+$1bMh+93yZQ6lZ!%4ihNRx@_hB3ohm~;qoTAOtCG2VGZIb0qr5Er^!?3)T-?fy zjk6*O3ydm_EPSg9o%PF{Bh4~H{LBK=%=0IoWfZUX_VW%g%{B>5OieXPPcKf6D##7a zOU?=R)V54daY{A`(e^1Z@-->1O84b5tH?J^bM{D2%1ARVay8CzEh={L&2Y_(vIutf zG<43a3UMng_esl2@`^-{0PnCOi=uLcjFO5xFaNU0s<0}T(qMzClzM;XEI&gJXZPG3 zvy5Z|U(h;p}VbnDVG6Ae=X74r2nT_Te!D?AL1s{)+@lPWyZbIP>6Eli4y1Hw!b9X*}u zO>*+IO#(bBBDpdh^$p#^{XM<1j0;Qji%ndT(|pa1(|jYU4BP`U3(H-+O!G1fgLBLi zF_M>Om7{N=qe6hTeqyFifJdfjNls=`aAr=qzn7U?MUcNomRCWUQC@O*q*GC8T1jGf zGM9;&cWRV*cD;Y3zC~GfQDs$LSXn{3YhHLxgiE%&p-DiRV~$UFN>x#=fh(7;uC78# zU_^vLxVL|aS$RZ}pHFs`lb=smW ssh-ed25519 V1pwNA HO3CoMoRFUYu53Pu1LX91h5lF0BzOLlUfLd6VJ4zSnI -7atgIwovOjaPHDvavVkswMJSTJx79aWiriFRFP75NSM --> ssh-ed25519 4PzZog Y6mMkSE1mokAsIZL0A3jBM47S87iO6Lkv7PSqnOi0gY -TU6PMO8MlVU0LvugBiU7BC00g617cI53FMr5JZgeLnQ --> ssh-ed25519 dA0vRg VSPO7NnddH57YMZfmm1/dktNLLeNzJC005UtKg1ZQQ8 -cqiFWD/e4eNjX7OnWClavC1PSY9wqFpQOUN6SgW24mw --> ssh-ed25519 5Nd93w Wm741XfokLT4GE42ZbfqEUUzuubc5jksgadaTQ4ziAk -N/Vbxz+C17ZZuMJ+cw7DwwrshB+iS4Ar63jki/94OPY --> ssh-ed25519 q8eJgg EqOr15ZLJs6aJsJyEOI82nM3Ywb7o16pRIrG8baEqTo -a2qdPY+ISpjyL0V8MA/hkltpY2JUaLVLpCHgpA+veYM --> ssh-ed25519 KVr8rw hust1JIIdHjZoNzoKuIEqCP0dtOzp1XugjP4++ELnms -UydEPSUphPtwhWZA8FThcPS0x9MyzcL3eZs24Z+Ve1c --> ssh-ed25519 fia1eQ MnLuWkPlZ8+vW2gBOX4siYDnUTh2VpFAWtcS2LGzqFY -AqBKFG5sT5CdvAPAYhHigI/wEnbDZXd2isbMTExV+h0 --> ssh-ed25519 IzAMqA wsKTiCAsPqDZPmXjfeOXDxIJ3dgMSxTtSlguX6Eu2FA -ac37JPjLfM4aCNKQzjG8SeRJVLol8PoyPRGpCkP7YyA ---- uAyo/rbHsVU87DgE3yiEvhTUUz5GYl1PeqrQDztHIxE -÷*çtÆ MÆ·\„×€š~^j쾞jjÜù Ù…²,1ÖžWý/¨ð)lÕ¿fP¤½*âÕ*ÝÆFZÛÝAçè\™ïzÁ,b‡ëÑ«ç2O~(º£šZ$ZJŽ$ÅœsMŒ|9´‡ÍûÖ¹ôŒ)Æ¿,×ìD¼ä¹F ŒY–&ÚÀ•*ÆÅ.TÿdÅ/¾¹CV˜‘Õ+Z³ç¬SNÉêeÝåÆ{õß:¨O~¸=%$ 9¬×–ŠàÙTËÙ€ \ No newline at end of file +-> ssh-ed25519 V1pwNA yAXv1Yf5cEeD82SIn1Jl7abXadIEHaeQgNF81IuUNSs +Uo52RGQKIuE4SpS8SUtg+mu+SV73d28S89R921P7oTs +-> ssh-ed25519 4PzZog e37Cp1r7wkQcOPcD5/kYUvCcBrvkTaSNc19L1XZnfE0 +MjP2tY5GBKsd4liVGx7co97otBTex9iTGLKv1wR3koE +-> ssh-ed25519 dA0vRg Bm+JWggvHAUh2gwJciC+vNljgavsLjdLfl6eRGjqDkM +k6UgIXDTyVpxyLH63jssdB8V1MwaYzeS4pXnm/ZaQUA +-> ssh-ed25519 5Nd93w Xb5zseV34mZ3rSfTqD96aAMGZi7zsE9eacaAIrHH7hQ +8uHzgm3NuYxdOe4e5PC6g25KSgmbpws6/mx6/bnu+vY +-> ssh-ed25519 q8eJgg Q1NOLn8bvsRkglPBvXePM2OgnRJlxVrF5vgR3+fDTnM +abvDruxSUw/T7s7iJFbEmF9nxjATId0zlSwnOW4XCPs +-> ssh-ed25519 KVr8rw F/9sikG7MFodVtYc/BQimUKo+hCnsuI5uxztGjacOAs +rVMTXo3pxKOE7DcToi93ZPoAAm2BdFDgLhFsiZXz7tE +-> ssh-ed25519 fia1eQ Gaf4r3oMiuPONpsr17jqFrSYgt6aK3fyGBHR/kenCys +MFAsCFnmIIJv6+LJiHER0bLJyhkVTuCg4FXeqjNqqYI +-> ssh-ed25519 IzAMqA sKzeU9SFlFwPw7zJHfl/u5yys4UBLrbxlTObTXEzkXg +3P3ez/1ZyWtG7NpBK95Y2dqYGge7yRtaE2S6uafRaac +--- 7t9qRdM5F8vlbvUTqq3cj/D3KMyPvxOhXDFpg8/FLlk +ãùD‹?pô¹/¸ø¸}ß!j`§«o‹ê\î²j)ò+ÂHŸ¼ãk¾ûé‰Ö—Ãm0ɶBPïÎÄ°,§v@ +Ði6x´FµÊ Ø6iÓö˜ÆÇÞr‹“ŒÍ~\ŽN=ÆÀ¡ú=rÃi}cüÝ®&?æNÕšéõV@± ¼ï|%#°H-% c ¤Û⪊@•ü”;©; p$PÔéÿnh;ꓲ-šÃ›ºÿÏm-²¨ÉžKr‹H \ No newline at end of file diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 9145587b959492b7744133efbcfcd4aca525dc64..8e145e7d0a611896eb6cf57f07b98629ac514f72 100644 GIT binary patch literal 2814 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 a@bY~xW_^6)6?tlz221yZUYo8>KDPmIwWT=# literal 2814 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w|`N=}Uo z3imQ{Dl*YF_e#>v%#Sc|j|k5(Gx0Lf_RXkF3eI*j&xouv4&+MD4>EO5cJT`GH+3{} zwTN`gbo5U*^bg6*^A3wN_YCn&^K!BX%QOnBN=CQMB%mrPKV88rNk7~pFDN`URX-{z zDmU2IB`CPK)Fit&$~D8&H7K&UJli~}JS?jqyqL?ipfcMdCA%ckz*t|~)S%Qe&mbq! z%pytKC?wsz)H}W0-=!!uGBqW_$P?YR6i0)ypmc@Q5X;m^-w3ZF!}P-PlmPAgP>af> zD%X_!RJV|zya z3QXONgPbihQj^_$Dh;?y-CP39jq-}~vO--4H!3k*VX zy}c}wO7qceE3`=UN>5h^FAXlt3HK=QHZaO{)^>Lb4Jt12%MS1fPBu1lD=0GYDGACh z$#5(y%1q`mi^|T<$}MpWDhenoDe*2ea&d7^NeXdI^eN8D3r@{WwG0n)PSf}D3B(9V z@310^qH=|ZqRrUojw zd*lRF`s@3Yr@IH5R{53sWq3KecxU++xo4OMndc^lx|F8nMd>FSg_v*!=D1{KmK&Cs z>W2qM`gjCp`GzHWg=B>U7+ILRdO8|<`5BgExfSM{1i7Nyrth9)njWZ-ol|72udz5Rs7? zl#_4a*aMWK&J zQkq#*MP{Z^uuoE1rm?4aUa>gCx*IJC51%=Iz@6-X_vX>7o~U=`eYa7looipy95@v6d0PCCHe(81t(dQ zJ9)Y}rIlr5Szy=}5nSYGR<00i8RS-EQts;HWSL~>6P8};?B;Axpl@yw8EhUBQf8Fx zm7Wn1QdD758Or6OpBIv0nQfS!W}0IVsh^acXX>2qW?Gh3nidgWoLXt@U0#rs>hGQ( z5{e#@E@4%{ndu5NPt6zjW0MLJi724@=?21Rl?`z2?l zxhIGCd*~Y)r8*l0lvI>C`s5fzhNQU#rh0f5Ygbz4xp_Ey7iFW{R#_HonN+S|8Wx^a znIBo=Yi{P_9+hUCY80X!;_jFgR_bJs;u2NvS{UV3pzRpo8Xn4(;u(?~VBuRFl^q#g zm6~rBTA1XXRu+}$obH|OXy%(@R8(T(VruE(VT@s$XO*LGp`(JIiI2XgS88&RXSijA znP*;!SC(gizCr(GcL%{_byimb}BHU#^ff4~ zC`@rO35qiGa8Ggy3@hiVG%In+ukdsA3O4Zz_ILNNGz#!`DNZxg4~X&%PP42^_x5r! zH#9CbFT%*(!G$hPxsD2k`7RY<`Ds~R!H(%Jp{{|s-ht)$g^{LdnSuEp5iSOWZu-fN z+4}B2VWC_B0cjD&j)q3QDUqSYhT-KoF8*#FmaZ0|WrqGCX`!jP+9BoH7Re@MQI6<- z3w1S1OAb_U4Jt}=(J%6>D#$2L4$h8n%PKYuOfS_g3~UOQW2#^$nAP+&$A1JyQeS&CK-83X{z}f*iSuoOAQid~=PX zoHLy=D*Tg@oDJQ*%>wi-JzTs>JxwbuJ+z(jqAZOf%P?|xYL2sOYPy1Dc5YQjnM+w_ zaY#X^QF&TuYFK2bMNX-oqiaf$L8*UMQBXuhntq6jqc2y1c5!NUcxAeOs#BhJL2{n4 zS8{=~Q(lCjp{HePX_<3zfk$?JNJwgkA4dIVQ5I$C9Hg?*3?_M5mmSd5UUsUOnmYE(B7Ri<6p6=ul1}k{<3DTx61;tnHOm zYEf<)?rpB0>~5G`Rp3$;j8T>pRyY~>g(mxClo^-@Wn`5El!o~_2WFXMnHU#Z zdKX0mRv9`v`Eu#%>MD3-rWTm{1~{4JmYRfACTCl?l=NOYWb6Fvy(A(Ze>c`(p8a&|CWuF)>QIn#`-^Q_}u1lNc&3qQwtoR z^GfQiwuPrdn6`Zkye9blmiZF%&!6(A?`1TX2w|vx@N`OQzQ(o7ul-N|dBf1KNb4P& cKY#qReQa9YCTEljtvw%0^fIiK+UL3v0DD568~^|S diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index b7c199c9683045aa823f80e8c62b59995fe4dfa3..6f73e30e6ca333a89a788982257bdf19b37974f4 100644 GIT binary patch literal 1204 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!sx4EAsf zFe(YjEY7kB2`?}-cXTsIN_4HXs3=d?E;mb0j&d_9wk${t^W}0i&&&)lsM0q|^^Y)( zNGhrH*UxbC$~5%LD-S7;@HNbLF3Uib$6-*A&w< z*H9C`ax>oo$KXN}i)3`$O#M2dO+t){iw&Fu3JQZgGownilOtS% zO0(SjGCa|3E3`=UN>5jaEG#OIEKW5K@y-qoPE9uRFe)&%NJ{nh3{Lee^R{&IaWW5% z$a2j{3bNqJGRVwG3)c>E(@yj@Ep~}0_Y5#j$*OYl@bYjfHY=|Ts!H+9@in*bFbhPt z%{#2fqNrTKxGcY-$R)t1*uW#q%QZ*aE3LpSqry8f+t0)_*R;~p(=$0a*C;62!pVdy zAUQP1*)vDmCn%~gqQphNvP!$s)wDb*DmOnZE8EN|DkQ=s(a+d7xXc9IwzSMd!_+{9 z!lKZ;NXvq(yajcmZ3{ySLl@^XlPHU*0+STKBv-TIj0h7h&xlOV!15d) z--;afs8myZlkBP#uRNDBFR!Y?ob-@L(-0>g%L<>;v}9Lw+x$v${PZ0a3{x!hGcwY$ zONye5l7dUp4PCv%yb5z1y>f$7s&f3D(<0r1-E$LtQVk=yw7o(-k^)Uq(<_V(or{ga zg408c(haLT@(lBWwf)1w42rV64YNEF6H72cvdk#bz|v8{wJ;>#D<{#wBcnn;D>XEI6+;xy;`n*u=@FAi~ez+}|kB z!Y@28JS`|J*~G=dKfr`*cYEc14(?f17Oso#^sQ{)_S4{|WK_~_w=?1U!j>0(Wzn14 zcx#2vf)n996MtxL+ZUl~pIEIP^}^<9u{aQ*N=&%m;rGS9M- z;;^*bVoxXS(yElwqKb;d)XcEV90M+|l58{o3a@fEH%E`i0>3itpsFDM3OA=DzYt5u ziVRN=3-hq_g0s28GR^%0vxCX!nK19z5TRHGeZM13XHw{LVdK0 zDuaUzN?g%xE3`=UN>5iX_R`MuN^{pwNr`Yw39!(%^eu7?whS)N_6sXYEGP*sGl_I` z3Jl9mF?8jM@Uy5&2{o;7bk_HF$}p?6@byl%@H9-#k4$k)adQnRE;aN^F-k1=GtEY~ z%{#2fqNrRUFf=s1$gnWLz|1wVq};zC$uQ6&IU>+FucV|R$D`ELtUT2xBh53>HzS)X z$J58zCp#r6BcM1t%*@9>G^aS!q@XOsJj>arxYRf?TiZ+9H?K6=BFO;VwzSMd!_+{9 z$c)0m0{Qq ztV**yCsU8mRP*rgsyzK7$3l-x(_sH(_W&;g19R7`>>!MI^DD{m(|1$|HOeAd_P6v1%?so*&37y|FLF$etjrAcHcCp) z%l0wM^vfzp*EeztE-E(GH#Ezy$Tu@dEeb^UTbWU$fu*BDSz<+~VY$0ml(%K5S7c^| zvqh4dYm#dB1e_4P@YO-IBcZqkUd6`*|rGB`hYhk`w zc1oyeV!pO_n!dSXzFAUYWqKr+uCA^^k&$_7r9r5_Tcmzsc|c`RN=k9CafwlCzFVGI zM2bt9my?sLMMa8!fMX!nYKMMre*vzf(0f~?_D0m6>|6c$aqy&z_y`s*7uXo9w_^8FKoQ;IqjPJo9?M4k{4txxD@W3Sk4!IUdh*Qk<^5h zvknPz*BbWEboJ=^uyom1&5sXccG=mUW%rE!UAgsi-h}poY;Av?9ir8N+%J{PZvIfQ QG2U%hzh_zNys9e}00vH(2mk;8 diff --git a/secrets/email/details.age b/secrets/email/details.age index 9c02ed7368fb7d1c70ffdb47e8ea9068da236c7e..0f821b0ddca2203bea4d0f761dbcb49937a71ee2 100644 GIT binary patch literal 1419 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!uLOm$8R zjEFMO&MQkROOFh2OZCjvHV!mO@((V}E6Onp3UvuAG7rp3FXu{j%r;Le(YCZK^oukr z2nh<&Ha83Ka7%Ixtc>zX3<=8hO9_s2u5dTYPDi)RB%mrPKV6}!EXgy;)F2?k%Oun- z+^EdmCC|*+zbMHf&@m|}QrpF=AYD5@JJPi{B%Le7G}7PMxvJ3D%sV^CzdY64DL*sW z*fqdAL_0Jj)zdvS+bgT0tjN;R!V}%L6i0)ypmc@Ii1Mo76gO`l?+Euolgj+EF!xFW z(|ki`i-=Og;?#2A2=R#lCpxh+$?7W<`kdjnC zzs!I%%e>6|LjU3dGYr3(`lVPJmn$S&mN{A``uOK32j!+!m3f(jW>+MaI;EGIn3r3) zmwI~VC1yt?I~FH!11-2ry>m?h3&Sf+ zO~d^{&E1_VoSZTY3-rA#_07U7e6>@O0=z29TmzCSoG?Ptv&zx8&`}{I$)~ueIL#+8 zB-ys+czLIC0F0u4a2t5s46GpbOry&!eB?|&}0{r&};*DFHbXX zizLI+loZ2Er()L-$E=KibSF#w!Zhbx11|lHlC)$OKO+N|!t(Oe2(QYr+?`Zh0 zl+ehef?Vgsa#N=wztE~QU-XdlNHWMQ2vjHxvMA0eE^#yo*LE_|HY;^D@O5)GGW2jy ztkCy22`Dvn%=0z&^ViP}PUgxo$}h_`uT0F)_YMyTuPU)DEzU8GboLJnOo=jz2saA| zcX2QC2ud$4&qucn8j?W)k%`G39+tV@{+9YxZjM=nr6%T_#}(f5-{{8ERedX! plLL#lPTu+8jc%KfkIMYA#zjSnXD2AGdmg3k&n@?T@wH@;;{Zn;-s}JX literal 1419 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 delta 1296 zcmaFL^^|LZPQ9UTc5+pPw_%!hQeIU~T4Gv}xs!>1URFe;QDJ~~nQ>BqZ@IsAZcbu( zC|8(#okG-p044EE@|b)=7A;2DXxi@0g;8FW2#U-M)i!i3DG3cOay2fu zEQrc2s4_`4EON?ptx89a0PnCOi=uLch@3QIZ+|1>V*Pw=?L6l|w|etn+4N@C?aG_jF9J3P~%p%uFhXitx-%%MHp*4NEmM&dSTo$}}y{E6wLxz2vCx1Gm$? zZ~e9je4D6aue-4^Yv$go_cXUYR46FBai?VIMlGEmPkx_ut6wMF*KxA$>cOwF2X2V! zy>JWG@lW@Vi%Cknm_D?k34uA1ZHpA z6MQXilD*i;0Kpk9--?A(lbpC@=W3gMv%R)He4-rlAGaq*?9O@>9hiN<`(D-uvyw*> zSBI|etF*eY%&~VJ`zP0W2D|;9>^Ukqp}(rq7anZznWPebv1PZ{;pI~==RM88@$K7e z`CH0Cee5Uh9!%W*GOl5k7jqM<>}tssmafyUG`)zrnv=G_L^n7zq=Lnx+;sN7zcXCt zKJ(P_{b{-B;*JEPisx-7(%P3Bnd^Jn{9wK8e&Fn6*Dn8bcA?Y18%p?A2GnQsOx*Br zB73si;xL~7Dynb%PUF`QZv%9l2DyzBU}y mTu`lXbCcXByZ%72me(sy9^6wtbl~qBj`ma2cD%T7!5jb#=I<5& diff --git a/secrets/forgejo/runners/token.age b/secrets/forgejo/runners/token.age index 77a80e3..ea25e52 100644 --- a/secrets/forgejo/runners/token.age +++ b/secrets/forgejo/runners/token.age @@ -1,19 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA g2fcL863aQ9Fyd46ou1tLRUyk+lgmaq2ebrHtsGS/2w -dnE1XFTUYBtF/JU5WKqt5hPC+uDGWS8kT/m3JBm1FqU --> ssh-ed25519 4PzZog DPgMcSEWU2eOVSEzznG/gRrkhJzhrZvFgJeI/nzjCVQ -STlzeXPR6YRa6iQQVOuYKTtvSRmG8u7Ne/WdWtSJd9k --> ssh-ed25519 dA0vRg 91a3/mO9Mc8z9UXzPAHwUA+sZSvveNWMXHdKiy76jlI -sOph7DsS4uQ9lDpGSJCxUP6zz6HDQ4CCXfa5XDHShpM --> ssh-ed25519 5Nd93w mP1uWGQiUgBPWHV6JuCif1CtR73z/nkiGEr+9WFmjDI -KGoT0BxUxlE9f2BPPnw10Tya2+SHfAigtSYTQwGFqlE --> ssh-ed25519 q8eJgg e84g2UFFvCR0WL87MISDVeGyqS+2WJwSWx9Ei1f11gc -PrlpA8SWBLskYxujLpOi/7yeUy6q0b71sFicHcS+otU --> ssh-ed25519 KVr8rw MEUHwxdpXsX5i5m7mcDLXK30Tmpznl18pE2U/ey3DVs -mCKEB6ZeZQRFUzaGqH8BVBNDbgHa1UocNxPjThciMh8 --> ssh-ed25519 fia1eQ 3fVdGpKBs3gsiHWQW0hj8Z7LzgvQ3CfR2d3zAczNzxQ -xqMW2BNyTyDCT2qew5VLVi22toQ/SUnx8L3xCpWKtQM --> ssh-ed25519 yvS9bw 8hv9OFOBacjS03cT73lluCDfbQa4U4YY0Mhb/fzXhCs -WoNTbQ72XUCtxxRjS+D7sBnShmmpoeQNvwqpNa1F7M0 ---- 1mryHIWXt0MNzqKgZlzikiIr8pfTWZxcwtZVvI0YSJY -õ>§þT%©l殓;zá䆲»ª/òL£–±bï<’V¥9«æç:}D6¾\0„’TuçÅØë‘í¦ã•óÚ…VÏòJ¯HmæFTÜyc \ No newline at end of file +-> ssh-ed25519 V1pwNA WVFiA92ZgJeUK8nqIDSgJez/RmZBN8xa0hsQURIitBI +3U6oEXcOzR4IvLyqxoZ9EASxy/zrLneNfC6i3jA6k7k +-> ssh-ed25519 4PzZog KuCLxZN6OhSPX/4NAKgVEfRnFsjVVOlEglmZXTazHW4 +SZoxI6JqY502CCvf47UdOIR03zqUD3Wq1RgJrOS6ses +-> ssh-ed25519 dA0vRg 7x9LrBgnVx45VcEHcS8NUcoaHqzlhy9CtfQ3R2yAAn8 +anutykjHH0r8K7ZdcByyfU8GlJr216Tu0JO2oJwYtmU +-> ssh-ed25519 5Nd93w GzzqXHBA6reqmVRgnojBcwH7OUMDXBcb0w6dSvAx8QE +h0JK3Gy+22br72YJKEMHAsFKaRhqtaEyznUTlwnSJdM +-> ssh-ed25519 q8eJgg 5DHBi0TP4zOqk8gaCw6dXn/9jkDJwijOg6mgzPqQUDg +Ck4yt4Buy79RygyADtPWyqBHO2rJBSwIsnkJ6KuslCM +-> ssh-ed25519 KVr8rw FeDC2FfZRAWfLAxVov+bjIi/SvKcsQOFmAUtAFaKkjg +WP0WhV2ri61B90R0H+xj+Cx70um24CcmyXrwk55yb/4 +-> ssh-ed25519 fia1eQ dQUiH/S8DW7X8Y/Urug17Crzv/+khFdE3oKLvvmGOHE +0CaTFR6Ccb7kSl4GW4Iy5H95+unkMcchwy4f1RawYHg +-> ssh-ed25519 CqOTGQ oR76yJX7315RPp7LTZX5lmFHf35t5G5lybvpn9PZdw4 +7qgpY3pLW0ygHl2NsezmOfMRTh91ciZ0RyfSkJuzhjY +--- 8B1YHPeGspJhu+TnQ72FJKAkm+t8nIMVrbrBMTUMMpM +ϨZ +N©FÒœdÉéx}{Ã]Û'˜k/ jt>ÃÿêU¹$Ý„¤$jŽ%XSï¡Áò-X‘±›Š@‘جï¡.ΛMû¡ Ñ,q¿æ‰d" \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index 5053de7b47217ae4f0c9bcc2c999c1a5f029acea..f555db74585773b75067d5756ce7394c124db773 100644 GIT binary patch delta 1024 zcmcc4ah+p=PQ8ARrE{p0X}YslmcCoCtC3}m8on1qW z3X?38)3kFeO;eN83%xx2yj;>;^8EZPOU<&3oQu=l977_xd_6t#D$+a>{d|1%i(M>@ zL;QWq0}@NU%RD{8f-=pFJwp6lLS2HwQbK(vpJf!U_YUw*EA;RSsz^_F5A*Xd^vpLd zDK>XDFi-UHbBXjV^zlte3(xUMHV?AkG70bqOD!OCw_s zH~nnwOtbLfknBkRlJK%1UoID~!17!}eQ!(uFoU2nuSg?j&)~$W)W8DsQlCWEfP;~3kG7}9`0~M-#0!qrt69Y}03iZvLQp?PW{UXgPeZ5_cEnULhDk_ai z>z(qwt8#*zBTTrGqmoKOBm4~Ai-O#PjogCFD#9wF!YZ6yvmFbwoXsta42_CI41CJ6 z5|h!bD~+mhGEP^>GYYIoHFtHgFb;DJ4|H^OF)&DT&2cKUNc2nbjVSjt@$)VY&G+>w z4UFV+OVbZ?PYSBfHt;j|DRfP?C@u@m@OO1IHF3`iE(^;Kb~ZJ3P7KKNigNYj($&>f z@Qko@^78Y`(spz7t}Jm6)=x|?@^nlL5Aky~D@`)?^i7ZOj&e=SbWC#OiguUV-JoIr z#jbW<>M?_Gn^@`8izPLmKQg&()0}QUmd8u!J1ZK+e4Z8PBx!)&!*e(Y*`lZ&-&TXX8awpAtr6Z^@c4_#(GMoaA};1$E?yj#w&wYb+YAn7asHZ| LVjFl_YQ6yg6Ubi^ delta 1024 zcmcc4ah+p=PJLB)iiMkHlzCyHyP1cjx3*`LK}dLnwnwo`PGN;%iMDG-wsW9|c9?~; zCzol8xxZIvMrcZSUSM!qPM({ow`-VxUSyz2WKnUNze%uBfsspPQc+4#GMBEMLUD11 zZfc5=si~o*f=NJCRDQZbZh5w2n7gNTRb`sDc0oj-nOmNzM|p*xNo0AJsZYLVZlZg6 zo@1tISVWcqmw}n3XOUrGxp%2YMR8P6nSr^br9p0nwr5FHhO3unxnaJ4RY|6qk-xF$ z#E;_PnV}VK{uO><;pzTP0mT+hCBX$rPC1n&hEd**F4_7{K2cF7&L(c!C1J%}1(rpQ zdEOOnIWEqrnN{uq1yzaKW}aCU>0XJc7E$H7MyUplet!BsjxO1g;~B-nolFaZa?D-a ztAbrijh*v-yhA4BV1RinDTyy}UAw41?X1 z-O6)4GCaylDzdy>okNn{%o4SIjV;qn!puA;pJf!U&x$m4F32-8OAIo#2oLaeGBYms z@y!l2D9<(w4RA>>P06z~HZ#*VG^=#ws)#T*FfDPeG&D9gDswEZ2rEw4_IC=j%r8iH zjdb+!Pd6-Zs;sJXOmQ_qj{)znB8#GOg<@CjLQmgvPs3azqulJ|in4moi1NfN?^HJ* zv+S_Y$~5y#!;s)$vyjN#e6Ca%vy$>$Hz)t}(3E0>GM7jX*U}W{wA@hVsEW)IkJM5Z zFXJe4%iz#l19a=sG7}9`0~I{8(_ErT6HNmGBLZ9s%c>mRa?ISlj0#;#yd#S8@q|3}Dk?mKT@1L)%PS)zBTa(S(>*LIN~3&|(!KJEj7vRp(;VIXN{#&73^NSNy}dHZ zvqRCXD~+mhGEP@8$V&Bg%n!{C%Zl*J4K^wdF>(s^3G&J@FAfRM4ahJJPbw)1_AJZI zO?Tuf zFfz=_FSYaxx3Dk?bq**kHB56VFpCHePOS6|a?8mIt#CD|Ov}%;$SLvU+Teb7&+2;@ zzMr-5jEcT`K>eGbxqD-W=p#$RqmOxinjbT&J)^bw62Btr>++Lsd1<>D5?deYY)ra* zV%-MI8!LVA{Wo92ivnt1Ea2|IHiOZ5p7 MtBkK7X3jVc0Q-<=O8@`> diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index 9998666e77223fcd96857a45e96963278592d1fc..be9b53aed6f104791bf92c3dfb62d178e7e7ca5e 100644 GIT binary patch delta 1023 zcmcb{agAewPJKmjfoX_;xOcv3hFfl>pNmCyUanbzS+ag*x<`6|Ye{K}e}-#Cx>1#L zK9`qKij$9al$&;`qf5TAad1>oNKR&YuD?NAS-5MIua99~WTlsZV{WNeK9{bYLUD11 zZfc5=si~o*f=NJCRDQaGvsZ|3Xt-s%MTS?tXJTGPm0M0$QJP0tT6RU4nSQBxczSU_ zL`amQiGNi-SCW@YQi)+jaJWx~YoSG0j$?R^d9jgMskU#LMZU4NiFRZ`RGN{KpI?sa z#E;_P5q<$)E;)G-#)hWad1cyZra8qG*(nyuA>L-%nQoazh503cWuc~76=C^YncgLZ zIRUQuCH_7o<{^n@hK1o~mL~d%Re=^E&S?QI#lc>o`Pv@ZW@Vm};~B-nT@3=9{UR#T zJ&MyDvy+32osEK%^2?I~10%dW4TB0ZvXWB*Dv~m@gK`bHf-W#BDqVy0!#$HD zT?(9vea)T2%OdhBTvD||ybJ>({Zf66%*~T0pJf!U_x6d<_s?;&&@cB+3Wz9mit=+e zG)qnj_KYYl^Kz*uuFNqANH0otHVw4k3UaE-jkGAvH1aDb(Kk#tw2VqEFn0|1u*`Qd zH?znJF*3_YbSW|_GdABBTLUjgB1NDeVwUt!bBcoe!y~!$jg8VxBg+hfee{cqigF6eob${x!V7Z>io6|5{LBN&oh!Bs zj4{$zX;hVyak_$gNRgjgWO{L7KuDC4S5{IT3M<^a&bkZuV-jhl6GoTVWF#2 zwgs10R#u^9c~*T{X_`S)VT4a*aayppOQ=z0mPb*!i;J;$x@k~lNoHzJO1TM_uCA^^ zazw6~Q>u2DQE_>dmw&KJhIUGpYlv@|Pgtr+QF?fOnpwKHt9fKzRb@VxAA`>l>GC|{?|r)Vjs4A}pxTAkir(*3 zy*-V~MEu3OA1w!hcS~G-{@Cu8g8Q=1LSKGu5R&A)FJ^jZpPt|hzY7s-QY?+KGo^Mm LDaHARpL+)YHJfXC delta 1023 zcmcb{agAewPQ9y9zQ3baQMqrDMW}Y5S(%e>en?lbicf)OQfWXzLB3CRAeXM4LUD11 zZfc5=si~o*f=NJCRDQaGX=zceaYS-uN>X5ocWGr}rCX?Rn0`vRg|k<=g?pJ(sb6_o zQj&pRR9Sj9mxoK0n`@YFR%Ky!P)UV{tAUGIaFnBKNVZEzk#lNsu1iH?xJyJ-VwQoy z#E;_PzR4~*sZn0~W;y0XWq#SoKJGbL`lha-X8I8&o=H)L1+Mz#2Kgo#&e_Rat{%zR z8JW2OP7#5X0cGa;i6K=HF21>r;mN+=3yiW0Djf^-qYBF` zgY&BN^MlQ^DznQh@-j>k^HS0xO+qU|(v1x!pJf!U4{%RU$qC7J^Nq}mFbFc$&rYl~ z^$o8u%L;NzE-BYe3M?$%%aTHEZ=(lpmKlxGS|HD z;0W(L7yn!Xg96V$#}co+NUkC$kMb;cw_-0dNA28f)8fPe_lz>%ERS-_@JR2_;*4-7 zeJ`H~zr>()S9I&rG7}9`0~J!-{akaiOWiF)jf?U^EBtd@0#dRvBYm_}N~!`pgF{j* z>dide!&9}rvMjjr%={8Pogz&lT~d5pqs$V`-3>epd?Nz`vUAM+%PO*+e9K)@t4#d@ zlG4$wD~+mhGEP^h3=7G~t%wZs&Gof3H;s%it;h>=b22qAET{~rh$!)JF7(K7wv05$ zH%R8H%=h(<$WE?z^-eT)cXshNF|l+GHB0w5Nhv7S_VvoQ2oFg$t|&`N4J$X`($&>f zC=SZZE-&!VFDNlfuL{cca5S~d%8bhKDhmnI&ouQ))sJvY3=dB$$@KT-sywsa@OS&X zgtmlKrzuMJf30$I)KcfDJhuIuVeS=g?$-)$CtVjPmu=nYSZ4jSP^aH(g=nC8P~v3Y zD^>fq7yjN>ePxR6@#QsT#X|F5JW%@LdsVTqrnASt`SH~!yv6r#W>1*1?Cn3TM9W1C z-l1s^etzz)v2&`l)^YmuRZ?!|Og0V$|C_a^51gHp`EZiqb@zEItg2nan}1B6 ssh-ed25519 V1pwNA Og+Yx3IddAIK5EXVRkGkGQo1uLTbHIe0PqOsbc8Zhhc -8cRXulCpUe0g0d9g+1Rco3KSDv9SsnZIPZpCURJLhjM --> ssh-ed25519 4PzZog 2QPPJ1aHcSGwDAEsZDoul0i7gNhrDUiTnTMZDIkZY28 -q6/hLB31d6bZBb1cyMFns5DZA1w/cWOnAfOCnSD4+w4 --> ssh-ed25519 dA0vRg q3E6IEJnhmyBspbZZkN0AzULmhosvo+3DfskLI8SoiQ -9zzEGaEQA4244oT9M7gSf+x9JR4tpRyigrUm6VtjZw8 --> ssh-ed25519 5Nd93w k+YFpnrg3PelZb6VkWU3jNIRbcdVefDulVcB97Ty50A -H9oIXUHfQmBOyrUwCD4wecdieZ9r68BKll5LiSq8gpI --> ssh-ed25519 q8eJgg YuI+KWmKVOb7nAxYfBcDpw8w3yAzr4zbJx9XmAosbyM -ulG7By5LTkTwRsizDy9Dvbo0Aq9hvkR7OYg0k7x3c+4 --> ssh-ed25519 KVr8rw 9rGKrg4728MIyCTvpZujfb6MerMvWAcceEVJqkrhjgI -XwEylc2XK6IbPKa1KbnmRpxOBocaJA3u8GP75ZtDkDc --> ssh-ed25519 fia1eQ 304jqcYsqS0Zv1bPBVryRtUev8LNy02Zh8X+6QiV1C0 -LoUFCs4oRgcUU9BIImEBY4YPa7IR16b3uU2a3fUv+nM --> ssh-ed25519 uZzB3g 6ChChOsFGTpa8ndrvfx5SEBHJJxSPyy3GDmBMwABcXw -c+p3NG8gHiekqiiVesAtXSInzd4PIQDsHEsnTnDcmDo ---- hOqrvD4RR5WmtwXSZvjH2Xs14ymC0hECQIXA1vaDb54 - æ2½§ñ±P½[cåÀÍ…ž ùvâ¨[Õ_˜a€FÍýyÐ\öÌÏPÓÒ·±«Bö;ûuµ€²rpàPk™_‰€EÜ ³ä@Íd8%ècúÔGû¸žó”Jm2ÏE -âìL…ÇÔ\šû§ .-·jqO;0Z;p¾»Ÿº`(–€M~ù¤ËõWÉæü¿ÔÎ1ªWâ¯] ssh-ed25519 V1pwNA rITnhjccFQTSCG3yY1gfUd3RFPtymz2PBBPafKqDgzk +14U+liTyDY/cPPDPLqtDzzB8VEOjT1OiQHW7ZsdqTwQ +-> ssh-ed25519 4PzZog vQpDvof5krUhHTT3QVXpRoBglQ4xZsUVobDmmZFcsVs +/wGu8wiBV+zIP9aTDydg9B8mXwk9mhu64pHkOPlL/e8 +-> ssh-ed25519 dA0vRg 7PnZ7JoatOi//MWTodmrzjfJJzauh4kUO6ErGpN5rBk +p8cXhiS7odlvzarQiqnrvll/RnECkZ0jPnMjuA8vgAM +-> ssh-ed25519 5Nd93w J5vVy6L4UjYswx0g3xVK3WVU6nwaLZwcQuTRoYJAsSA +qzmRfEMcZI8P40fER+V6KfxVJXxttQpbAjChNk0k4gU +-> ssh-ed25519 q8eJgg G1iqzNqpPeyIlOt8CelGhgC7Y09+c3W0LLoVl49vzE0 +7Pao8KniI7QJdnMw/q0fMQrjInF0CTbfnCSL9FLJrjY +-> ssh-ed25519 KVr8rw FMvso907mXDbRRv1LGmrRJIo9BMQz5Swzv1ZHjh0j1o +RrqdTZsEpnWgkGvGNprnk963KMx/ShhSdvK5VOe/xNI +-> ssh-ed25519 fia1eQ 2tppsKE/FfdgBN74214/etyJhnzNSBtxWvP+OHaY3xw +feXjn9T46anxhofgwQXTn3Bj9usC9/f48I7irrtfTZE +-> ssh-ed25519 uZzB3g 1JNZJ2MOAeOgPH+jWjNf9qi5ncEaXczIMkr54vnHITE +/IWEATVkAioRB7DFiEZp7QiD3tRAX6WcyFVEZT82snM +--- lgmy+3gc+bFhK9OPeSHJWPnjjbZgZ1GHjBGz4q+fRa4 +µ¢.Õ~68¼×@|¡5Êm¤"¬ÒŸ N™N`›û´dÉÃÿãÉæx=ª:ІN%Ù0;«DƬ1¸8–tiõ ãfÛ¶==¬Ùj]q´Ò¨ïŠ"!¡Òð} ÛIÃvÏ—?«"‹p„améÐ\âªòiü!w~,Ж{ýŒµ·˜DýƒüçKVÄQ#Uª‚dËS³©õõêjK‚WÏ \ No newline at end of file diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 6bd12523bb46997f584b75b1ffb094a9f6ab010d..d94ee8f122326dc3590239772b08c0b5898ea0fd 100644 GIT binary patch delta 978 zcmZ3a+Z;)pSPc3eyB@iaZ03jZj@y}aaD*}SY=*Td6AcEnVUyZN=AC< z#E;_P8LnpK#^q)vfhmcO89AnfiQ0xHVMR$r#YrKl`MG|1p1B5T!2u~{Il0MP1x8-w z8DZrfi9R7!K9&(-;o9Dg5e1RCNp6;THOnlmEY!A)axU<5_4W2KGsGR=xIOZ3b(%=GcCD38i7 z3q-fhxzInvJy4;tqTH!0D%UsE%Q!GAA}HJ6z&Fj$C_OkcCDJ*) z#DFUx-NM_T(!5^VD>U7&D$^i2AT`n4FWuX)Fw{)nB|S5(yxc4@vPwHGz1W0HS65e| z)HA~+*dV>!*H=5R%*oBoImOE|$k(ep!aXV1qcGP$!@x2uB`+}C#XpES`HUs=>pW6obxah$c^*4gJTv#P<0ZKh?v1M+ ze3$#1e(H1GDgFbwfy*QxGzE0pvfV!LFyOWH#7!TfLf7uR_+E2G)60Vm+M1q)>x~mG PU3+oO=vbx^!_rIu@*!9I delta 978 zcmZ3v{M_}6Q!~>|%%c3G(%mx>L$VSLqLQ@(tFqEEwIc$#+{~lWT|EM-%#s2M(^HBv z{7l1gi%c_1QvLjlveQGIe2ui7+>8B+{3D7dpJf!UH>xm6EYOc~&+v1}&v()eGtINi zFm@>m3Qe~RjZ8K!E3V3j@D48t)pv5_^3*pl^Gzvq3@r2H z)5y>;=VE;yQ|;W83hgY{P_Do-gN&fU(2(59Ov8+bye#h|&r}mjlZujzO6LO8ATwu= ztO~y(g8;XrNObGcG7}9`0~IU{vdy)V469NdJqjw^!}W~|BTa*XeY{*Og3aAc!VN7= z>%CLUk^@6i4I{aHjKd;a${qbny}iSVa-E9x{hdA2ip{FL3NkIzN=z#&64RXYopS?| zqAbv@t1Jt)Oe$9h45`vCvhYsI%C1Zf_0A4S337}ycCPeD%ndcJ$jk`|&T$wMf zFe^2TaEvf7HMP`EE=~2$GR-lqFb*s)bg48h2{AMX4o$W+3N!REbqmYpI^3cX)xY?J zrjSrhHh;h=-S7+Rrf{jA%G6%={?oqD9xIbK2P_Q_=l{OX>{*?f*!E&Qi_f~Q(B8R! z-tK8W^6$oDO_$Ogwz{7?k38$!_~6madxD;o2bu3F?fEA1Z&s`Cwy%?26`nD^&)>&U PpXl|9-HrK;W%eHc8`)7* diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 6bbf420a39d42a269a206a3d421512412a2234e7..49f3dfece2722b93ea0ca41a3d79e32c2dac5b1b 100644 GIT binary patch delta 978 zcmZ3L~e*lfumD-R9I-Xr?ZoXE0?aFLUD11 zZfc5=si~o*f=NJCRDQaGv7wu>yK!M!u2W^AUxYzOkeiu*qGL&gUv`F9Xi=heUXpp4 zL3*iAZi+!Rmw{!KWtDe;yFqE5QBX-%SX6p)ltE5dct}ceqElv6WM!2}VX3cok$alw z#E;_P6-ikEMuz4Ajv+-(A!U)3?rzz^0g*x4u7ye7zTwV^dA=TzdD-PvLGC78rf$Vv zhUVq@?g18+72eJTnQ0~_k@^PZMcH}2RergJg?Xmh6%mep?p5WJ;~B-nvy8)yLJN{i zLo$t%&5cTe!px%z5(_c{{S95bBFb_jO#{+1Je|FY3ynRwLQJb%EBy=8(|l8tT#Bob z!>S4j40Ce)(u-W2(u#9E%AAYbEwl~Xiz_21pJf!U_jHPiFpn~{%#Jk8&rJ7l3@$Hp zEGP+&a4gAna!pK4arHNGO7c$3Fm|`#DlzfM@HTKWDY7)G%5W>HEGW(__Vi7v@=Q&% zF!IVOPBBX?@o=_u&n^f>j{)znB8#GOh42z{cay~2pb*o1<0PXpH_v)YmvE!ffN;N1 zS7TSd^eT&r5|8x!{0uX;3dy^pl;l9SyjGvW&9A!}Edze6_PZP0h;k!_w0nOf z@G8smO4UwDE%bFYk4g!OayBqbObWr4N=Gk^F$S#&u)+Hj{TyT=#zt?{i}eg*7#=NtBb^JTydB~PxyMKbpcqC47u*hz}c zV~DxdEaAIjrrP;cr|g!iXt=vXvn)FKgrR;?R=wx7xX#68-yfwY9}C?xd+|<-r#b8P PKF(@zy1$&6`%?e_{@PLc delta 978 zcmZ3zl&c~ZiIK9BbTn7LUD11 zZfc5=si~o*f=NJCRDQZbiFvMfKz3TDiBC{cp_{(9iCdzXUsz^QVQ^Mbs85zxaENPu zQL1C6cTT!1S3qKlt4CExx<_VqhObdngtM`KL~2NOW>IN&zKK_2ns?^=9U$%sX_W-z9#7fWljdJrrM4v!J#>!1{LLb=2-^m;Q`wD=8oB1;m%G0 zVdajd1yO+|=@mu3#`-?yk)~c@<$hrnj@nrUZaFzsRTahV+NJ4};~B-niwuIDv-Qi1 zLPGM)JR;JIJdI7AgQ`+fN=-b|LM%e_b1lkzGo4Gbqk{6eGL5ngQvC{2JdL7EQ=^i? zT(it0T-~xgvwYID3p_l^+&psK&74D%Dk4KCpJf!U_j3&>H_bK7bMi>aOUVm%^RLX# zw8*ve4@-B$px6fgcHkf?V#ot@erbPAfrCiqBA5&9!Cd_VeR$1CLhDa QWR7u!gvZGTzWeY900&f1O8@`> diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 6064f30f5f682428c7b77643adf1220bbdc366b6..dbfb4eb1bd160bb427f0980b618360ecc054e4bd 100644 GIT binary patch delta 1024 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 delta 2585 zcmaDN@3d4yY)eqMS?cwtnbccf)OX+>C;qhpn$sY__& z#E;@(&K3HWA$f*rnJ!8Gks*GmF2!crxn%~Geiac#sRiy{CV{58-VtU#$u6N>&aT0k z`u^!rrg{24>Ar?hfnIs8k!2B;K~Y`>t{#rg#r~!Ge#P#VMX8hH7$w33GF|f%J+wph zP5hJGlH5Yv-7QPJ3o<+_lY@OTyi>DWBC?7sOVTRK+%34u%w1dxw8N81%d`9fOj3ix zLrgLq&5iSNQcCjjD+9C4y$Z@BQnK>B9MdPCWfZT^2r2dU&P?`AFV;42%+#;&2n_JF z$Z`+T4|gst^)xiAa`Es9b194P&dKIVHFI@Jam)ADj|z$k2ywQs3=7pR&QC3J3NuM7 z@eN5X$xZS!%}Q~0_rQn%@310^qH=`*%c{`I5I>KkD3c_=aF@!IdZ(&D%W^|c)399q zobZ4=lM1gYQ`a2Nv_Ma;;;JmmOtUf6x0cTcT1 zEYFS#46e+u;7ZmH4l@WfPV}uT%y#tj3eQRkNOLs~H_Z(&EU}0(NH?zx^>sHdDh-M( zN4Ksts>;bYUBM~OEIBzU)YsQEHP7ABH!{pTFU7bxIiozu%_1?-)z8m0D!-sI%HJ_K zkjpj7vns^Mtlq#gpv==L$verZDAc6f+cnMCH`Kf^B|9@e)IZa?%Gbgv$AC*$S63k@ zGo{SDD#bg%KT^BO&$QIct*S6B&C#bSKhewEu{<%Z+^UqqrSXCB{#5EH@&X( zwD0xjw+zZ|y~z~4YnFCBMAhoyjCY2gGac;@CY`8~JJVYtm$#vEV~di&BOz-AW2HCQ zGa^MfRZX1cRkDaqTR-ib{BxIGmTu3;xhE<6@9wu(R~Ko-?RfhxLvume z-hZdRyj>ZvKl_U7ldtR6eN}v6=J#qLD_?l``QWN$g8NpzsI|HMWZjpPIQd-vgdG=W ztxWB5)?;5K@L`=!n$P{KddFl!oM$tv(mFefec{TA55_u<@oDbgYEuiWm)8GJ?*3aI zDlD-}w%Fy-rzo?%Dus-B(U&&2&s%ax?wR(?8G?M_TRjVx{5d{#mxcWiMyJLjvPKVA z7ZpgCyw4K6d?NVc2dVh=%8xr{B+Si-UH^i^t6lMz*`XOJ_m>v>vHtqA>G@5Kz_*4| zHe5TscExMUMRE_0t-F3_aokC>xM?Z1jP-dcjqe{ED~pSKc5}}Wb)MMN{b%-yr*SPf z^{V*r+sS{=ANOvl&06wxi{eyeSNU~5^P+!$TC-BKX~&gSF4>Rf9=JZGEG+o@uh2Xv zq01c4rk!M46=Q6ZB0jCP;91P<0@uGk-e_+1{rYY~II|$biXWNscO)BA)(Cs#ytyFn zk(@Tuyk1Oa|8novM?0H}ZWSpljz1e=6n)}^N9(VPm6oqdX1d&)(iha8vFY%)``eei z4DV$SE`OiyY?S0<*r~pCjoxg#J8ma9*38-}VY;B*QvJq_zw#kj*WbTd6sDPS=k&QQ zfe4$Y`g?r2@0E**R(6a?>)I2+JVZZWR*^0&Yg-%D*t0+eNeA*S2y*9<`-_4$P z(eo0g)oPm^XkRj4W(KG1evRALxPNpWx2XwJWwMrg+bxrGZE~%_%jJ9O8Y4Xld}ca^ ztw?BeT4-{<{hfl$i%mh!d26&LF57&+yR&+dU58^&c0XJcw!*E;lFiw1a>6bLwKG}Q^ICpXZkxoj zJo%(#rgw7E?7~yYrjmtu7hka(@lF2NRD8d9^(p0b`Wj`24@n)J{V|{IQoCE>tjID~ z-#f0AO)7h9j3zufwfsblhC0`RIlI>;%u96gvUP0Qa^~{COL9f8WnR}<)yMK_=v64a z+oIl{V0Sbryg=)Cz{_RANrK9ZiW6A3aV^<-yie6{*PCCLUq8D#|9pSe9NH&&X*@FdYwCe^PMe$%lAHxll!u( zp1n3Q(PqI^&ip|3d+{}_tk)RTuYdJeyY1!KJ_+$(kyEV#=N6n?W@~TQCY0fMd}8#2 zg*Nr)&$MUtr(OKMds!&cmrJwOE9<(&9QB$R(fnz;+UDsjs%3_U-sLdJ9o=GFHQ8~I zpilDu$geII+Oh49GllpK>N9s}Tgq$=ke)UD(2mLM@@7hx{eL z$1%D08$*Prt97&l|ZdmE?+w10;zzLDc@+vbUZpVEs+;sVBINyrT ztk?grh>K}G@$0TwWws}f2B*fe1bA=DN0Mrc4bGz{a35m#paa<<^ski#7=YI|Pk=H)rAd3t%n{`EnY%Jodwvos7g^ts<) zEL=HxYK~)|MwIU29Gl5aCs@y2ys5RfeeJI%ajUgQV>xOpZmpI(WuVQmM(Cu}VqH5| zk@DM9rJP-r?wCIgxhquiOMlLltoCDlZT^;xsRivp?7XTvUZf0xqel!M`~iA z372P7Nm!<(TZEI3OJ;CzWkzn9wrg@_cxrZXo_4BtL9mHQNrq#kS%_IdF_*5LLUD11 zZfc5=si~o*f=NJCRDQaGMV@Jvwy%+~Pq=}zi*aF5iCcPzVNObAfRA%>W}%6vpFwVb zfs>`HX_8|yS7DZ~VQxs6S8{4unpswkN2RuYUUqg^Zh)CrM5ud3fPT7vWT{uNiFRcA z#E;_P`C&ns?xChtd8Q>Le(7#5>52Z~fmKP)2KmYQmbn$-+BsG3-sLXddG01$&Vfal zepO~+9wi}VUWwYCrY42?ZceGmRR#f3S*ac&nWcHbog9ta zLW3+rT|&LW0*k96oD0mt4Xb>;a?9Mp%nS;P(sDdaGO``H5<`-*{8REhg9BWmax=}m z4U1iiic3r~BV00!{KJ9@Q__vKwM(+{d`*%kpJf!U4>a|yD)zN7&kZXyEOfPW$|wwp zEQ-uD4)k-Zuq?_?@+t|-FxIY2HVO6Q3N8w>2n_c%4)HPzaC3?bPcIJk@pbd{^{gll z*EWtUxAe@*@K5&hHx7+Nj{)znB8#GOh05~C;G*I%(=7e6G$T)o?6CTrg33IToWSC8 zv%I9Rz)Byt$WY^QLwD1RKrVMbL%%|8A2S1wqEz3MqQLy($g+saBv03*f+&w-m+aEg z%Fy6&Pv6{BS9I&rG7}9`0~HEPtHM(9GD4H8j15g4wVg{$^D6u-Ljo<`4ZSVA3p`xB z>I(uZ{VEEKLmaunLrjf4(tHAQBg*q56VpsQvMcn{f=vBW%~A~uGeSH})AP$xQuQ-U zy|U4*D~+mhGEP@;^D{9v_el0k4)D&cstiwe@eB4eH&53tDJU$D2sVq z&xzzR_baJL&abF<3re!c3ot0~4KPa7PV&)C_ALmE@JKJO2rQ_oFp9_u&dv1X($&>f zD2d1|^R6s14AnOADmCzna(B|tHH}KMh^nmeFtuuA6&$UQvceX?e0`dWE@{M^RQ{VP#}lWvXRzhLg6ttEFr4 z#E;_PVFAXaQGULG!TN6chUsPb?p21K&Ov2)LD>PtVg6;>COP?$f%zHX#UABcm6^dt zB_0_S9_fB%5xHRz6`m$0Aprq-+WJ{JWtkZP9(no3p}u9QX71UO;~B-n4YbWujE#I# zjms-@&7&-m3oC=l3%yGUOw2rd%w7C~&5SMb-Lfnq%R)`K%FHsfORBt6k~8xH%JO`2 zOT7b4O}sLk%yKQ=i;X?aas&KI%px+wOEWDdpJf!UFYtGcEJ+ME5ArlL@pASw4sgzo zOw~3`s)|Sr$}Fk$^DNBM_jU94j0pDR%FW2D@D8`g&&{{U&WWf>b1x65iu7_SGRb$e z4EOOU4Nf&nN;P)Q2e|_+2E4Q;siMrVG)dnzJS5!R%fi(&Eh^MsyTHt; z-qBS*U)wFk*_F%CEF!WZIm^hTEG64QJHSOhGcPL8z`(*U+0j*B-zYNEHPR{3-QBb@ z$^hNE(x@sY<8*~01BTXv*M6K zM+2^W1MP~+9Pj#U$2?EJsx+@Cb7PaT6m#?ND8rH*<4A+z5KsSLS4(rhBvVH&U0q#; zibC&-B{BBw}KOD7i-m$WKZZTGygLMLaBJl{yJT7Ju!;(KR* zoK#{cuG{9-`Mkv7LiW)+58fp_zy8^?oa0aY47p>AGM9-(maX_VC#8B1)4F~)uWX~z zrx&iW%;xO7C)dXtCjDGsuiC)_pX2YI+jc|ez{T%(^VH_=t-I7cb#fm!qo(3kR-W1o zr*g8jwzU{&t-F3x+qqOIzd6-N*7*zbw|%t{A7=QiQsTIExZJZM{$U=NqKoxU}AbeW@cuhc448ZS$So- zBbTFTc3!Ecep#TCuTgkZRCutrn|?s1OPG69RavEXKvL_SbAdrsQbDCp zL0NE8m``3dS7m{>pI51GaJrj$SVdTvV^OfNcW$^@j+>XKOG=(=k)dyuTUKafQjTx& z#E;_PxmkuTHS-I}{;Q=@5 zqa6M7Jsk^uQhZ8-3v!AB-GUuMwNo4oQ=BKCVU(yZ@ysjpj_^$hPW8?8%W_IDD$WT? z3HL7xPR&bAam&{(^~`ZEN%K#SbaLb>$PG)02rLiu_c1c9O4j#Dwg`v}%kv71N;LHJ zEcZ4kuJUm=a`bUAF?B?b0PnCOi=uJ`H|>fdzrc|2EYILjf8(^g$a-^UgAA_-@6rMj zH#cwJBBR1`i{PLFm&8m*u8gX@0K>eDNY8B3oQTY_LVy3rh?Jnx4DqS(~2|vg99srGm0JcOG^xWj0;PgJxz05%aZi74AM;ub9|G7Jk4A) zP0+0?jjD1oPFEaF|PC|cS>=I^ffEZEAsI%D7VaZ@hmFxDECZvi74j!RDG4*#OCVn zj=xqZs{dk4Yqu(_+FhygOW1om&w=0Re~Ob^4=J!HWPN8T`?Kt2ZMF2Z*mhs;xbm{+ z+{N!cYbf8@yf^Y#8sm)fYugvG`plJMT7K@M@{|>c*Y z8RnK|j_FAOVZq)($)(;^mLX;4MiKepX(h(Krf!7+5fzCUCAry?;~B-na-1WoD#I)s zjg#Dbs)D?us@xpYvh*!X(z84ZOhQ~7vn&#Q^qrFn%MH@GB23FH-ID?%!V0pg4Be_6 zi;NR<%Upa-f(yz+Ew#N8&5BHmf-^z{obHO`8v(l>T-k4WZ9aR~{_56lS<_4e`3NiHlfFZ9+AiYU%6Es65< z@hwe{tV;KDFAT}|$aO`J0PnCOi=uLcQor2F;y}NU07GMoAXjJ8y!u4vbZrB-9A8Us zqwLVCB7cM6@Z2=RG@p!eF5j#Wm;Au;08bP1qVybnW8?Djp!5)9SJ%{1*U(5K?ZU7$ zlL*rSf6wG{bnDVG6Ae=X6+-=t3LH%=GW?VEBTId~3`#8u4YMO%@&faWT>L@{OtT~E zEkb?sebTZ#Jh{>$N+K=1y^B-JObP?i!Xlh~gNsbeOI@AJj6Dkr49rUsy*(q+!rlFh zv(c?9jjD1oPFKi|2s5g*H1P>G@=H(22o7>CN-Zx)bIU3-PPNE23-b&MFUzth@=8yt zbmU454$mxe(ykBi2#NI94=gY*wx~4n3^eh}HZ@81$Sm^7$;^ogt&B=@3QgzI)zwv~ z$Vkc#b}aD7a?Wz{v@ACF3yAc~Pc89^bPaa$@Cq&S$#Kecb;)oKDlyNfX@ J8@E_2GXP@QX2$>k diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index ebc15aa..53bc965 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA kcb3u3/R79sZvwHPXxp1faFzYpnTUJjnDnyA3LCb7js -KQaHb04I9t/ah32d09P3AW4y78EXxqlKMZegAMv0D/8 --> ssh-ed25519 4PzZog Gc9EMmfVfQVsUDv/EGwiExDWzA263KxCc81TpnF/bHs -2QGJpcxDqQYly8tpyyq9uSCfYW/FV1tYgv+Mf/8eCik --> ssh-ed25519 dA0vRg HTT5Awec53+Eg4itwGWrM8W9s3/fFdpQJbNHryN9qAo -SXcqmaUfjBIfgJtkqafX75wgqWOfRPIYgwH66SHH9aA --> ssh-ed25519 5Nd93w VhDrPTSM+V9lTPpizEkonGM/r5vZWF3gPA/iov4kWjg -Kv5UWwZr7/3r1TxFA897+OgkXkX/sSLPicBDOLhqEMU --> ssh-ed25519 q8eJgg /BpYqgnWdctlOj0NHxAASTuYRfp6cfc9OAUgNsKOykY -ivH3zs9v8+yuzqQsLE08sAzAsd/izFH7b6ATVs5HI9w --> ssh-ed25519 KVr8rw gTcaaJC6XYsyLyxnoP5/HdWJCAPe4EtFk6YOOmqgtAU -5VUHbnghG7lwbk5xCl+q0nJtS1S5mSv6vD37NgCJAgU --> ssh-ed25519 fia1eQ 3U/5b8+aOACexOOqS6+EztcitIiTG40ZtwjxM8RPTAI -5An4KawPz4EcrAY0EGUS83lHFOGJXKOHGSd1Cj4Pa9Q --> ssh-ed25519 rmrvjw WMELHgVvy9er/V5N698UF9ZFiwaeedNsxFJ5Tlj3ZlQ -lw+sHWr3uHV2b22xNxnD+vSPis/iq8Xbp7XaIWG5XDo ---- +UH8vyepaxWHUviCyJ2rgJ6OcQRmBC22Z00VB7WndFE -ùñ3fؿȘڪ…·‘‘¨ÇÑÐ_‰º'騠ƒ3'L¦Ü¨´beøG<€6餔)"†P„¢¨¨%?~žI£ùÕ\˜u¤ \ No newline at end of file +-> ssh-ed25519 V1pwNA ocbo4VYNAuSMl+cwAnQox8FgSfIIL6EcjEZ2w81Ahhc +D0lErQCzwi9TBMSd6dkqivQ6bHCZrtlkgaTjQVdfAEM +-> ssh-ed25519 4PzZog PpuPLWrKMhSn3VFuVe4EtbeHdIGRBPsN42jJqP6vJnc +lHF5+sdN8B/2Iv9kxt0q7SsRm0KKmnRYOTj9tQz/aD4 +-> ssh-ed25519 dA0vRg 3fAA/TDGslCUZKiYHjm2qZmP2x1w/RX80mAVQD1sKlM +Po0PftPgHBij9jBoj4iCRq6ARmek9ooo9ONFh3Q5kD0 +-> ssh-ed25519 5Nd93w lXvLkIuGZJRAvgmvd+SBay7qJizd9UUs3cM5z4Z26Vw +HSohmw9oO2IKdiH4Iu0ZuL56kjpmKJ713sLF/tty/1A +-> ssh-ed25519 q8eJgg z7HYPsacyFXBnpIkRFnUSjEavyDG49fIT1VNoLGsCEQ +s56VpGW2ubBAWp5FoHrgQDZySqINJda+44xokM+Kb9k +-> ssh-ed25519 KVr8rw 22pOg0xxlJg13RyZqMYakteo2vw/6mjsK8ce26nqaUc +xjJHXIpWQ/Y17R5zUp1hnpIF3zdqkfJIzvgppGPMJD4 +-> ssh-ed25519 fia1eQ sFOx3dxfZ5uGKjqVHoW5QcwEIvHja/+uWsZrdnoQvz8 +Kczr+yv3PEmTqDXJ3W7hn3bZ6wrpivhmkrg8fhmOcsc +-> ssh-ed25519 rmrvjw 9nQAeB301lCj6p2rnnumD+G3WLjMmZ4NYAY/GFLy+0k +FfnwVEYqZ/odWg5NOeizDMCkRMLiNQBtpW7ko4pgmGg +--- k4P7z8pNs8T/QFPUfC4E7/FjsbKzhiM26rD7YcJ39uo +‡åM¶¦ú­à{$ë‡þ´ÿ€l£Gþ„¦=5÷¦ü©ä‚9}qÞ¯P´Á (³wÅJßKŒcT eß [AòŸwò¥;éYïœêÐ \ No newline at end of file diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index d79875c625e9895fc7fedb493850065ee7bb97bc..e693051e00465c8a64053f9f24556c374deab8b5 100644 GIT binary patch literal 1636 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sb3@{4rL zF-Y=G4RuQnFw6|ejLP#fFE7rraB)pf4RLjKOsy((%d9YVHsK0LbT3bJtO!dhDGbXt z3U*8jh)N1ED$0t;cg=7QPRVsK%5teJtH|~abVRq!B%mrPKV2a=DlanA(BHkHAkV-# zDKoOfC^s-AAi_H}FDuy5!XVPwv&t;jydozsFPqEA&&R}E-_5kZ$0wl3-A_NvsG_vU zGt)3RD%Zf(EjP;9vA`oFF~6)_-xb}q6i0)ypmYW2Y!^dM!!k=3H}7nhVqf2otgIq8 zeW$31vQ(ecVE;lh{p`q8N0TDU@O-W!ZAZUiZO?oQ$1qnflYo?vFq0z7WS@!*S2JU; z^b!{zgTioc*UV7ABnx!gO#MU3|GJ+#^d8LygLVb1KrzTwTf?Eh@8JGb~Fp%DqyHEBrjQU2}p8 zQ=L*%{6f)fE3`=UN>5kN_D<0*EzOT~&W(yP$aJwRj!2DgH}j4(H>h+ED0DXP$uTQ0 z4slK~sVwF)@Nn|?&h<<#cD1NA!mzwNGqS|8B-5}cz@#cIGTF~K%Fx}{DFh=V(=rncQv($u zypuDulQWH@vfT`m)6z1s(j0TMQ#{kMd{YWNJu`CLi;M~*OfuY)JwmyX0`rTb()F|a zQr(kW^aINCOnmh7vO|lKf-Id1O#>}UvjWTVU7h^Q(lA2Ov&zx8&{3hn&?GRZ*x$TF zyUI6A-@T;R#49U2wW7kZ)IT*Vz^BC6KPjxLFs&ja%af}jz%AFmz$?EpH^RR%I4vV5 zF+|_9!X!1jGNj6+EYQ2ysUoj5J3k;i$P+yzOQWisjMEj$(z5gPJqt<#yh>9HDtt=Q z{j<}ZEpnoAbNoZJD+h#8oH9N2y_`Y{vivN)4g8JrJ&Q6; zE%o#L12SAgD=JJXv(kNhQZQ`uNHWMQ2vmr0FEQ6H%h4{%%CpE#$xQQ3@k&X~H!sTz z4);s)sSK?2%gN5na4ilCHQ;g!E)CE0D>X|@DK-gCDarCH%QbZg$PRY5$PO_rF!S+9 zcP&bG%1VhU3q9l7!YOA6dl@Edk?nCN3}o@)^p8J<#=o6i*#J; z@1E=$O_?d)o1ZWNRjk(&`2QIuQEu6k)zICBg0kEUgR^=j&l$Lh}Q><}vdID3oK7mW`_)BmQ* zHFD0$T4R3ew&c6zYI26r+|@r^zkm9-RnY36EwkCSR&BwWmmZmGIpjo|q&>TtL)V|s~S(4TGg`D_~-!e<5k?nsg|n7E?$;>sn~{L56mt*>uC*_Oa1IAzXR-`#Vb zNOsN8KD1G4#*&`G88ww2%1jd;3DhSad@^(0Nrqn>uDaq;oS)_&`(>0h>BYK#O8dUg hxqok`$O4<)zur!{?&2L(Ic34TEpe+vCa*a^9RMJ`HvIqq literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!thD)aJm z3=j1*D<}_4)eou4NOml;@C`2V_i;}QHZ>{tsB&`+aCE8&&*t*ZPIfJgbn}la&JME- zN-s)F%uMmtPb;v9bn-Ov&rho?$V>Ffb@$3EG(fk_B%mrPKV8AZFQCw%Fx|M+(OEkw zA~)a9HzhRHE7HqIJIB#6*T~V?(b3dHKh4p_IGxKoB+J<-%pzkUCJG%M028a1Nnk0Ez zmPD3#q?#KVI+qt#xpMitSfrJjyA`*~zoSG%DFV!Zj=0G$S*^ z)i|P{DwNALJ18*9psdKx#VpL}Qe|RbZKsSD+spnvZUqXO*LGp`(IxL3Xf*n?-tx zS%|-%slTOfhqj{Q1Nq%ZsLArZ+Wih&KrBPK*#_0;7&S6QJscxQ?NmYjV`Vr-3 zCFzzHex{+u7RA{C`bkNSiRFGp&dEM`~qE1p8Kn7w9KiL?&fBS2=}6rlq7= z1Z8Drq^GB7n_#3#XhUHJ+`|2*dG-G-p0&-aOK#owQ>Ybi_A<^Lfn}j!0(sowWO8=i`Xw0*fyJVr8bfn?c oh9tH48}d^9(QbiHeAf%yzcO3NkBC3PiWfB%mrPKV2ccI4aX9C$})SG(59B z%fdA;(jX)%!rk97DJw7_HKo$4JhIBvU0XjdsFQi;{!=@-r%f&0Ldx zeazh~e8Rk(4boCvjeNP%%*sQ|A`N}YExnAYBEwu#42+X~41xpQ{T5kt4)m&WcP;cU2{SXZD0M7xa*fQ)h$Zo(A~!PB$j7ieGCRyDz`P)}z|bwoKPb~T!WYA~w9G`q)IbGe zb1w_CvUD#qk7Q%N05`MB$O=a{^PH+gr_6xFfC^tD!?3hav!v1r_jE2xOP6eSlawsS zf*fs^@Bn9vKo`TrK#P(J_lgK3ub|*67vrL0SF_9_k79Jcc~&|47CI`Jm>C2nM--Xo z8XEegE~&zU+9*YlUib&7+PND zZRY3ZQ<`pQ>6YRckZDkyVi6TuY+f80QW46PX_8T{?-XX_>=6IQBk8B|^#QIhBp zk`wM@SXPqZWmx278D356L(;9xG{DQFq`bl?G}Fh&*dVB)(!-+IE6>Q+$t^j#AhM#$y&%Io zE6*>?m#fex$|Ez^vdBLtBF!Mr&m!A6IXk^5G{`+YG%7pQBFW#+#4Ox1Cnwm@giBXf zSHasL%d$Aztt28OB(2QH(J&}1(aAH+u`)B&BPB66JkZPA$k@rmBr(&#g3BZJNJ3$s z#G@r*89sqq)lcj@Z?~|{(tS(D)sUk*U4Gsxd#}EgpVQ=)W3c~o!|B)7Pq{e9nfaHr zwn^^@q~&mOgTG+$-jLuwJDXPjPGoxTnrpmB_@HE6a-a}j zAM27^Gv{trvrw4OWh~6jz;~HnKKF%0VBTWByMONPI3ea(XCL4qbjNSz!r-3zzxC5= K8H`z91_1!IZrpPK literal 1440 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tlOF-bEC zGfv3}cdjzX%}>h7Dm2dt4lC173oOiv$d3%K49WBHb#>H_$mjAaPB%|3HZBSXbjz&F zPcbPB)V4?q&-C_jbn!~j&d@e34M_8=GDr$daYeVyB%mrPKV2cPFeN9++1xTSz%1P- zH!-uoB_pNWqcAKpBeOI;RNE{nH#E{c!#T0iIFc(rrNk@1Jj&3ws4~zmv8W(9*VU^u z-6+E|)IH47v)t9f(9}6R*vu%W(gfYM6i0)ypmYVlvOKe-v>^S!#H1>x(j4RPME~&g zg3O>&^U`$JGRI)c+)$IWya@f$z$` zsKQF~97~q~_oxCtb5C^JO#M8Ui}Lc^Gt#+S!>fWl{GvQcLdt{8oZR#LDoZPaBFs}$3j$pH{3Bc=Qd1nw zibC@9LJZJtE3`=UN>5iX$aD5EO!qJ<4Knl0b1n193kfkS3W+GyHYnB3E_e0~(zozQ z3r#EakI3e#Dl{(f^h_z#E{QU-EQm}>EH=qWcX0}=46f8q(KgbLh%nJkN)GU=iYiC9 z%{#2fqNrTKJUy$#KQBBWBqLux%OW{E*geR_*v-!IuD*f=6RF(MG%wzSMd!_+_p zgQASkq^KOnEaN0I%lwRB!!)Ddu*&3oeG|h#x1x~zY}eFC6I0{z(uzQ?lG4=7?23|- zg353wQ|Gea5RXce5XsO&rrJ{L0Eo3Mwsw{LGCFP0I`_4RVXoZ7YqcaxzX=@HO*xcPp<9tt#-!NG!;7 zb8_QHVjKfx6LETAhRG)!PT)eB;UlX(#X8hHzg>mG|$p9Aj2&z zr`*8B%stW7HKa1lzp%6bsH#K+&VJjuu<&(X;_ATZ0% zyUgD-y}T$h-8&H@-k>4r=3$nY?pN%d<6~@OmhWYrTxpo*UsV>C;pQErA6%N{lv|h_ zS!Pm^>Eg*%?%`yT9Gc}=73yuE?^afn;g?sQqwkWD?vb2iQjuHk;S%O*TA}ZlSK`T~ ztE;Qv?(Jq$Xl$A7?_})j?^s??T5eKR7;fm|V(O$FSY)OhT9K|@Vd0eOVQj%wcx|Ft z)Vr-~Oc*DeHQW`De7WKO&RvZ7ROBLHYc#c2R=?ih#ZBns# z8Rw~Q!Z+pyvs5be9I%|MWGpjB^b(I&ysS)Z{E@b%E1ws78o3;p9;Ybbb~xac7x#L; zqNQ8(-PQiM{hc*s+4hdrYnSHb#iqAU?KQgpvu|I*HRB~Yz5<(Cx2ZpJQ(n>aNFnWB NrQDfQM^`-m2>|b<>RA8) diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 0c9899808f917eea774f494d6c21594d13eb1819..98b1e9aee4fbcc18158c9411c67d493dda4f90d6 100644 GIT binary patch delta 937 zcmZqRXyBNjQ}62$>YrSg>gD2DTjI66&9rTWstW$fawiP+Xj$ zo0?)|YHDbyU=mOjm7lJVUSwh75s~lbQW+2x=oR1+=H~3}ZxUpjVqsWbT9ua-u5aL; z6`@_2Qkdh*m6?=Znjao%Sdr!H;_6nM7hG9t9Gq*BUmjK9k?c_r9G)L)S()l(S?XUr z@uPUSlUYeV{qBEmc@!XiD= z(;`E|JRNgQ3d^!me6otsW57GC$fBrRA;{IFAi~`-+03=DB-GO1z_UIwFv`H+x7?$w z#MdJ;%cR06D$6gV$}gwVfXm%HDbU5xz&SV5HA_D$z_r{jGBiBfIA7Z%CD+N<&Ckfk z+&8o`H8nLn9o@RL%tXV~Kn0JSfc(6u5|?1Ng2OI?4cuL`Qi{sGor?AIol`@dvP%N+ni&9b}^GoYpA~M}wBHfZ*yb3D~JS;s^4g8|q%EE)(P4&ZyJn~aR1KiWObaizV z!aU52Q`52|JfgxPEyAnZLc>k`Dg)euq73|!k}C|00@B<{f}8`>BTACFTpw%{l71-G zctP^5Q<;5C-tF)(CyvLPx$6J#@sv`^QR>l4W8b2;>(LgHTxQkkCalU8BmoaJcjnBtgd=4+&%o#$<6?CG0c z%;j4iR25?GYgz7^VO-#AoMc*5W~rYZmK$Y}mz80rAK+c&Z0Kl^6X0p?%cX0lP+Xj$ zo0?)|YHDbyU=mOjm7lJVm0MsMmQ!3}Y!Q&;7VH!e>6Vminw}Br7+`8x8E)e5svS~Q zYT|3*nx31@WolqjnC2do>Q`8qXY5^(=alK~>JeJ(6d4pyR21grnwcGuXk6%=R%DPq z@uPTnnsIrgMPYu5r+J!xW{O2%maDnHuW?33nnkW(azVDAsX=jCP<~KEkxM?8Q?g@l zKwemcfor)zVo_LlhNZTnshOc~W=f`Gl5tU`msfycSwV_dL1p>mct-K?2=6ox$3n~E z;Jm8RFoR^b)T|WeOv?C&BrPP$P}|5n zCE3+Gr`S~AJUGas*s?4qkSoL0DKptM*x9twttj6@-zy~1Frvu2EHbB1Kg-myyxi2J zq&UUU&oIm{6y3VC%tXV~Kn4Fm?+l|NZMV>ZOh3y&?`-{?yf8CIZO6nQm#Tm?lc>s) z`qZQx6CZuo3InckXZ_&fG;a^DFjI?U%T!l`5X%Cu(x80TNK3cuC_nR(V9SauLl;Z$ zqHJ{QBHa=zoYNJ|%Od;(B3;6YeH{bxeT_`Y!n4AHDsea6WzlqLw$3z0(?F5OD%%ZqCyK20|U}?BVC-mTnv-F49z0BbaizV zBK2Jj3=`9g5=}e|TndA{vyvhmojiQqQoW*_EOLS^0&)VvoQoa9(=+qAEcoV5RrJ}( z!mwQ8fwar@O}3U<+l#hj%9rZ~an1<1b7s4Txxl&2``&Ilt?iLqB0HXOCzq$WKN0DNmVtN;K2 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 8461339..9a9b5bf 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -23,7 +23,7 @@ let galatea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3Mke5YtaMkLvXJxJ3y7YAIEBesoJk3qJyJsnoLUWgW root@galatea"; optimus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqYbbWy3WWtxvD96Hx+RfTx7fJPPirIEa5bOvUILi9r root@optimus"; glados = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6go7ScvOga9vYqC5HglPfh2Nu8wQTpEKpvIZuMAZom root@glados"; - wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEehcrWqZbTr4+do1ONE9Il/SayP0xXMvhozm845tonN root@wheatly"; + wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPlgCGtyvd3xwYg9ZNyjTJNB/LvUSJO01SzN8PGcDLP root@wheatly"; kitt = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPble6JA2O/Wwv0Fztl/kiV0qj+QMjS+jTTj1Sz8k9xK root@kitt"; gir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINL2qk/e0QBqpTQ2xDjF7Cv4c92jJ53jW2fuu88hAF/u root@gir"; neuromancer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEFAs6lBJSUBRhtZO3zGKhEIlWvqnHFGAQuQ//9FdAn6 root@neuromancer"; diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index e567e338e608ff2564e6629897c0099948ba5005..8b0b7e2da6c5fea0910a14441bef7f964a75d556 100644 GIT binary patch delta 3124 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 delta 3124 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 diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 579b11e8e3c2df9042312ff970a8c781e750b0de..a3a0a76dd0cb098f8a5a344fd726b3397dd7ab3f 100644 GIT binary patch literal 1461 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!uEGz`m( zF!e|?@$<6C@egxKOfxGl_6w^pN=x%G3@rCfch)ZOPcip!P3F>fk0@|1af%Ac$}g!5 z%_#{eEDA4mOmj8yF7h#U^))i|O-=Ihb25!|E=IS_B%mrPKV6|TGRRZAFtoxbv!FE4 zHPq8D#WSoR$JejQC_O08sLUuoJUuZn%q=-3+knf{pfJ6_!mltmIIz?=CBLe~+qJRjY*6i0)ypmYUu*W^f-ocw~!FsGd2upCq4On+~; zoWvl{>?GfuBK-iTG}Ex;^dk50bQ7+8?Qqw?h@cSP%&eR$|KNfgCu6U|sM5mV46i6l zmw?=KfBoQ0k4U#<0|Rv1O#M~S{ za$TH_O45=XjY4uN-8{K0ib|a$bDaXrGRxDGJc4opk_&u1Q#_L*os*0Vos#lXN{t)? zGCeX1!yM6VE3`=UN>5j)N(n4*Oeri340aC;D9mvSOEUH-clJ)o_J}G>&oI#TGBr1_ z@YK(7cQW8|iwZW#FfBZ8BO=SY%(XZtqujmR$=#yVr!qMz(zV3JM>{t)!`Yz3HN&7JJjj)1}a`*v&0GFry^h+|4w?MBCe=#3UrcqB6-RJTN6N)Y;KBDWx3UwzSMd!_+{9 zum}T_u-vrd6hn^+i%3T^%jBfssB%L`x8&4};;1ak;HqM$h_dv^(!g>qm+V}Nj3^_c zko@v&zg({pzYwEfvz&+`3s=X?KKUbx6-I8C*yR5ilA`g5W}j9)WC3Wm#PY% z(jw1D_nc7A0{5WYq@qak?7*T(i=3bwzi?l!DzoG=gVNkWcSi#cZ5PK(Q@23Z{X9KOeT_>^(%rla-HeP=%S#gj zDl*DVGBZtGj14f-Bs3&Lvm=bcQp|l4-J=}S%iMxO^s~|}@|`Ta-LgxHBF)XiOkDJh z%R^0aD^0k3GE$N}yo1V(jWbdW0t+LHlMJd7^P(aw!rhERf=t~r%u)(+vV5Y-5-qrN zb#)a2{XNPIi_ODbiYxTZObxON15MJyf_<|Mi=6|~3LQ)GLJP_QQ+z_4@`|~#0`7Il zxv3I%uT8cG7SjujLOr_N-2#BHa5xd@Cb6L%;xfR&5!cQNiE3ANexaf zbxpGf^f9P1Ff=sqHq0$G^C~L$D=^D*HZHMDv_QAbB%mrPKV6|T-Av!Lz%bK0*EGt* z#5E@?D>2d~F)1J~GdtV6%qKar$Rnx1$E-5IwVbQW%fPJ4!Z6ga(l<9TsI0OwF~zUE zz`!@i(>F)kDLE?1E7IG?)gUs|%>doD6i0)ypmc@w5%#8A4FGKS@Un7?s zFEew4oCu%7oYI1Dr$}_$O#M2b6U#GlGK;zLa=b&_GQC`!Q!_*JD}&420)2gp%%j}gT)d3)-KtWP0}BGu zssb}yBeKzLE3`=UN>5j?(2mOX3pNT$49hIecg{}qa}7>+^9WC>a!&TEa@7y_i1Y{x ztSrm*aLne4s50|0u5#4(uMDjyDGAOAa7i^Ovdl?N(@rUmDAe}$4>gTQ%?Yz~O~VLD z@310^qH+Znm&7n9r}E5zvciyj(@4XtazAaeve1x}sB*Kk5@W*>6C+oToU)v3Ltn1E zWbeS_ERS68Jpa;^rUoj6 z8m9OpJDPbo8s)iKx)k{p1*ZiiM^^b{gm_i>JLZ{YhiCYuq?#8R`vgWNW>y6U z=!fT&2NehTyPBA|lo_TO=OlA^mgh$$nV6?r8sr&OdRCeyc}92{86vPa8RQig`$xHEM|hP*rKd+Gn^q?48yS>GM8`8=9%aF8kU$vcxCBl_`8-E7Nq28XGY}dyEtk4I_4G_I-2=c29*{^I&yI^M(JI% z`KFgqbl}JDizl@o-IX`D)IBb`aedyrxG4&kcgF~I{dv#+?dYv&q@y|m!@9r?Hwhp*1JlbBnVez0V-p^$Rlj!WfP4{prvw!XV~O;NI*#ZJ%07>g)f i>9bEtp8C#ol2#?uNCW^C?Dly8 From cb2fba3f81e0a868c56b26d2d8925e69192705b1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 18:54:27 +0000 Subject: [PATCH 358/563] fix: servers need to have git lfs installed as well --- flake.lock | 2 ++ machines/_base.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/flake.lock b/flake.lock index 0026c38..7e53c95 100644 --- a/flake.lock +++ b/flake.lock @@ -1024,6 +1024,7 @@ "locked": { "lastModified": 1689960297, "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", + "ref": "refs/heads/main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", @@ -1043,6 +1044,7 @@ "locked": { "lastModified": 1696876711, "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", + "ref": "refs/heads/main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", diff --git a/machines/_base.nix b/machines/_base.nix index 81baf36..cfaaffe 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -123,6 +123,7 @@ in { environment.systemPackages = [ # for flakes pkgs.git + pkgs.git-lfs # useful tools pkgs.ncdu_2 pkgs.htop From 49d69b1a102c46922a52718d610ca2d08da99b2d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 18:55:40 +0000 Subject: [PATCH 359/563] fix: slight improvement in how packages are added to eachs erver --- machines/_base.nix | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/machines/_base.nix b/machines/_base.nix index cfaaffe..0fa84e6 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -120,20 +120,20 @@ in { # https://discourse.nixos.org/t/systemd-networkd-wait-online-934764-timeout-occurred-while-waiting-for-network-connectivity/33656/9 systemd.network.wait-online.enable = false; - environment.systemPackages = [ + environment.systemPackages = with pkgs; [ # for flakes - pkgs.git - pkgs.git-lfs + git + git-lfs # useful tools - pkgs.ncdu_2 - pkgs.htop - pkgs.nano - pkgs.nmap - pkgs.bind - pkgs.zip - pkgs.traceroute - pkgs.openldap - pkgs.screen + ncdu_2 + htop + nano + nmap + bind + zip + traceroute + openldap + screen ]; }; } From 45afc95d9911488df78dfbc8991d0beab33dd947 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 19:09:47 +0000 Subject: [PATCH 360/563] fix: back to old version of the websites Dont fuck with them --- flake.lock | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 7e53c95..4eccf2f 100644 --- a/flake.lock +++ b/flake.lock @@ -322,11 +322,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -984,11 +984,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1727122068, - "narHash": "sha256-C+PD6NveB9tascXQ84rekqlDkSNwe1mFhzZXqVlNvuQ=", + "lastModified": 1724210543, + "narHash": "sha256-JLt77gajtOPwM20m86Kh2JkWuOq1+kmHr+98UMzbjAY=", "ref": "refs/heads/main", - "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", - "revCount": 28, + "rev": "0af67c9ece40fb683238093d857d96aae2414522", + "revCount": 27, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, @@ -1003,11 +1003,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1727122067, - "narHash": "sha256-AAj5tmfT8IuAvgcMjlIjf5CD1LNC/gDCvFRt1NAedPw=", + "lastModified": 1724198445, + "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", "ref": "refs/heads/main", - "rev": "a9f125fb750f33747d28271bef3b3425563096a0", - "revCount": 15, + "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", + "revCount": 14, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, From 8c98281eff281f5a0930166058cf7e065adb2be1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 19:49:35 +0000 Subject: [PATCH 361/563] fix: finally got items that have git-lfs working Long story short it seems that ``git+`` does not handle lfs objects when hashing it The reason we are using teh archives is as follows: https://nixos-and-flakes.thiscute.world/other-usage-of-flakes/inputs > # Regular git input doesn't support LFS yet. > # git-example-lfs.url = "https://codeberg.org/solver-orgz/treedome/archive/master.tar.gz"; --- flake.lock | 58 ++++++++++++++++++++++-------------------------------- flake.nix | 8 ++++---- 2 files changed, 28 insertions(+), 38 deletions(-) diff --git a/flake.lock b/flake.lock index 4eccf2f..00e2d0f 100644 --- a/flake.lock +++ b/flake.lock @@ -984,17 +984,15 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1724210543, - "narHash": "sha256-JLt77gajtOPwM20m86Kh2JkWuOq1+kmHr+98UMzbjAY=", - "ref": "refs/heads/main", - "rev": "0af67c9ece40fb683238093d857d96aae2414522", - "revCount": 27, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "lastModified": 1727122068, + "narHash": "sha256-KeZxFw51lKC0MQpai1HbcWSGmxEbG1Si6gBlyOzP9nQ=", + "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/d6b13f9c6e0a09346e0e210aa1733a7258e13763.tar.gz?rev=d6b13f9c6e0a09346e0e210aa1733a7258e13763" }, "original": { - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz" } }, "skynet_website_2009": { @@ -1003,17 +1001,15 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1724198445, - "narHash": "sha256-7cN70t/qqmUsShNhIbOSSMToiCRGhEhwZayN2n93KrA=", - "ref": "refs/heads/main", - "rev": "3aa4568ae82846a9d365fc464dfc523be07e7ac3", - "revCount": 14, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "lastModified": 1727122067, + "narHash": "sha256-s+K1bZsYxeBrsus4vjNeGxljUj/Wtb0qYQ+5xNbZexQ=", + "rev": "a9f125fb750f33747d28271bef3b3425563096a0", + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2009/archive/a9f125fb750f33747d28271bef3b3425563096a0.tar.gz?rev=a9f125fb750f33747d28271bef3b3425563096a0" }, "original": { - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz" } }, "skynet_website_2017": { @@ -1023,17 +1019,14 @@ }, "locked": { "lastModified": 1689960297, - "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", - "ref": "refs/heads/main", + "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "revCount": 6, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99" }, "original": { - "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz" } }, "skynet_website_2023": { @@ -1043,17 +1036,14 @@ }, "locked": { "lastModified": 1696876711, - "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", - "ref": "refs/heads/main", + "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "revCount": 12, - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191" }, "original": { - "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "type": "tarball", + "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz" } }, "skynet_website_games": { diff --git a/flake.nix b/flake.nix index e600e63..5184299 100644 --- a/flake.nix +++ b/flake.nix @@ -47,15 +47,15 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + skynet_website.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz"; # these are past versions of teh website - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2023.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + skynet_website_2017.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz"; # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; + skynet_website_2009.url = "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz"; }; nixConfig = { From 4f4431cd6ddc207a67653724383dc5ea7e969aa2 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 2 Nov 2024 20:14:25 +0000 Subject: [PATCH 362/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 00e2d0f..8fbab5c 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1728492673, - "narHash": "sha256-UtHjRQEojBuH7Kx/XaCYsrcSXgwfhOsPJpyvurf4P9A=", + "lastModified": 1730578327, + "narHash": "sha256-+2l8cLQG8rfU8szsLJGTs339Y+ephbC1ByPVkEfi3BY=", "ref": "refs/heads/main", - "rev": "4b01336503479806efefb84823f4d827f39bd50f", - "revCount": 107, + "rev": "b6d9ae059174252fdb683db6f1f17fa3c4a79e39", + "revCount": 108, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From b2297e28430cf843369b69aa82c0e896b98951ee Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 2 Nov 2024 20:23:02 +0000 Subject: [PATCH 363/563] 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 8fbab5c..2c4fae8 100644 --- a/flake.lock +++ b/flake.lock @@ -1072,11 +1072,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1729290386, - "narHash": "sha256-9A0f1RueEtf6+NhgqyJMLR6o0I2uYhSLPZM//oyz77w=", + "lastModified": 1730578917, + "narHash": "sha256-ByFTg5oIkGCFORnV3dnN29UFVHjrUefQvjUTE0fa48E=", "ref": "refs/heads/main", - "rev": "a32b3ced29cbd9cd26482222ce74ea725baf19ce", - "revCount": 112, + "rev": "0262d4dc8f22898d53e12d4dbf41e46af9c81014", + "revCount": 113, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 1baeb24761ec07667040e061913f6a9137e36a8e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 2 Nov 2024 21:06:06 +0000 Subject: [PATCH 364/563] fix: errors in the secrets so just rekeyed --- secrets/backup/restic.age | Bin 2760 -> 2760 bytes secrets/backup/restic_pw.age | Bin 1047 -> 1047 bytes secrets/bitwarden/details.age | Bin 1155 -> 1155 bytes secrets/bitwarden/id.age | Bin 1031 -> 1031 bytes secrets/bitwarden/secret.age | Bin 1012 -> 1012 bytes secrets/discord/token.age | Bin 1141 -> 1141 bytes secrets/dns_certs.secret.age | Bin 2814 -> 2814 bytes secrets/dns_dnskeys.conf.age | Bin 1204 -> 1204 bytes secrets/email/details.age | Bin 1419 -> 1419 bytes secrets/forgejo/runners/ssh.age | Bin 1381 -> 1381 bytes secrets/forgejo/runners/token.age | 37 +++++++++++++-------------- secrets/gitlab/db_pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/ldap_pw.age | Bin 1110 -> 1110 bytes secrets/gitlab/pw.age | 37 ++++++++++++++------------- secrets/gitlab/runners/runner01.age | Bin 1065 -> 1065 bytes secrets/gitlab/runners/runner02.age | Bin 1065 -> 1064 bytes secrets/gitlab/secrets_db.age | Bin 1111 -> 1111 bytes secrets/gitlab/secrets_jws.age | Bin 2660 -> 2660 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1110 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1110 bytes secrets/grafana/pw.age | 36 +++++++++++++------------- secrets/ldap/details.age | Bin 1636 -> 1637 bytes secrets/ldap/pw.age | Bin 1440 -> 1440 bytes secrets/nextcloud/pw.age | 38 ++++++++++++++-------------- secrets/stream_ulfm.age | Bin 3194 -> 3194 bytes secrets/wolves/details.age | Bin 1461 -> 1461 bytes 26 files changed, 74 insertions(+), 74 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 0d7ffd893554e33043e6def7db1ec95c520042e5..9ac27b6521ab08f3b19d327555252c3928fc1865 100644 GIT binary patch literal 2760 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 XLjhM$pGuRztdx08*YZ!HOu}ve=g5gQ literal 2760 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tlv^~&@x z4-5~_sxVLY$gD^;NY71lGS*Hl^Knk8Ofz;(4K6P+_153=T8M zC@f4h%8Dp2ta5h@^3D(QF!U&_C^t5=bkWY!PDi)RB%mrPKV6|Bvaq0_B-f(E-Q6$8 zP~Y9jH`6WEv7*=@(LBpF!pS8$+&|Yd$k5Y2JejK~z%wVOD6*(HFC)r3w=~Syu+-Qh zOh3$|s?t0w&#~0J(8Vve!Z^gJ)Dhjb6i0)ypmc@QBLA|WD4!G;<0K2WsaAZI_HP|F-QqjWBF?*gMB{S5!WGViKvUoST^udGs&R1eQ!|6C(q zqXK=;bSDd=l)P}~qEK|(O#M5kNjx=>LE>H6^@^myvD#+I^H1*9hE-nc1HLxhH2zAK_G79j_ z&Wy^=4JqcTC^W6i_i_tNFHejxEj294%{C5=tTK$O$fz>62+uY*NpmlBip(o_GQseh zcUX}{QMp2}V`XS!iix&~zCl!2h`x!DL2yNBnP+ZbW^qnbNwK+WrnY5XnR94JPBvFi zvP+O@d9G7vmVv3UyLmuqj=yVxer8U9wsC<+UXEFiQB;0uSWb`WJayM3q*0 zrj=BlSv0~dYAV*ecd%AoQzzcP!Q67xhC&m!$$6E3g7WFIr_0#82^r@)Ltql%>b zDuYmWKiAB#^l-P(s*+&Gs1oyFbC)a&jCk`a$??;7R4{c+P7f_L4oSkb1y9MF3z+} z_jd}*2nhDdEAb6AHFb5v@LQQtq=BWQLY{A^lUb&hMOsdNRb-`^kwsRSuTxNPwrgmi zYl%@tl4-7AzG+xMa-q8`SAMZiSdMXdSXFqkNnW^%VOD`@vS+z@NlIaWk$Hxtn?bRK zrIB%Zfw>EYZ4tpmj%MWw`Xw%I1*Ha6sTLkpj{X%XUMWRM=6)__i4_@@LFtYqIhkgq zzS$NfB{_jyseZX3j*jMGk-i2=h5-fIWzJQ>RmLeE1?EMiNk&1r9;KmqmboRlsjdd- zIlv{XDmXJ;AuPz*%sjio*{>qmEzHZHBrqjEJ-whLGs!G0Bq=L3!oo1HxH36cKPShP ztHj*U**(9?)w#^c!@xT?GEh6)$=EZ(Bso0FJT*HsA|xl!y)wDXEIii}-L}%GDktM~ zh0M^PluXMI{S?#OWP?NtzcOQ!yc~~$qB27d-^2*FK$i%w%s`_=kFbb9uEM4ZEPsR0%2ZG1O7E;9$JAg9+nfviL)-%u^ovZh+>?Ei zBYcg5!p#$XjE(csLLwuB%+1q0{r$8}@+zE4OT9}o%PL*DiXxq|^UG6>vx_QB0{lH4 zT`jzQsysq{-8_7~Bg*~Cv`tLXolG*)%nLAbw`Y~3Z=s_?q?wC$Mw)4cp^vMjMSgC1 zUao7XcCdxHo1<50YH(?3iLZsZp|*jOerPgRQHZ&xSH5$aTZVI9Xr`sMufAiBlbdmF zhJ`_5aCnf5XL^1`QAS#BX|4%+NO~k0WEKP}R0JD%n1mXZ1~_Ns=DQfVyZIKG82V&e zx|&9%Y5V#6r0JU{hGv=v<~gNvm84~4msR*yMmSp(x(0g{`DYbnm*rUcMuwOBI;FTf zXN3Bs8~FJLh2*%R+h$ylqwig=kRF;>S!7{R5$qrCRO}e(<{6crX=YU5;$EETq@NZT z=9*;W8yIMr>X>E174BaVU|C>dl5T2fk!tDZ5$WYq=vv`sP!eDfXq4sT8=7vO9qf~v zVIH21Zd-7ni&L(nLT-d>X^usqSAJ2pS)zHWV|kuiL}7WFySuSTxJP1Asz*>tkc)|b zR=7tomy=VXNtM1|gt1SKW3H!bWO+$$pj&>ZX|hLPp`~Yjg|lavXNIFkK%N0cyoI`& zr6mU{q$HLH`-O+OWEBRKdU__M8N2DH>l?WQhFByg2S!9XMOLPir-X%TXF0oaW#l;( zIr}(g+A zxg^jcy(B{4!p$c!-BjN^#k(}qQaiIUEx0f}SU(>X1Dh-3eo!rbkO|zUUavY0;f{HO}9E-9jOXolZ)4+h-+_c=FAP;@hK+95}a?fO+ zk_xAMw_?wXLg%2u^b8l*$U^@B&)jUTZ0*WiW8b2PVy}oyW9`svmlUHAzfcb+e-G_2 z|BNydi=1SSLX)h3$WmW)zZK;cm1UJHq-hr!nx~W-BnPLPMg*mMyLhG;nK@T@L|UZg zWaQ)&Rl?6pc z6zPYiJ0|;b>FVk#6opupR26BLcxB{9mW3GTo4FJPg+v6nTZWodRGMTu`gsRMc;#oB z_=S6N$@+S8zr1s5{W>}R>x;tn-etb~Y+C3}zw&u?;Y~XOl{aUuW4*e{NM^a&+ciHL zTf@aIE356i#eQ;!JLTP-R3`v=A6Ei^5IN=PvLCW zk8?eo7r$^fvgB^%dU5J2%UgHXSAA7C_Spt|ulQOSJ$c!^rnSMlc3->U+vKz$Bl~cH VW=bCg+Ba$a~=S+ZAEWs;L=S&2#d z#E;_P1!2V@A&!=n*?E2z={aWJ`p(&r`W|_q$rh>MhHm-=!G#fp`k@7d#=)*!#+A8& z9tK%Xj@g#kCFM?`WhEIF?v_z0E>%UA{#AvUmXUs8P8MmEW$vz%;~B-n(}Dv+GQ*9N zP0A7t+)OiUWQqnD*3{y>u3_?@%Gs7(=pJf!U4|U7*Hg+>%lGB5GU^CH~d(lPWU`!%Vn>P4gUG13X-F9rKJG-7EYIOxy~>yvxHpio#2xf{lvxQvy=M%1nwX zoiWmvaY2s0ce#RZMzTqzNpV$TQea?Ws#ADLlzDDgic4NpWKelYUS?jAQ$}*7M}BCo zkqK8$V1ZA1L3(|tL1MOLxJ#g?S4E0xWR<>4XsV$}ag|S5aj1KRV`h%FX-YPiuCA^^ zYG_q8e~C+yNkB$uWMGkTp__SfW}%a%Z+Uq|v9Yg3Zf=EX zfVs1=Yf-o-m%d}5WpPwUT49-CXl6*1e`ZlZc$Al4dYM~fV1YqZm}O>Zlv%lDQJ$ge z#E;_PNlsNoF8RK$ZWSewL2miwk%^hE5lOC9S*}s3erZ|3Ays*9>AwDsMM33UM(M%f z*`+0Z{^5QudBu)_6>dou&c-H|8LlBEscz;LCPo>ViLSZEXnN+OEGB1(%2oJ&F{pJf!U&$aM(OD+$}$uczzFb{MIuB!A7 z3=Q`TDbo)x*Un6-^s6#7%@21i@((oOGA=R;*LL;RjwtXlH+6E2tT3pEaP*2WOY{yY zNc8heiLfxM401Oti^{V=j{)znB8#GO1)~go&-}{Dfbg);Ort^%_oRAvQ$rWGazn3V zUze=3^g=IlPfthF;5_53P_9y+oC;6x;NX(H>>R&{TizS~EGtaPG6T7MUCdJ|G77`8lXFrG%yRsKeIkv#{et}r3&PB@i_8ms`~tEnyu8zs zBZ|?jGcL%{_bylPEDttMbt#I-Ep_pB&MV4|G)@jO2{FhG_i_(UDvruc_sKFYHO)@) zb9Ll$3Cjz0F)XeR)h`Ok^RDy@HA*b@a`n$jF)ob^&2q|jjC9T@^$9I2clOEW($&>f zC^j?A&n?L`u*l6WFY|~h^NlF>jY==}aMw0<%F7RMt4dGG&k9IRE)GuSdj24+Pb{Op zMBH;jp^oI_Z*F(^PB!=bIrHG;lqX#(GKISoYR`9shUZPGF*kPDeCyxObHxmEpPY4b w{v^_I|Io!9QRcr2Or&;~F3WoC@mKNb)cE7a4owccGhwGm-eR>U78VW;0EWm?tpET3 diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index ffc2fa715987313c9e43c483631ea41a5a8b8418..acae7c7bb8e99451e61872cc0fcca3fa3ae1e0f4 100644 GIT binary patch delta 1068 zcmZqXZ04MxQ}1pWq;KL}o@rVf5EfD58*G%DUY2EH?4RoyU>R;4R$1m}S)AizVV0fe z$mQwlm1F7SU+$AwWtFko55@>GV zVv<+pT$vfkm7nh)YLe<|?313P?-uH8o*3+rljc&8m*VDEr5_%i>Zot(o@trqTADoZ zgG6|ecTu{(wu`H~Nxqv&x{tY6P++#BbE&^^eo|nzerkYgp?1DuewI;{M$s9RFDPkBJFd5V{_iDiXnTIl3>M)B~1O0V#&ykf($ zV2{+KvK#|yu3n!Epjt*yi3wNGcEFi+@icn z^$pC5Q=;56%94|V+`=OA^^KE5jPtoH^~+M6jQpMQ6DzVK1Ix-oeOD>*zWxxT#6w=k$IB-=T} zy}U}hI5DHdw6e(9t285$E6CD2BQK-CAf-IRD9^$*FF(S-BFe%ts30TXy)-Y>(mTDt zIXBzO*U2Cm-MX~QM8niT1;e0>q)4ywq^RH^cQ4Oui=yNVZ8O)xlobE8id#}cQ+tjNN&NK40LuQU%A z19a;=s~mj`9TnUPopQY^OrWO2d%5uu> zE}j$Yb@*J>4Y5*xam6qj$+~@0uFTp0;Qzjb5#|?Mp1Uot?_GTPKi`FOF`t|_yA@yd zHw`&%s&Y9~Oh4!PrN>+|dl~iyHwTn0lv(baI=$%0tLPjL&ndIz=TBo7UQs*ochd*M zPcBOR#jV%NxDjew0NH;RNz#dH^6i`pyqka@QMucMaU zv*W(ctQD7Dw>6MI+C-(HJAPxRJLfTtq7@s9c6zr~O;h-x@`6L>xqj--Js!Y!KpXXkk>4=VO%P z$`xwp>>VCb;%#7IU}Th6;gxL?;bduQmJ$)J9T1Uj5t*ZHQ5F^+k>Zu($)#(jP+Xj$ zo0?)|YHDbyU=mOjm7lI)WbAHYZt3EiYGPXKQkvxA?iyTb;T)M_To9NURuZml5@=Bo zRaIJL?rq@8m>TG6l53XY=9XjPl$~PiU1*eQV(3^}X5tg->|a)tZlFE! zgG9JnPKCCwMRth3qq%lySZa>GWoCI*Qf8K!Q;3hZWl>UoMT&k}fJb^%s0CMMg@u`y zhp~4+o=1L^X;qGwW2kXPMx}mgV5n1RN|CX1P*!G+UvPw9a{lCaM)7cuG;f0tGbgje z5KG6>Oh>mYvrO&$fTUy-|J>B#oJt=L?J^_x6ifdI_dqUFlhFJKCuff^C#NVk1COWz zQ%94C!U})G3=_v(?{L@BK&OzDw8|{U$l}Ro8O7_}Bi#c+GAhko!&1Y%4E@YQ0zxYt zE%QoCDqRe`g7OP}1N}Y2Q#1UsokF>SsSv_92LKf*AnFekFo zD5Kmf(Wl5S(Zk;})HgVpE3qKN(=w~P(#tQiOkdk1C^gT+$J5>0B-dO&%OfBp)XOKu zF(5g^(9k>*-MX~QM8niT1xxQNZ~YMWpsJj#?80!%An%|MXZ_H!iZs{aAXAGn{osiD z0`DZJtbh#XP_E)Aw}7H3PxrheqX3I!U(<3+KS%9ClR%T=2v3t@*HUwzKuZflZ6EJK z4BvTHIr|#n5U&yl?Fr_mzJdGNBM??mS*KtgqCG$SLOMK=xZA~rv?Oj za(SC38U}df))!Zn`MY@;n*_~(@S=9Y$LM{?=v>MEp| z7^DaJ7#4a5g;a#Pm-*&dRv88+TVw`S1qb^(XQqS{gqW43cvk2aCv$bo7Tf5Xl=G~@ z;GagV;3n(rc`w#FhX&4gC-Xq<(&^CCqQ~@mJtr{u^s|KXdHX|Owg9`m`a;tl+=_Z!_gcynrZDrFqn6>oj)O3U9bO%vt_7tRV3xSXvP zxp@7QeJkpde#dXBn9n&`cK@R{b*d&y4*%FAtP)~0IpO!_64hBdLK6i~eSW@?J*$0B z=;@W&sai!UPYzbpcd4x1;%mgH()T$xu1f15U)C*=RqskWl@H&abL8fhnd-_GXN+Ho F0|41_bz1-c diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index f6e46def36a6f34556012afe5e7e1ecdbd61369c..897ec179b662593c5640a6c390b1b176dd7a6571 100644 GIT binary patch delta 944 zcmZqYXy=%qQ(sY-Smu-ISL&LdZ0??C?wg!ZmLKfuY!p;f?B-IGX6ftd?iLxAW?JT2 z%oSDcpY0k{5|n9CS&67YTS>kG#6%v{l=;q>IQ4;1+>}!8gC?Oqt{ofDChVp!^A6dn-bYh)4OTA5y)YpiXO>7V3m9_;KJo@0?b z@uPTnQE*9UaY=quP?|xexqpeifqR}=Rf=J9pl@K7OO8*VMR2mKr>}8@Z-gsXK#)MP@;$ey&keP=s&3fk$9=ghfGFNM-iqct-K?j675SeC?=w zPj~Ima>pcnm(WnJ+-#TR)JkL1G`c9%!2dE%k!Oba@|cF!yHrn3Q|4Y(mjK-OU&G|OZ-af zg9^0+3{t()i@CxgEc^}JBEySZE1klE42?@H9J9+j3k|~x%H2}3eIvBXok9aWoT?%M zJkfpUS>@s@YS=2l;9mg$`oR%q_z(5!)UvnNL&bXMP{*@^yrrBp3H~*$JW}-Ki ew&}Bf3AnRJTP&Gz*Y`=G^_{*)xg$$fasU7nfjve5 delta 944 zcmZqYXy=%qQ*Rm;R1oDG;FTSm?&?@>79JeplTljfk{9CUksDQ7oz#;g_9UVqoFxWbB#|l$eoiX>6J7?pm1|X<+7G?v&(amSkLHnr7_d%B5?kP+Xj$ zo0?)|YHDbyU=mOjm7lI)np5QFV&oK-QJLp#P>`SE>J}22o)zj9Zk}6V>0acXn(O1^ z73FSGTojVcbXl&@1W8jwL?BQQXupXFqlt({yv z@uPTnQj)uWhNGi}yNR!7a!zHMe??wIeny#hL1u(kL3*}-QD}&BQdWMNxnVh%o3@LO zhox^yWROX^OOmBYwr`HVg?5o~c6gq?PqAfaKv-~8ns2#tNJRPMct-K?NCR``G%_|J}D%_0 z^3kpHta9`%bX3r`^eQqe^C@!<_Da!?^a&~Q_75_Ss&otruL{cXaWhKH%l1igNh&J{ z^5rtq_V@Sl$g0kn zuwQPZe{i5HSDt@?NkxF0Z<%LCsE4J0Xjqknld+G5yQg+&u2E`wmPeR@TY7GaUwOIj z#E;_P{*Jj}hTfS4MOpct>HYy8&XLKvsYazfnW2Uit||E$A>odu&Y6A&mF^Z?Ci*@e z*`_|u?nMQ@p21}WS!wy^fu$LFK}D{{mC0`IxOmmzn98y6@=ctKEklbF zqY}$pvmK*yJOeTlBZ|w5gEM^7i!1#CeDfnGpJf!U*UvY%wD2=aGW5;~O!M`%Ob<*m zu?TUq3^UJ*@DHj8HwpGHNG^zUF3s@d3JQyi2rrNFaq}^Y3e9p)%8hWUa?LW(4oEdB zFNksr@XRu;^svkh@+^-;j{)znB8#GO1#Lg0a(#=kG8c3GQg`DJ-^ltTZOgLU9R0GW z44>@$U~L0qZ&#O`z;M5eVlI!oRBhv6v$C*c)8Gp8Krd~7=b`}T5|d)n(&8v{C-d;~ z(&9X~K%d;;e01y5G7}9`0~G?iA|t)id<@<5bAn1N4ZNLAjZ(@&E2H#1vciMBaxKez z>qD}f%8H!*vje#zlFfq)LQF%Vd_w&FgM9prOIANLH4O5qtkBo@F0n95H4O0$_RJ19 z3v}elOZ9O~buO#VE6yf z2)A%D%g#wOut;;w&N1;WD9|=Yb@a$GcQVW}4v%zpNiHq-Ds%L74L7ym(zN*Nt|2>b z8>jG_Pje^CyZx*vepZS6l4~ogwk{RrtFc>@pVIo_`cJd1KSZ<)vUax?HEsFG7xHIy Lj8<73vvLyv0+==Y delta 925 zcmeyu{)K&lPJLjqkA7;Uxk-wLPegF8pG!%qOKxaEiAA_kX0S^{L1=ECeu_^>VYr1; zF_&LJa#m@1vUW*nrCC{SRibxjmUgb6vrkEGZmF3?R;7tcS!6+;k7IVIE0?aFLUD11 zZfc5=si~o*f=NJCRDQaGr(dW?R#I_EX<@dDU%pwOuUk?;Wv08CXL5>nKwws?cCeXa zZdhrGbH1x1mzRM_g;}a&NKtTNX?AILnM+WmS872?p0|EbRzPBrbEZc|N@|cnS#fgY z#E;_Pp23NgzHUAd<*AN=DOHZzk-5(0X#qj*#VPvvrrtRzxdoM>+7XTxrEZQ~N#>bG z5y@Va?)m;@nFeJMVP2X3=Gm4hQ3es=;V#Klj>U$?={}Z;mOd?O9>Tr13+E%RI_pJf!Uk8m%E3UT&HaxOCQ2nqIf)erW_ ziL~^O2v4dAPYm*p2z1Ia_6g2*$;)%)axM#~2+l|;@CorS^2*C|GpaJn4vW+dF3&Ib zw#X^UC@@P-G4pjUv~co8j{)znB8#GOh5Qg7-^{Gah}?>*++>pwUn?9@c(tV9cww3I4+^TJBwz$63Tsw6)jdgzIB0NmWG9$Udjs0>gLc$6yE3=YH3fxWnjC>;syh2JM+=D}Wjf|r#eL{i*tFrXV z{V}Zbta9`%bX3SM@yH5G^(!zA%Sy{F_KHmNbqOyn_o~oN&G&Mv$}@3ua`km{F3Zg` zNawON4D~E>@~w9=^m5E_are&jNlVF3PcbTRcgYM4cTV)l3<(JiDN0Y&4k_o-)zwun zay9YE^ej$vay7NIjI8v_Du{{-)7OtG@F*`%@^SMvNOy?}_4KZAbGG0Tjr^demT@WO zQq*4usXqzN*UA~6Sj+G+z3?J`V@!>O*mC)^)#eh)yv$ccI!eO*?>_!Ccm6)s;w{DR K?xtIx$p!$%j5<94 diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 5d5e1e329e0b6505a8cade83a6faa19ba1409976..4def5264b4f7a371249f683141a0df5e90e9893c 100644 GIT binary patch delta 1055 zcmey$@s(qOPJLRIaYU+XX=FfAXi2$AV6bU~TUw}DQi!=@Nw#CKfkCK~V`8L>o0n%q zF;_~3M`C)hZ>gbwW`&!3dWCU?pOdAzpHD_fV3cuYp07n{uuD)uu$O6IF_*5LLUD11 zZfc5=si~o*f=NJCRDQZbg@2-FW|FsgnWI5vYE_ntn_HSid2yOwrN6ODnT2^&sYifm zl|gt_wrf}Lr3Rt?9wljoA<0F-u9czL9%kj{ML`B!p$54* zfgVK_VYw!z={ZqBrbeM9ZiQLNh7m#O{>k3?rrEx^Sy_gW-UY>z;~B-nJ(J6Wi~YPx zjZGtslB0@TEh=10vWlHeqqL2jjJ&d4Oj69sl1nVoLMj8fg3WW1Q+y4=l8wWPEOU$V z!!zAIi`?`5jr{!#{i4iF^uvOEa&jtj3<{GcpJf!U&#w$FO*IaUa;hp%)Hcl5&yFZ8 z3wIApE3eegbxN#A3=azTPcb(#aSux8%5Vx#4am_qGAhe(Gxp4>Gzc|J$_g&=&2uX? zEA=){PO}KfH!7+y4Ty+Dj{)znB8#GOh2*3NKkd*|e@AE2q{vDWi^Tf0V(%>Ps}^IR%Z3sOQ1O3JlEqAYSPi!8j03f(h` z!}HOt^Q?08Ep${UNGuLYEDlM|2#hePFe)|j@((PCEG;g~4-d`tEQ-v~FU%{*^o>dl zcZ%dn3ODiaE%U68taOXa%5>2#GW9QTEiFqb&T};^DX#Jks7iDxFVA*%b<_6b($&>f z@HeQ;axY8@Os{bEH}^_6HE_@N@D9<=%ye>diVASfEe#sgrzodw*nom4YqR7@=b<*CZ-c3{YadjQG(G_NW zb-eqFME8_;QZK%pIjb46Pwmg{Y-{VLM|W3m_T@Ypy(Qq(xw)kmE3C!8i8x(k`gnKw tJyw$+?|Zi%vfFU=g?Romv5X}lcNH|Fg|^Ljm2hLG!q(8c54(kr0sv&~dm8`% delta 1055 zcmey$@s(qOPJN|gM44e^nrX6Ys*8nDuxFm3SB`mNQbb~kr>jR|YGAsbn}wlgX{cXt zF;{55sZo%7ptonKt4VM{utjiaNxF7!sdjLfxp9h-MX-fskfo7ffO&pMF_*5LLUD11 zZfc5=si~o*f=NJCRDQZbsnPGX5ady7z z#E;_PPPy7%;pypR9*&_IM(O2V$(hdDWqvtX>4{~(1*i-OZa3SBJC5*>ZrqcY8_id`*J6O$7iJ&Qa%%rgSHEJ{79(sPadN+T;${8LR* zO#__G(v3{LgVS@93d)Pk^m8lB^po;RwaX$WpJf!U4>a`i_sO$JDk~1kPR|K&DvL-B z@HO&J&kOR(sR%1_Gc8LGGS*IW3CZ*2N=zzqDJrc94lUOYF)udH^m0pb&2_WPtH^Q; z@k}wO$_Xyd^A9(Pa1OwT0q?LPi=uJ`H+{?E%xrgaU$^{}u#(7R{d%Xs%-m4#eC-V9 zyy8+%)6$Bn68EgcWPitEuA(sCkcfQaf(mbcS96!-ko-(b@UsD)SOo^axMOOf*alRB%sBGbu98_suK~@b@byE;2OFDs(Ffj!Z8xOY}BQt8{m& z_XyI@PR(Ni%2cZ@+&Ni z^hCGLv&zx8&{3h-yDBx*GT1H0tvsOIyvoZXEl0o9w6e0;B-F{LD5)YR#6Kw{!nG

^QaGQ7my+^@jN+tM`BD5WscJw4UDGN>fc)hO7kG%+nGF)^7-S65fT zyu`9FD8<**&7v$PsVp?4u+TU;OW(!V+qW{HtinGd!o{s1-9q2ZCnuZh@lTg-`+_e! z^>_T(QG1_BF)LxY^y>WXS26E4^=4^)(mv!df6wFWee%Cw)^}c;emK|Q|z22hk$vtQ5V*31Sk1-xt_{+BFaOT|F z? za4U25kI+vFbM#Mfa&j|rt4uOTEp;!kG>y#4@J~)Fa8LKhHsLbM_cMt|N;C*JP1jE` zc8xGfbT;ub3v~-i)6e&CPfrP{a7y+~%JNL{$Va!$B%mrPKV2a>%Q4wMtt2tZ$<@&@ zNoo?c8vWOh>M)0&SPPl+>hf*OY8a?eY@+ys}^epR}N2w=|0o zbL|x0w6yTt3geQ1atn0ZO#M10yZMvkbUWor*2eB8yTDErQ&`EwqC?OuS4Sb5h-nv;7L3qYM($9n+HY zvx1!~jUv%)E3`=UN>5j?42?>0Dm2QEGO`TS&#p@K^LNkFF0=?r%Jxa}D)%)=4fgUV z4E6~#bIs-|D@-&qG$=8RsPM@2b_z~2FH7}LHn5Cxiwrk+bu;uX@Jw1Nx5+fx2N^<=49ThB%lQT=wvkNR8vkZM)yiG$> zs=Nv#!@?pH!_!Ojos-QfeZ8_1wUd)8Be}dok}Fg6gDcbheF{u+13V3@++9Mvo&7@0 zebT~0%MFd3%JmELLh^hIFmgbdQKW&Tqk?u?xSy+0Rj77Om8rLTsgY}nk*`ORWoSf| zS3sy^XsJ_pW{#V_W3XXhK38a%S9qRdR#38wd4yS}qkcweet1e$NOEy#u(n~Cue)hZ zs;5Uqc$B-JBYH?i1Q$7)l`EvBl^ADQmCYF0zR#=qf1^SsL<>mRMrny!|Mz|P97MA;$ z`=Z^$QnXZs%TBx0wn^hQI7*bW~Yn&LW9a>iAUS?eGVI1TW5|E>vU6!a_7#1At zR?HQUpH!8pZyFU=ndY7m=53PfTUh2>nCO_FV;Nzh9blZ{ni!huk&>C1jFI0;qpF;Y z(-oWyU5tV)%(W{6ip|7@D4yUKA8rU|^Q+9iANG8XoGBRheXxmf{lPV!&mdmFkw7@9UIVQts{+ z=o4I-7a3OR8CmR_;gM?YXpx(eV`iG3pBZ7Aj8SrVRyq0>Iw}O_mLz+aCZ;8)rkVKp z21S@S`WA(Hgd3JP2e|v^cxk75W@NayWrsQkM{;?ZM5bGmrRPVwCl`mA7#9{Am}ut} zWmNfk85yJ|24?xYn7DfR8dMooVB`RgB!kR?Km})i^Sr>|VDF;b>_B~IGnZ1Yiqv9H zU$5L;OUu;2$`YR{FKuJ}Kw}F>PcHpzr@X?{%(DDIAKyerNAtW0gAx<{P{*=lf6wF$ z*HX(QukZ@b(op{}1N4wIF38dME>|cFb_ea&fIlbJZ@ej0!Qz z^N1=k!AO(Ag)UCHjtWlhg`79#P>D+Wy{w1&%(2MFC}wM%vCf z#-?U2CS306W|rZOB}Lkfj%kr0hVI(o$sxg>InGIbg~6sSl@-NNVa^fmXh%r`9wGz$nT_x8;)vdGMHw%`h? zbPW&6^-U^`NUe&D$}1@jNeS~z%Bs|lbWJKs%PI6N$Sg`pH?Rl|3q-dq(k-#VIbFdg zq&PF%DZA9E+`ly0sIVw6#L+jbBq*^ws?sUHI4U?fHO<4KFx<1SDv&GDCo|03Ji^V> zBGV-(#M#}$sM0Ghw4gF2E2O~O&&@D0JwMyb#mFt+#01^8)EsBm)O3Xq??CTV$FfM{ z>^xJ?(lU?yV1wZBk_a;s^E}r)!;%V@w2~6@f`C9*cMC5607tjN0QZ#OVB^pf?R2*i z-w1bu;*6q*;M}kxPp7J~@?=9x$7Dl4FATp~lto!O2P*iv`?y)A76cR~rzHi3CnuHo zrbc=udl+OnM){Wcn*^ALCV7|SSmd||MRG-XnI@*W`+FK2`A0exgcq9?q#Bx58F@Ns zn^vUz8<^<(7kd|&WmbfkVzh#aa*N8c$`wk|(tRt+NEzDeeee^ATBl1Iv4Z_3o^sD?bO@cBkgPk%GJ#vh~ zosE*RGkubB%ei!Qbrk|l5_2n}(!+C8Jd)GQ6AKf|j6w>$9WA^gESxN&JW8E1syvgu z%ahzfin(0(J)T*_Ki4MasQv2&Vge5DYENeeUDas*DJHqr`b3;@z_bfqPy8o84!+ZU zL*Y@vwq=~fN%odM7Og)d_P;{q<8S@mA9W@Yr`)*f=X00E3$OTBU{YsR#FIlx!=KtYNuS-O-v3xre<>f+_1M*44xV`Z?ZMRYc>*WB zRsZF4I!R~=2&mn=zPdUls%L7!>&4#RdYU(%ThE$Zd;aO$`#e_!Y6EP0cKqIM&uH^? b&8|wP*7oA0u9p7)7gwo1QduOfET;qj&-|T0 literal 2814 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 a@bY~xW_^6)6?tlz221yZUYo8>KDPmIwWT=# diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 6f73e30e6ca333a89a788982257bdf19b37974f4..0808d0bcd91089e42e294ea5f19241a8cdcb2478 100644 GIT binary patch literal 1204 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zg{O}7Xy z@eK5d@-|G)@XX6HFf=sw&n`?%weZXhP6;UsjEr<~F*UWwOy^3>H!s%@%`Z1Ab}q>; z400(ljm|DY=4^vD7y(|}B0Q5iXi72*k@y;=I3Nv-J$aimgRdHXJ!_d7Wt(oyXJFwMi{0!rsbxT zq(=CZN4S{>nELxvXy~v*MyB4GK%_pIXK}7Z2UO z|D#=+zA*N@_b7M9eBr8SDYC9|Sdvj;p9FzDncWyGPMg7=4 Q^?byJ^=8^`hxhja05WZyVgLXD literal 1204 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!sx4EAsf zFe(YjEY7kB2`?}-cXTsIN_4HXs3=d?E;mb0j&d_9wk${t^W}0i&&&)lsM0q|^^Y)( zNGhrH*UxbC$~5%LD-S7;@HNbLF3Uib$6-*A&w< z*H9C`ax>oo$KXN}i)3`$O#M2dO+t){iw&Fu3JQZgGownilOtS% zO0(SjGCa|3E3`=UN>5jaEG#OIEKW5K@y-qoPE9uRFe)&%NJ{nh3{Lee^R{&IaWW5% z$a2j{3bNqJGRVwG3)c>E(@yj@Ep~}0_Y5#j$*OYl@bYjfHY=|Ts!H+9@in*bFbhPt z%{#2fqNrTKxGcY-$R)t1*uW#q%QZ*aE3LpSqry8f+t0)_*R;~p(=$0a*C;62!pVdy zAUQP1*)vDmCn%~gqQphNvP!$s)wDb*DmOnZE8EN|DkQ=s(a+d7xXc9IwzSMd!_+{9 z!lKZ;NXvq(yajcmZ3{ySLl@^XlPHU*0+STKBv-TIj0h7h&xlOV!15d) z--;afs8myZlkBP#uRNDBFR!Y?ob-@L(-0>g%L<>;v}9Lw+x$v${PZ0a3{x!hGcwY$ zONye5l7dUp4PCv%yb5z1y>f$7s&f3D(<0r1-E$LtQVk=yw7o(-k^)Uq(<_V(or{ga zg408c(haLT@(lBWwf)1w42rV64YNEF6H72cvdk#bz|v8{wJ;>#D<{#wBcnn;D>XEI6+;xy;`n*u=@FAi~ez+}|kB z!Y@28JS`|J*~G=dKfr`*cYEc14(?f17Oso#^sQ{)_S4{|WK_~_w=?1U!j>0(Wzn14 zcx#2vf)n996MtxL+ZUl~pIEIP^}^<9uNS z)F;!)yUIO1Fd`@{$1>m1GqOzEt-LD0*x%VZ!+^`PII6tRIN8j|G_tTN-LTj@)7{9~ zwZN?`Dl#)M)H5?JG%vrxAUz|?!~)&66i0)ypmYU)?W&N_$n-22WPJpBWWOG=CMJ&k=_Oni*BgG|E%LMq&f zqY_PmO-&5-6SIqbTur#r%uUQplaez6^DVS5iXPWR0|VOgB$5D+|<4^0Q1W)K1AODor;lF?7?f&^E0I%a6!$vGmT&2n#hg%EyQ| z@310^qH+b(tgKv14_~ujL!ZJF^Pu3Oyrd$NAa_GYj}ZN!0GA5aumInZ>~xc?U;{4g zVxv4GKg*O5@1Xp2FSE+zz|7ntH)HcKzmN*oY~zANqf(P3Z^J;BFbvz$G7}9`0~H)| z+(Vs9oiYnk4cv0db1a;V4V{ymBfJXSgPh!Q%u*uUl0Abx(n|^glesFBLM(mD{1QD) zl5&j_oej#|or+z9Tr&(yQ$tLmO3Ok@0wcAZ3cXA`J<&tbv&zx8&`}{RA|=?XEUUQ8 zr_9LQ%QrhT$s^D^&CI=^%GcE2+#`0g7 z!0<@_(DYzS{S-svlnh_*Bm;EYJdzAD3j!5VQi46bi#)x{B2x^@$}>w#(?U%P0}YGa za?KONQjN26&4P<9+!6yka(%giJwx46P0}n=N-Gj00xP|oBa9ObTrw-2Jd8ZFJ++-m z^YZ<3y&??Ki+#~;gN9^kXrgaOQGSF`sAo|?vUYJ^y0f3ZVM@NaYjQ@2yI*ESV1{2= zWMyG)r6ZTVQ(>8ZP()>pyH|j|Q(Bm5K%RkrnL$;KrKNt5V{(vRQND$9NWNQ0a5|T+ zuC78#vSp@uVOmOZX?aSJS58S(kY!jviobJInNOsLM__qaYL#PgYCy6D(<$ z$`=oAUoh`|`0f_t!`Geb|E_u>$-Gd$fbWT3duFq~_x1mFzaE8~o?0?*6(95d(#C0x q>=C~T8>9s$-#S}nnG<#(JaKWy?obOJldzeK?b8mc3v%u8{|*2U=Gj63 literal 1419 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!uLOm$8R zjEFMO&MQkROOFh2OZCjvHV!mO@((V}E6Onp3UvuAG7rp3FXu{j%r;Le(YCZK^oukr z2nh<&Ha83Ka7%Ixtc>zX3<=8hO9_s2u5dTYPDi)RB%mrPKV6}!EXgy;)F2?k%Oun- z+^EdmCC|*+zbMHf&@m|}QrpF=AYD5@JJPi{B%Le7G}7PMxvJ3D%sV^CzdY64DL*sW z*fqdAL_0Jj)zdvS+bgT0tjN;R!V}%L6i0)ypmc@Ii1Mo76gO`l?+Euolgj+EF!xFW z(|ki`i-=Og;?#2A2=R#lCpxh+$?7W<`kdjnC zzs!I%%e>6|LjU3dGYr3(`lVPJmn$S&mN{A``uOK32j!+!m3f(jW>+MaI;EGIn3r3) zmwI~VC1yt?I~FH!11-2ry>m?h3&Sf+ zO~d^{&E1_VoSZTY3-rA#_07U7e6>@O0=z29TmzCSoG?Ptv&zx8&`}{I$)~ueIL#+8 zB-ys+czLIC0F0u4a2t5s46GpbOry&!eB?|&}0{r&};*DFHbXX zizLI+loZ2Er()L-$E=KibSF#w!Zhbx11|lHlC)$OKO+N|!t(Oe2(QYr+?`Zh0 zl+ehef?Vgsa#N=wztE~QU-XdlNHWMQ2vjHxvMA0eE^#yo*LE_|HY;^D@O5)GGW2jy ztkCy22`Dvn%=0z&^ViP}PUgxo$}h_`uT0F)_YMyTuPU)DEzU8GboLJnOo=jz2saA| zcX2QC2ud$4&qucn8j?W)k%`G39+tV@{+9YxZjM=nr6%T_#}(f5-{{8ERedX! plLL#lPTu+8jc%KfkIMYA#zjSnXD2AGdmg3k&n@?T@wH@;;{Zn;-s}JX diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age index b4fab38dadf75cbd15b5436744f70fb294ce0786..294bd09506606f954e12f3c04c6f42b3a93bc9ea 100644 GIT binary patch delta 1296 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 ssh-ed25519 V1pwNA WVFiA92ZgJeUK8nqIDSgJez/RmZBN8xa0hsQURIitBI -3U6oEXcOzR4IvLyqxoZ9EASxy/zrLneNfC6i3jA6k7k --> ssh-ed25519 4PzZog KuCLxZN6OhSPX/4NAKgVEfRnFsjVVOlEglmZXTazHW4 -SZoxI6JqY502CCvf47UdOIR03zqUD3Wq1RgJrOS6ses --> ssh-ed25519 dA0vRg 7x9LrBgnVx45VcEHcS8NUcoaHqzlhy9CtfQ3R2yAAn8 -anutykjHH0r8K7ZdcByyfU8GlJr216Tu0JO2oJwYtmU --> ssh-ed25519 5Nd93w GzzqXHBA6reqmVRgnojBcwH7OUMDXBcb0w6dSvAx8QE -h0JK3Gy+22br72YJKEMHAsFKaRhqtaEyznUTlwnSJdM --> ssh-ed25519 q8eJgg 5DHBi0TP4zOqk8gaCw6dXn/9jkDJwijOg6mgzPqQUDg -Ck4yt4Buy79RygyADtPWyqBHO2rJBSwIsnkJ6KuslCM --> ssh-ed25519 KVr8rw FeDC2FfZRAWfLAxVov+bjIi/SvKcsQOFmAUtAFaKkjg -WP0WhV2ri61B90R0H+xj+Cx70um24CcmyXrwk55yb/4 --> ssh-ed25519 fia1eQ dQUiH/S8DW7X8Y/Urug17Crzv/+khFdE3oKLvvmGOHE -0CaTFR6Ccb7kSl4GW4Iy5H95+unkMcchwy4f1RawYHg --> ssh-ed25519 CqOTGQ oR76yJX7315RPp7LTZX5lmFHf35t5G5lybvpn9PZdw4 -7qgpY3pLW0ygHl2NsezmOfMRTh91ciZ0RyfSkJuzhjY ---- 8B1YHPeGspJhu+TnQ72FJKAkm+t8nIMVrbrBMTUMMpM -ϨZ -N©FÒœdÉéx}{Ã]Û'˜k/ jt>ÃÿêU¹$Ý„¤$jŽ%XSï¡Áò-X‘±›Š@‘جï¡.ΛMû¡ Ñ,q¿æ‰d" \ No newline at end of file +-> ssh-ed25519 V1pwNA 8acWnck16a9QK194orAzlQgQKINum/cyUzJqO6i0rkg +In2UpSbBR6QoTMTZR/GpZJN3x+5CK3hZcEvr5fORoOI +-> ssh-ed25519 4PzZog /YeuXUmWrWFohgOSEmUygaTax668bLZpYO2T7KXl8n8 +mgnBBIsPycR6RMhLk4HQei5xQLzVHiBHaooOzZdb4YA +-> ssh-ed25519 dA0vRg DidrxIBYvAfPkwNzQXy2+f6inafUafoX8cfUChA7l2Q +/wfxyJAyrQ3Uycxwov+0b9pKKOxPP9mySRK5g4BzMnY +-> ssh-ed25519 5Nd93w i+oP7x/eHY/Roj4mdpOFHrBe5rxUL7/4617F4O3jPh8 +yTVD0dR3ljoUSv1qyuKcOvr1fMRm9C8YAZKKjURtCPk +-> ssh-ed25519 q8eJgg Y0yxgrLm9/E8nYBg6Yvd0GPbY7PwCJCumQ9CtgWFxxo +9BfGPSP7pTTM8Dm9qXagKaw95hbqvvp7qsFkhQgQco4 +-> ssh-ed25519 KVr8rw pXha2ebkoIFX9dMX3uRz+0rcbwcQ1mwPnLWp/wCzx10 +BQQ77pXJl75c6myecmKlEpqHtWB/rSdG6Pwpbxzcfbk +-> ssh-ed25519 fia1eQ gCgas1CqGNZ7n09J7iXOvh2xeGgoszn36ABZwiskBBw +3a7WMN9aB6ZvwFyP98At9V9K99hD1vkvSJgnY16/JKY +-> ssh-ed25519 CqOTGQ DU1oon3RPo4MCdzigrM2+b3KnTzzTSG/WDSvtBaF1VE +zwKaQnXT004dMojYFXPz9UERL4ULe7mPZ+vwlZMxFvY +--- FWICxx8MWe7awI8P5t0XsbA4Ye0zbxCdMbapTs325HI +wûùÿŒ­-”¥d!Ñ×=gŸ&ÜžH¬©ó?÷IçÛ’ÚᕪªêÏÒ¢Ù„öLÒLË-Ù¸ÏñU¿? )ûVýJæb®éÄÎC \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index f555db74585773b75067d5756ce7394c124db773..b98b8a6a369d468a9548fcd4a295b6fdcd5a3470 100644 GIT binary patch delta 1024 zcmcc4ah+p=PJKweWr=%QWN~RpPHt9VL{yTSmv%@=Ns60eUQ&6aWqwMqud9EVXGv~) zIai=Xa=4#in43vbSY~l}n6JO9qnT$!VMeNvS5-iczNN2aXlO)uc$k4xGMBEMLUD11 zZfc5=si~o*f=NJCRDQZbsxUo&~0b zjuysAj_xIqo~eaphUEs8`KI|vK^fX^;gMdR&guT4rrKWlsgZ$`;~B-ns|?K?jmkp8 z+*2yjy>rt&@`Edby)3;glFN$%({s{tio#tooXVoieO(Q>Jbh9ujS9l6D#P6KLi{7j z^UHFgj9nwleTv;849qeLQ&Ymt{mYD;BRxGQpJf!U4@xr+H3&|LDh@F5b4|~5$+3vC zv@CJX_s{k$FDlA0EjCDuEQs)TH>(WfDoNLlGz#}9&CgDB4)Zi|cCIKbvkVP4cK1xQ zaP}>YF!1tn4G#&)F3$=@j{)znB8#GOg~(7p)3BV7#ENipzs&NIT+4cGw-9%KPaps6 zoFrFwA5+(`azm%mWcRWNN3N=f$mGmoQ%ApI7x#cvxBM`}#GtAWuT1~INTUG5C?Ahv zFPCgr%OJN96Ljm+G7}9`0~JE@f^+;M+yf1qO2e{^Oe3=_BMZXAOCodg^KyJmGqg*c z>n$@v3ypn!ja|7cyom@F;XjajeMa($&>f zsPZ%l3idAXb1`x)FtaQx&L|4X_BHhO&kRa+)6X?6ONlhe^7JtG3odiy`u(O`bYG}f)Onr{mL8j{L&>G+Y}!Bs^69p zP`lJU%HD=of4U;S#Om+K^1Lm!Jdz53-V0^qMJ34JH<-BTP{%66sd>^l6F1&@zPs$m z)wJ@)BUzVS9hf;djOH3v-~ZWqf$^8?jT`BcYhHW|j4=|v@Hus7-EqNL2W>B}*%zCZ L5|sCO+ru3IUoLAt delta 1024 zcmcc4ah+p=PQ8ARrE{p0X}YslmcCoCtC3}m8on1qW z3X?38)3kFeO;eN83%xx2yj;>;^8EZPOU<&3oQu=l977_xd_6t#D$+a>{d|1%i(M>@ zL;QWq0}@NU%RD{8f-=pFJwp6lLS2HwQbK(vpJf!U_YUw*EA;RSsz^_F5A*Xd^vpLd zDK>XDFi-UHbBXjV^zlte3(xUMHV?AkG70bqOD!OCw_s zH~nnwOtbLfknBkRlJK%1UoID~!17!}eQ!(uFoU2nuSg?j&)~$W)W8DsQlCWEfP;~3kG7}9`0~M-#0!qrt69Y}03iZvLQp?PW{UXgPeZ5_cEnULhDk_ai z>z(qwt8#*zBTTrGqmoKOBm4~Ai-O#PjogCFD#9wF!YZ6yvmFbwoXsta42_CI41CJ6 z5|h!bD~+mhGEP^>GYYIoHFtHgFb;DJ4|H^OF)&DT&2cKUNc2nbjVSjt@$)VY&G+>w z4UFV+OVbZ?PYSBfHt;j|DRfP?C@u@m@OO1IHF3`iE(^;Kb~ZJ3P7KKNigNYj($&>f z@Qko@^78Y`(spz7t}Jm6)=x|?@^nlL5Aky~D@`)?^i7ZOj&e=SbWC#OiguUV-JoIr z#jbW<>M?_Gn^@`8izPLmKQg&()0}QUmd8u!J1ZK+e4Z8PBx!)&!*e(Y*`lZ&-&TXX8awpAtr6Z^@c4_#(GMoaA};1$E?yj#w&wYb+YAn7asHZ| LVjFl_YQ6yg6Ubi^ diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index be9b53aed6f104791bf92c3dfb62d178e7e7ca5e..35339892f729800d8d6a5f91598ad136cdd7e6b1 100644 GIT binary patch delta 1023 zcmcb{agAewPJLozRzPTWR+LA6V6KH(ghz#OSdx2jxlg58ScnYmr1^3sdq$)mq~VUS!uCbgt5P`aaci0RhnZ_QF=~=SBRfQwsT5`XI4?@ z#E;_Pj#cgzmIf~7nN^m?=^iD)WnrfIo=HyG<>`U01!0lqE+IjIo>7Koo|%DM?m522 z`9&sv6{Q&-#fBbU>1Ia$#!)2!Zf4FN9&X7dW+|C@W@)(=mhKjl;~B-n^BpS_qq0JS z-JLCS^Bv6#e1c50Q>ya49n;g@O1(qgvcypk&43gi0RsHmuL_sC3h z*RtgBOt*p%kIGPe?Se4lK(0vric*7&qKrhhs1$$8$ViJaPrm|Vb4xRiC~Y4{AML<0 zr(DnQ-27m3M|A7bG7}9`0~M;=%$yyI+)RqYBC0%tQuESW3eCekstnA+BivH*&C7h# z>s<^@{XF%HgG{(`jf>sA{CrCsQzP{&Jqxv6jPm^QlHL6(BDB4|BT5X)o&62NeWP-N zLom`;X;hVyak@f5NPcp9h;e#|d6QX=r3xQD}WwQhH*cmvcq9cWQdFL7_oFSwN7PW0bjLj;Co_nn`LvT9z-DuCA_v zrFXDpg_~1OYGhb(MP+tLW_FZzNQ9-fwqbc;M6QcdR7I$9x_Mc7xlbsUO|^W{+)(`) zdwVwA7YZ#6@7|DPJ}DR-z>jW)+oiZqWJjC+@gSMi!SOqONc-GB%58&QQ2hUF{Aky J=e?*m>Hv_kX88aB delta 1023 zcmcb{agAewPJKmjfoX_;xOcv3hFfl>pNmCyUanbzS+ag*x<`6|Ye{K}e}-#Cx>1#L zK9`qKij$9al$&;`qf5TAad1>oNKR&YuD?NAS-5MIua99~WTlsZV{WNeK9{bYLUD11 zZfc5=si~o*f=NJCRDQaGvsZ|3Xt-s%MTS?tXJTGPm0M0$QJP0tT6RU4nSQBxczSU_ zL`amQiGNi-SCW@YQi)+jaJWx~YoSG0j$?R^d9jgMskU#LMZU4NiFRZ`RGN{KpI?sa z#E;_P5q<$)E;)G-#)hWad1cyZra8qG*(nyuA>L-%nQoazh503cWuc~76=C^YncgLZ zIRUQuCH_7o<{^n@hK1o~mL~d%Re=^E&S?QI#lc>o`Pv@ZW@Vm};~B-nT@3=9{UR#T zJ&MyDvy+32osEK%^2?I~10%dW4TB0ZvXWB*Dv~m@gK`bHf-W#BDqVy0!#$HD zT?(9vea)T2%OdhBTvD||ybJ>({Zf66%*~T0pJf!U_x6d<_s?;&&@cB+3Wz9mit=+e zG)qnj_KYYl^Kz*uuFNqANH0otHVw4k3UaE-jkGAvH1aDb(Kk#tw2VqEFn0|1u*`Qd zH?znJF*3_YbSW|_GdABBTLUjgB1NDeVwUt!bBcoe!y~!$jg8VxBg+hfee{cqigF6eob${x!V7Z>io6|5{LBN&oh!Bs zj4{$zX;hVyak_$gNRgjgWO{L7KuDC4S5{IT3M<^a&bkZuV-jhl6GoTVWF#2 zwgs10R#u^9c~*T{X_`S)VT4a*aayppOQ=z0mPb*!i;J;$x@k~lNoHzJO1TM_uCA^^ zazw6~Q>u2DQE_>dmw&KJhIUGpYlv@|Pgtr+QF?fOnpwKHt9fKzRb@VxAA`>l>GC|{?|r)Vjs4A}pxTAkir(*3 zy*-V~MEu3OA1w!hcS~G-{@Cu8g8Q=1LSKGu5R&A)FJ^jZpPt|hzY7s-QY?+KGo^Mm LDaHARpL+)YHJfXC diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index fed6cf7..cea4beb 100644 --- a/secrets/gitlab/pw.age +++ b/secrets/gitlab/pw.age @@ -1,19 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA rITnhjccFQTSCG3yY1gfUd3RFPtymz2PBBPafKqDgzk -14U+liTyDY/cPPDPLqtDzzB8VEOjT1OiQHW7ZsdqTwQ --> ssh-ed25519 4PzZog vQpDvof5krUhHTT3QVXpRoBglQ4xZsUVobDmmZFcsVs -/wGu8wiBV+zIP9aTDydg9B8mXwk9mhu64pHkOPlL/e8 --> ssh-ed25519 dA0vRg 7PnZ7JoatOi//MWTodmrzjfJJzauh4kUO6ErGpN5rBk -p8cXhiS7odlvzarQiqnrvll/RnECkZ0jPnMjuA8vgAM --> ssh-ed25519 5Nd93w J5vVy6L4UjYswx0g3xVK3WVU6nwaLZwcQuTRoYJAsSA -qzmRfEMcZI8P40fER+V6KfxVJXxttQpbAjChNk0k4gU --> ssh-ed25519 q8eJgg G1iqzNqpPeyIlOt8CelGhgC7Y09+c3W0LLoVl49vzE0 -7Pao8KniI7QJdnMw/q0fMQrjInF0CTbfnCSL9FLJrjY --> ssh-ed25519 KVr8rw FMvso907mXDbRRv1LGmrRJIo9BMQz5Swzv1ZHjh0j1o -RrqdTZsEpnWgkGvGNprnk963KMx/ShhSdvK5VOe/xNI --> ssh-ed25519 fia1eQ 2tppsKE/FfdgBN74214/etyJhnzNSBtxWvP+OHaY3xw -feXjn9T46anxhofgwQXTn3Bj9usC9/f48I7irrtfTZE --> ssh-ed25519 uZzB3g 1JNZJ2MOAeOgPH+jWjNf9qi5ncEaXczIMkr54vnHITE -/IWEATVkAioRB7DFiEZp7QiD3tRAX6WcyFVEZT82snM ---- lgmy+3gc+bFhK9OPeSHJWPnjjbZgZ1GHjBGz4q+fRa4 -µ¢.Õ~68¼×@|¡5Êm¤"¬ÒŸ N™N`›û´dÉÃÿãÉæx=ª:ІN%Ù0;«DƬ1¸8–tiõ ãfÛ¶==¬Ùj]q´Ò¨ïŠ"!¡Òð} ÛIÃvÏ—?«"‹p„améÐ\âªòiü!w~,Ж{ýŒµ·˜DýƒüçKVÄQ#Uª‚dËS³©õõêjK‚WÏ \ No newline at end of file +-> ssh-ed25519 V1pwNA RT5AJD4kBHmv0pPNB9TASl4j8h4cIS418P3V9rUUjWs +tupAAUlbIdszxHMO3T/LgFcl0LlyxnSmu2E7MWuCFDI +-> ssh-ed25519 4PzZog Vq8xPSUr64TjNwWY/5aV9tw2UqmCcflWphHQgl1qNmM +WBWAJUfJ5+otsz5ubRqIMPvk5p0/h/yQhyg+sV41hBE +-> ssh-ed25519 dA0vRg Hkzhdyy2NueyE6zrVxzkXvPBzPiczjCYsT63XpqcSHY +bP2gd7I43q9vjKdyvrxddxxlG9b3mRq+NS8gC6NXc78 +-> ssh-ed25519 5Nd93w SLwM7TepNucy+RZJpEHm6ZffUInNzsNVqbqYz1QcGFo +nnxkYPOQkHkDFIBOVoB0/96NblBpy3sBwSf4JHjQWMA +-> ssh-ed25519 q8eJgg GZpY0Ya99WQl+SaQ9+uROl00vRnQ7AKfAL7L/f2UEjc +Ylvcy7f/6whLkWW8a9V7cFHQynznmoiK59d1KouN+nA +-> ssh-ed25519 KVr8rw dkq2lBd6MX7QwX7VLYoERu0TH1kl5mQps+oPtrwcUBc +gAdFa9ycxKUDErboYQRgIs1B6QK9ExWLkl6bzwHjOcE +-> ssh-ed25519 fia1eQ PBbnQ2fhPW2GB5y8DpYAu9Kugb3sdWb86h0bSYwXRzc +1HVvMRgb7c9V53ApEasPXetfBvsz9GSArJOxGtRXbMM +-> ssh-ed25519 uZzB3g BMRR0RZLtsSAzI1EsQzeeLx1JyCZ7QzhnGvn255rlyk +jPWO8HsZFX2TGtRbxwHV6x2OWwbCJb+sPl45f0mAHp0 +--- J1ejh1XpuAwFhOdWUga4WiJzgFmFdAgLpp2pe0K7cnA +ÒEзP¯s¬*ãÇw´€Þ⎲[ ~Äž6H=].ú!C?‰#›$å5ëáóàAv øEïý§asöxKñ‚d ÉV’Ñ¿·ï¹DQ¼ײ$Ü;µé-S;‡ƒ%0ÒïÍËEˆ•œÛ‚•ŠÿR0äô¢ø½)ÐFéˆÒ)¦§ãb¦ê1åD¸ è› +¡yʪ<ÙßñG®7Ð@åMú \ No newline at end of file diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index d94ee8f122326dc3590239772b08c0b5898ea0fd..00fd51bcd54adfb5763bf3451a5af78be8a97cf1 100644 GIT binary patch delta 978 zcmZ3 zWmbimm#d>Mmz%GjQ-QCUzmG{#uxq}Ldup10a%7RAVPJ^AabS@}nUh;sT1G};RbpZG z#E;_Pc^QR{#?I+EK_NxHj@iD3&LM8;W`-_-CPrx~-r40I1qEq|r3S(JVZp9krWsxy z<`t$P!FeTl>25i`#jY7ng&`RgDgJrh`9;PVWs&7kWs#2N{w}VQ;~B-nJ+pm7jZ-50 zjmt|*^Ar7Z64PALOv{|o%aU?^^D2A`Qyhybs#3DDbHYuyA_^+~bJJ7uihVNt42_)q z-9v**%=5EKy-Fj>!rjBlE8JZD3r$MBvYZVjpJf!UFD|l7FAEB=h$t!uNKWxjcQ&oa zbkBAz$tlh;wx~2K%MDI94tLY{%?vW&Dor;u&kxTEtPBhCGBh$MOv=|U&j>b1DM`r; za?Wtii^woFGj|Hg@(r^a-bOYzgVy?8X0%Nm8ugYNUa`%wjyvz{S;M80{!wBt6i#(5V-<*_W z-_T6gs$xe+Pju_jG7}9`0~PYJlghKpgZ(oTOAVs3gSdTV6OY^fc0)4r1O+$;cvpw_tTnn;1i%tDgygj2lD)bElvnosr%Zf_N0|Rp`vx5S) zee%(*b1w7`aSv2*PPcILG^z42sBkmRa5Ks_GII^h4A3sEO7|*Fb}2S8^2swRPEB=n zjY#IQ$SbT2&yT1#FiUcAuSjw$2u`XrNy{m+F!uBcGz$;*%`ymeG50QvDlAUs($&>f za7=RyjI=Z`G557_iA3%%`@;zCs delta 978 zcmZ3a+Z;)pSPc3eyB@iaZ03jZj@y}aaD*}SY=*Td6AcEnVUyZN=AC< z#E;_P8LnpK#^q)vfhmcO89AnfiQ0xHVMR$r#YrKl`MG|1p1B5T!2u~{Il0MP1x8-w z8DZrfi9R7!K9&(-;o9Dg5e1RCNp6;THOnlmEY!A)axU<5_4W2KGsGR=xIOZ3b(%=GcCD38i7 z3q-fhxzInvJy4;tqTH!0D%UsE%Q!GAA}HJ6z&Fj$C_OkcCDJ*) z#DFUx-NM_T(!5^VD>U7&D$^i2AT`n4FWuX)Fw{)nB|S5(yxc4@vPwHGz1W0HS65e| z)HA~+*dV>!*H=5R%*oBoImOE|$k(ep!aXV1qcGP$!@x2uB`+}C#XpES`HUs=>pW6obxah$c^*4gJTv#P<0ZKh?v1M+ ze3$#1e(H1GDgFbwfy*QxGzE0pvfV!LFyOWH#7!TfLf7uR_+E2G)60Vm+M1q)>x~mG PU3+oO=vbx^!_rIu@*!9I diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 49f3dfece2722b93ea0ca41a3d79e32c2dac5b1b..28aefadda7cbcbc9db38f03b6f0fc92186c827a8 100644 GIT binary patch delta 976 zcmZ3hM1(&X!LUD11 zZfc5=si~o*f=NJCRDQaGp+}Ormr-P*L1>1vsiQ@eyPHe4r%8Bfage@GQD9J!uX%=_ zM@djwXr!wNS71h2rk`PCpqX)Hrm;~`ig8L%gm!sknsZj9YlwD)f1ycgP>^X}m3OY| z#E;@(+U_2O-q{`{`r(B|<%v=GhURWAt|jS?{wdl8?!hK*-r-&r&Pi#B`W3ERh5Qjflk^6Ayt{q=B2qANkL8}W&wVFA)dyO;eJk8rmmCY7$w3}lhVAyytAr8 z^D2W1{7SGAc4O3JHy=ZDgRCHf zBnww#w=ARZ0@q42v%)Z6E}x20LsPGasPMx4++1(J%)-PxqtXbkEQ^fbyaK1ZB){xL zqayzj57Quw_)g1AG)xUtNJ{f64v9=jE=~#YE6nyuG4}TM%=fSiFDybph8xKg}0BZMQT=JkWXGln2AMJke^9zskd`Zm~&=8m7A+sW|Bu$m~&!f zGMB4yl2cKpOMO6ynVU~akVQnki%&&%a)v=bdQpC5TDECvUQ}{msi{Gwr6ZTFuC78_ zmT^)}hF4TXMOnIqYjRn(seY=7wt;WDS$cU;QFu;9pkb9kVuWi&RwS26|FcIQydKT4 zWqEV{hJJG6yI%2Clbp5%K0MLhA$0gxisfp)ZN0yKU1mJRSQp7c1BCu{Q)2(MZBAXKPKC*k}Y*6;|NLf`Mw@NeSmW}$X M^5Eq2QiWA_0TDD&@Bjb+ delta 977 zcmZ3%v65qgPJMtyNs*URR-Q?@r%SSjX?jL_iJ!4+xR1B1sYy<@YgUoDrAe@{k$zyN zBbRw*X-1Ndxj|5Ng;S_YMoCaXdZo5^dX|M>L~e*lfumD-R9I-Xr?ZoXE0?aFLUD11 zZfc5=si~o*f=NJCRDQaGv7wu>yK!M!u2W^AUxYzOkeiu*qGL&gUv`F9Xi=heUXpp4 zL3*iAZi+!Rmw{!KWtDe;yFqE5QBX-%SX6p)ltE5dct}ceqElv6WM!2}VX3cok$alw z#E;@(6-ikEMuz4Ajv+-(A!U)3?rzz^0g*x4u7ye7zTwV^dA=TzdD-PvLGC78rf$Vv zhUVq@?g18+72eJTnQ0~_k@^PZMcH}2RergJg?Xmh6%mep?p2fH7$w59jKhsW3zAGj zGL4hXjY@*T%%cht3o-)z4PCq<%5o!31JW}*oxO?+jXk+SOsiZg{R`96d{dKLimQ^t zstO7Wb8`IBi(H)2igP{6oQvEov<=*gDf z^2#bsF-t7*aJF>ME(k@B0PnCOi=uLc@Dg)(lf>Mh5Yv3)B%?An&w5LjaHGwX;1<&C2q_($gGGUA;rI(##7&1B-m~GTak=Bf@fg z4bZJ~F7yv^4^%KK2=S?iO7}|5O)l}s$}FzRFwP1O%kee|%n1$3bu36T^L9+}NOexH z4CIP*%T5n8@TzwXh{_Ig_sVzkNiz!02+DQ~$}n{EjW8}R&oJ`v3kY%!t#akk)zww- zD$Daq)lNw*^mR3lN(qW`HZV*~3dm0kF;34)cS@@)GEXfEH1yOqDo^M7V$ZknpstRvEs=1SqyLNh{FPE;JLUD11 zZfc5=si~o*f=NJCRDQZbqJKbMXn}{ho3UfCnP*~YqFY8%L11KLWN?IeMzB|MW`&Wn zp>uj@aek%+SB8agW_F~%XJKBtex!F=zEO}@vZZf%Qc9wCm_eAaiopXP^OvV z#E;@(`QF-9d6~`ufhoow<@!#!hWg3wW+?`qX=dSt=3!we6+wo1MIQRT9*%)r$(Dg; z>6L|hPgJ8p` zqTob>;$ZE7L~ZTL&?v)vF5`kc%T!~}Dt|WvuZsK(-vARM6Gyl3ax>2&=YU-8w7g(* zgXFY4?hJuK7GBe~2&jDod8yiBuF%#+jdoD(fG!+jFdjH*IC+>IkWL!;dCO7v5+jSD@DNZ&CHBU754G7G4EC>kkOQ}rC&#N#BN{I+{Pc}0Qce2Pa z@Z^g0$oJ9qwx~Bvj7V_~am+O~_D{AHk#vRRa=oAaiz2zQ zZn?@h>i%8(yYjJ`pOKoR@6@^Pnev)=Ib?ZF6q7g2j8j!8C+xBq8kz-hA J6mI_682~*~U)lfw delta 1023 zcmcc4ah+p=PJN-1wr{y%q@{CeZj@tySyE_na*<_Knq^`}PMD=jXrW7Fk!7ZHzL#O9 zBbQ}Gnzvh$flF#)c79oji&2@EM@4{1iKSa=T2y72lZlysfw{YvZ)&zdK9{bYLUD11 zZfc5=si~o*f=NJCRDQaGxl@&8kU?N>WR|;UR6%l5l$(=(P-bveqOqe%lu>zLdT2^y zj$2ZNM@pqHS7D){OJ=IGpQn3zVW3f>mwuIDK&pqkc4mQ(QFdizRAEqViK%v~UuCK1 z#E;@(##J7PrjAwVr4fz=VV)_5d7;J0X%XoLhAAe#6;+;z#@eA~j=A0`$?1Vyo@tgD z#xB|6uEmw%$)?5Tg(gXknFZQD?(WXHenut+5tiu{mEM_N=?0VI7$w5p0}Atu0#bt9 zi_AlkExfBDT@u~(&5ON5++92j-HiNv+|2cTi##GSD-F2ZgFJE#O7pY*%QF)V0xMkg zQ>t5szUvWeO)J?WfZRuuJR};OwUdCOEJrKEl(*7Hx0{8 z^bU&*NXgA~4$aMV%yy|T_NcHdaZcy*F>*4_a`s9LFb*;DDNPJ0$V~F{N)PbJ@iL4k z)VA~t@No*&H!TkFu82gB0PnCOi=uLc3KK)al&IXaVy6nX+$f*4f_gunkbvTXB)@?2 zq)^{5ztActXQ$%a9A8&YuBzf(6GNkn5YtdIM@Og7ps0eJaIYYbw8)f_?8p-1Kr^3o z{lri|%g~~9bnDVG6Ae=X70k7r{i8xNO4H5#O)8ut{F02ki<9yV10(!=OpOfO-4jFV zqY9$TEAxvo47iLfqYAw$GCV?(3beC>d@LjLf(rCKeO-fG+>I*qLk+94ypqZavrCN) zUD2&8jjD1oPFE-i&`)&A3^K|wOv-g~wI~nrH})v;aq;u7C{1+FE(xv(_fB!l4GE~q zPUcFA3ODlij;z=AC^1j=ady_vFwM`e3JfsFw#+fe@QU!uEj97VC~)%dOSa(B)zwun ziYQ9X@k;eb&af~mwaE6!N-y;+b2RXCHcd||uP{n-_b&3y$w~9}OO523#_499Y08~Z z`A+0j7w77h|38)#_pPXKE|6ICx2|=$p2I#H>q;BuvNLMsdDr))C>i~F%AhKu9&(P? zZ0S9T`5%Pu&-y20Zc!^Z=MDd>OTT(}+t>I7zG5#c(Y@T%FM79Q^Ujl2ALi7lwR6nB zcE+JMNK!5NvX$24V{5{zzv`(8ot1d{re{v{$@hm3UI<^`8}{Ohk#T~+*SHJ*KO16R K-C+pbW)1+IfMs9+ diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 461b442a7b9f3bad11169fa8c39d4cc6a049c84f..a06e1f383780915f1c7d0ff44e51c06a276a06ee 100644 GIT binary patch delta 2584 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 delta 2584 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 Kwrq9#%ntzFm1HUa delta 1023 zcmcb{agAewPJLKtwyRrlRD_wYbFqb~lR>JZM{$U=NqKoxU}AbeW@cuhc448ZS$So- zBbTFTc3!Ecep#TCuTgkZRCutrn|?s1OPG69RavEXKvL_SbAdrsQbDCp zL0NE8m``3dS7m{>pI51GaJrj$SVdTvV^OfNcW$^@j+>XKOG=(=k)dyuTUKafQjTx& z#E;_PxmkuTHS-I}{;Q=@5 zqa6M7Jsk^uQhZ8-3v!AB-GUuMwNo4oQ=GFWpJf!UFY(MP^N#RM2~PFR^~-WfFDlLn zN(uKb3r@{TO>xWDF7?cDFG=%Hk92b6D##5>i3ltY^!G6`txDGSNwx@x49oKhj7l{0 z^ep!_DX#KyH*)lGF)?*Sj{)znB8#GO1vl-ABEP_p@GQ^ZP=DjJyvTZUXM+r{2=CGY z6E`<+-y);Ja*N=g0++;0N3M*jya2Y zqoR=9aFZ}+S9I&rG7}9`0~Lx2%SI!%LD%{BwPcOR_Qy z>-}=8yi>BP(zCgoywi#^{DT84gENX9^-D_(eT)lBoIOo*T+5R5vkcNr40C*wgFMY# zGfmK~D~+mhGEP@0t#HlvHq15%Hj2=<%<&2=w=@V3O*O4b3XjqbP1APq^$PU#E-S9g zHumMpGb+jt_6n}AO!0J#@(9h#^T>BGPj|^IO)pGKNw-Lf zNH;ULD9v@uPYTJ_&M~g^D0fP6iS#uq%`5WpF(|jpcJVAK@+kLAcZn$G`c!?D-NfeV z?~cD#DXRZsOl!9)tlC|v@=MrzJI{gN>3@ooTMsF)C}e$SDf_eRWo@HUI1cSG08D{p<)r`u;Xu-^K;yU8xdq2|Sp??rPIYr;=1^WP^FUU|*p L)+@tb+jao}!(DD^ diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index 53bc965..fb49dc8 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA ocbo4VYNAuSMl+cwAnQox8FgSfIIL6EcjEZ2w81Ahhc -D0lErQCzwi9TBMSd6dkqivQ6bHCZrtlkgaTjQVdfAEM --> ssh-ed25519 4PzZog PpuPLWrKMhSn3VFuVe4EtbeHdIGRBPsN42jJqP6vJnc -lHF5+sdN8B/2Iv9kxt0q7SsRm0KKmnRYOTj9tQz/aD4 --> ssh-ed25519 dA0vRg 3fAA/TDGslCUZKiYHjm2qZmP2x1w/RX80mAVQD1sKlM -Po0PftPgHBij9jBoj4iCRq6ARmek9ooo9ONFh3Q5kD0 --> ssh-ed25519 5Nd93w lXvLkIuGZJRAvgmvd+SBay7qJizd9UUs3cM5z4Z26Vw -HSohmw9oO2IKdiH4Iu0ZuL56kjpmKJ713sLF/tty/1A --> ssh-ed25519 q8eJgg z7HYPsacyFXBnpIkRFnUSjEavyDG49fIT1VNoLGsCEQ -s56VpGW2ubBAWp5FoHrgQDZySqINJda+44xokM+Kb9k --> ssh-ed25519 KVr8rw 22pOg0xxlJg13RyZqMYakteo2vw/6mjsK8ce26nqaUc -xjJHXIpWQ/Y17R5zUp1hnpIF3zdqkfJIzvgppGPMJD4 --> ssh-ed25519 fia1eQ sFOx3dxfZ5uGKjqVHoW5QcwEIvHja/+uWsZrdnoQvz8 -Kczr+yv3PEmTqDXJ3W7hn3bZ6wrpivhmkrg8fhmOcsc --> ssh-ed25519 rmrvjw 9nQAeB301lCj6p2rnnumD+G3WLjMmZ4NYAY/GFLy+0k -FfnwVEYqZ/odWg5NOeizDMCkRMLiNQBtpW7ko4pgmGg ---- k4P7z8pNs8T/QFPUfC4E7/FjsbKzhiM26rD7YcJ39uo -‡åM¶¦ú­à{$ë‡þ´ÿ€l£Gþ„¦=5÷¦ü©ä‚9}qÞ¯P´Á (³wÅJßKŒcT eß [AòŸwò¥;éYïœêÐ \ No newline at end of file +-> ssh-ed25519 V1pwNA Je94T4psgEbYV6YBZ2BSQ4JZbKubHtPEKNuVjL9CaSk +Fp8uHwymTnjkFQBfezrFj2ycXsYrnqqW2+KeKfsjONY +-> ssh-ed25519 4PzZog paDltxaTs3odGMIkWFMuTfe+LnO2RqvRTqAi7pK8EB0 ++ZtGVOK71gSGzgY6nSlDT32Q6IQFFvZd8xMp42GD/xg +-> ssh-ed25519 dA0vRg 2ZGLw9dW0qbzkJb+M1DhhEaW19VaPdgy9YvzxeEuZzw +Gycx9hEatq1jOQpE7EqF4G8y3+XvRnIC8oNK3hJmOzw +-> ssh-ed25519 5Nd93w uyUnDy48bjq4cfG/HfIF57bnCxNGSFze18MTW2XmDmc +TWCJRIC3J9KyjbCaM/WmCoD0x2MtrGGKVgHCA/TBe0I +-> ssh-ed25519 q8eJgg qPb7JIMkwOWIWw4yIhQku0u6d09QqFKtOXx1gC3XowA +8+YLpW8xzEzq02zKFhlbjOggEWfMZ6j2G5RGIq/TE/o +-> ssh-ed25519 KVr8rw zcZRh0qTa55ENUWXRIPk/kAv3tKB0+anEQ+IuEhsFjY +8oN0U8jD1BA07XOS4idvHgu8LA7/E5aciLZOshsZJJY +-> ssh-ed25519 fia1eQ gkdxv6Uda41PT9GhALDwPCfzzSiCDWluZG5m3WRwKAQ +5YSmnIYFXmBgTur0Z7PcLOT9ANvLJgIech5gp4Pqwjk +-> ssh-ed25519 rmrvjw H0ZmvmeUIpb4ZAUvh+7k47mUmZidcsKxDHC2oC/100A +IjYufbdJxMMANqicCHQQAU0Vh/NvROfCfaxJBM3rai8 +--- TrZyyHaK0o4ot71wVxZzBT+3mVrVUQ3jKv6FuWNO4Mc +R3±g ”GÛVðgñX3cÅœëñÕPÌ\Úy’‹gûqÐqÒ·"KO(ôÜ.ý© ÷8Í·&Ò3Äpëù‹)‡‹4:MRS¦³pK \ No newline at end of file diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index e693051e00465c8a64053f9f24556c374deab8b5..4b5366453d97dd98d38d344056f76678a605f2d3 100644 GIT binary patch literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w9LbMXu= zG%PmpEDuc!N%8isEXs;-G%ZN43px*oOI)mQg?knm*Pt8#N6-# z<1lXzOQ(YLNY|)BcQ=<@vm#56a9=L7!rc7gq_WJ^%#;wvN;89q6eA5iPOp7dWbj}U-P0Gk}$u+BTFEtI#F|16@O)+rvh$<-2PctYA zh&1!kclP9R&P&U4HF9++E%mdAs4{dmjEwR$j10>tGe|0_G|kJ;OmYp%^Gr0W@W=3* zcUX}{QMp36TS`h%K~hw>M`=oWxodJ>ilbkkV@Q%oU|v#aqHASwuwiJnr;D#qo&}eu zdxUnrNq|RGWO9acZdy)wabC7bgk`9cSDv?lyGvAIR-$KcWMHUsFotbunTdv}feMEC zd8Qd*<>l#KW|dhfg{cPlj{26Rex=Uo{w4Z(9t9;4`Ua(@0Rd^Dj$EN8rK#!ZDOH|s z+JzpT7KR~#MkOhse!hN@u6`aCzQzR=ey&c%#t~(hA?aD==v(NhkYk#YVN&W?8I@k* zSs7GT;GF3c>Ywjn=xUJ6l@eLvWag1<=o##q9%W?eo9URW zo#$teni$|8o>~>`>FW_vn3@!np`VeA9&e>lRZhm~3Zdqij-{#P{uRMx?mmeT#m-ep z7A_$<9^r{W!I5d1{>d3x?wOvUY2|szT$wJZh8a$k=1$pR+DU~Tfg#~(#ZFa`fhC1S zr6wjp6&5~*CECfR`dL*b=(c$z8Dtg&DwGEsga(+UIc8>RaZynp+weFf32MJg7V)$bw7u=)tSpjni*Fyr#jIb#?N)wo;AB z$G?dOENh%xBB*ldIQQk&hsWlv)6)H=?Xs$Ru=`VcqCe2JtH(#!kyYF|!oOnIH+CI6Xt%5ak ze#TDU8FTz#(saL5{gq2{li#GIN%8B(DIG6W*LWV>e%$-`hl!UQw*HE??)Em^cj?#J j?T;qj?Ney~=I%dB-n-i%I`8+ZZ{>!Yp2*#OGAR%Mxoj^4 literal 1636 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sb3@{4rL zF-Y=G4RuQnFw6|ejLP#fFE7rraB)pf4RLjKOsy((%d9YVHsK0LbT3bJtO!dhDGbXt z3U*8jh)N1ED$0t;cg=7QPRVsK%5teJtH|~abVRq!B%mrPKV2a=DlanA(BHkHAkV-# zDKoOfC^s-AAi_H}FDuy5!XVPwv&t;jydozsFPqEA&&R}E-_5kZ$0wl3-A_NvsG_vU zGt)3RD%Zf(EjP;9vA`oFF~6)_-xb}q6i0)ypmYW2Y!^dM!!k=3H}7nhVqf2otgIq8 zeW$31vQ(ecVE;lh{p`q8N0TDU@O-W!ZAZUiZO?oQ$1qnflYo?vFq0z7WS@!*S2JU; z^b!{zgTioc*UV7ABnx!gO#MU3|GJ+#^d8LygLVb1KrzTwTf?Eh@8JGb~Fp%DqyHEBrjQU2}p8 zQ=L*%{6f)fE3`=UN>5kN_D<0*EzOT~&W(yP$aJwRj!2DgH}j4(H>h+ED0DXP$uTQ0 z4slK~sVwF)@Nn|?&h<<#cD1NA!mzwNGqS|8B-5}cz@#cIGTF~K%Fx}{DFh=V(=rncQv($u zypuDulQWH@vfT`m)6z1s(j0TMQ#{kMd{YWNJu`CLi;M~*OfuY)JwmyX0`rTb()F|a zQr(kW^aINCOnmh7vO|lKf-Id1O#>}UvjWTVU7h^Q(lA2Ov&zx8&{3hn&?GRZ*x$TF zyUI6A-@T;R#49U2wW7kZ)IT*Vz^BC6KPjxLFs&ja%af}jz%AFmz$?EpH^RR%I4vV5 zF+|_9!X!1jGNj6+EYQ2ysUoj5J3k;i$P+yzOQWisjMEj$(z5gPJqt<#yh>9HDtt=Q z{j<}ZEpnoAbNoZJD+h#8oH9N2y_`Y{vivN)4g8JrJ&Q6; zE%o#L12SAgD=JJXv(kNhQZQ`uNHWMQ2vmr0FEQ6H%h4{%%CpE#$xQQ3@k&X~H!sTz z4);s)sSK?2%gN5na4ilCHQ;g!E)CE0D>X|@DK-gCDarCH%QbZg$PRY5$PO_rF!S+9 zcP&bG%1VhU3q9l7!YOA6dl@Edk?nCN3}o@)^p8J<#=o6i*#J; z@1E=$O_?d)o1ZWNRjk(&`2QIuQEu6k)zICBg0kEUgR^=j&l$Lh}Q><}vdID3oK7mW`_)BmQ* zHFD0$T4R3ew&c6zYI26r+|@r^zkm9-RnY36EwkCSR&BwWmmZmGIpjo|q&>TtL)V|s~S(4TGg`D_~-!e<5k?nsg|n7E?$;>sn~{L56mt*>uC*_Oa1IAzXR-`#Vb zNOsN8KD1G4#*&`G88ww2%1jd;3DhSad@^(0Nrqn>uDaq;oS)_&`(>0h>BYK#O8dUg hxqok`$O4<)zur!{?&2L(Ic34TEpe+vCa*a^9RMJ`HvIqq diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index 5d9f2304154db371fa3af01a48fa7cee3ae59a37..2b4c4c079968029196cd027d40802a3db2b97084 100644 GIT binary patch literal 1440 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t--_o_0f zGW7~eGR+N*@J#me2n{N=EVcA4_bd)h@eem~&WbdubWF-NjN~$`$~1@wP1g=^$_V!@ zGW0C3a?H!jDi6+eGOH>L4av_i@G0=gG4%1xPe!-RB%mrPKV88w#H6IeDa|suq%=Pu zJUhrJCCke>Bsa%2&8;#(JHS1pA}H89#I>+2!;vdJ(9EqWvZ6dEs=U;@+&$be-y}J$ytI;HN5?c%H&3qQ@G3LY!jb|fQ?IDP;<)3P%S%!7OkbMv_z-O2-VJu*`&Eko0NvdcovE3(5Qs!9q%A}k}#i@gmkiwezB zOnjo!ibK(DE3`=UN>5iXN-YeiGzoPH$qIzpBhBG1)mFJtDxPz#!ZyG9BG-X_<+JseuYE z28m_f&RHJ5X#pjE#wNwi6(va_p4kOO;okb*`WfD#q2+l&#Z}slj_F*%-X8ja`kvuo z-lZWvX&L?@21%vi>1D-5PQm8IAr+Nrt`(k9&e|DK!Nusdc~&|47CI`Jr5R+G1)F<% zCzj?q89OEhCj~@BX*;L*<`!iJ`+4PfnERGz7!(;^XcamS;fU>+o3sWPD zsJukaP*WpcFHh|p$E?CEw@|KP3-`#P5Z|C&W8biJud)zJ=VX_N(8OG$)LiGv5Q|ik zNO!N)B=>OFJQH-=pdpzZXi->P6zE@=ZERFgm2OmEQj+aaVxHyiotYmLXcA%R?p>9e z7g28EXu@R{R%}+Ho#q;5o?7bb<(QOP6`5;TrCnL%o<7?l-KmS5uOT@oIi6w0Nm ztE&*@WNKbyQ0V0p<{a!9RZ?6MW~5yeRB0GwP?=)r<{26lQj+eO7?I*qWWY7|!fMS$ z-eH*$MtgLFKAt=9D*kNBB7WhOm%Dn7RmH6UC-)n8Y*787Ve$J_r%s%c0=IxR!?nbqdEUOwtESwQote{LvU%k`wepWCj?cu- zaunq+PWbjV_qm3~45{u9Z!Nb9h@O90_xAFkAG#;LZ2$Vw{@Up@S&4X`gvst%2X$-D MZ>_N2;KTR;01_7Q0ssI2 literal 1440 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uwvEDi`N z@ej!J3-hS-FLce!atteV4XJSU$ubK!b2Kq8jxq^xbksIh9tH48}d^9(QbiHeAf%yzcO3NkBC3PiWfB%mrPKV2ccI4aX9C$})SG(59B z%fdA;(jX)%!rk97DJw7_HKo$4JhIBvU0XjdsFQi;{!=@-r%f&0Ldx zeazh~e8Rk(4boCvjeNP%%*sQ|A`N}YExnAYBEwu#42+X~41xpQ{T5kt4)m&WcP;cU2{SXZD0M7xa*fQ)h$Zo(A~!PB$j7ieGCRyDz`P)}z|bwoKPb~T!WYA~w9G`q)IbGe zb1w_CvUD#qk7Q%N05`MB$O=a{^PH+gr_6xFfC^tD!?3hav!v1r_jE2xOP6eSlawsS zf*fs^@Bn9vKo`TrK#P(J_lgK3ub|*67vrL0SF_9_k79Jcc~&|47CI`Jm>C2nM--Xo z8XEegE~&zU+9*YlUib&7+PND zZRY3ZQ<`pQ>6YRckZDkyVi6TuY+f80QW46PX_8T{?-XX_>=6IQBk8B|^#QIhBp zk`wM@SXPqZWmx278D356L(;9xG{DQFq`bl?G}Fh&*dVB)(!-+IE6>Q+$t^j#AhM#$y&%Io zE6*>?m#fex$|Ez^vdBLtBF!Mr&m!A6IXk^5G{`+YG%7pQBFW#+#4Ox1Cnwm@giBXf zSHasL%d$Aztt28OB(2QH(J&}1(aAH+u`)B&BPB66JkZPA$k@rmBr(&#g3BZJNJ3$s z#G@r*89sqq)lcj@Z?~|{(tS(D)sUk*U4Gsxd#}EgpVQ=)W3c~o!|B)7Pq{e9nfaHr zwn^^@q~&mOgTG+$-jLuwJDXPjPGoxTnrpmB_@HE6a-a}j zAM27^Gv{trvrw4OWh~6jz;~HnKKF%0VBTWByMONPI3ea(XCL4qbjNSz!r-3zzxC5= K8H`z91_1!IZrpPK diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 98b1e9a..d1e20c2 100644 --- a/secrets/nextcloud/pw.age +++ b/secrets/nextcloud/pw.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA MHUOcqeJDIssKJltAjsvWURE1DqJ1ey6pkLvLHJAtWk -hQjhau12rn66Ub6UAtG8TZ4lB6QAo4b2rutUOams3FQ --> ssh-ed25519 4PzZog gr84HXoNDyPZQJPDVCKO4R3d81wuznjW/0GjX+qdqlM -ibouoWY1xjMDEFsnSyu3Sm8owZpHcHpSWoU9yeJ9uOs --> ssh-ed25519 dA0vRg B6tUnzySxNAu6y+BI/GzkQrcxJby9AkMCiaHw9h+tWI -xlJg0NR2DS1T3pPSqVcSObmE4g9NrH1Qm0FWMTjXJ/k --> ssh-ed25519 5Nd93w fk0dRqO+p5Di4viidYPit9H8OKITR5IlKEb1Y2m4WDw -Qye8lfTf9y1Cpi/usPPk4ekMQUDt4HP21RrMeRyqdMk --> ssh-ed25519 q8eJgg 7t82641gHHp1gZW03+CeDGxpWAk9mtacNR1d3f1GcFE -kiP/KgZ3HnNzdxtTEODLXVH8VYHgfYUVIAm4qvjdLjs --> ssh-ed25519 KVr8rw RE4pXGAc6EqtU9O0IYQZ0OMwHvtMHij4x2ZjNTzNly0 -G7bQD10CmiEj/jPEwNYUWk3o+HdmBMFN2L7MUyeeeWg --> ssh-ed25519 fia1eQ HlPonZtDSFpYlfeUnTZCP4aRtSlg82orvifaMbdhHXU -ty95INO0wifV3qzmsVdwU6ME9HmK6LuYfcSjlLAHrAM --> ssh-ed25519 YFaxCg bG3Wm0GEjdrwKBs/oCeUBktQnclkBmFhwHCDVeP2YGM -ArdeYouDXiGDYFcDJqy0H9Ie0NZFvWRG5/VrHoeUPGg ---- VH7sefkXHZVY8WzFUW4NyPGRZ0Nbcx1rPfFtRCQgXtc -Eà±áÐíBv?\nÛWVBã³ -ÿ¼I"l"Œ.f´.ºâÂ}nŽõXç„«vbNKàJp§mÔn§›ZŒ¹ðdo¶;¨§ \ No newline at end of file +-> ssh-ed25519 V1pwNA wC7Nch41YKEjrwpf/sDR+SUWKm1porqP2DyQhz/MLh0 +Mu8NGcxWphZZLgb0F7h10EJGCPiontn6y2lWNSldNGw +-> ssh-ed25519 4PzZog 6H6fsEDq6xiIkmIy6gUUGL+Mm03HSEaSGnjel3EO8EU +xzqv1RZijhQqeiWIFq7ReVzh2JLtBoo9HmZJ1VXrMPU +-> ssh-ed25519 dA0vRg UC9Vm0pLH8N9XGxKAZ/3Efe/9SRvx/rlxCYx0u5oljg +gF4IFYdCIXfvPPrOsJFvGMf1PzrSyureKpOP66ZHB1Q +-> ssh-ed25519 5Nd93w 338ts/scFEwjZ+3f4Vcd8C9Q//E/ZGoSxIutAxKgpAo +C0vs3fiisD9FsZ8gYJZj/I81mT3Psw3g1jN5ztyuDQ4 +-> ssh-ed25519 q8eJgg eIHEYfE/50IRNy+gnNmqQD4jtVgJRla4ilAQp2gYfjE +bFNJA6KPlBiZWrB5vjyTilXC+rkW+xqVSWcvHln9H/8 +-> ssh-ed25519 KVr8rw Kq/0pxm2r136ezrKRugC1So2cIIx2VTShPv6WTc6m1E +W7VrsPf9jkkxqndVjrFuGBwqJR3v4hwig7Fed9xJSAI +-> ssh-ed25519 fia1eQ 1sA1YfEKVatTzHV5Wd/tzqwRiIPUBQlfoKZkJpxRYig +lLtPzvg8H0y+FpfGfF/Q5g1nCap1TgW2wipIKU+Q+WA +-> ssh-ed25519 YFaxCg zUYYpsC6BXvPRcIignITwUmvBhfhy9EnxFeCFg1niQk +QcmAhpDajw2lJyttDX9kn+0bdugmYYifSl1esaa3xpU +--- 0sQ4g4YxMBe/VBe39F9ZfwVh9XEOHYHqgiX5oakBzPU +¦cò±hðWÚp@å ‘ "L·åÒ[)’ØtŠ¼/+”MyÍä¾ò' +‘8K¼ƒ[©m›}·qÿÈ1«{²µ¯]·OS%ᙯ>» \ No newline at end of file diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 8b0b7e2da6c5fea0910a14441bef7f964a75d556..ee6ab1ca90c527cefcfbd446b361346e0aa72260 100644 GIT binary patch delta 3124 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 delta 3124 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 diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index a3a0a76dd0cb098f8a5a344fd726b3397dd7ab3f..ba63ef50500c5cf9031eb33b181d4a67af0d7b77 100644 GIT binary patch literal 1461 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uz32r~>b zH!gM!iPSDG%*hH%%(L(;^ht3sD+w;H$Sz2BDl~AiaCS3w4dn6;stPC$4lFkJNjEHa zDkv`vNq5T$&rP&2DXBD1EsZj)$PNxmGN?){HbA${B%mrPKV2cqDKgKyD%ZQvusEqA z!z0qQFx|N@%stSvDl*s4DN5fcFU!$5F*7(QG?`1^J0Ku9(8A0wJ1f7~GR-yFGcv@& zv%)h!JhRx{$-lD1w>Z@_&&4tzHyz!!6i0)ypmYU&r%3+*6EokWfROaG;&jJKUvDD= zmvrN-h)V4u!<>xBf}DWNz;M5yuyn49(xB3);9?J_DAW8*{mepr*C4~(Vvq2&BrjiW z&yuo$L>FI|>;ThB|7>*IO#M5kF^-WF8aCfvw3kj$)$}TT8HE}ohE;dfe%*?R#w{$m4&vlAQ zF0ab53@_$#GITWyG|^8q56N=YH}uN%)V45Abgjzwj4IF2b}uwF&+v6D@lEpaNDM@` z%{#2fqNrRU*t|sB)2A%Nup-;lKd{Is(IYoX+u0?@G$f)RsW8MfvCQ00+cU%?)j5Joh%cCSL-!mZBxvId`v9us0GRGI)wzSMd!_+_p zcO%~n|DY6;vSbVG(%{0NvLZtxXP;2_JlCx9v^o+bTvxq9ks;X?Rl#r_6ENAZu z!|+mV(+rRNvUJ0ORG&)caA)JB5HG{9Aoqgwz=|N}TsI4J+dQireG45GvLgZ`46}?1 zlOsyQ4Z_N$wFYY2F3yIfi*&UfP8wLB_tu zPRNujx}ra}5ao~5O}LFxMWRe7#uf!Sdm#uc8K2F?|} zg%(j2jwW2Dg?YYd24y9tg(lAVK2Zj4`Vs#5ktV5O9)=-qSx(tzVP2VuWj?;fl?Gh8 zy1EJ}RjyT*;o6}_;h~uo{;7G9Np7JQ9?q4KL81PY+9if*+AiTq#$Fjg0R~*VcS(22 z?9yjib!=&Y;OXqY7xF!yWiQNZHByHam@m^!oK~F|DUn#JTc>Td&owWndx(y z6mwF{Zf)4MYKx>`B!|kI$;PGgRYRs0s!W>j@>%>IM!Ag>`MH#AZI}JJcp~LT*fNRL zOE;K&Z4Akub4T~m`rfZ|Z*BR!H}hGj&ylEQ9=#EK+t+L8|2b-xF*{Fc-h>C|pC6r~ j_2s{+&-uRv*@ngQmguoBsL_6tR2Z;v+W~2@SdKaXb-VCx literal 1461 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!uEGz`m( zF!e|?@$<6C@egxKOfxGl_6w^pN=x%G3@rCfch)ZOPcip!P3F>fk0@|1af%Ac$}g!5 z%_#{eEDA4mOmj8yF7h#U^))i|O-=Ihb25!|E=IS_B%mrPKV6|TGRRZAFtoxbv!FE4 zHPq8D#WSoR$JejQC_O08sLUuoJUuZn%q=-3+knf{pfJ6_!mltmIIz?=CBLe~+qJRjY*6i0)ypmYUu*W^f-ocw~!FsGd2upCq4On+~; zoWvl{>?GfuBK-iTG}Ex;^dk50bQ7+8?Qqw?h@cSP%&eR$|KNfgCu6U|sM5mV46i6l zmw?=KfBoQ0k4U#<0|Rv1O#M~S{ za$TH_O45=XjY4uN-8{K0ib|a$bDaXrGRxDGJc4opk_&u1Q#_L*os*0Vos#lXN{t)? zGCeX1!yM6VE3`=UN>5j)N(n4*Oeri340aC;D9mvSOEUH-clJ)o_J}G>&oI#TGBr1_ z@YK(7cQW8|iwZW#FfBZ8BO=SY%(XZtqujmR$=#yVr!qMz(zV3JM>{t)!`Yz3HN&7JJjj)1}a`*v&0GFry^h+|4w?MBCe=#3UrcqB6-RJTN6N)Y;KBDWx3UwzSMd!_+{9 zum}T_u-vrd6hn^+i%3T^%jBfssB%L`x8&4};;1ak;HqM$h_dv^(!g>qm+V}Nj3^_c zko@v&zg({pzYwEfvz&+`3s=X?KKUbx6-I8C*yR5ilA`g5W}j9)WC3Wm#PY% z(jw1D_nc7A0{5WYq@qak?7*T(i=3bwzi?l!DzoG=gVNkWcSi#cZ5PK(Q@23Z{X9KOeT_>^(%rla-HeP=%S#gj zDl*DVGBZtGj14f-Bs3&Lvm=bcQp|l4-J=}S%iMxO^s~|}@|`Ta-LgxHBF)XiOkDJh z%R^0aD^0k3GE$N}yo1V(jWbdW0t+LHlMJd7^P(aw!rhERf=t~r%u)(+vV5Y-5-qrN zb#)a2{XNPIi_ODbiYxTZObxON15MJyf_<|Mi=6|~3LQ)GLJP_QQ+z_4@`|~#0`7Il zxv Date: Tue, 5 Nov 2024 17:39:56 +0000 Subject: [PATCH 365/563] feat: outinul.ie now has ssl --- applications/acme.nix | 4 ++-- applications/skynet_users.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/applications/acme.nix b/applications/acme.nix index 1cf168d..62f97d4 100644 --- a/applications/acme.nix +++ b/applications/acme.nix @@ -32,13 +32,13 @@ in { defaults = { email = "admin_acme@skynet.ie"; - # we use our own dns authorative server for verifying we own the domain. - dnsProvider = "rfc2136"; credentialsFile = config.age.secrets.acme.path; }; certs = { "skynet" = { + # we use our own dns authorative server for verifying we own the domain. + dnsProvider = "rfc2136"; domain = "skynet.ie"; extraDomainNames = lists.naturalSort cfg.domains; }; diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index d186092..b17c731 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -86,8 +86,8 @@ in { services.nginx.virtualHosts = { "outinul.ie" = { - forceSSL = false; - useACMEHost = "skynet"; + addSSL = true; + enableACME = true; locations = { "/" = { alias = "/home/outinul/public_html/"; From 2728487448e203544c28c463628356f12a33efff Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 6 Nov 2024 01:25:57 +0000 Subject: [PATCH 366/563] fix: this should get some items built and deployed --- applications/acme.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/acme.nix b/applications/acme.nix index 62f97d4..1031cf5 100644 --- a/applications/acme.nix +++ b/applications/acme.nix @@ -33,12 +33,12 @@ in { defaults = { email = "admin_acme@skynet.ie"; credentialsFile = config.age.secrets.acme.path; + # we use our own dns authorative server for verifying we own the domain. + dnsProvider = "rfc2136"; }; certs = { "skynet" = { - # we use our own dns authorative server for verifying we own the domain. - dnsProvider = "rfc2136"; domain = "skynet.ie"; extraDomainNames = lists.naturalSort cfg.domains; }; From 19a0b8044f16e2b464368cccd193b11edbe6bb63 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 6 Nov 2024 01:35:23 +0000 Subject: [PATCH 367/563] fix: force ssl --- applications/skynet_users.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index b17c731..2812bcc 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -86,7 +86,7 @@ in { services.nginx.virtualHosts = { "outinul.ie" = { - addSSL = true; + forceSSL = true; enableACME = true; locations = { "/" = { From af1535b7dcc99cc5e75a44e5edc9e5b0ebea96f7 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 8 Nov 2024 18:23:16 +0000 Subject: [PATCH 368/563] fix: backup of all teh email dirs was causing conjection issues --- applications/email.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/email.nix b/applications/email.nix index 003580b..519f3e0 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -202,7 +202,7 @@ in { config = mkIf cfg.enable { services.skynet.backup.normal.backups = [ - "/var/vmail" + #"/var/vmail" "/var/dkim" ]; From 7799bda982d7d5a4c87d5d5eb2fa0d66abb02bcf Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 8 Nov 2024 18:24:13 +0000 Subject: [PATCH 369/563] feat: added Shay --- config/users.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/users.nix b/config/users.nix index 659b6b3..0a705ec 100644 --- a/config/users.nix +++ b/config/users.nix @@ -66,6 +66,10 @@ in { "amymucko" "archiedms" ] + # Committee - SISTEM + ++ [ + "peace" + ] # Admins are part of Committee as well ++ cfg.admin ); From 67c3787d2ee2df6536b5ffdaf503c3a749f7f20d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 9 Nov 2024 01:22:41 +0000 Subject: [PATCH 370/563] feat: pre-added the api key needed to access more resources --- secrets/wolves/details.age | Bin 1461 -> 1589 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index ba63ef50500c5cf9031eb33b181d4a67af0d7b77..c8a6e84828c9f124f6ba4bfef1be26e74bfa0a58 100644 GIT binary patch delta 1469 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 From a1c9125397ea55068d6b88246edc05adece033c5 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 9 Nov 2024 16:53:54 +0000 Subject: [PATCH 371/563] feat: pre-added more stuff for the new bot --- secrets/wolves/details.age | Bin 1589 -> 1907 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index c8a6e84828c9f124f6ba4bfef1be26e74bfa0a58..e49dbaf6751496f53506cf637ff4f353f3f93b39 100644 GIT binary patch delta 1790 zcmdnW^OqGMBEMLUD11 zZfc5=si~o*f=NJCRDQaGd0tX(SzxwBQEq@id7furkefwBwo#O2WPoc~WQwt;PpG3o zWLlo5Q*wDSS8`&eOQmUmM^0W~glAc)S7K>KL9(`UVoFM-flG3Den^hCxwf%|S+J?^ z#E;_Pf##;+`TC}oMM>tCmBxAA!S4B`=DGS=rB2yF0dARLA)aMnxp^VZX?cNM-lnN# zeksL4X5N|ReicpzE+wv}PA;Jlei0c#m64IIS&nX=ZbhY$rd8RK;~B-n{hiW1b1EWC ze53pcQ%Y#gFeR7N4y#q|M zoQ;dkEZtJla=e`^eY0|t^u0>VeT?&+y^PW)pJf!U4^N4T^iK`+at{ctG%76$&JHj& za1YL{%Jg&d$f>l5uqX&9j?(tcH3{_PDzeNs@(#=o2=;MKDfe_Q&MnI{GAS_h3G_?U z_YNp2@r_7}a84<3P6;hWj{)znB8#GOg}i+460^!YZ%3zyuI19a=sG7}9`0~In00`xud(u0g5DkGholYR5UbMk{j9Rs|43X}b_%!|`A zOr3)>lL|ZxveLPXopOA%{as9oBi)V7J-mDhOOp$O{FC!Sb1jVXa}or^MggCp4lg&C=T=$+AG(SU=C-6WuGNQB_XH=?WHM z&f1m{MJ0}2$szg1uAUL~h8abU;ZA8@ky$BGsgCAV?#9{vWu`e!ZlPQyQJ%(O0XeRQ z78MZ&=^?2W*-l~lA?6;HVTQ)ZMy}>*W^RcdMHUqS&KTBtBpGBD1S$k&mKN)~L|B#? zSU84-1iOZs6uS7Oh8Ttxm!^bgl(~nSnR-^02I&WTx-$!i zrJ9GN`#6@Q7p579S%zw7o91N|mKX-Pgt>x4t~5Q-)7-+Z(6QKE-!~)2sM545F(4&5 z(9OlC%)KhG)I8BI#VNfgtTZs4%gfz3FVoPsIJh{#qBPUXtTaETO54&gBcRgRGa$Dj z*S|E>G$5cL*(1V&OIKG{p*+(kxH37#-^10(%Ph^&*~ij7r!3MW*(=d9B0SG5Bs9gl zKF!}T$R{|voa;<$V#MZtN3jgkQ#0Mq9cfIG-ZH!J`RR?SVoVQwjDH+!Z$AFi?OXev zCjK>C*ONrdU0n3uGqbG@*V(Z^XLXRYgznPVf;kaMch%Hy#;@6(Udypdx>hyx!SU=5 z&m|Y%x@qR-@QCC0te(4Hc<1Qo?v_u^l?xJ*o?EYFbba;YL(vt&PVD9%_RrQcmA$pW zb>+5$ntv6)&U|35A^D-e^uNg5uD@~*XC7`VaQwWZN@Z_iQixReS;LwO_1v27M;}+} zp0ru#I@_;MQgy}ElZV~6y=>6FlWe8OCi}0W;RHvnrRd^Q+*_GV*K2cKWjh<{vbe|-|ien+zWY0xU)1u=&E&CYiPuYA;T`+JPDSiqtD6%5s4 zXBIE9-~U3ZT|wL~WJ0?81o3+7jIUMKAJ5smc2L^FCC( zmEaN*K2`bg(lYi#|GL&Q?~_0HD`sincF#tuyW-b{&4X6>M(+xUogWwfE%B%+quS9~ z%y!cC!nfB?IO1Kh=F{d4SxKfFx{qkz^*`?!t2Sr4`D7;6sH*Gt?uf=)NJY+PWlRGA D!%U$3 delta 1469 zcmey&x0PptPJK{NS#nl(n5$trfu&aNmr;)Lvfm>!!WoEHQp0T&SzQ3DmIhU@TLUD11 zZfc5=si~o*f=NJCRDQaGd#Ou6SXgRaL_|n-RlZMfid%tuP?4pvlX*~;Wn{8TMR16= zXR3dcqkEtyS4yapX`+FvUut@yk5N=uW@4^?qGd+5X^E3_hN-Jlgp+x4fm2>VsBeWMIEHY0{POG%cwoEHBC@Kj~ z56(^rFb(!_%1FwyEH3oS_ArSwa}UnuDo-l(jZ7>{FY^rus?0E`%+hvE5BGHmO?FAH z49^U(^fga*3JXXIG08SSj{)znB8#GO1)p4_$XtDYbKkPcDr5KjB-i@F6h99meGAjv za<{zPU^An9eOHfyO7EaxN3OzxAX6VxZ*y}eFa4aHNaIA0q5{tnU!NkgV%KbsY_o!Z zq9Rw%OhZ?ne01y5G7}9`0~I1e5)Je#!`vd>T{9wra|+W_d=s@T&4TlM!#rJ6oJy06 zOuYg#1AR-&TmrdLJcHd!eN2kOvx`lAvYZObEqol4b2A(b%L*+WOP!rd!-Eoia!Yfa zeLW{9vWVAf`}>%=xpMSNUf~I2ISXrIx3g>YL^HY3I3CSeQh*Rfcl8 z7UsGXnG{x-S{mo%_$THW6}x+R0~$Sep{Ff1xCOf@gh zD$X&o@Go%+&NA>d4vq>eC`+qwtOzL%FE%wT2+a41Fw(Cm=d$oH_je6StT4^?^@%Vn z^GxxK@X8JKEAtESb2N)Aaw##-H4Abn^z|((28UdZPeqk$U`kT1sij4>QBi(*x~X?n zevV^#S#nmQX=y=mh-W~lVU}-{M?P1fwyT?^mxpOiQn5#PhES*o*TPGvw+N}yv}V3MJ~cagcjeyV3q zl3BfFUXXu8dZHs&fst=}R3X>Ksj1IY6EE#o5A~nvaQ^PALwQkY<}On#MN3VR3M&3R z5beGlbn<(E#lHUf(ziA|2?BxF7B5wMTn)WxRd&!2WDN(7ylI=DA9gb%kxHm)di8TWSD9Q}dUJa*2NauiEc# zj7wdmwDpqKV>jpCIZHPGXA#`5A=J0m*<*&p;=d<1RX)uXywRg9nOA&V@Z~Pus2dTF zB7Se#GArrBgs<5_XUn7RxJ}uid$COGPGHEAw15hQJ6CO=ZL3I$*Z=L1<|yOxGP|Hx zM#l51S?~78ZqprJY~c4VT|IkUPcff)>n)e Date: Mon, 18 Nov 2024 12:16:31 +0000 Subject: [PATCH 372/563] 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 2c4fae8..4c66b31 100644 --- a/flake.lock +++ b/flake.lock @@ -946,11 +946,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1727122069, - "narHash": "sha256-Dr8CxlBbw5vKL2sH0QiJPWIxKX7KFxg+pdPWSKqJ9FY=", + "lastModified": 1731932013, + "narHash": "sha256-T10JNkkBeAS7qzuvh0ZraApyzpj1xv4/ikmYSdUpKno=", "ref": "refs/heads/main", - "rev": "aa0cfc017d3b70457c9fc34cbb296351aa5373f9", - "revCount": 233, + "rev": "00ac57de634314d9f1e914e5bafda4e1432e2a3d", + "revCount": 234, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From e012fdf3a76986b1ef9c1682a0b1604b95460c44 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 18 Nov 2024 12:06:40 +0000 Subject: [PATCH 373/563] fix: ensure ldap can access values --- secrets/wolves/details.age | Bin 1907 -> 1943 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index e49dbaf6751496f53506cf637ff4f353f3f93b39..5173592c9b3681b5df999d7bf2b42ba8193ebc7d 100644 GIT binary patch delta 1826 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 D27jR8 From 70a83bd97b17d185fb0a4a8bb0e5e760bd8ecc68 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 18 Nov 2024 12:14:45 +0000 Subject: [PATCH 374/563] fix: ldap has no need for discord stuff --- applications/ldap/backend.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/applications/ldap/backend.nix b/applications/ldap/backend.nix index 180221e..a24f259 100644 --- a/applications/ldap/backend.nix +++ b/applications/ldap/backend.nix @@ -40,7 +40,6 @@ in { #backups = [ "/etc/silver_ul_ical/database.db" ]; age.secrets.ldap_details.file = ../../secrets/ldap/details.age; - age.secrets.ldap_discord.file = ../../secrets/discord/ldap.age; age.secrets.ldap_mail.file = ../../secrets/email/details.age; age.secrets.ldap_wolves.file = ../../secrets/wolves/details.age; @@ -69,7 +68,6 @@ in { # contains teh password in env form env = { ldap = config.age.secrets.ldap_details.path; - discord = config.age.secrets.ldap_discord.path; mail = config.age.secrets.ldap_mail.path; wolves = config.age.secrets.ldap_wolves.path; }; From 2d9a3cbd11ec1a1e5edc0770147557a5c744f168 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 18 Nov 2024 14:40:07 +0000 Subject: [PATCH 375/563] 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 4c66b31..d68f875 100644 --- a/flake.lock +++ b/flake.lock @@ -946,11 +946,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1731932013, - "narHash": "sha256-T10JNkkBeAS7qzuvh0ZraApyzpj1xv4/ikmYSdUpKno=", + "lastModified": 1731940725, + "narHash": "sha256-W909eUlyTlvS/ty5Ns4p042NuSMppbC0N19zGpVCG0w=", "ref": "refs/heads/main", - "rev": "00ac57de634314d9f1e914e5bafda4e1432e2a3d", - "revCount": 234, + "rev": "0b397369d185edee7d890f09786fd3450355d89c", + "revCount": 235, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From f92fea12241de908752206791749de471883271a Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 18 Nov 2024 16:26:58 +0000 Subject: [PATCH 376/563] 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 d68f875..59310c8 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1727651998, - "narHash": "sha256-2YtDLIxtaA/BN8g1nCx753OYs/+4R0etW//j2d5UWjQ=", + "lastModified": 1731946960, + "narHash": "sha256-Uw19Q4RG25gG2fqWrr2tIrXM+gp+SEb4wHOeDk12pVg=", "ref": "refs/heads/main", - "rev": "80c9191eeec29ba20ef4084713eca7fe0cab7412", - "revCount": 151, + "rev": "d8d4bbd706594726acb63e2415428e90fc77e2d4", + "revCount": 156, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 111c77aa61d8bd0a1133fe754ca892724e9f0f38 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 23 Nov 2024 14:49:58 +0000 Subject: [PATCH 377/563] 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 59310c8..478b8b0 100644 --- a/flake.lock +++ b/flake.lock @@ -1072,11 +1072,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1730578917, - "narHash": "sha256-ByFTg5oIkGCFORnV3dnN29UFVHjrUefQvjUTE0fa48E=", + "lastModified": 1732373358, + "narHash": "sha256-r4VUwCzbh59wDj8fYGWwrqLqCMxQ4UB54kPBPWx+tQ4=", "ref": "refs/heads/main", - "rev": "0262d4dc8f22898d53e12d4dbf41e46af9c81014", - "revCount": 113, + "rev": "3ca52f0a3dc81c73b11565d0f3611a7e0a4e1ca6", + "revCount": 114, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 249addc5be691feb08728a1e8ef4ec5b4fe41172 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 23 Nov 2024 15:10:45 +0000 Subject: [PATCH 378/563] fix: seems we really have to use this format for lfs enabled repos --- flake.lock | 48 ++++++++++++++++++++++++++++-------------------- flake.nix | 8 ++++---- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/flake.lock b/flake.lock index 478b8b0..833a472 100644 --- a/flake.lock +++ b/flake.lock @@ -985,14 +985,16 @@ }, "locked": { "lastModified": 1727122068, - "narHash": "sha256-KeZxFw51lKC0MQpai1HbcWSGmxEbG1Si6gBlyOzP9nQ=", + "narHash": "sha256-C+PD6NveB9tascXQ84rekqlDkSNwe1mFhzZXqVlNvuQ=", + "ref": "refs/heads/main", "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/d6b13f9c6e0a09346e0e210aa1733a7258e13763.tar.gz?rev=d6b13f9c6e0a09346e0e210aa1733a7258e13763" + "revCount": 28, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_2009": { @@ -1002,14 +1004,16 @@ }, "locked": { "lastModified": 1727122067, - "narHash": "sha256-s+K1bZsYxeBrsus4vjNeGxljUj/Wtb0qYQ+5xNbZexQ=", + "narHash": "sha256-AAj5tmfT8IuAvgcMjlIjf5CD1LNC/gDCvFRt1NAedPw=", + "ref": "refs/heads/main", "rev": "a9f125fb750f33747d28271bef3b3425563096a0", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2009/archive/a9f125fb750f33747d28271bef3b3425563096a0.tar.gz?rev=a9f125fb750f33747d28271bef3b3425563096a0" + "revCount": 15, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz" + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2009" } }, "skynet_website_2017": { @@ -1019,14 +1023,16 @@ }, "locked": { "lastModified": 1689960297, - "narHash": "sha256-Hw/9Bo6YdILbbXPymkfiMaah6/t4w7h3fYeUh1+PBe8=", + "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99" + "revCount": 6, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz" + "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_2023": { @@ -1036,14 +1042,16 @@ }, "locked": { "lastModified": 1696876711, - "narHash": "sha256-gfQFYN5/qK5aqN+nGSfyQFOjOQzahbqTKadra5zSIL0=", + "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", - "type": "tarball", - "url": "https://forgejo.skynet.ie/api/v1/repos/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191" + "revCount": 12, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, "original": { - "type": "tarball", - "url": "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz" + "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, "skynet_website_games": { diff --git a/flake.nix b/flake.nix index 5184299..e600e63 100644 --- a/flake.nix +++ b/flake.nix @@ -47,15 +47,15 @@ ################# # this should always point to teh current website - skynet_website.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/main.tar.gz"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; # these are past versions of teh website - skynet_website_2023.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/c4d61c753292bf73ed41b47b1607cfc92a82a191.tar.gz"; + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "https://forgejo.skynet.ie/Skynet/website_2017/archive/edd922c5b13fa1f520e8e265a3d6e4e189852b99.tar.gz"; + skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "https://forgejo.skynet.ie/Skynet/website_2009/archive/main.tar.gz"; + skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; }; nixConfig = { From 872ccfe62d48138dd70c18ab098dfcf943be0566 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 23 Nov 2024 15:17:26 +0000 Subject: [PATCH 379/563] Updated flake for skynet_website --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 833a472..a066b46 100644 --- a/flake.lock +++ b/flake.lock @@ -984,11 +984,11 @@ "utils": "utils_6" }, "locked": { - "lastModified": 1727122068, - "narHash": "sha256-C+PD6NveB9tascXQ84rekqlDkSNwe1mFhzZXqVlNvuQ=", + "lastModified": 1732375016, + "narHash": "sha256-Y+bJw85TNOp8N369OV0VrDdm3oDy8CXG+GUuG6pZjbo=", "ref": "refs/heads/main", - "rev": "d6b13f9c6e0a09346e0e210aa1733a7258e13763", - "revCount": 28, + "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", + "revCount": 29, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2017" }, From 32ed44a55979baa33f1e939b2cfb9ae734a94f11 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 23 Nov 2024 15:22:04 +0000 Subject: [PATCH 380/563] Updated flake for skynet_website_2009 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index a066b46..5434ca1 100644 --- a/flake.lock +++ b/flake.lock @@ -1003,11 +1003,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1727122067, - "narHash": "sha256-AAj5tmfT8IuAvgcMjlIjf5CD1LNC/gDCvFRt1NAedPw=", + "lastModified": 1732375097, + "narHash": "sha256-LthEi+y3a+i/VNLBlQZ1v9nkffgJMykMjonFtTt8Yxg=", "ref": "refs/heads/main", - "rev": "a9f125fb750f33747d28271bef3b3425563096a0", - "revCount": 15, + "rev": "42a1ca5c83a6c21c734d4cc10eec2b06ae25f7ec", + "revCount": 16, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2009" }, From cd346bb6be4f8a612c94dc993c47a3a9fced588d Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 23 Nov 2024 22:39:40 +0000 Subject: [PATCH 381/563] 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 5434ca1..8052e8d 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1731946960, - "narHash": "sha256-Uw19Q4RG25gG2fqWrr2tIrXM+gp+SEb4wHOeDk12pVg=", + "lastModified": 1732400840, + "narHash": "sha256-AueoSQb1hjI4UUIuLnvg1LxwleCKX60jg283rZg7RrM=", "ref": "refs/heads/main", - "rev": "d8d4bbd706594726acb63e2415428e90fc77e2d4", - "revCount": 156, + "rev": "bab6e4fdec14b58112b2328bcc9f0ef809022734", + "revCount": 161, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 8b86b74dc65bfcace08eca439ee8e0ad03201913 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 24 Nov 2024 00:02:36 +0000 Subject: [PATCH 382/563] 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 8052e8d..4f1313e 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732400840, - "narHash": "sha256-AueoSQb1hjI4UUIuLnvg1LxwleCKX60jg283rZg7RrM=", + "lastModified": 1732405825, + "narHash": "sha256-c7IVTtnb4DS5B62YJzK80E7Hoc780F4AxY3YN5+R5sA=", "ref": "refs/heads/main", - "rev": "bab6e4fdec14b58112b2328bcc9f0ef809022734", - "revCount": 161, + "rev": "1f3c33458e680bfb5ade7e4f5760ffeaff964c77", + "revCount": 162, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f34d3c10cb493199d8a55a5c99859912627a8661 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 24 Nov 2024 00:26:50 +0000 Subject: [PATCH 383/563] 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 4f1313e..3d7c0e8 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732405825, - "narHash": "sha256-c7IVTtnb4DS5B62YJzK80E7Hoc780F4AxY3YN5+R5sA=", + "lastModified": 1732407282, + "narHash": "sha256-fBANe3CQGIkAG74lPAjSj7aFvW0AzrUeEeNV2XxVwn8=", "ref": "refs/heads/main", - "rev": "1f3c33458e680bfb5ade7e4f5760ffeaff964c77", - "revCount": 162, + "rev": "ad94b197ae887d8b1ddefd4574b69ebd8d41cc00", + "revCount": 163, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 3c5a3dc84a15fc25f88f589aab53bf3f8a09ac3b Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 25 Nov 2024 17:57:38 +0000 Subject: [PATCH 384/563] 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 3d7c0e8..bc06311 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732407282, - "narHash": "sha256-fBANe3CQGIkAG74lPAjSj7aFvW0AzrUeEeNV2XxVwn8=", + "lastModified": 1732556704, + "narHash": "sha256-Ll4TjmbyJJQ95yPsBl4qBml2xP+kROK7vJZX27Rcp18=", "ref": "refs/heads/main", - "rev": "ad94b197ae887d8b1ddefd4574b69ebd8d41cc00", - "revCount": 163, + "rev": "bf55dfe31e0f2e8e70382e8d00f99c8cd9965682", + "revCount": 164, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From b1dc47c5cb5b7696a5dbaa04ba2f21c2193a91d6 Mon Sep 17 00:00:00 2001 From: sysadm Date: Mon, 25 Nov 2024 18:19:35 +0000 Subject: [PATCH 385/563] 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 bc06311..c14a04b 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732556704, - "narHash": "sha256-Ll4TjmbyJJQ95yPsBl4qBml2xP+kROK7vJZX27Rcp18=", + "lastModified": 1732558040, + "narHash": "sha256-8BwVv/D0mpXfhS4HTJ0paqSutUgFvg7bBn57DE4g69I=", "ref": "refs/heads/main", - "rev": "bf55dfe31e0f2e8e70382e8d00f99c8cd9965682", - "revCount": 164, + "rev": "68d7b53905215d6ad752a57125fb10b2d7a4cda8", + "revCount": 165, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f57302ee1af74b0a9eaa61381c9c08ac0c16c0dd Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 27 Nov 2024 14:03:17 +0000 Subject: [PATCH 386/563] feat: added Kaiden to teh list of committee accounts in place of Irene --- config/users.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/users.nix b/config/users.nix index 0a705ec..770260f 100644 --- a/config/users.nix +++ b/config/users.nix @@ -60,11 +60,11 @@ in { ] # Committee - OCM ++ [ - "sidhiel" "skyapples" "eliza" "amymucko" "archiedms" + "kaiden" ] # Committee - SISTEM ++ [ From f5316024d2a29f403c634d22d5d0229d0d31fd2b Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 27 Nov 2024 16:06:10 +0000 Subject: [PATCH 387/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index c14a04b..d92adb0 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1730578327, - "narHash": "sha256-+2l8cLQG8rfU8szsLJGTs339Y+ephbC1ByPVkEfi3BY=", + "lastModified": 1732723529, + "narHash": "sha256-8Mb/UlUvElrDJmLGMcce2CR0DhCJHxWeDDdFCc/Ojak=", "ref": "refs/heads/main", - "rev": "b6d9ae059174252fdb683db6f1f17fa3c4a79e39", - "revCount": 108, + "rev": "2b6c47b365e45ae9f8a7f88aac83b60cc423452f", + "revCount": 109, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 6f09cbb30c897e6b436814bf581a5e3aa7dc4b76 Mon Sep 17 00:00:00 2001 From: sysadm Date: Wed, 27 Nov 2024 16:12:41 +0000 Subject: [PATCH 388/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index d92adb0..39718c1 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1732723529, - "narHash": "sha256-8Mb/UlUvElrDJmLGMcce2CR0DhCJHxWeDDdFCc/Ojak=", + "lastModified": 1732723930, + "narHash": "sha256-25w50gGNTIyPgkcQa39XSFFX8gYVVniL01CX+IXfC8w=", "ref": "refs/heads/main", - "rev": "2b6c47b365e45ae9f8a7f88aac83b60cc423452f", - "revCount": 109, + "rev": "744777c990434c9a84304ce6fd8c4582e6078a4c", + "revCount": 110, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From e97b7ad0c66bf791f26dbc44460d70ac693b6fb6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 30 Nov 2024 00:33:18 +0000 Subject: [PATCH 389/563] feat: added an api key for MCProfile --- secrets/discord/token.age | Bin 1141 -> 1204 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 4def5264b4f7a371249f683141a0df5e90e9893c..d9fed9a832fb9a80e1bfe719974831b2a0bb00e9 100644 GIT binary patch delta 1117 zcmey$v4wMjPJOn!hf9D-W|UiqyJc2RVR)#QM}b>psgGA$V6tIKT49=BaH(IBg?q5E zFPCq*e}<=zd1+~Wd1-h+MYwjhaiWuPVTx&ilW~ZXr+HP0fp1Qrc6wDnK9{bYLUD11 zZfc5=si~o*f=NJCRDQZbRe6!4zfqY{KyH?2aZ!%ByIWO3iCI9TcTrJARI#6hZ(wm! za%Fg!iHmVES4miMiF1i}siA3ZntyOea%O;=f0d(!r)h|3R9<$tX>o3(X?R$rNlKXG z#E;_PK9Pk%;lZAsMNuZ+C0WkerN)I7`e7M?Io?UBMM=d`sV?aT=9#`JmYL;TAs#+? z#gVRoVeaJ-7RezIuA%v6S=wG6-sZlU<&OSkSt+@dPH7?TLAkz@;~B-nEQ&nyT#G`y z_0zq)OpDCJwJQw6TpdF*z5TOIlT(ATa#AZxL$u95j165( zE!=%wvpoaD(le8*l1nok%bik_or`^a)6yoNVU(!POE1dFNK7?02~8}_&vrEPcg%Oq z^$K$-)=v(J^vf@c3X6!03=XMG&NAW3vq&wE@G{Xa^Gvjih|F>-chB)MGIjGQE02iE zjB+&0E_C;D*LKe`G%`Vt0PnCOi=uLcNXyLP)KZI-5chn2?}E~Nulmq(^9pmHlF0mQ zCkr<(Z|(HbBC{f=^il&?F89RBlHzRrBIlBT3g^<)GLMwX2ODucB z&)&;>KkQw+h(+e?IhzYdXEJ0wo#B^Y6x`B%d~%y@i+kw0dKb2=Cx?~3m)t)7U|-S6 z^O8Rnt*@+lce2}_|Ydk*DqZ*DCa${eCpV|PY+hN zxv{$B|ClZq_H4}t&Q&HSOB$~$R2iPTkP?-{GTYvf$9enSFF_|hvb>+8)$V3w@F-%2 ztGJu+E29fff^9SAx~%vbIw!w!XW_x%8w-}2l^-xZHO1WP==yt?RT#4z0+(hUIGWMA zWctz+`JFSIwJrx9FV&7c+*#25&P*}G$an4G-A3gxu7?XPlJn+m`m^-1#+r*i&y`+M HsLloew_=;v delta 1054 zcmdnO`ITdWPJLRIaYU+XX=FfAXi2$AV6bU~TUw}DQi!=@Nw#CKfkCK~V`8L>o0n%q zF;_~3M`C)hZ>gbwW`&!3dWCU?pOdAzpHD_fV3cuYp07n{uuD)uu$O6IF_*5LLUD11 zZfc5=si~o*f=NJCRDQZbg@2-FW|FsgnWI5vYE_ntn_HSid2yOwrN6ODnT2^&sYifm zl|gt_wrf}Lr3Rt?9wljoA<0F-u9czL9%kj{ML`B!p$54* zfgVK_VYw!z={ZqBrbeM9ZiQLNh7m#O{>k3?rrEx^Sy_gW-UY>z;~B-nJd?|Vi~YPx zjZGtslB0@TEh=10vWlHeqqL2jjJ&d4Oj69sl1nVoLMj8fg3WW1Q+y4=l8wWPEOU$V z!!zAIi`?`5jr{!#{i4iF^uvOEa&jtj3<@WoVU(!PuM93tH4cq(swz*^Hq6)0jwmb( zcMnV}uhh?VN~}l>4+{5BF*h=C4@&3Ca0*Wi$k8`4D$8&)_ROg?2sKQ~3NG=@b1O9~ z^)^pVvk1vIDylFIh=@dw0PnCOi=uLceth`ih&xp|6$bdBe zG{0OU6U!hIbnDVG6Ae=X6|&0%%MvYIlZuLie6yUAqsl`p3|s|q{EX_m1%elN=Q%iG`D%^bnD}2iXLc;a)Tq;uwQbG($%C$qHEOIT2EWC>f-7|{A z^Uk{VFH8zduWp!Sse_A%`eTh~p$E2Em$Mn<(oi;2h1zt$*NuOhAASo!8T!%c6!Bg_&K zJkP6S5AE~$G;yYcDWPdrhg$kttT(%z=tO;h)Abse_R6=r>P zy!(qp_mp>1FTR~Qs~NIS?a%IPYwM;*cUN!r-Tc>Xi7j3ps=6*QxTw#|5zaAT&z*3i2TyM>Pe0NKxacK`qY From ab1c347b11b3efff986985629018544cea97a1d3 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 30 Nov 2024 01:14:04 +0000 Subject: [PATCH 390/563] 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 39718c1..0b0f9da 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732558040, - "narHash": "sha256-8BwVv/D0mpXfhS4HTJ0paqSutUgFvg7bBn57DE4g69I=", + "lastModified": 1732928719, + "narHash": "sha256-N9m3X802go2otaPatgYbG1kOtaW1StY0XG8aDdSa+Y4=", "ref": "refs/heads/main", - "rev": "68d7b53905215d6ad752a57125fb10b2d7a4cda8", - "revCount": 165, + "rev": "9b3c71e3215b6f525bc25e91c0dc542f5fe7e9ba", + "revCount": 170, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 51ea03ea78f64d16000d66a1f1cfaeb31387156f Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 30 Nov 2024 01:23:42 +0000 Subject: [PATCH 391/563] 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 0b0f9da..e9ece69 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732928719, - "narHash": "sha256-N9m3X802go2otaPatgYbG1kOtaW1StY0XG8aDdSa+Y4=", + "lastModified": 1732929700, + "narHash": "sha256-y2iJpVC34UNYKJOjAg8vxq+Aib42jOPYoTmONDlN0Cs=", "ref": "refs/heads/main", - "rev": "9b3c71e3215b6f525bc25e91c0dc542f5fe7e9ba", - "revCount": 170, + "rev": "68ffa55dc5b48933e38771983e0f87a11a2b6369", + "revCount": 171, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 8970f558214da97d0a01802a6a706958cb536687 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sat, 30 Nov 2024 13:50:46 +0000 Subject: [PATCH 392/563] dbg: add option to test a local build of an import --- flake.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index e600e63..6ae4c98 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,8 @@ skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; + # for testing a local build + # skynet_discord_bot.url = "git+file:/_college/CompSoc/Skynet/discord_bot?shallow=1"; ##################### ### compsoc stuff ### From b03c6482311f4879a94caf937891a982823056f1 Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 30 Nov 2024 13:52:01 +0000 Subject: [PATCH 393/563] 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 e9ece69..1083040 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732929700, - "narHash": "sha256-y2iJpVC34UNYKJOjAg8vxq+Aib42jOPYoTmONDlN0Cs=", + "lastModified": 1732974570, + "narHash": "sha256-y7DflW/V4/9Df/0/FncvzBOnEVTK/p4hCh2K0/TCaM0=", "ref": "refs/heads/main", - "rev": "68ffa55dc5b48933e38771983e0f87a11a2b6369", - "revCount": 171, + "rev": "b7d36de976ca8a0e2e9724043b1890e6eb4d3e10", + "revCount": 172, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 8844b1e41323cebb12229d0b1ff3233fe7988e09 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 2 Dec 2024 18:09:16 +0000 Subject: [PATCH 394/563] feat: give ultron its IP address --- ITD/Server_Inventory.csv | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index 5b3d8c0..6c121c2 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -1,7 +1,7 @@ Index,Name,Status,IP_Address,OS,Description SKYNET00001,agentjones,Active,193.1.99.72,Nixos-24.05,Firewall (currently not active) SKYNET00002,vendetta,Active,193.1.99.120,Nixos-24.05,DNS Nameserver 1 -SKYNET00003,jarvis,Active,193.1.99.73,Nixos-24.05,VM Host +SKYNET00003,jarvis,Active,193.1.99.73,Proxmox,VM Host SKYNET00004,vigil,Active,193.1.99.109,Nixos-24.05,DNS Nameserver 2 SKYNET00005,galatea,Active,193.1.99.111,Nixos-24.05,ULFM Radio SKYNET00006,optimus,Retired,193.1.99.112,Nixos-24.05,Retired Games server @@ -19,4 +19,5 @@ SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic SKYNET00020,ariia,Active,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" -SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access \ No newline at end of file +SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access +SKYNET00022,ultron,Active,193.1.99.84,Proxmox,VM Host \ No newline at end of file From 721e8cf7c09f610fa2b303d328dae077ec39c0d8 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 4 Dec 2024 19:28:38 +0000 Subject: [PATCH 395/563] fix: add leading 0 to allow sortign IP's --- ITD/Server_Inventory.csv | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index 6c121c2..c4ac711 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -1,23 +1,23 @@ Index,Name,Status,IP_Address,OS,Description -SKYNET00001,agentjones,Active,193.1.99.72,Nixos-24.05,Firewall (currently not active) +SKYNET00001,agentjones,Active,193.1.99.072,Nixos-24.05,Firewall (currently not active) SKYNET00002,vendetta,Active,193.1.99.120,Nixos-24.05,DNS Nameserver 1 -SKYNET00003,jarvis,Active,193.1.99.73,Proxmox,VM Host +SKYNET00003,jarvis,Active,193.1.99.073,Proxmox,VM Host SKYNET00004,vigil,Active,193.1.99.109,Nixos-24.05,DNS Nameserver 2 SKYNET00005,galatea,Active,193.1.99.111,Nixos-24.05,ULFM Radio SKYNET00006,optimus,Retired,193.1.99.112,Nixos-24.05,Retired Games server -SKYNET00007,kitt,Active,193.1.99.74,Nixos-24.05,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" -SKYNET00008,glados,Active,193.1.99.75,Nixos-24.05,Gitlab server -SKYNET00009,gir,Active,193.1.99.76,Nixos-24.05,Email and Webmail -SKYNET00010,wheatly,Active,193.1.99.78,Nixos-24.05,Gitlab Runner -SKYNET00011,earth,Active,193.1.99.79,Nixos-24.05,Offical website host +SKYNET00007,kitt,Active,193.1.99.074,Nixos-24.05,"LDAP and Self-Service Password/Account management, also hosts our Discord bot" +SKYNET00008,glados,Active,193.1.99.075,Nixos-24.05,Gitlab server +SKYNET00009,gir,Active,193.1.99.076,Nixos-24.05,Email and Webmail +SKYNET00010,wheatly,Active,193.1.99.078,Nixos-24.05,Gitlab Runner +SKYNET00011,earth,Active,193.1.99.079,Nixos-24.05,Offical website host SKYNET00012,skynet,Active,193.1.96.165,Nixos-24.05,Skynet server. (DMZ) -SKYNET00013,neuromancer,Active,193.1.99.80,Nixos-24.05,Local Backup Server -SKYNET00014,cadie,Active,193.1.99.77,Nixos-24.05,"Services VM, has nextcloud to start with" -SKYNET00015,marvin,Active,193.1.99.81,Nixos-24.05,Trainee testing server -SKYNET00016,optimus,Active,193.1.99.90,Debian-12,Games server manager (replacing SKYNET00006 soon) -SKYNET00017,bumblebee,Active,193.1.99.91,Debian-12,Game server - Minecraft -SKYNET00018,calculon,Active,193.1.99.82,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" +SKYNET00013,neuromancer,Active,193.1.99.080,Nixos-24.05,Local Backup Server +SKYNET00014,cadie,Active,193.1.99.077,Nixos-24.05,"Services VM, has nextcloud to start with" +SKYNET00015,marvin,Active,193.1.99.081,Nixos-24.05,Trainee testing server +SKYNET00016,optimus,Active,193.1.99.090,Debian-12,Games server manager (replacing SKYNET00006 soon) +SKYNET00017,bumblebee,Active,193.1.99.091,Debian-12,Game server - Minecraft +SKYNET00018,calculon,Active,193.1.99.082,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic -SKYNET00020,ariia,Active,193.1.99.83,Nixos-24.05,"Metrics, Grafana and Prometheus" +SKYNET00020,ariia,Active,193.1.99.083,Nixos-24.05,"Metrics, Grafana and Prometheus" SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access -SKYNET00022,ultron,Active,193.1.99.84,Proxmox,VM Host \ No newline at end of file +SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host \ No newline at end of file From e34f93df012737fce0605d8d4994e71fae42b5a3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 4 Dec 2024 19:32:51 +0000 Subject: [PATCH 396/563] fix: give proxmox servers an IP so they can access teh dns server --- config/dns.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/config/dns.nix b/config/dns.nix index 592ed3a..8383746 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -12,6 +12,19 @@ config = { skynet.records = [ + # Proxmox hosts + { + record = "jarvis"; + r_type = "A"; + value = "193.1.99.73"; + server = true; + } + { + record = "ultron"; + r_type = "A"; + value = "193.1.99.84"; + server = true; + } # wifi in server room { record = "ash"; From 2056c43a02471d1fe22e2bb34c77f68bc2826785 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 4 Dec 2024 19:34:28 +0000 Subject: [PATCH 397/563] test: a test server allocation to see if we can create a server to run teh pelican panel --- ITD/Server_Inventory.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index c4ac711..dfbc30d 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -20,4 +20,5 @@ SKYNET00018,calculon,Active,193.1.99.082,Nixos-24.05,"Public Services such as bi SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic SKYNET00020,ariia,Active,193.1.99.083,Nixos-24.05,"Metrics, Grafana and Prometheus" SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access -SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host \ No newline at end of file +SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host +SKYNET00023,optimus-test,Active,193.1.99.085,Nixos,Testing flake for Pelecian \ No newline at end of file From 9001157fc6def4828b957f874a8db2a6412ddfd9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 4 Dec 2024 19:49:03 +0000 Subject: [PATCH 398/563] feat: add the new server to the secrets --- secrets/backup/restic.age | Bin 2760 -> 2870 bytes secrets/backup/restic_pw.age | 37 ++++++----- secrets/bitwarden/details.age | Bin 1155 -> 1155 bytes secrets/bitwarden/id.age | 36 +++++----- secrets/bitwarden/secret.age | 36 +++++----- secrets/discord/token.age | Bin 1204 -> 1204 bytes secrets/dns_certs.secret.age | 98 ++++++++++++++-------------- secrets/dns_dnskeys.conf.age | 42 ++++++------ secrets/email/details.age | Bin 1419 -> 1419 bytes secrets/forgejo/runners/ssh.age | Bin 1381 -> 1381 bytes secrets/forgejo/runners/token.age | 36 +++++----- secrets/gitlab/db_pw.age | 37 ++++++----- secrets/gitlab/ldap_pw.age | 36 +++++----- secrets/gitlab/pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/runners/runner01.age | Bin 1065 -> 1065 bytes secrets/gitlab/runners/runner02.age | Bin 1064 -> 1065 bytes secrets/gitlab/secrets_db.age | 38 +++++------ secrets/gitlab/secrets_jws.age | Bin 2660 -> 2660 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1110 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1110 bytes secrets/grafana/pw.age | 36 +++++----- secrets/ldap/details.age | Bin 1637 -> 1637 bytes secrets/ldap/pw.age | Bin 1440 -> 1440 bytes secrets/nextcloud/pw.age | 37 +++++------ secrets/secrets.nix | 3 + secrets/stream_ulfm.age | Bin 3194 -> 3194 bytes secrets/wolves/details.age | Bin 1943 -> 1943 bytes 27 files changed, 240 insertions(+), 232 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 9ac27b6521ab08f3b19d327555252c3928fc1865..75ee0c0091f7e881192ae9a497c868ef1300017b 100644 GIT binary patch literal 2870 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tlPjmp&z z3NjB1ugG-^NUyA{$aV59NYAWHF?V(~FE8}UGS&|AGRRMKa^*4z4@$|kOw!LyOHIqF za4YfiD)R|QvdpzCFLF&v^vg3Y2s1Qxtu!~SvOu@ZB%mrPKV8Aqywb-o!!$C?G|DU8 zE3D8$+a$n0(f1u(lk8Pt(dDc#NXS)AUV>xqFg`Mvpn3-GCjS@ zP}|Kn&#}xP#5FxEKRqWrB-}YWEg9Xm6i0)ypmc>C%XB|yi?Hx0rzBI4ip~h)`qm@X-81b}CpIm5`ZIPPkpA{HTR_W=J7?o^ZS?X<=6Xcp{l4k5? zXkwY@?#Pv%ZBbfQWvm}y?604ZYmr&(UTEr_>X;nhnC5GgW|W^39#B+L=H!tPn2v6n zcUX}{QMp27YMFkDL3uz@W{8Woc|fXrg}JL=o{^=yrM{1eezuc)xLcH=MMg$iMLAbR zW~F6Bs;{3f$#Wo6D;+1W{cj>TMw{{9)2UM>ax z>EXqOein|NsU;P;W~qkyCZVY*DPj7BeikW#Wu_rXmY(Rg>ANSHrUxoyr=`04=KDD6 zyLshjMrFAABpYQ`CcA`}7Wa91TUg2pG;!_Z5oD`H6 zl;`cCpX8V47+_N5lUnK$<{Iqdo}Fc!9-PjlU!Gi)os}Jx6;N)O>{j7lWn%7E5MWqn zP@Wo@7*v# z(orEVKO!w9$Sgf2-z2%j%}d|V#V|K1#4X6FDBZ}=J)<}z(A~n(JkhYKvYaa=sysa{ z*C5Q>wElYD; ztEvhOGF(l{yrK+E^Nsu>ll=3|Dh*N`U4lI-9bE!FeS*E+T)F(iy*wgJ3>}j*qasZ+ z{X;90^4v3BT+Kr(qI?aKjZN~5&5Auu-5s3*G2+d+&_BdIP{BDpEjX{tI4mL(V(!v*wi&IyUbEQy&^2kf-5hmG&eoj+b7G|EH&HBIXg2uIN!wB z#H36=EIHjPBBH3+J1MBb+tkAs!#2+HJ4CmY+ z_p}hlh{UR-!kjc;^fc*_WRO`9sNj`dSz2mdQC{j=6yX?Fl4+Tq;uYX)o@)`|>KtfU zS>WhunV6gEVr&@h$W>wL6PQz;nv(A2nw;mAo8p;j>0Tb1l#-K@?pIKmT%7CZ@0}TB znrPvSQ7Ri3xe$R27w`78+{%MkM8@xdny$hv-KZXN3A>m!$YtM)_JKMic}E z7lcQ6a+$iBx>$r71o#_dR~nh*2l<#J6`BMGcov#v6<1XF1>||SnEI3k1AI6o-M)v>g^peWVU%qcQiyTHrKC#=FR**z)G5#6>>SF^O_Km`M1 z_b}}s{hV@bH^*StyhK+cqe}lQ1MduflPI&)wDdxk;>3`!iV*EUPp(q0l46q}i{dDg zLca*F@U#?j3llf(oIsa=%21C&leB`wY+r5Dst99Wj2sZ@mRRAOu8{gNzUg2io z928RMo9656W?-3I5R{c4ky4gaoNMWmXc8LWo9dF8%%vR><(cPW9_&^YW4DZouJf`G6< zXRqAcq{t#|Pvf9$H&+*o+SH;f%F;PdAw4O~+25nm)hxNx!zkU^*)Px|E!!k0JuRTZ z!=Td4Hzd)q(7iCj(>U0Kt1Pgppft3k$gjAxs3gtZCt2S!GP2y$qbMN4%P%#vz&tR| z*DTeg%q$oqO%~-Am1UJHL=|R+MLPQC>X%lTa`rANACd!}VYl@wSed$@ROXJt7Bdg@!cg%lMy2N$F|7n>FYr58k&x@8t~ z>FVk#ct%y}2UnJ48VCB7XIr>MrDwYvnY-sFr)ETY8Tos9g!}kgn!A;nI~loh#jKF+ zyI{L+yTydM--~*Vo7IKCXe%lFZ)9L77_gjh4VdvO(vdA_+UjL0_ zrty?g$4bu-g|l0AzvNvFTEBLCVeF%vjDzP&%g?5zbiB#fd+Ti0-~5>mjKnv;E;MXg N;NWu2UrfHF3;>9gvl0LR literal 2760 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 XLjhM$pGuRztdx08*YZ!HOu}ve=g5gQ diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index d7a4b6b..ea0bc3b 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,19 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA d/AgQuQidsB5+UMBxg3/YIA/4EVMF9+BeZrEMzgU52Y -gPmTDd4oeIwwJ5ZdnWp/s6cEupsYPY08TBvmL5fe3NE --> ssh-ed25519 4PzZog iR02KGER5WMrs4djPPpMRc3v5qN5FpcpjTkB+O4GyV0 -ibvzSePq1ruF03QBsHRr40VCZ6ZcnWjvcJzybB5vt4g --> ssh-ed25519 dA0vRg pVsTTA9yknN8gl6K/CkY/HnUc8eW1F/pSqXq/Upq3SE -3ymQH0jBAk9ktwBUvth8G9ZdDzr9Ozqi9YNVB8fyvGE --> ssh-ed25519 5Nd93w fSPTiW3c4va0F5IYoFF+QoN4u1tFGRBrMO9lypICiXo -8MgZPPUXJGGOdmGknXhaV0xgJl76dg9B1e5r0Ud/iW8 --> ssh-ed25519 q8eJgg UFiK3B6YB3YR8fVOWOPLlpGuo5pWpK6b7zteIngC2Cc -K+e9B1V7AdimOMdy7YCJ7tJnHsHoQChAmWmOJDIdwMU --> ssh-ed25519 KVr8rw FeMibaL1ITDNByDL26VRXVz6d2FP13SpKoN87RgTYDo -e0LPmpAe9wRRvgKTYq96Qk+WiUhfixiatuWPPi72Nlk --> ssh-ed25519 fia1eQ i5+7lIZDOm48wywy6CRMOLVhHWnmV71WM0QLSbyhqV4 -S5nAEPHEmAn3AGxN04FpVKwVHrWtZS2s/dPeVv4ryCE --> ssh-ed25519 3pl/Kw Mhc4y4szabQQaeBWtZ7mVdDnZYRwtninrBhcyHoUm24 -lQpLgpgU0ak9WDQIJxd5Yz/DUe14szLvsUGxAil+5dk ---- eUzkrzEEXETs3FXa2YqSW4yqQiRLFC8Umr1D+Bq334c -ڙءm“ }ïÁý9Ž.›û‚”I^éY%Kcö¨SšÒÈ®#ö¤hVó„Á{þ7Z'i ¸<¡Z#–síÆšs. Þ„zÒIW=†WÀuþ7ϱÚàX \ No newline at end of file +-> ssh-ed25519 V1pwNA mGy7a3SPHMxFaJ5S68jaRkPk16Ahxqp7C2YGnK6A4nM +TrEf7fz6yY7G2HXNxhnM4v7QkVrR5D6vdh+eUVbWbdQ +-> ssh-ed25519 4PzZog 5ixIvICVbbk2z8gqvodMAhCevBWdnfmpskWupnpMm04 +r33h6oeu1jQQGs3mP15xtbRq50FGpKwtbbqWbSTQ1jE +-> ssh-ed25519 dA0vRg gUxwHHDBhxpYMxBE+UfTYJ4I8nY7cEdWG1XBSLLWtlY +pNawroXlES4EyNZSUUiEPNy+WNdG9AnHnUl+7qLB5Os +-> ssh-ed25519 5Nd93w AchMesYdEdLHtphyfCumqrdCRFABzNOEf7KfFgQWFAk +Xnier5jnPDl9n8F5r/R4CjBoEvmwAJRLQWnoWoAudec +-> ssh-ed25519 q8eJgg AgmUpmYT5z1qAFZ+uUY5a7huZ8Bhifs1ZuDBlg7ZJxU +kgaKF9t8cEKBc715dNocxA3o+2dwpK8erRo42NzeP9A +-> ssh-ed25519 KVr8rw AafFkG0axLsqGVs/k0DrzLFsKk4uXtqRbJIFhuAmj18 +shiQFq5ZznBovnNXWfTNvSVX/O1X47hK6g13P8r6xN4 +-> ssh-ed25519 fia1eQ AKbaMyAtdDHSpP5taXQQjaunzvO6yZuCOUjgV2+4iDc +yDFZ54QNklvVHUD1AkiaQ0sntqiRxkMGZw9yos/IvcI +-> ssh-ed25519 3pl/Kw KD86EfxdUwpfFW7wqf283Wmdw8o/qnVzXxTCrtNPsWI +L1a9WXktp4a9s1GxF6O7VV14ZPQOp/VqwS286Dqa3Tk +--- +jytGaOhLk0unuAlkbbtAFNde8Z+tKJ/3l3Y3tBgcFQ +€¡VV÷õÍ7Pø =ñOý]àbZêëj§p¸QKaXIúµNl¢_vž +ŠÐHsh3~F«ŒW/¿ŸÝÌ ^áa\´¼Ô #/¤Ú‡i[÷Üfbó¶•áúXøØ \ No newline at end of file diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index acae7c7bb8e99451e61872cc0fcca3fa3ae1e0f4..7c53a8d075d8c11ddcd27be00e352781b4e3e5e7 100644 GIT binary patch delta 1069 zcmZqXZ04MxQ=e)Oo}c0pZeVWilwMMvogA8(wKq7L*(s z%9ZWx;v10anqQt3P-zxsW@uiVW|EX>7@6rEVya&dWFF~iVxXO9uI*i%%%y9mP+Xj$ zo0?)|YHDbyU=mOjm7lJVpJ-@q9BH7RU6y50rC(B&?Plo}92$}5?jIcCoNpeHYZ|Uy zk>ZygXzA?By(nF?PzRS8Dd)Kn_q5doS1K96zG#Z z@uPUSVPS-MO1h_inW<4=wr74wK|qy%vX@Drx1*U$Wo}w=Zh2IOeqecMad0`8i)VIH zpi7Z^WT0C{igQ4oc|@qcb3vJbe^G!%flF3Wx3-cmp z?{d$w%FLjuoMMB@Ot-)w{fbmq59eG910RFQXBoxo!?pdqBmE0J3WxOz0fo(BeB9KLOaJ%+sQaG%f!pnRXf8p zyDYLI+}kie9o@RL%tXV~Km~VG=kfyW5*PhU?c~tXVDIn@gW^2TqJVrSbAL0#^rYbA z`tnGNaQzIgN)s+0KgaZx5}*7W@1P=6W5+~`kfhSe9Ovwy^q_KQKhLPBvIwu7vaHaG zC=+z+JgXdi3mp}b^Ham!N|H>SUG+^PO*4wZwGD$J-E;j76T`CIg3}^>4I|AW12gme zbMm<|Gg5%zd0)jSQS!EM0?=GJ?u8%)A_pLh@a?baizV zJRFM({8Mt0b4`u>!adT;jh##bOtihq(z4Txb8||wONu-lBl9dmf)g#cPBd>S;oms% z)Rwu8XEv3{cwRZZn$x(x*+}e+^91SNtud!?4ATd7o-QMG^i2hFS_Pm1=uIc$`i*Esdbk*hVk-UaE_GftQiX>+My zt8U?exzQY()gyky delta 1069 zcmZqXZ04MxQ}1pWq;KL}o@rVf5EfD58*G%DUY2EH?4RoyU>R;4R$1m}S)AizVV0fe z$mQwlm1F7SU+$AwWtFko55@>GV zVv<+pT$vfkm7nh)YLe<|?313P?-uH8o*3+rljc&8m*VDEr5_%i>Zot(o@trqTAG|c z@uPTnl6O(MzqX63yGg#ANxF}@S5RQKqjRahaeh)@wti}WYoT_&VSbiTl}99(SCV_U zeq@$kxJh8Xr;kCpWktSgk*i^fQ>a@~woiFLuz8A?vx#MeXIkjwct-K?f=aLOth{2w zvS5$Yq_P|XcdxQi-xAYoXYbIUEcZa)V9SiEAXoqN6eCZrQvLFj@<8WY55tl&W9OU{ z?bJepL^BVkR3D$DwEVPGkI1AHx4agWSR*^7W0ALyYseEcMG$oQ(XP@)IkvBLmCILw#Md0RU-@P<1)Y3b> zz&SVD%h$;u8Qr?H%tXV~Kn25~jHF1f@}#KXAa^g%Y>T4g3~e*l!ju&MwB#t?JR@)a zdW)invRqf6ifk?)XW#UQsL;#|Z%+$-_W&3nKKhbG5x(($g|Mog&H%%d5;o zf?c_CeY`UYeBJ63Q!@iALy97EvbBSYvI>h$QvItOy+bRF1HH;pJ(3;Mb8=j{baizV z0u8(ilMPZTOI=e6^9)UWs(cJgEb^U`+}%AaeX}ETozg~;8D)eW&ye{sby8_BwTQ?AU}|KR_=g%Rc#T%NlvukT%a`9I%yH<>yah7hX|2@psb) z!%r?s{l%@<%eq4wpViAJRZfvA7oK`vjeB0_OO1eyCO3+NOvQ8;UyIr+_mFwE|F5H# z-m~Mr&#V=fUbi)nKiWj4p*wzKs5|E|jiMDBi*|aqR!vj*q4I)5=ed6B&OIOVTAyU) Gumb?u@qAza diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 897ec17..7c2ae23 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA xqavLiNuEoc7Gn7MchvoSEC2RrsFDrf9MEGFYVf5vEs -ZwOkERtRi8yxlZ6sUl+mzJ+YFw/h82vV0WzhRjQOTo0 --> ssh-ed25519 4PzZog eiC4yLeOytE1jTUaQDOxtVHsM2jJAvGLrI75XJXRCSA -HJg+GqSKlXld1uB2WPTM28XEygsm3+4iObC7SCMWl8c --> ssh-ed25519 dA0vRg rStUstoZRf0i7Ot/0Gn6zd1cQMQjDlLQ8ScEIM3XMXE -PR2UGWuO5VOBVee3bndRxipU/m2ZRXMo0HQkX8pvTyk --> ssh-ed25519 5Nd93w hn5Oo+ZoIG+UwAb/DUUJmkDcey35fG5WDBgbe494T2s -TxUgeQb8UdxlowGV1/j2Tr7DTNqc6d56NGaFGZfeidQ --> ssh-ed25519 q8eJgg vcWProg0hXGuIRVWXpFSzyS4Ei4YHSdq17A08avwCmI -4iKGWyyGfCKEliEa/9r8y+D5LsyLglFvcUeXyzO+FCg --> ssh-ed25519 KVr8rw 2kNscJDgyfKH6WrfSKWnX5dgRM0Kk7FztGhoJ89VUWw -/biNgciz7/fDOyY6GfwEI57ESdUyRwmKaI4OG5pJs20 --> ssh-ed25519 fia1eQ lv06SnwwoBlmG4AVAeNpeIFgISkt6FktNuRq+P0eJgs -VX8O0FYWrEyBVR13t8AkvIq1VpwFdkMX+wBUQHBzXPI --> ssh-ed25519 IzAMqA b0DnkDgWeERguN/u9wgiBB1sbxHaMXmMZdPOJ14/UDg -tmKw26Fs6iKbVq7BBK60UoQSjykp4BzLW59/ZbbD0hw ---- rR+hloCeC8YmoV34TBL7hLk/4CSfmYKwtAbmtUjHvKE -7ü¶RHSIΔC# ‡Ä/ù:öH•ôImId÷ëójkõlàa˜Ñlõb\ƒL¶ ²¬6Ø¥†/ôPÜ¢+cº÷’U‰MÅ Yt© \ No newline at end of file +-> ssh-ed25519 V1pwNA +Bzh++C1+jxdz1VwwhxPpO3XWn8fy7bsP2wX4mlQ63A +1GZxY76fwUOo/t/XeoCOEuxxq+oiU8+GDaasH7VTOkA +-> ssh-ed25519 4PzZog lkqPlBejVuYcBQwAZX96296VjJqyz3Q7J7O7OzfSDmw +x+bGIiw4SYhEePIkF5PLK6KK7EJ8Iay1oQIOJ18DtQY +-> ssh-ed25519 dA0vRg o0tqstSEhdxxdu4Bu8T/r8al3XJpIHvXp7xe8YNbJgo +m1OKX0L8Nn6ZrXI0Sk61fe8JIRbh+os7p0wzCMtdi6Y +-> ssh-ed25519 5Nd93w pYmPUfDB3HfJZDPgNh4Vmdu3UlTimrX4+EtUzSONyw4 +C/URv/SZEtUlI2SBPNTfni4oI+bsYZ/Wq3xilcS6mMc +-> ssh-ed25519 q8eJgg k5Ml805g9vQ5Wv3hozSCAq8EGzvczTfpssrOeBlB+GE +IxRgNIg7Xi1RN9MthSqjsHoaLpsFWoUVd9f+ak9Qm08 +-> ssh-ed25519 KVr8rw 5YvUQVmarpS4FgsFI8EFLz8tucmvs3V3Q8I0hT9q1i8 +Lifm2EUWhv5hDU9mwkOu4fH8zyjEtGXW1qVBbC4dfvs +-> ssh-ed25519 fia1eQ sSzTT/AeSH5y4vyKt1Vl0bnkT11ZXINQi/pGU+M3oh0 +Qm0ktboSsC0/+HBCIsOu2Oa+EAdT/DlStNLRpC+EOtw +-> ssh-ed25519 IzAMqA DhHry81R6JO3xWujL4l3uOmtqvdmk40srcWuXCU03kg +L4AWjbf1+bNXSMfBpC6DTKU1hvql+1mIRemeHZCFXos +--- Jlkn7bKGiezveI2e56iV/3B08/z/JxsJxgyvgZ6WhN0 +·Ô|’s ÆX#Ï┘²?ÿWÔÊÆîÙº«Wñ(¡ßåˆ@†L [^tŒní‚ÃhGc÷¢Šæ\¿zž^¡>¤­üå^D{*.! b \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index 0fc2d37..fde27b6 100644 --- a/secrets/bitwarden/secret.age +++ b/secrets/bitwarden/secret.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA LbYb1XP9bLe1lcsAfGwPkK2/r2+TnkkEgfS9fi1YKRo -Z20C/zQluu+Qanf4d9GSj4pLirCyqJpa60H9hodMt5k --> ssh-ed25519 4PzZog IFlhg/gbQpiMugcQZUHwfAnSvhxCwW67XmfSNmYOSQE -nOp4xPFMvIhUH9OUVz8B3L8GI+Um2egjHV0FgmdNwwM --> ssh-ed25519 dA0vRg OAmV1KiprjoIgOPHCYcme2uLiU1xEdohTWA5CiN0yG8 -4/LHk5LCGrpMISvpjfo7QuhnRrE3ycFGwGTQ1i6VaZE --> ssh-ed25519 5Nd93w jv27aiNze8Nxp2ohY7NIRtZv5lBxAdKYGWdqWD12zU0 -E5Rk0r8To4B39UsaZavEkAZlIPiaXswsShMgsyNPMoY --> ssh-ed25519 q8eJgg /o798N6b1KlQfMM9gQf48TF9V7nXORxW4SOpcpYCuhI -RVYXWwZLFL6ZUjGbmXBzEj0+Pe2wpZFPIj5yH9kRIwY --> ssh-ed25519 KVr8rw +N2w/8vvD7/uG3TMYb+9vml/vZhLkoS+03KEDlQWNhs -Hne+3S6vVc5Sx7QJ+OCrPCt4s5usZ7B7WwusnFQLmSo --> ssh-ed25519 fia1eQ PJYYKfL1GolRt90KC52dvUyZ/HjWRJm9vMTjBvrCOkQ -Xc7SpT5TZLTOORLO3uE8tPXKx7thUwaJi3ixngLRljM --> ssh-ed25519 IzAMqA AtoNahZ3dTQasdfP3wf7U1RJyx//Kt82e1TMSIkW6QA -neLAeCvnsl4RDq2H1slZJ+5i3JErqy4aRGoscpRUi/0 ---- W8B6kla08fEkl4Kpp+0eAHj7B1j3WYCDcuwJvAIEW58 -)8ýG(ž¶ ìòžÛær_št¤Ö©zµ¥|>¢od…ð×ù6µø*0j»…r‚´ñTü«\*v^#‚ \ No newline at end of file +-> ssh-ed25519 V1pwNA ud7vkafWPnZmwU0gvby16a/lB4VVkUhVpqnwvkMdKig +/PR7w91ONFOWIvObEKI+wD9XTxbjqQoMjlar9yqN8D0 +-> ssh-ed25519 4PzZog nttwEm+xO2qLIkb+FqRmDeqbdidUune5CdS9AvHCmUs +raINPneffb9cQ6Zq3Jpwfz0MiIaTtoOI6s+1wB/S5t4 +-> ssh-ed25519 dA0vRg uuSSiAgzEPgfh+VqE2QfB+8fkJlnUJsffF5/3C4Ovx0 +1oFB/dDSQRpcETXb5IxYSqSG7oI8Y0i/myB6IaJqtUc +-> ssh-ed25519 5Nd93w ZZA2ylM3mB4xjxMzLmrYNujWTcjVsgKRzIYVsmPSqXI +30g14yh+pO4moRvnd9Xxe1/QQxmE2h2zHP9mqn8dULc +-> ssh-ed25519 q8eJgg lkPUz5/vn10nmk03AeA1W/6fp3tfyrdLq+kgoR5Cjy0 +fHtjZtjYG18wWhhvZY3cn3FxxJiY41zQg16ltudBue8 +-> ssh-ed25519 KVr8rw E2OijEik9tPfGCeRe+XDV+tKHTOOxojVbG0esTKuLCk +wXIOcUGlmF9GinF+Z81KQNiVACN2pthS1nwCK41IHMA +-> ssh-ed25519 fia1eQ VIfFJCbkM8ZvKKXN3+ZjxXIgK2y9vHpFdQopX25kUAk +utaTUdI2GBRxkDJT6qmxsdbGqjgSRP0ss4ZgQRQhQBM +-> ssh-ed25519 IzAMqA WX0QlrMPSMMvv3KnbOedpKcQrarKBQLHRXThmvveGmU +uz/jl2Ze8sdlCv5G6U1Dn5EiucQ1wlK4+/wwezX6jTI +--- fLAcK+fEa833GdqAvbD+sIr2ViSHQat1WQgPook94Ag +¬‹¬Á­°xçšáI¯ê¿i*ÿÂXÊ|ÔŸ‹*ž>€é!þK•‘GŸƒ£Ù7îoÍà)EU¡‰›7ÛUˆ \ No newline at end of file diff --git a/secrets/discord/token.age b/secrets/discord/token.age index d9fed9a832fb9a80e1bfe719974831b2a0bb00e9..a346d9bd6dbec104b3b8803c7707cfe0daecc60e 100644 GIT binary patch delta 1117 zcmdnOxrK9rPQ7EYnO}0Gn_GHzewlMgrg5roafV@;X+UajzKL6MwnRDK}1xLesP4ScD{aKvRSfGNk*o5aoMJ|*daL1ty4UZ#Z^`6)#KG^?^;~B-n!<_@n9o;O; zvRzE|i~UpFTzu2Q(@Z11{DQPg+`V%noh+Oj-CW$la)TVX3X)un3Q~P5LK6+E^wW|& zEOL!gjq@Wi9Mh|`6Wt?yGP08NBO-H)jJ!-HpJkM&ukc7o&56uQ@vm@qNzN+BE;XnO zGBAsD_sj4t4vNZl)OR*ED{xBl4ld?$$}ulYH3ZN z$u}0~gbzya=OwFUJ%!pL%Z-e`5oW04I;a ziVzb|C&M7~H0@;bfU0yZA5%ZyP%r&_Z*A|=;IKr)^vY20j7U@eY)1=YSN9~(^voO= zQ*Y;}q})LC_)g1AG)xUtFsUf@PtQqrGb|`I4e~EevkY@H^>Pdi$u$fyOE(P&c1icI zuhiBrF|kZf=W-0nH4exK4fHMzOb*RTF7`|J*d>r!o}GuFx)Y}BErNt*)*{*E6pV;*^^6GS63k; zzqr&WDAiCqDbOfN-z?Ix*f&3?$gDig%&fpAxHP{wHM7jEBt6*I&z0+^=J6HR^wfeT z_Pa=a(rS2k>37ZE9Sc?!oI1K&$LfgZvFa|T2=BkS)hh+h*J}q&`hDz~!iEF??N}1u zKPYRQd5%jo@JGK<-~Q9$t&5KyOt@LywZ~<-&1$g>;gqc|3F_8c805Iws{MamYwEwr ztTXA%QJ)nuf^(R}d%|XE2gVlN2{^x4|LtSBJTI&BtM)LiN&LG{-Z(qwu;Gl=rH(gW zIv&)0bVGc@q`B7n99_psgGA$V6tIKT49=BaH(IBg?q5E zFPCq*e}<=zd1+~Wd1-h+MYwjhaiWuPVTx&ilW~ZXr+HP0fp1Qrc6wDnK9{bYLUD11 zZfc5=si~o*f=NJCRDQZbRe6!4zfqY{KyH?2aZ!%ByIWO3iCI9TcTrJARI#6hZ(wm! za%Fg!iHmVES4miMiF1i}siA3ZntyOea%O;=f0d(!r)h|3R9<$tX>o3(X?R$rNlKXG z#E;_PK9Pk%;lZAsMNuZ+C0WkerN)I7`e7M?Io?UBMM=d`sV?aT=9#`JmYL;TAs#+? z#gVRoVeaJ-7RezIuA%v6S=wG6-sZlU<&OSkSt+@dPH7?TLAkz@;~B-nEs8wzT#G`y z_0zq)OpDCJwJQw6TpdF*z5TOIlT(ATa#AZxL$u95j165( zE!=%wvpoaD(le8*l1nok%bik_or`^a)6$YBpJkM&PcO>JNK7?02~8}_&vrEPcg%Oq z^$K$-)=v(J^vf@c3X6!03=XMG&NAW3vq&wE@G{Xa^Gvjih|F>-chB)MGIjGQE02iE zjB+&0E_C;D*LKe`G%`Vt0PnCOi=uLcNXyLP)KZI-5chn2?}E~Nuh9B(^9pmHlF0mQ zCkr<(Z|(HbBC{f=^il&?F89RBlHzRrBIlBT3g^<)GLMwX2eEcMeS<7qUAd~ODucB z&)&;>KkQw+h(+e?IhzYdXEJ0wo#B^Y6x`B%d~%y@i+kugmwL9WCx?~3m)t)7U|-S6 z^O8Rnt*@+lce2}_|Ydk*DqZ*DCa${eCpV|PY+hN zxv{$B|ClZq_H4}t&Q&HSOB$~$R2iPTkP?-{GTYvf$9enSFF_|hvb>+8)$V3w@F-%2 ztGJu+E29fff^9SAx~%v*CnUdeXW_x%8w-}2l^-xZHO1WP==yt?RT#4z0+(hUIGWMA zWctz+`JFSIwJrx9FV&7c+*#25&P*}G$an4G-A3gxu7?XPlJn+m`m^-1#+r*i&y`+M HsLloeh4!0{ diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index edaf67f..02a18dc 100644 --- a/secrets/dns_certs.secret.age +++ b/secrets/dns_certs.secret.age @@ -1,49 +1,51 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA 5xvtgxFvEOX/bVAOdBBF2Fyb0euGt95YjhOcfpGgHk4 -6oN4Xba0W5g/d3EX2aC4N6UFVf/oHGgdTxBcMbjIdHo --> ssh-ed25519 4PzZog SjAcOftaZBEAAZ/P+Z9OTira4/QLSMRefC+JkQcf0G8 -zG0R3/r+PBjWj7WBABmHPXpqx18uLyuFMJKB2az9i2E --> ssh-ed25519 dA0vRg k8fekPA7w/QFMVnDfCrpOlfv531/nw9tO7B0d+mWHiA -jp+DndebWEdk9+wt/nvS0LfRsFf8T7+dMffWmx3tPw8 --> ssh-ed25519 5Nd93w dYe/tZ5qHoacI1IBa7yvDL/grZU7Lc40gU8boQY8Wj0 -eBs8fYre18RGW8+RH4J4AleG3kNpCZ0agAfcojSCy2Y --> ssh-ed25519 q8eJgg 9UZdBq2oZ29U/kzeNOGn+q8RbkLbJwM0eSJHqSLV6Ek -vqa610t5XxHiKBSf7veOc09ZFYW7EF1KpIbCpdCsegw --> ssh-ed25519 KVr8rw 1CkykLAC3c615TDRlOeI4GHmqu0VT2kclWkr+DT9dSM -0MyPNEmkHICQZxpKt0jBZpce13c+jn4WC7IJL4uWZHo --> ssh-ed25519 fia1eQ OtFYStmc1y+yqYNaNgHxEheIIVykYAa/uR0dKS4xX3Y -c2HYDyrD6Db3FNLP8tebLngtS2S8LHsmHovbofsUk3U --> ssh-ed25519 /Gb5gQ rAc4CqbqdkIAFystL0rLqGNH56GrKxOBamqhiIFAY3c -RR+NsZe0HQdQv6SgeIqy9IcIChXdvrsspNDBngW6Byw --> ssh-ed25519 NtlN/A 93citgkp9Aj1LDK5UdzJqYVVYaWgt/Cc6yMJka+ccyY -KTcyd/SygOLp4mPI1zGDTKCNT7LfVUw12Bw/qnTnMpE --> ssh-ed25519 v2Y09A +fWNE2zU+lz5KGu2Ed2MHb9UXzJPUAUuBWilF/AS1Qo -UVJWnAjRcD7X6iA/heoWdZTcsUS+1VMG5leIHxWZGNA --> ssh-ed25519 XSrA6w fft3i85PNprS9QqQo2yKr3lx3qHuSVFeVYuT5Gtfyng -lNOo2jQXvaMElQawI9x8vnQN5bnnNefEyYXD3YqwOwM --> ssh-ed25519 DVzSig a5q+imjqWqTzyM3aU+UvvGv3wH3RLTPl+kva+qVSSFs -Pobzi/5ZVyfGhVK4cMqvMqaAol9X4+P3hEaUeHdiacY --> ssh-ed25519 uZzB3g B1D2S87+yPr66EikAqLw7s5pazfQeQUxAj4FFnk0nAE -3lEw0t99aSGqkZdi+ILl3+s+JWRKpY4BHLXdrHfFxng --> ssh-ed25519 CqOTGQ urZpNzMYvDnGR1UgjgrRYp06gKWcTEWUDjyb4fdDTD0 -7jeFeoMBitwGFQLSynYVyIYsEhHe7A8mdl65goiX5c8 --> ssh-ed25519 IzAMqA QmtcH5afcef4NMRX4AMrUHW1tCPGOlJ+gIhhDFkUCSY -I4Yg8vgoYGcsV43qq04+nrhzMJ20eaQjOD4EJM0z2xw --> ssh-ed25519 Hb0ipQ CO7nQSSKrmkQ/C6DuJxesIMJmm99eQytLzJ+3/Q38AI -/kBnqeivoQLMaAA7nX0t4/UAvcOIchEu9bJWxIuUOV0 --> ssh-ed25519 3pl/Kw qUD++i8FGbEAuqa+/v6f664tlVTwHGYF3AmTo0cuZyA -vjImiKQm0SHiuO7jZTKRg/3MKzDExfE+p9ZT2nHZr4M --> ssh-ed25519 SqDBmA BGwTqAeEptBFRbwwVkHZWX+OKQpALqrPvA2+Cl356D4 -Gg69WAtr+AAfYT1G+WcTSIlCbNqS5DyxsZw81DaBSkk --> ssh-ed25519 UE6fcQ 4JZzLWThfgJQSNDDtDp8ayM7N9o5tQ6PVwKMj28inC8 -RyEWRmMbuXezYZntsTdVIbjy/YEbrflqMpirdg08UVQ --> ssh-ed25519 YFaxCg LTsikBkuBwOuc2qrnTAMVtRawZyBosZScefH8qWIqzQ -aLiVK7XFI8iDRTCGH2yJnUpydjTp7NF1Ygok6D2Fo44 --> ssh-ed25519 elCEeg TKQKeAvY3kn5IuvHoS0SWtX647nEn1txDftt7pPQEG8 -OPAFqPGdSS3Ud+gFtMXG0shrXSmVrIBzvwc19Ac1NJQ --> ssh-ed25519 8vZ9CQ NGLF9epPqcfbQWcbtMeYIcH0jAZMvO4P7UbKtl8lGRY -ZJ5afGOI32OYBpWs6pe15z2IB+5xgO04/OsKp6ixT5o --> ssh-ed25519 rmrvjw tfgMxvtTE2vv2qQJtQk1J+YV2UC/2iZSs0nvbVzV1Hc -HW86DML/9MXoTs0WWn/zNi4Rh9SBhaHl2WC2bkiLbmw ---- Q4amxZgWmdHcf7aqav2TpKA8KX8B8ZHuBhzIcKwbFTs -E¾ã™r<\Å?ë @î}ËkRÕ(ƒù­;È^3P–ÐJäO“ãSÜ‹Ø â`¶¦ sb?9ø¢¯Âÿx$ñû/ø~4ÊF Ÿ v_¨þp4{5 GZ²f"’BͶ'ã)/¥×]«ôÁÈëöà•wžÉK%þo B*&Þ׫{\ZŒ•pë£KöŒƒ³Î¯k}Ïåíß Ô}P=Œ¸û·?<õ¬ºyB…‡sbŠ„ÿѪ%â$¢#" \ No newline at end of file +-> ssh-ed25519 V1pwNA ikotG+f48KCxKj5DIdhwIEYHtspuBfGj9DvlXLchllk +TQ8OlL5uDpwnjveBk1RbpB+cCOpqlPQtOu7c0/LRiqw +-> ssh-ed25519 4PzZog ptPetu+OMhjcqwIZD2EtPWojceX/p+xFRu8SdFBEBzk +5HKDrQTBiv+hTKhkLtnYOq7sUO8+dKOS52bXGjGXwxI +-> ssh-ed25519 dA0vRg nQ1GTSQwHt806xrFMyqwQ86iBSLbgGDIL+GIWMD3AFw +OPyLNOxp5k40I4WvDStpKun/AdOuWZyEQLPyyFdqtcE +-> ssh-ed25519 5Nd93w uYt44+U3T3DOThXDGvl5WPDPGj506O2Fc271qlw/lBo +tcRUll9+PIfcvcdvIzD8fcIU85+d8lw7ThPetfq24nU +-> ssh-ed25519 q8eJgg wLIZSQp/YAKSohUD5NsbADyYua8p2qik9lRlzdvZuSk +f/b9Jt8Qk7dcor+5xczk7zRzOxTgknGYstcLQv7ztJA +-> ssh-ed25519 KVr8rw InbHZ+pieHIQGGW3LOOfYHS+RkuXRMzxMblHHLOV9Cs +0oHx4kyD8AW5vgpds6EirGHeYznJ+z2WiGmn7+6bPww +-> ssh-ed25519 fia1eQ UTuEfUIL1xVc5W/HSXpVvPxeQriwC6Tot1G0vRaT1XM +6mWM2A8DVPMKzp7ccqTj+3go39xsyKIHuu4zZypHD9c +-> ssh-ed25519 /Gb5gQ Q6uPEnhxFPRulsd5YWVXfrVUJqSN3oM02g4yK2IYUQc +qqcy7z7RohVz/GDpB2FfjE2V42Bs023N6+G4qIJN9Bo +-> ssh-ed25519 NtlN/A F4k9xBWDxeIS+v+DldjlN5e0WQmKH7Pt23XnKxkxTVQ +PgCuox8LSeYaamogydWcXyP4aVCQadeVfnjnFngWC+A +-> ssh-ed25519 v2Y09A Dq/SngPnj9Or0XiVOoo7EQNdsh9mby1F9v2zSZOfMH8 +Y6J+nWC58lxZKc+wMFUGeymONf9LOxJhMonP1Vo/LMo +-> ssh-ed25519 XSrA6w KnF8xhrzss3txgoF0JK84/M7b81NuFeB9Ir4590LYRw +jilyzwKpL/A4CmO/hMOMjZqPfwGsNYsngAw2trX7hKM +-> ssh-ed25519 DVzSig A4EU6+2yqw3S2ISYUBbZYOq4xBEfXoEy1fTUhTzGXV8 +c6CyaaBcdHA6ZNdJApUcQT/ED0hQYPqqyvPF+zwCLME +-> ssh-ed25519 MhHMYA ixDHJ+PFXFxsCu41Ye2Vwlk8wVlXofq2ztKIU9qxH0k +8JBxpk9/nQqR2y6i8GU9PpoHfyitJwIHxMr8nb2Y5As +-> ssh-ed25519 uZzB3g zZAxSWF9i6321ifYiizQn6kvadhQ17/fNkYSgOyR+x4 +H5jsIQmgVgRoMRRQ11K17eD9HqU78CpKu5ylkgqrtq8 +-> ssh-ed25519 CqOTGQ TzL9qPqBl8M3d9whmAaBgx3Wo/hPKc7Q/P6Kt3pPxn4 +BTnEU/156/8BKqdFcWisleg/K69RIiMaNDg6h9MX9og +-> ssh-ed25519 IzAMqA +w67jWJmcVuPwjlkKn5Y/ryZBzA7ZzLl4va6KxfMm1I +mO9xeZV3RYUbGu5TJfnRAaJumAzM5u3wmIByawDdFn4 +-> ssh-ed25519 Hb0ipQ y/srd2GpXb5EMVySg3BYOr+41u/NnJlx/2sQlhRyEg8 +s3Se3Rf8N4WqP6QdmkAmNtgZKgsvmuWfiOpC6pKGNuo +-> ssh-ed25519 3pl/Kw u+QbsaYgVdhbsYBlbuusG/1nOXQ3PLCwtwWE2nUTUFQ +laEpITIyaNx7opXwqT9SHo9qNWCRH0WozQYt8SW1cz0 +-> ssh-ed25519 SqDBmA 0dlLmNcgAOBOUrVUT/t0oaF+AcXUWqkDN3fu64rLx0A +y9Xw6atnsCX66Q+iIMHwsq8vxeL4kxTihIbMut+JMlA +-> ssh-ed25519 UE6fcQ qBrP+r+1jy06z90mQgk05zLog586HGUMDgHTbExoMj0 +TnZAUZUNNIAJzd8Efqb7KqR/n26YXr4jV6zPvZXu4eA +-> ssh-ed25519 YFaxCg SXGoMkrpgduoXNIZXDy93gkzlnKtr1fAOQJxZDcZ6Q8 +jKdd+OufjXk1UYsXcJc/Q4JeiRhCcHW2nrDuBrHu/pw +-> ssh-ed25519 elCEeg jPd0A53zK9OFThb4pCF30/My3QxiwGyGiDp64ob1vWA +L0Rj+47bdVVwii4LIMoI2by9qmzk4H1kHoyEc7rUO9w +-> ssh-ed25519 8vZ9CQ lgEkLneoENKWwNXRtXRbN5VSm1joh7NDSSUn/bp/81k +X2A6sHl6dFe2p9hfVINA1G6nR8lqMQNjBKc1FvM9cnE +-> ssh-ed25519 rmrvjw NX2NPt0SVGc3+2p/ob735mUIb4t9nhwUrdbdFk8CnSY +sL3zmOASMti3QcIfa0CGEcJex95qGX4aeIqO5LS1LFg +--- 9+vokggbkBI5tk1kvqpdPkePahvTIcYWtU1MU1zTyCs +¼ê{—Œû.xX«®qÆ5Áˆ5à˱È{º«ýGzᆄ6á ô:²‡ÓáÊpð²‚6[äÍY„U—Qâ`©—Àíþؼýa’R ±•—S]–Ñušÿ‹±®cÝY–X²H" h äÁ7Þ…6Ú†´o=®*¿ÊˆGèiɨLûA™?ĆÛÑõ†‡TpaKžùÔóùaåÅì2 n`\ºN34îXÝrÍÊ´·I9Adq»Ÿ \ No newline at end of file diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 0808d0b..adbf427 100644 --- a/secrets/dns_dnskeys.conf.age +++ b/secrets/dns_dnskeys.conf.age @@ -1,21 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA +Ug8WtIQLZK1chInj0113Okqae8ImSdTvQYYDD558ig -ao7w/Uow6sCtoqRDr3Y8NjuF6f9P62sKfx5+5+3yV8k --> ssh-ed25519 4PzZog KZwHoIkqMTVHcHma22+hG19oBgCNZ3zZ9fgs0i3NMx8 -hxgtsHVx2KATvEQM790y7foAaWVBFnqXz72CovkbcyU --> ssh-ed25519 dA0vRg QORz3gYpB5PiM5Dgm4s2JNyJSBFTzY15tlC0JNMtoTE -1AuUbuw4YSoyly/iHY2DGBOhRijWoXjsFfFM1pKKlUY --> ssh-ed25519 5Nd93w glPMyqAhDvJSOgief6VEWflVervhftUbNgnDOVtKX1I -xDSl0Oe0UPiWRnFythx/6ErNSy04paTWWKrlheEEzLo --> ssh-ed25519 q8eJgg 4Xs8DKl5BV5E8oGE9MrhBanGuTltQZz3JsCI57UYwiU -c99NCU+f8vbvFq9T+P4Gi51ae5xygzuyLMFGf8px9CQ --> ssh-ed25519 KVr8rw mPvw8t8On+jnc97m5f8x79Kcx9ZhHWyL/YW2zVllqUU -X8CuzLbLfT6sDhZp4rGif9RDD0zHQzjEp+v5PHX2BAk --> ssh-ed25519 fia1eQ CRUdnRPTZQtB/YlTqGcghTUjUlN7avoJ3iip5rNgcEo -IX1fAfmdteXLwXF7S4aFidVmzr7ClQE5Dlh5siyQZPM --> ssh-ed25519 NtlN/A BRTimkF1zqBp4N1cep8+Mzet7cX45ZHTz9NekWNaNTw -//1gIudKHmPM5A/1fJNPaQO5TqbZzV7FDFM8EhEFzIk --> ssh-ed25519 v2Y09A U0jsaGMHVO2LpKActT5oYiJrbw6oLeSwzgzR7ufQpF8 -CfB7xVWpyMHsRZbfwhtlBdZyUwAuLic9R0LBm6vXNUo ---- wiRWKVnnLoriKkk//al7FuIGYKru0nO1/XGhpz6yWls -§$r¶£üþlÁk=n†CxªgA3Ö•^%ÛõøÚÚ8ùs€±öúJº&  -×Cå&Yõ(Íe(jðv€“ù¦Ž¥!¢ä€ ¤?å9^çU·¿ñ>fA¼ê(ŸÝò­„Ó1Ûìæ#\³0c"Zš†Íû³‰^œ4_ÌÜÙ&Zø»•ÏX°¯6+Fÿ \ No newline at end of file +-> ssh-ed25519 V1pwNA UBWTUleT3gH3VTd/ahMfx1iSc1JTTlZWKxD4Sx61Dmk +rGgE6UbDrVFRBbCfw2+o49aIlk4qOHDNYD5nQnt97vU +-> ssh-ed25519 4PzZog OGYMrxkoi+q8ysF/6+HYm+RQshv6jhZyjqQr+d5/vlk +1PY3xrn9dHVnXOOlEukTwnF0S5KL6AsDRXh5MvWioyo +-> ssh-ed25519 dA0vRg eVrtU8/e3XSCjOHFeujDNIZHPWDq3qcot/+RXmBwYyk +mOFaEqWEnYtKxlilozF2QRyKPsOP3HvNWnQ3KLRON9Q +-> ssh-ed25519 5Nd93w WXvBheSNZ8CJOtyxeK6GBLRgt3n1hgYGGnksp4pUhBM +0mr6EjSJnnJezPk1nXIEpaIMmn30tAFJj7pmpS7vHzc +-> ssh-ed25519 q8eJgg SLkAt5hvW2niDBIqeKjcYZvDR9CkJzu4wf1y+0Fizzo +ZNm7qSf+Bl981GJuZPPjRL1HcCJbZ58eOUQe+jFE7K0 +-> ssh-ed25519 KVr8rw xfJAoIGIRNVyRsPxjlARAFXm3jDnYxBZws0/8mkqr2E +w//2SGsPl3BjEgGIWAsomH8jGwnOKCpn0SJsbb4y2EU +-> ssh-ed25519 fia1eQ MjtOJN21srAeob/eGpKQON1FGebBqvZo1bKfQFz2bhY +eSRZ3DTQ/HfueI4k56nkAmUdy7MARgcNYgPGD5amCTM +-> ssh-ed25519 NtlN/A n5uN0giDnRaRrfa0jCpqkDnzx1x6hQipumVP/dM9Sw0 +J5Z3ETAYMQbugOUsak+k0suWd3SInz2kfRDrJhP5ObA +-> ssh-ed25519 v2Y09A KxmOke5LEOx90sSm3W5gdNHTxk9Smrwya36g8rxFyhw +2FUiiEe5v1CUG/Gkyu1Gw0/tmo64wCIq/vsCjevL3l8 +--- eFkoeakUQHfc0nofk2Sm/k0ujxlkKkahdm/MmMqPHrg +Å   +üúa +–Î5ùäÁ'?åc0øí ¿5SÚîh hª mÈfœZ–’Gõ¢+>6øçu½¹Ï¿rèôâ«ïzYЋá•Þ¯ÇѦJé|ä·a>îò»˜Å7iÕ݃‡Y«˜a‘‰.P&ðÖdKZS£Ì©/J±r;ñ×¾ioÜå±9hN¸Ã¦ç˶ \ No newline at end of file diff --git a/secrets/email/details.age b/secrets/email/details.age index 4ee9f379ff01d0c77170c4867a7d90f402da584b..d8c9aa56e9c8dff7d093aff5efb4bc9a8fce66df 100644 GIT binary patch literal 1419 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 diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age index 294bd09506606f954e12f3c04c6f42b3a93bc9ea..7a716d1b83c03bf40c05fa613d047819829ce36a 100644 GIT binary patch delta 1297 zcmaFL^^|LZPQ7bpP+qb{Rho-)rlpyAslQ*2TVi2`Z%~!FXPJ+QSx`V#L~(|1qP~BG zCzn}Zu#rKKb5yQ{pI2yTkhg(Pgn3A0Ns7O5NnwqVFoUqd5#qZez`ubz8TsHuf-=jXFnwd=bgqK3Di6=FR1>4}Qs07*Fy|;wKTmVd(4g!9U&qYivYfnN z|Kf1-l#Gn5e01y5G7}9`0~MTH%H1O^D#FX1D+3L+EAzvWt4vb^EZw7=T#Nm)3SGR7 z>pjB*9m7%+U46Ms3j$JtoC7>k{4%ngBZ@Nhquj$hLJf;eD?E$6y%LLzjLW0K0=-<) zsf zC=H4*E6y;=&enHz3oOr!Fbhbk@b%Bg&nU0T&dAGkw=^?N^)dAGcC{$x%Dg&P^_cM6 z_f<)qnl7^odJa1naC{07Sbp}q-q$vk(+d~A7XIdYsOD?s*7^Wr;R6%T>VGV&ENi+Z za`dky|FyV7{JB*;)~4F-J!FvdNpr$R z*~bf{A3XeYqk8@7?ML;?qh^>q3v$fZyg1GI)%FJqW4BlFzcb%?^4PP_*QQ23J<1j3 zZ*CubS1U@p&FYf<37^K-^*sG=<(Bmy6fJuhc>d&7{biX2ThwT~VBE)_kOI~x@v;Bx8C(oO@TO9i(<+pXd zIvloeUQCzi)Ag|ho29k{nX>MY%J7_~W)j2nvCgC7#W%+Jrp|4ePH)dRyil)C+ijDq zT$OVFgbm9bMi!$}7pv7-)t(Ew?ci3;=(6eR1_Jv#8lo|B;;xCc#5g%^ii=R?w#^Wl)sc_&J+)4H-9lXLCw(S msJY&CtG0;m3#t!m%=LZ3&aKPl`|V$80>{y**At}MBZ>gYnd)x< delta 1297 zcmaFL^^|LZPJKqWUwLSSTc(k3W_FroW@Kf#OQDmYiLr~Re^sSLMoF2USBbN!V`4;j zHdj<~ke^wkLAjxsS+;&aP`O2MPD+$c|_mqDbPzNw*OI+w1ULUD11 zZfc5=si~o*f=NJCRDQaGc|n-BZ-iH}xrLK!riEp4rdv{0sdh-JTZXAwWNu+;dPI7K zvteaKmQ#)=S6XCBp?8K?j(=)sl~1NYpmU0)Nu*b>eqlyxq*t+9gr~QoZ?I=%Vq{?P z#E;_Pi3L7INx{MH6}i4%rKRR2DIpe?J|P}e&V`xUsd*+&W=`P-fd*MFQEq`;p#?rZ zf!UTGC8^>1PLUP4m1e(&BIcCoJ+F|Q;p3_ z3jKm|9iyC$LXvZw4V@$M{fm7vs=U%ejC0B-pJf!UcP}h7_Kr+RD+{QIaxp12@HBBP zEix|53`%!4F-wdLG*9%*3M_Ofh%zwYGV=YlcFzmQDRDDR_jj&JG0lqfDoY9v z^m2DfOg7HSO!bS5sIqWGj{)znB8#GOg+#+ZbM1h_v?#}_3}62sv-JAFiV%~?v@o~S za!2F*5?_%Ba~iZa8Cs~ow^yo-EH40Ch6oV){)y#q?M-JB}IN=jTaqnwf~N}SU4JuQ4(3yb}8 zGqTaGb1w7`aSv3eOfPc}tVlNvcQUH-uPSt}tV%KuC<${m@ySe23QO}bDm01=5AqHw zt1{rKDAlhh3AdEGW-0GI9#Y%q|P@b&gE-_AZWc&M}YV($&>f z@G;18_6^I7s?gVtbT%kGMsYmWSiRN z#i9$2KUiO~RIlh*nZ>fHV)d1482_cMxf)wHS!~LQTK;R=<)#yYxPIPH__1iq9#2P2 z#gol4rzYP1pU=JVab8VjLdk}>nbjP6>%CX{A2DJ1qgni4e)%cAD8)AuLgw~m-dz#W z^VrDp*1mTKPu+Xy{N?f@Zk1@`AIob_9^%bb-h6Mt7fmsFn_WzsxX*z}vj*8s*B q)7CQSzuS3b&dpux%`< ssh-ed25519 V1pwNA 8acWnck16a9QK194orAzlQgQKINum/cyUzJqO6i0rkg -In2UpSbBR6QoTMTZR/GpZJN3x+5CK3hZcEvr5fORoOI --> ssh-ed25519 4PzZog /YeuXUmWrWFohgOSEmUygaTax668bLZpYO2T7KXl8n8 -mgnBBIsPycR6RMhLk4HQei5xQLzVHiBHaooOzZdb4YA --> ssh-ed25519 dA0vRg DidrxIBYvAfPkwNzQXy2+f6inafUafoX8cfUChA7l2Q -/wfxyJAyrQ3Uycxwov+0b9pKKOxPP9mySRK5g4BzMnY --> ssh-ed25519 5Nd93w i+oP7x/eHY/Roj4mdpOFHrBe5rxUL7/4617F4O3jPh8 -yTVD0dR3ljoUSv1qyuKcOvr1fMRm9C8YAZKKjURtCPk --> ssh-ed25519 q8eJgg Y0yxgrLm9/E8nYBg6Yvd0GPbY7PwCJCumQ9CtgWFxxo -9BfGPSP7pTTM8Dm9qXagKaw95hbqvvp7qsFkhQgQco4 --> ssh-ed25519 KVr8rw pXha2ebkoIFX9dMX3uRz+0rcbwcQ1mwPnLWp/wCzx10 -BQQ77pXJl75c6myecmKlEpqHtWB/rSdG6Pwpbxzcfbk --> ssh-ed25519 fia1eQ gCgas1CqGNZ7n09J7iXOvh2xeGgoszn36ABZwiskBBw -3a7WMN9aB6ZvwFyP98At9V9K99hD1vkvSJgnY16/JKY --> ssh-ed25519 CqOTGQ DU1oon3RPo4MCdzigrM2+b3KnTzzTSG/WDSvtBaF1VE -zwKaQnXT004dMojYFXPz9UERL4ULe7mPZ+vwlZMxFvY ---- FWICxx8MWe7awI8P5t0XsbA4Ye0zbxCdMbapTs325HI -wûùÿŒ­-”¥d!Ñ×=gŸ&ÜžH¬©ó?÷IçÛ’ÚᕪªêÏÒ¢Ù„öLÒLË-Ù¸ÏñU¿? )ûVýJæb®éÄÎC \ No newline at end of file +-> ssh-ed25519 V1pwNA kZ6MC1GXuminn2Hlomkep1wIv1lp6KpJOJcpXkhQWWM +K1B58FSyb4QpINlhuvVv4dGFNjTChU1KNoezZcS/a6Y +-> ssh-ed25519 4PzZog pbxwzRvcsOgY9hd48BZEOH6VHFLn93gJ8yDHQyNIiSI +Fa/Z6si9vyox/pmPvWTndyYCQxo7tcvdlRuTgw6IY9g +-> ssh-ed25519 dA0vRg OW2y/LkN/287NVuRRlSpihR+k/MZ+a0R5cIrHFne6RI +U0ZqipfDlpz9LeXKNWkl7tYCnsBjSQz8q4mETBVEalI +-> ssh-ed25519 5Nd93w jDy3i1Z1NWYqdVdw4h+maaBjokVWNrSfHtSQotb2bWg +PtgX9L78wpJHiX4lmP+H0bfRZd/tNfHrUEAShJ38ss8 +-> ssh-ed25519 q8eJgg BCaUEZ3H3BglgKPAbl/ITQaEv9Jc2rRAoFuPXhy4WFI +DMqJu0vjDJ8rIXLSL17Dx4Aoq8Uhdo4jU8g1jTSvMK4 +-> ssh-ed25519 KVr8rw dKk0SN9SXTQsPwMFiKKMuoRwzTHJB8kr33nadRzBoDc +m2xPKYFMC/y5fKkgaBc+5TVg9ZH+zVSM9I4I3htSm7I +-> ssh-ed25519 fia1eQ NGl1o/38iTm6QiQB7pl0NBkohMZGLMeaXZ37TV184B4 +zk/DTLhuGfhDU3gNA7S0BjGOowteEhR9v5oNmOkWTGU +-> ssh-ed25519 CqOTGQ JbZYKqGfWeVu/JEAAeC6wE4QvKLEeidvggQnm6beJxA +ArogOkTDAnvC1SKPkSGapNix2W6yvku1QFOFs9bvuGA +--- yWZoUAOfSIL4FbWSAvhVkOEbUA1u3XPGKB1gNka/xfo +Á¡þzòõ´lÐþÈ‘ L‚´C$’ì?Hc´®ìì|¥çÛ¹„.-øýÜå¡jõ ©lÂ}9:KÓ®U…Á^§í¯Ì“ôŽIO6µ \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index b98b8a6..ea6ef85 100644 --- a/secrets/gitlab/db_pw.age +++ b/secrets/gitlab/db_pw.age @@ -1,19 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA To9tGfYsutlmjqXZbFJ+TttdFAnbwY9odSMEOvItmgw -Q8cWN1VF4bVisWVMOEA6IXqhe2JzPl/9M9UUXWWV0Bc --> ssh-ed25519 4PzZog e3OTx6aEjhNCwyiysZkbwSC8ecVvVaVNfZV/3iNpZCE -o8jHkyg0lptJh2Iew9ZtVi3AUOSAtmDzBIz2nE4mj8k --> ssh-ed25519 dA0vRg 7smMdyMEq1stuvSBUsBZXJoeap4Aru6AsljjFPPpfiM -Ip5qA83bAGtYIeqv1w0yo5obRh+FWYJICgOU5+JoeYQ --> ssh-ed25519 5Nd93w z16A2vTVGdxgKmgHoSySJ9K8cwrQglflrWDhBvZ7ME0 -ILd92pWzyVGnTOXwovlZ3EX7LsFX06hqedW7Ov2CYII --> ssh-ed25519 q8eJgg Rf7U0SdZsP4NEgiDl8Z99tCoOkIwrrl5s0aYpXOG6yQ -tg+Y2WHuokaCVI4CCxuv9UW3GIa8CMuX0JJEWTTkwjU --> ssh-ed25519 KVr8rw YUN5VlTaxW7Niwtm9+FTGOILOklbEGL5EVw1BucGvXA -zXYcis5ANsDGPeFoV1aRzTJiOQY2P1ZLHsJDkE9RFT4 --> ssh-ed25519 fia1eQ TnSlOXGQ0BuVk25Yj9YpWWtYmonlM5h+uC9hUq3MM3E -8KrW7R5AgumY9wLVQyUmKlHD3zcUNIc+VU/X+vvY2LY --> ssh-ed25519 uZzB3g 9ms4lu4KjQED/2AHQwr9oLd/6ws01IxuK7Z05CY6N3U -H/4AnWwt5fnZMvWjmXdoe/Os5ttJFYsMmjaHHqBdAxo ---- zI2RSKtND2Ep69vshrRkM1KOiReF/m5vdY4jIH7NSvA -ûì‹ënà›µ·ÞÒÜ I¯ ü$¨¬Í[ëP…Uó¯"ÕκZX„ñNnNg† àú¶dP}¥GZ?< /—!«÷c „=  üïhnZ`ß0‘²Âˆª1•nl‘±Üç»vÄÕfwÄjÓE@21{ßù…ÐúEØØg“|èñQ\2Ðóe¹~ÇšÁ=Ó¬¾]fdRnó¶á¸ \ No newline at end of file +-> ssh-ed25519 V1pwNA TtxqHD3bJI046SXF61CKfpDRI+HHTRpc/iznIMdQiUs +WWgm2OdnPjj29tIrAMa2sJCNEaR2iTAl/hMfPLv2QoY +-> ssh-ed25519 4PzZog 0I9h+D7DjRwupkHWDUKIxJlVBUWwbCTR1nx8UcEm6Xg +NIYzimYGAo8ou93B/tzjmB1K7hu2tXy4XMRiwlDqI0k +-> ssh-ed25519 dA0vRg 1U+1fUueu2k7FaY8GVN4BAbiF71OvKbGOC4oZ4mV3ko +/fKxmEFW/L9A/1fDIteeTcz/SOv24HNct88oakdAkn0 +-> ssh-ed25519 5Nd93w IjwMC1ZruM915vwA+lExdIq/OFT/4SlWgwOm9xgUPAQ +mOOTbPdcDjORB1GhS0m4/p3MA6TfHXzWXvAMzKhw/n0 +-> ssh-ed25519 q8eJgg mODUrCPf9GAix0jaPaKUs4ws1D9BM4huHbK2mst0SH4 +7qbxM/Wa9pMpB7TjQZgBojXR5qDJUBZvplsrI6EdSO0 +-> ssh-ed25519 KVr8rw ybBiUHmEOyesWxdTEa1LPwI5J/PQaxYi02QJCAuYyGA +LoRQ15hQdVGLj9pJY3TabBFhtPGBvU+bnAa2dzrkOY4 +-> ssh-ed25519 fia1eQ Qu2RTOQiZY9i2SDs0NVlA1zcert0oFcFA3mXDDl59G0 +6akg1POXrvIrzITX6B8yTDw3cCqlxsD0k40mYnv5r/Y +-> ssh-ed25519 uZzB3g xNdZ8eSTFQZ/RcrNR4BpedX2pfceZwPjvgt9Wd8rMwo +kMxoKyE0bjXEZ9tNykOUMZ0uHkqdx///QJB5QnLRhcA +--- 1DKMo46SYm7JlzFo3nZwtaK21TFmapfXqxXzxMXWb0Y +8îé˜Ì‹}æš,æÛ^mmîH¿v`Ž#ð‘?0 «à¤Ð>Ù‘Xï¹;λ åLÇV’8°=]Ô¬¢sEœˆéhÓâÉ‚Lè(ƒ`ÔýÇ"žZKîc¹1¼.|GØåóç??eÙÈp_èã™ËÁ‘¹ìÛ¤ÖÆ +äá·ŽÏzéùëuPåqϪ9ªS«V¶évÆ~§I4õ \ No newline at end of file diff --git a/secrets/gitlab/ldap_pw.age b/secrets/gitlab/ldap_pw.age index 3533989..3cdcb5b 100644 --- a/secrets/gitlab/ldap_pw.age +++ b/secrets/gitlab/ldap_pw.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA aYjPUkjZHoQm86XHx3VbGswLy6VdKNaaHe3f3CGa1ls -HMuWoZj4tY/nWj1nrgOxob1hJJD/mPD3kQnDgJJafeI --> ssh-ed25519 4PzZog GojGaXIg5RK7WjJSCZxJksXvsm9TZTlbHITuksMivBY -4oAuKXtJ4ksvusFX3OM3VpdzfArrglxJTN8kCdhIjrU --> ssh-ed25519 dA0vRg AzGx90D7iz93gHtSvV5oIbBkwgQEpVY7DTRQIZ16IiQ -GlMsor4NxuhHs1HJg62O3ZtPF6CHHFc46din6fm89G8 --> ssh-ed25519 5Nd93w oAyaZjUSGC9moA7pLR4+dzoKAggFuKUNMnRbn/fm2FQ -eHa/2iLWrqv/pPXjgfxtk68MgBX6EYW1YWfs1kXkazU --> ssh-ed25519 q8eJgg xBdXNLjZqKi2o+cbCXGdOOSFnlfPgaxjQb+IK60MYHw -dxV3kTuaJ1ANFgRaYchwAa0kjGZHZ3POc/Wrw/per+w --> ssh-ed25519 KVr8rw TR3AjhWy5K1ntzMx3mZZZWGYi7EvcWiFpTHyU/+pV3Q -Y/xu0hrhaFZdO9YY8vINp3796HZ+LAL+QvBmIWmoS7A --> ssh-ed25519 fia1eQ zF6CArF4sVXzIRenfDq7WHz06WXFdo7vMgD15NI/sR4 -m3sGJNMtAeY/yIq+D2nNncGNxX+KKXt0wCO1WMZmSTI --> ssh-ed25519 uZzB3g pTocgT3gT7VHD7BWt+rGRIqUZYuh2G+1VeTJxyb7Xxs -q5UYfrUVbgaqJCxWKegc0q0PvPR6AZ7AlI5ff4ePfjM ---- 9KS9xFBleYVsxyktikZ+TX9++1wqXmDBZxU3g7vwwLU -<{rU/˜½Œ°ßR¦*°Jd)¥“»,#ø9ns!LsÈW#_ÙwÒ ¤äÃéÐMÃM‰Ãýð8sÏØ]ß•üƒ—8ð3ˆ¤7@·YNØçXlÿ¸æÜåº š¾Il^0p"aºMf«¬çG SÂdBŸ/»sêéÌ×,¡4!ãÌrPÖ¢Ñ-Cáòky‚ ssh-ed25519 V1pwNA 2mRcx22kddqldRvOQY7i32z0sMwCuGlbCkJJ8vlJKDY +aL+OgWP6uTute1b5dlPG5Tz12KHeFlCG/Su9+MBTceo +-> ssh-ed25519 4PzZog 67PxsXDuqXhmcyvNAu2jZrDtd+XgUQnEakPw4pR150Y +nOCZQmAhHCptlAz134hin/UKKpuIL+ueRJ7Kzhf5Aiw +-> ssh-ed25519 dA0vRg tiN/eg2X6g4x6KndLJs6ze8i8brhXcsBqP1ZWq2s0T4 +1lx0Qqo81L12eIG4XfQUWYgpimEfgaPweZQ65GTHSaI +-> ssh-ed25519 5Nd93w Iq6wxlnODEkmZaYpf1s3XxKmROa/JwXLdXOtCpXuM3g +0oENjjsAh2c5tIHNEghw1TE50xRfU5yWHnZenYT2UgA +-> ssh-ed25519 q8eJgg HrJ8YlZTp7YhRpKpv5ZBUbxv/777ATRtYzcbGH1JVhI +Cytu763lKuwmLLUhFJo8VunzHxYn75YRLiN3vnhxyL0 +-> ssh-ed25519 KVr8rw s60G0Eusw0rEW3woOFeE++5C4vI8L6NOUXATml2egBo +tPGsNcE3H9crSOCXCkktBzjRq5JyaGvgmx0ZIs3ehOQ +-> ssh-ed25519 fia1eQ P7oFu5pYYdJu2fcqTYbKuENBWiFnNVQxg2N8QAXNVhg +aZUyPG6FpfFo7GixaofYbCeajExpKFME6PBb6fTzk6s +-> ssh-ed25519 uZzB3g hP2SPeZNhsmePX55N6g4Y8q2KIwRONPBEAqSp273Mzk +y2c9S06vYQl9v0G/7IrbEx+kGv3DOnpz6+9+vo1o1wA +--- 7prlMrCmXuXHtiD1+44Pg0LV05OvyIEF9fYkCiLEv1k +_Á2¾":GËoã‰*çë.TÀ5 .Ð(Nö£4OS6U1ø ÅCáíµ§ÂÒcO§’á·[Q èýä¥ZÈäŒ#I›Ÿ1 cÓM;÷/~Ä`=ñ&²'ü?ºn}e#ž/°›µqó‘ ÎÛ±`xj¨¦¹hŠ:û¸?´Î¥Â/±æÜJ3 .‰ÞÿÀ+ÓOxkÑYâbkdÏ¿Ï \ No newline at end of file diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index cea4bebb871839c8228e97649ba620e6bc6f0809..6ef6846a207a94a4c0b5d046a9c194c60c504abc 100644 GIT binary patch delta 1024 zcmcc4ah+p=PJK>kibX|GaipbwX;pfWU$|wKsc)fCag=_JmvfF|Vs2(eVNQOKVUbB* zI#)(&u3@@`hfk6vX}Eq^NQP;CNL09!S#oxAMpTkhHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGtG;8FlUZR%RZ5zLiLYmrvzt?zlezrmLg2myc(-xo>h>PHJF&L2gdq z#E;_P-kuR&0mUwUe)^7KA%W$EE;+_VDQTHiS;pBBDFMN5#@a@u`B}bUY1zJ9ULo#2 zZaF!A?pa=;&MC&(p}tQ3dF5%^nME1Sxh5%<=6+d*MFAnHnNG=*;~B-n!@R@N3q1S{ zOntq*(zGp8%Co%76N8g8^72cgDswFjGqNgzGyH-*Lh`b?9QC6d-Td^8igLXYlUyw$ zJS!4QJu1V@Qrs-GlZ}I2A{?VUjLjl_EZlr2pJf!UcMNvROb;n6bq)zP%PPq;%W^C( z$uQFQjH>Vm@HX^xPtgv|_sI1!4>AnoDl@8ZHOuyo2rJIYbSyWFH1W<)DNHIi({?cl zj!G)eGxAFb_A^c~ajFVLj{)znB8#GOg~EUo_oVOw^Q@>!kANyacY}J@O7BD$x3o%FrglS9K&U6Z*&a&r7r+#~WmtISL)EK2kI3td73%9HXueDYj^T$3`&Oe_mL3N6iD z(=mKk8dc?FoUV}S>gAqoVPssE?cy7lWSE>>nOjzDnOYcRWab@QTv3o?ZkAtQVc}k8 zoX-`MooixgT2h}K?pIXqU0#&#mYSAc>g8o(;gjc9Tx#ZNYM8F?mtzrW66DIItE;P! zQx%?HZj$Zi7?EROl9cUXmRaOjS{xo`Y-CuTpPP|b6z*!45@DY0k)O}S+aUDrRd>(a zH%DXsZdBaM67{u;p+w8;?VOp$tGP}cdD9{%`0t**>M514<#U?0ZBza5a^vm!ii(;n z-!I&fOLTwoJN<*JgWFCyU)@cS&$SaX&(B<7X7#VftZ3z*M_JM)WeXZk8sA@YEV|!~ zvC`z{Q@6J_r&=D`eEFW@de?N$o?51s-*XbT$OisxHqEnN`XX}D^tNBG|1V8^7j$c; LgMmTfjKUNEoXBm& delta 1024 zcmcc4ah+p=PJK{_siT*RNw$+mZka(rfS;3Ph+}Y$NtQ*1NwR0KiJ?V+ahPRMXlPb= zF;_`xfumz+PLgLzaaDzfufK7KzE8Saa*lydPGv=2aBiuQtGRD@sk57lCzr0BLUD11 zZfc5=si~o*f=NJCRDQZbSfNElKyYZ0nMp{NUwL?>zME-cm}N=1QD|YVb8=cvctM6o zV0w;Wp7p?WknS!DHRnt?v_c$xj}{6e!&*$&SriQ$>tW5;~B-ngMG?<%|lWP z{7RE6wS%I(3S2#M&7#uMLOt{Rs*3%>3X=*Ws|*8^-QDuJ^71OOBLn;cvpuq1+&rE9 z!}6UB^exT&l5(61DvgVs%7fEPygaf3!+jkmpJf!UcaJKFG>A;JvSNtjw#* z%gxX9HnmJK^v*B!)6R25j{)znB8#GOg_P_>ShFz=C4!{D6|8^5jsbWUh3_6t_gn%H#^~P#4#tr2NRhpmfh-LnpI9Z%fyTaG&fP zv!tqWk1YRWS9I&rG7}9`0~G?ClJWwL(lP?Vjoh6~D=l0KA{|RDy-U-RjEhsklPt_K z>J5^DBg-R#s*<@3J;KU-gVK}ClP$wcjU5YI6N>{PQcKdD%8IKj-Gd#Ay!f z@G?xz$}o&5D0M7%%kWPL4^2-r3D5MZN_We3OL0v1DJU>1NHy>_PtJ4Xy5xFcdjQM& z;x*D*kB^sc5pB5lsBcp=XWfx`W*)Y&QhL7>o$Wi7XRGi%EjNArQ1J5u$1cn0(Y#pz7*6Awr+1$HMsPC!r9ZV z9aHDrZkpQlKgi(8mqkDJPSCvI_Oj!W=Cb8dkCS?ry)u02vV-%*Y_5fsr&ihAy#LXC Mo%sa^wx_OV diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 00fd51bcd54adfb5763bf3451a5af78be8a97cf1..59a5614c6c56fa7b10b14165914d10e98c07e747 100644 GIT binary patch delta 978 zcmZ3vl@`Um`MHj1fd=J1h6ed=foZNTA=(+)c`3e=;~B-nQ?f#m%ER1C zeG3E1lZ+|~bISvZ%X8e4bG@@I)6`&ChV;s;nvv4GAm`EjMzj%1+MA(@)H^%=ULSaQ4b` zGto8=aSk^&GBt1sGPDduj{)znB8#GOh0stF^N6yvO2cBKu)w5}oYMNL#Iz9o$owMX zB-gAQa|1X1L}zF7pu$MkK(6w<0R6JaOpn~6oZLJw;|L$qz?4D@OW!Qlv=r|&pOh@~ zV14fpw-iff4C~S|6Ae=X6$*?>3ksdmqe{$kEsec%GE0riBEt)v!+kvc-80fWO)D+x zi}f9I{XCNlvbkIW&CA@2jY9)XT+8!}0}_)83sSQ)OA`YV13cX;O8opSwKI$gEQ~C} z%h7%3T<9O-9;lE}9-1BH=#~)>=wp&u5$PTfkXlsf9vSMLl9K9}5>}*6Q4o|=5u8;V>R;+vQBm#|Rax%p>l|62Z|0ikm=VaOtE;OJ z9%&X8RGeJl9aroVgh%Iv@tPqs9taFJbq9~E5?cRTTU z_svCRhJO@zvTZhh$XOzq*XG6?JWVb7)A46>gR}dNh$fxPdZy`@uy`VGM*ESIx8k#3 O#P9ktjq{4Cd^!Ms!&GDd delta 978 zcmZ3 zWmbimm#d>Mmz%GjQ-QCUzmG{#uxq}Ldup10a%7RAVPJ^AabS@}nUh;sT1G};RbpZG z#E;_Pc^QR{#?I+EK_NxHj@iD3&LM8;W`-_-CPrx~-r40I1qEq|r3S(JVZp9krWsxy z<`t$P!FeTl>25i`#jY7ng&`RgDgJrh`9;PVWs&7kWs#2N{w}VQ;~B-nJ+pm7jZ-50 zjmt|*^Ar7Z64PALOv{|o%aU?^^D2A`Qyhybs#3DDbHYuyA_^+~bJJ7uihVNt42_)q z-9v**%=5EKy-Fj>!rjBlE8JZD3r$MBvYZVjpJf!UFD|l7FAEB=h$t!uNKWxjcQ&oa zbkBAz$tlh;wx~2K%MDI94tLY{%?vW&Dor;u&kxTEtPBhCGBh$MOv=|U&j>b1DM`r; za?Wtii^woFGj|Hg@(r^a-bOYzgVy?8X0%Nm8ugYNUa`%wjyvz{S;M80{!wBt6i#(5V-<*_W z-_T6gs$xe+Pju_jG7}9`0~PYJlghKpgZ(oTOAVs3gSdTV6OY^fc0)4r1O+$;cvpw_tTnn;1i%tDgygj2lD)bElvnosr%Zf_N0|Rp`vx5S) zee%(*b1w7`aSv2*PPcILG^z42sBkmRa5Ks_GII^h4A3sEO7|*Fb}2S8^2swRPEB=n zjY#IQ$SbT2&yT1#FiUcAuSjw$2u`XrNy{m+F!uBcGz$;*%`ymeG50QvDlAUs($&>f za7=RyjI=Z`G557_iA3%%`@;zCs diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 28aefadda7cbcbc9db38f03b6f0fc92186c827a8..4df759a7c80bd0cccd87c9bcee8a133f8a88f794 100644 GIT binary patch delta 977 zcmZ3%v65qgPQ9UintxJBL}5m#S+;X_l~0bJzQ0qFVM=9iVTxNxmV173K)6qeXJ|y0 zE0=a=zHf+SnNewWaducvS$bNseuPg@Ns(K&OF@{Mp=Dx@L6}itMR`$nB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGk3ogAzOzAYsfU+AxM#9ovYVN+nMZ25Nko!yWNDOkWMGk3 zWtfLckw=IlmziNzRYbaTMV^nbQAn|YQJ$%1RjOB%X?kLDV48PeK!jzAX_0n$N}_4< z#E;@(8Ga=`MZuZAQ6ZM0+Qn5x?&*cb`WeZg?iCRpP6k1R=A}Mv&fekqM&Yhp$r)x| z$%d%~q5k?tZdE0z*_npsdFCPRW`X5dZoWn3xk<^vCS}Ebg~pTP7$w3@%iPk;{0+_h zeLWqM%Tglpt6aU!s+>H%^t0Ux@+(vPJo607Qhm+M9h12Xol1)GD@#lAJ^eFM3W|y? z5?#Ym)0{E_3Ug9&D|15AExlb*@_mgeoQo%)WfZSZG)=8a_Q>@2De?Akbc{?X3(3r_ zs0=Jjvown^GIc373d<-ylAuKa)qpIonyAa@^s-$Hi-XP+ojLt`%&b3<+aw9LeCCqL7W zQvXPI-^gMMbnDVG6Ae=X6$;B!9Ww*H(macz3e&Zn3iBe;JcA=FLoKt4^NovwjomEj zwF6x|{gRS%0=d$Rl7mB2%(GIw%F@k@qbdr_B0@^NvXU|i3!?I~4Kk}T{FBpiy_^ez zFsySf^bc_lREY8_Ff)#D$#yAs@-GXkG&J>bF$gybbIkEcGA?tm@Gq!Lb}VuA%gD{M z;4*MeD@`#Ctk=#-cQegQ3r`P-wD7NR$_g;cFwIYONisDk3Uy7iEb(?twBXX!)l~>c zGxGE*HcWGkD0VN&PVp*ot_(8Gh)Q)14DiV)_fE?;FHR0f2?{dzHsH#f=%LPu8FGL^X)4A%o`b|o=%mHV073OW6pL&u$ zd(Y*O-}zu__1hT=7hFGD*6!2RcXJ9qH*?+w=}lb^Mb=-lWYwBvvgGX)p#Hj13HUNrHQ3?P6 delta 976 zcmZ3hM1(&X!LUD11 zZfc5=si~o*f=NJCRDQaGp+}Ormr-P*L1>1vsiQ@eyPHe4r%8Bfage@GQD9J!uX%=_ zM@djwXr!wNS71h2rk`PCpqX)Hrm;~`ig8L%gm!sknsZj9YlwD)f1ycgP>^X}m3OY| z#E;@(+U_2O-q{`{`r(B|<%v=GhURWAt|jS?{wdl8?!hK*-r-&r&Pi#B`W3ERh5Qjflk^6Ayt{q=B2qANkL8}W&wVFA)dyO;eJk8rmmCY7$w3}lhVAyytAr8 z^D2W1{7SGAc4O3JHy=ZDgRCHf zBnww#w=ARZ0@q42v%)Z6E}x20LsPGasPMx4++1(J%)-PxqtXbkEQ^fbyaK1ZB){xL zqayzj57Quw_)g1AG)xUtNJ{f64v9=jE=~#YE6nyuG4}TM%=fSiFDybph8xKg}0BZMQT=JkWXGln2AMJke^9zskd`Zm~&=8m7A+sW|Bu$m~&!f zGMB4yl2cKpOMO6ynVU~akVQnki%&&%a)v=bdQpC5TDECvUQ}{msi{Gwr6ZTFuC78_ zmT^)}hF4TXMOnIqYjRn(seY=7wt;WDS$cU;QFu;9pkb9kVuWi&RwS26|FcIQydKT4 zWqEV{hJJG6yI%2Clbp5%K0MLhA$0gxisfp)ZN0yKU1mJRSQp7c1BCu{Q)2(MZBAXKPKC*k}Y*6;|NLf`Mw@NeSmW}$X M^5Eq2QiWA_0TDD&@Bjb+ diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 1d9d563..3043014 100644 --- a/secrets/gitlab/secrets_db.age +++ b/secrets/gitlab/secrets_db.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA rEsQ/q9FmFkVdXfXfYG3zHN4KvXTfRmZBLEibdzbQBo -fJSlFRK0Oi4OpGBf7Z65U5+OFu4+Ts8MqKe7B2G+gYM --> ssh-ed25519 4PzZog aOPnUpH7F3AS6IauahbpQYYYSX7hSJcix2C1CgUsoi8 -h83ikYOIqng/YKfo2RJc9MwbdaKV0V3DFLj5socRi6A --> ssh-ed25519 dA0vRg oK+zniCPQd3Hw/Bm1/cG6d0If6Wq7VVdxR1nrH/MHAQ -c9Q6gyqil1XvTsl/QB9dpvYHa9Bi8bbfWNNfEx2wwo8 --> ssh-ed25519 5Nd93w B1mA5u9RHQ28ZopDLlJh8Z5Q530tJ9wjOzhMzsJSTUE -KbCpkJ666a/dnnatT5QIcPbEOMP+dUkiMERcc9tRMvc --> ssh-ed25519 q8eJgg ps+fnslUfJUthZB+bLXZdvwXgaM/Jsec5YVJiTZy6AU -vpwxjfgKkieWlxSjWz+b6U0p16zJq4Q+NqO2zXISWbg --> ssh-ed25519 KVr8rw sIxHbaWSfSZVoMIchJnvEPH0S1ZrSa0sS+Pa++yUZ1o -3pn9e3IzOF0JxohMP424AFWw6IrCPm+fnS70cfnKZ1U --> ssh-ed25519 fia1eQ XPBMusFIRQ2mqQgnYPpbn40heCrqiqa2P5tiq5H9fgY -7T2S+TJ5jd7cfnCa9iWLaf2zUHG3YIUZFnt/ek3pHUk --> ssh-ed25519 uZzB3g NxRK4Dsc4U7a3MPQoApPTNdybonx2RdXUGc61WB8l0I -YHoL+K85aXdCTAm33Oc9d1/BD6xFXCHZ8uJCqqn8pQ0 ---- BHDuf9Sxnh49jes8mUA6Rq2cTNqBxpsz51UZgL2np4c -þC <\ã2fkÛ×L+\¶‰éÿزµp‘&‹®6~Ø<àÌv¯séærx§.ùO¢Y -jÚEA-ý­ûyã&N2&M•ïn‚  4!c²™^$¬^;¿XJÁ@éFÿÍûf*²BIÉ`g†e{„ÍGžËmý…ñ?U¨i«toažìŠ ssh-ed25519 V1pwNA AbGjaacp7Tp3DYhUzCOUzzNlUGXYDTU9vEv1DJpzqww +grRQCuht2PKdwsdbABRIO/QLX2HikbnnPDYDfRNeeOY +-> ssh-ed25519 4PzZog loCPiNwbEIOtBgQnBRSuiCuizZdrh/l4lbdvv1/SYCQ +WMu8NXj0LYaWS0qxcuBsG/GdH/E8C8OmbYb2mYuRkrc +-> ssh-ed25519 dA0vRg 4UnugzCjQxs4Xqii2PWA7prXrjS4wP3wJQtUbrQi4QU +HqjVoiYSZ70DdNRui4yZjR5oGiCyR6Rly+CoM0MEbxI +-> ssh-ed25519 5Nd93w +PwbmFGDmpdwKvuHWLQOJExFZm2P8pl15RpRqeM17Vk +HvDt20lZsSpyZ8z2BShXHlAOzIM+15UpMonz3sqSwR8 +-> ssh-ed25519 q8eJgg SYtYX+5Q35sygmo6PdlUzG04g2bGnSyVGgnYPkJKoCI +nrZN3mp0jxSQfblj0pDE/7/pO2jAg0byTm4HQOQzQBU +-> ssh-ed25519 KVr8rw CzJ3Fn25Lq8zZOAHKKbLsiHhTHlAMDNHv3yLa7gaqSk +O1gss3s7y0VfE6ZS2GkdskeCfLJNytTNfFWz/bzEebY +-> ssh-ed25519 fia1eQ WWju+k3tswiyQfc7XR/txDAIaIjX7Xfnv2IcbKH/s2k +mAxPhLCJjwX68AwGSkJxMSF5PkGPQDSCkBMoCi1Ozf0 +-> ssh-ed25519 uZzB3g EbWWbRWM+8jrtg/ZX8AC8VKMOtf3ch0QrBn5QCia6TQ +8/TISW7rN55/vfkBH9HKx7GKaWAMIEVz6xmtCh5fjfw +--- +L6TvqJA1YZEmK9PDIzh2r5wtzB1BI+qz+i9JotMejk +úµÄ }“sIc’ïø>}ö5bîTì«ê§Ð¢ÙrÂN1ñó,ˆ4æONÁÔRzfíÝ=اŽèNx7ˆûÓÒ»[ÇÓä)×G òÄgè‘Øw¥ˆÄ!sõN‘>#ggâGÒ©¿³\üÐÿÓkت2šíg#@èÅÊaoï„—‹†ÏÓ47åwxû6mfC„Q2H +„>ËmaH”ï/uv \ No newline at end of file diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index a06e1f383780915f1c7d0ff44e51c06a276a06ee..25926fdc3eae492e990abedc4491e15fd9276b93 100644 GIT binary patch delta 2585 zcmaDN@&#Np87oP(WFPk#kUL zv9n8QeprPsSBayeTa=MUKwwE$xG{d!Rf!?qeo0Q@k^ZLUDUp-o7$w4;3(Y-~3e&@k zi?YK*vV0Qtv%}3@{F0L#!*e4tyvtn*O47YO^MZX$b9}i1@{KIBLQ;IfGs3+qN`ed$ zjZ%{`T}}P`f`arzLem00TulnYeGQYflaeQ&WfZS3b_qy#v`ou2%gE8s3^WePD-Cc9 z3=ar)j?fM&3G)k2FAK;F3N{D`%_!zdb@$B(@yiPJiW5A^Nn0WExf{$jmwG*Dk{>F%OaBN zb4#m=GEB3pin&~>3==DIB2Ds(vU3W8vXj%JN}a>fbG^&bQ+*9XTnYpHEi(%ZyweQ} zL(#1(jjD1oPFILXPc5r5FbGQXiOLFb%_=SkjkGlJceV6Oax(G`@lUHNDt0o}Pt8aV zw%|%J_6>JWbg9qr5A-Y5_t(}hiqdwj2=I2!53%&92#v@K%eU|g_V+hU3h?F9)zwwV z&nn1w&MkDx(k{2i3bm{X^ffH2@G%I_s?x4XF)GRni>k`1bc!@h%<|=uJigP*{ktds zPnIqJG&x?s40d6+N;&&%JSdH1~`45|LB;LTs*dZJ9Ua%x!hqUkbNY zoDykP&`q2iT|9w(+iLat#|Bl+8@LwSk>B;<*wc>__eB&GhGj*G_^**}+51&`<`OB+ z+Pyng%~R%j6XMaZKO}kYnfXdFNqtKTdp|F`EA;P_vhxI!*X&cz@7gtMYQ+z^*6Ygg zM~>&XhJC9)vS@j@>+ea+SvQx@zp^W5>#B-}Q)gdsmCygz=E;BX#)jBBS@xp(a~8G- zqD0w66C7o%3IsldY1Sqe+!N}LYhJ(Zl^H1XZpu%i ze7;8#771AEr++s5;ssOexBiO zH^=N?U(Y@H_r3LfcPkQ~Z_ocD;(m;2t_X+X8uvXjnB4z+ zYWF;@t!Lz1b2snJ0;80!Q(M?x9iH)Wr|9N0a_=_Y-pAw<;axvgR$%MG?qZ1_~e({sgn+}nTf zX1T_z+%j=WvsT|wnOGmb>A3UHOUXL=A3B!>&zfm_o7Z#Rvznie*D`#+{A2X^;E1JruOD1pZ_C8+>6Vz8zjiF& zv!iV@Q+hxAcoMJYBqo1*Lu>feH8G)w95rjqbtWV<$L>)Le8{u?S=YCduJxPv6HSwU z+_GHJTFbqRqtwp|lx`!(ddYUQaSM`?9SC3cprh4W>Ua%VK8&hzL|KONEX$#mhR{WTxwy!s*6 zsM9RXTscdX+vnr_a6Y5NuKQCf9eMt-==e;T=cezN zq?}iOwsBW|=*#O14?EY-_3pNooAPk>n;E;;Sgyald77EF>%Ykt7pTnJDP{FjKdW(4 z&g{9ix7;7url`ybwXqPBVx3&JbE*Gt&gJ<*x2@}1#1DV`7;yi`hKEyj>D6@^zB?W} z#W0?MU*&9`nd*jD&z3gswkUZqT_Gb{?~d-wy^oDKavJLSlKvg5tQRqx^FGafH^V3Q z$Ty`PyBKTEuWjVH1w%KArt_*2gg^j~}-(S9aBF45lT;xV5kNWe~asU5b z=8918uPpp65~#OqucSKHvPN;c+dBcG>N@K5M7&l~00iW{J)}{(M#CG@<_0$FgO(ECD*PZZ!Y^ delta 2585 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 diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index 02ad9fb5ba2f6b35d502a45aaa5022ae8bd40dc4..7cc8e3040790c5e07e17ae45c791e83588ab85a6 100644 GIT binary patch delta 1021 zcmcb{agAewPQ7u3xrcdXXjE=`phdaAQL$H9M36y_kCRhGhPI_oesX4cL{XxJXLx?L z30GdBM@49HK)9v9Pk3&CyK{v_R(h0oMtZS-n2}+Axl2W$iM~^6j!B7GIhU@TLUD11 zZfc5=si~o*f=NJCRDQaGi(^h=POe`>zJZ~ML6~K@shdYyQc+n+m|0pzvUY%lWs!4* zS4p^eXm&;lwj6+Plivzur z^P@^K^%H%Z-68|RgL2$_D+>&Bf|4ve3MZdol&IIX$TT&}3k<7pPBQWKOK~suDmF1U z^)Dzfx6Dm8OAd%KPxm*@j_|NBjO6k)()P%WaxBiP%JTDzC`r>#H!blii^vZw2=z+z zD|2^DDGVv{@JVv6N=6TV@310^qH=}eh^Szn#LDt2f9D9N(C}Q(`tnFePvh{iz{<)H zORsFRD#wVbNUze0i1J9T0JAc`Y(o>Liky-_BOgl-FTe8e;zF~4MAH%z_mcE-k6dHz zfJ_hVq;gku>(Vk44O0UZ0s|_%!b1xReJb<9vfR=O^TW$cTrx8ai@b}ge3SADv!d!l ze8PP)J*pf{xKiA`GM&7#^L*TVEDha#i`-Mfyv)NQJWK-oDjXB@lgq=4JuJ18TujPL z(5)+ts&X<;SMVxL^9l5K&yC74Fim$1%?hfDNcHxuOm)vG$Vv`y3Ji-V@Xv5DHj8qL z>3_D9|A)%REa`ZYi5^!=;1c<;_x Jeoo752LK>NY}x<- delta 1021 zcmcb{agAewPQ9OJMQWjQP?fiVeqvO)o0+3?VUBT9ie-jnQdx+$n`30EWu|4GYi?F$ zI#)oNk5Q^qwxvZ{PGVqiqDQV_NM?GjeyXu!p?A2mpQU$>rHf->g>h71K9{bYLUD11 zZfc5=si~o*f=NJCRDQZbMTuo%PO+znnSOF+g@?0iu$z%rc4cT@x~orEVOWMqWRZ4p zp>cM8d8KnGS9qazsGDVxyK}yazMDmWTaI>Sflq`}a!6@jwrioOc~C)-yFsyMkynw$ z#E;@(rLHMC<)$89Ng098`MFM(r9}oVRW25RVTnCS{Z37$w4-g9H3c^@GcE zBGS{G(o=&1OM?oGf(;Gav-PVCo%2#li;@FEiYy~bb1b-$Gl~k6b4>FMv%Cz`D~iq1 z146>njNQ_VoFlUeeNBss3=4v?(~}G;(}tSU1q$V+xK zFmyA>wD8H!&PWaS&`)vHuM7^!4&@3B_ww;B@-y=Y&(luHF^)`%s5DC}Hc1Y#EXWIv zN(u>2F3L~MDJ&>(!U%uwup*11a)n~^;M7!0-yD5&_Xzj&T}o*R06Oph&KQtct2C!;s8~l7fiPh(v=(f8&C5ckPtovPiQaPYWMQ%e->e zV)K*|ZwvJ3PRmR*Obt{piz*B$OE#-8k21;dt1!y<^)qnFF-msLOL2D8cQ$i2)vu5A z%CD+2aLml-3NG~ybP4dT3iUD0^E2|ztn!G=buxC*F3E9D^ES+L&dV+J%TFmP4XJWO zx2`m*%E>rgAuk{zt<)$nzrZWItkB8d$H3Xpq&zIM$|=;*$u~32+tDr0B17N8%*ZX0 zD=e_o!z{?5GAAoC(n;H|EG;v<*e4?(HzGZ-$jnhcJ=DbCEUm!XkxN%sS0T6D z+&IUtFvZ9-+rrUKhPJ1LCzr0BLUD11 zZfc5=si~o*f=NJCRDQZbsbjujfTg)XxJinUzI%3nwwp;vcwk{sX@;+3kU@c~Z&-nG za%rNgp|*EHErCOLsLl2rbJE$qz`jFmOrcsDadKmYVFzYKTZ?Bt?!<1BBVi~wzO6PGgA{Olyt zpk&L^lzh(;j0jK5Of*alR0uGy()I`_G|x55%`7ns&IpVMN=h%xjtWf74)Bc%F7>jk z_XzebEvj${GvSJ=D0Ga}cXthl47JDz@brl&@k|X3^mTPkGcZjqHBQP(&GjfK$}q^W zEJycUX;hVyak_$bSxTi@R(eF4uc>jKrMFK(Vnk-KMX^t|nOUfRRb-BKh<~|Dgr~WC zU^Z7?NwIdmNqBvBrk81zxq+ciwq;OemZf2etAAEhWn@NSP^x}pL~&7gxqm2^uCA_v zPo|-zdtR`me!h38TV_t8SGh}?Nr|VWafVxEQdD7DVNP0syL(Djd4>g-{<1&wqa|Jn zUSlv{ojQNU)7L*!O%Ju__Sq_Dy9HawI8S=#%W!kWs?U>@%B~%E+x_iGNQ%k9*i?yhRD^A7p{A@bys zq}`j#y(ZYsHQ17zHJkOkib~|ymQSC}cs~_xJ(QF9dlsw0o9&x;84n0d>0Vs^lk4E0 L&g_jW`~Ls{{&;I7 delta 1023 zcmcb{agAewPQ90LsJXt8V??r9VyT5irCD;6VSY(Tp?OrKeoCmmpIL=Vx`9tnKvG0S zK9@m8VwACKSw=x>YHElJkpMYwUI zNnV&?c0gr1S9nEenQM5mi<@zTTYyPqc0_V&P=$d(aCoG7VoHT`lu=%;dvRrnlZ$KU z#E;_Pz9E67$w?u>Zq7LszJ`9j`aZ!1hDH{SuEE*vS=nI${wW0^#qLS2u5P|u5r!46 znPrus`4y%50f|LsrA`qp#^z}T`tGR_`6(WyiRo^I>7}I}fyw!k;~B-ni=wJhqKdMD zlT%H-G6F&Z0-UQnyehmsL*0^Hydo`glan3I^aJyp6OA3Y!t=FL^DB~~qKtDbjLJ=u zD$A40iV8d`@+$KzGV{zrTtbr!@)Of@99{A!pJf!Uk0>_JcMNilEH^37b+jxn^f5Ne z3Mwx!EHdy8in7#>NDWAg^vnh&attr<%rVV056MdR@-_+&s4@97pr03X{~ZY)_NybnP7P3Vj#tpnOxOq&%bY@Bm{o zkGzV+V)G~yPju_jG7}9`0~LHC{mngmeR3)zf(pF6ywbf4ODl^ai;B}yoRfkg3o9bh z>rEH$t!E;K7NjdJ!Y&vEn02upQ! z&GhB+N%k{M^$4!_Pj_{z2r??lbv85z%J%Th$w>+fw~TUe3<`DEwv0%PFfwuF($&>f zD9&_G&vVX7^e8tA@pp_2GRe&4RXx(Oi7L8noz54ETsN7 zlBX?NU+Z_Y6GVZ|kV0>NT2g8!MN%Gw?LOgh=uJqzfu6;1Fn zx7pex{2;OWanh`dn;370`k5cLT&s|>RkgnE)3a)c<9`)ie%vMP#VWmT_OFDK9yK%B zPsr-LdmX)fx5=rb{kC%^|Nni-ZQ?=Cop1Sa54=wDZJBg?smaY*c`{YHbD1o=7yEmb Kwrq9#%ntzFm1HUa diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index fb49dc8..ace35e4 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA Je94T4psgEbYV6YBZ2BSQ4JZbKubHtPEKNuVjL9CaSk -Fp8uHwymTnjkFQBfezrFj2ycXsYrnqqW2+KeKfsjONY --> ssh-ed25519 4PzZog paDltxaTs3odGMIkWFMuTfe+LnO2RqvRTqAi7pK8EB0 -+ZtGVOK71gSGzgY6nSlDT32Q6IQFFvZd8xMp42GD/xg --> ssh-ed25519 dA0vRg 2ZGLw9dW0qbzkJb+M1DhhEaW19VaPdgy9YvzxeEuZzw -Gycx9hEatq1jOQpE7EqF4G8y3+XvRnIC8oNK3hJmOzw --> ssh-ed25519 5Nd93w uyUnDy48bjq4cfG/HfIF57bnCxNGSFze18MTW2XmDmc -TWCJRIC3J9KyjbCaM/WmCoD0x2MtrGGKVgHCA/TBe0I --> ssh-ed25519 q8eJgg qPb7JIMkwOWIWw4yIhQku0u6d09QqFKtOXx1gC3XowA -8+YLpW8xzEzq02zKFhlbjOggEWfMZ6j2G5RGIq/TE/o --> ssh-ed25519 KVr8rw zcZRh0qTa55ENUWXRIPk/kAv3tKB0+anEQ+IuEhsFjY -8oN0U8jD1BA07XOS4idvHgu8LA7/E5aciLZOshsZJJY --> ssh-ed25519 fia1eQ gkdxv6Uda41PT9GhALDwPCfzzSiCDWluZG5m3WRwKAQ -5YSmnIYFXmBgTur0Z7PcLOT9ANvLJgIech5gp4Pqwjk --> ssh-ed25519 rmrvjw H0ZmvmeUIpb4ZAUvh+7k47mUmZidcsKxDHC2oC/100A -IjYufbdJxMMANqicCHQQAU0Vh/NvROfCfaxJBM3rai8 ---- TrZyyHaK0o4ot71wVxZzBT+3mVrVUQ3jKv6FuWNO4Mc -R3±g ”GÛVðgñX3cÅœëñÕPÌ\Úy’‹gûqÐqÒ·"KO(ôÜ.ý© ÷8Í·&Ò3Äpëù‹)‡‹4:MRS¦³pK \ No newline at end of file +-> ssh-ed25519 V1pwNA CGCG7vFUJ9hUdJWRax68aDpHZEREFnrjo3expN7oUTM +/eCKERrmnmceosD45BENTxtoyLmjGmGVvxkGWAtCRyI +-> ssh-ed25519 4PzZog DSUIoivSmbzN0AvKIPXhtjTBft9D9AaRioe6biuh6XQ +XlV7xKGi2BY+sCgJCEiSB9AlpXFoQnbeIxKxNhPRetY +-> ssh-ed25519 dA0vRg sYBG5Ld7lMw+cm5zUgVR9Bi8YVwDrRglII36Tj8Jfl8 +cQMY6UyMrRtfoU6mn0pg47Vf4DB2KcjwiRHEmvU/Rmg +-> ssh-ed25519 5Nd93w H3k1nFMs8wkqsVKzGp3n4CE7MuyxJWRZ+xgSgDbnuzw +2fff1rsfvE5NikWjF9gkvHuthgLKLOey3PebYG26yNs +-> ssh-ed25519 q8eJgg UR21V4UAJ7/ALE7IcfMVYO3mD2jbanhBu1fj1iEjpBI +8Yl7/sLlQmCvGJvKZt1B4lJMSnPt6gHi/k1u6Gm2sII +-> ssh-ed25519 KVr8rw ur14/Gp1Z9ODFFVaUf50i4+ELKy9RHmsXjbaj5h9IGI +FTZn1ZuBixaehBW3hnVjfXrt2m8co1KSp5aUTA+TRdg +-> ssh-ed25519 fia1eQ 5bmpon54otL6GnIhyYT7CbLuCR8vk0td3kPBGxsSWCU +PSngrN6yQODB/Vmu8ka3vvDv5DkShktyOWrhzC9K1LQ +-> ssh-ed25519 rmrvjw J6YtkhTuDaUtc8LUp/zfvQD3LST00arsbe37bZw4nAY +r3TDmtyB0Cc7Mx8EXb1yytvpF3+4//6cy4jkK+cWTls +--- mSjAJK/sd2Qj4Ffuee/T5LTADcNLVTCcKL/4VlqZvd0 +RêÛÖU$ìòži‘ŸU«áXô¯ÍsÁÓòñãfá—_âƒo/’&cØ&{*¶‡ÙŠ/äh¬Â\œßLµ[%®=,Qòqè \ No newline at end of file diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 4b5366453d97dd98d38d344056f76678a605f2d3..3317f9c781e97deeb182539d180a94b617759a22 100644 GIT binary patch literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yV>s`M>) zG)ngkakH#Q3QOD;1A%H}GrtSm7rk90SUFstwm zH!CdgFLE}{uQW~x^)w1`_BSyI)Hd_T$SJnWOh>oPB%mrPKV3mP&?hM+Jv_0}*`mm? zA|=G!D90kx*VVt+(=(;qrJ%~)JE^e9Jj&0pGMURI!aY62F~u=4B{aAsJT*Viz&Fgo zz&p#(+04ScAl==-xhTBCs35Z3-51@q6i0)ypmc@O>;RuYUrSRXBbVY7&s4+IsA5ys z#L~2KAAhGpFLx7XmtxoS(1=Wb4_~e-r@)}xz>0{%usq+quuSiaqAYXoyquJ*azFok zmnt7WZ{PCru)J)aEDXPy`lVPJmn)QKrR9WXdFQ8S8-!>V<+^5tRd|QHBzuSZS7v*Z z`MBiyxjC8z6dISi6?5gKmxXwlr-UVzW*1vJ`sP|%)!8knJk&WPpfJaGtH8GQ#_K44Jysjk{ydoybUt-4b1XN+`XJlEmG1#1G)Tt zvRz%>oQs2fG73XHqe{!Xiu0VaL(Fp0%&QDDliefz$}K&OOOkRb4A5;$%S<#(4ODOn zFe)j_cP%b)FE(^^N-YgDNcRcO%5}=i2r5e}DK?HuG7s}NFwRL#cjYoK&n~nK@sDsS zHngw^@=tcFs&We|_p2}u_Hqm;_VLS3PPR-mwWvr+!U##vDo5W!M+NOD{ZQwm?9vR& z!l;0Jb8jQJl2o7Ubm#0M&w%{&;=J@!qp+-OgW|#pM=rmV(5jH&vWmc@LQ8|p9Fyck zL&xNh+`O_}Lw83Lx4;Uc2#??(_mJE`S1z>tRvK01WSp*$7ZF}*oMVy`9*`6k9AZ{c z5}X=n8D&{g8d>RHP?(!!5aFX8>7AYD?h?pV>ZP6T>YZg8njYyC5K*30pzT#$Y2p!* zXIP*e?o*KC5mc3Ks-ITnlV*W#n@5sCWXkcJsUbcBrdS)?KURJ2Tk)^v|L}s#2epo?KqHj=XX+>UCZl0NOsfl-1 zP_k2IVpN%nzad5{freycnxlDDh^wP%N>xOXrL$vIx{HyMWs+sENxq?hMTKXgdtR}2 zUU7DbOEFhOdAPGjMNUaUL|SlJkeQKtqM3zRc!{H_i+6rlZf1_ZuXbKZZf=lgNjbXT zptgl)wKXLC80WQAEc z`Bg-kmU}0bzQM@Hq8g{6A=2I{+4MCR<2LyTNl!R-C zxfHpTo0bRZhdP(}1?T!#lopp{JC&OTdT8rs2fFHqgmQTneyL6HIPyfsQf|^^@g@Zo zq3rK*o|QAs9VwPg$yuHd`0UTlX8sGB^4&{rH`;zO4PJXXDfdDb@QiHMicH@%B3 z_ws)@?I^zYW&JbG&hx7AwGXce0fvH@FU(`=1*W5S%&5Z!Y=RT7*G6jB>c&MKC mY2BQ_pmgS0hjSmq)QC8o`TsQFKx7z)UwxZ}_tUr9%!dJB`#YKd literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w9LbMXu= zG%PmpEDuc!N%8isEXs;-G%ZN43px*oOI)mQg?knm*Pt8#N6-# z<1lXzOQ(YLNY|)BcQ=<@vm#56a9=L7!rc7gq_WJ^%#;wvN;89q6eA5iPOp7dWbj}U-P0Gk}$u+BTFEtI#F|16@O)+rvh$<-2PctYA zh&1!kclP9R&P&U4HF9++E%mdAs4{dmjEwR$j10>tGe|0_G|kJ;OmYp%^Gr0W@W=3* zcUX}{QMp36TS`h%K~hw>M`=oWxodJ>ilbkkV@Q%oU|v#aqHASwuwiJnr;D#qo&}eu zdxUnrNq|RGWO9acZdy)wabC7bgk`9cSDv?lyGvAIR-$KcWMHUsFotbunTdv}feMEC zd8Qd*<>l#KW|dhfg{cPlj{26Rex=Uo{w4Z(9t9;4`Ua(@0Rd^Dj$EN8rK#!ZDOH|s z+JzpT7KR~#MkOhse!hN@u6`aCzQzR=ey&c%#t~(hA?aD==v(NhkYk#YVN&W?8I@k* zSs7GT;GF3c>Ywjn=xUJ6l@eLvWag1<=o##q9%W?eo9URW zo#$teni$|8o>~>`>FW_vn3@!np`VeA9&e>lRZhm~3Zdqij-{#P{uRMx?mmeT#m-ep z7A_$<9^r{W!I5d1{>d3x?wOvUY2|szT$wJZh8a$k=1$pR+DU~Tfg#~(#ZFa`fhC1S zr6wjp6&5~*CECfR`dL*b=(c$z8Dtg&DwGEsga(+UIc8>RaZynp+weFf32MJg7V)$bw7u=)tSpjni*Fyr#jIb#?N)wo;AB z$G?dOENh%xBB*ldIQQk&hsWlv)6)H=?Xs$Ru=`VcqCe2JtH(#!kyYF|!oOnIH+CI6Xt%5ak ze#TDU8FTz#(saL5{gq2{li#GIN%8B(DIG6W*LWV>e%$-`hl!UQw*HE??)Em^cj?#J j?T;qj?Ney~=I%dB-n-i%I`8+ZZ{>!Yp2*#OGAR%Mxoj^4 diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index 2b4c4c079968029196cd027d40802a3db2b97084..e5deda43ba685036906fda9dbb0f1e0667d49baf 100644 GIT binary patch literal 1440 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uxADk*U) z&y6f8G&3*D&d4v$E>83_F7R~=a?!5zjIvBN&dLrg^vS9!Pv$E2u5zx>P74YPF|f#S zwG0mOFU=_S&NeB{b~|>&DA8y%hEC1%gxakDz_6$wEiJDq-N+-tC%8D`$kd!Qc|Io^+&}4MmO#MBo|TiE&Q%-|l9Q_)o)R7s;+`RZ56Ka#e6* zX<(7DCs(4kM^U+(Z;6R_nWwW;M6O9%N{Oj?RAQogc4khQp=)BPd8AoLfRk|!M!b24 z6W65W|$|LC+GVc8D+Wz>3ilynN~zvWcnoM8hX2>hdKv)az%y) zdKs8jTACX9dFF?vI%kBsB$t-?TV|J<1)CS|;G2hvw9Njk0Do5W!M+MK4!pOitw;ZSB z#H5gPi^`O616S8V%P4>I;KbbIs8Dz3lBiH;$CBXOe6FCflFG=SlyKKv-;7YRQb&vM zV7H9Ys{C>b=i-R)sN71gAj@2BXP12abadNFqpF;Y(-qR)4ZKUWvn`!VEL_Z^N<9LK zT`WDL{0+4Ijm@&W3yRGGT_Rm8Ga`d44Y*A53W`iaodXgJioHoB4&^cqDh(_w)Q&O>GbnTnb~AL%D9Lom$TRhgGBYhs$@Q|x zs7g%=%5}`~wm`QH8j==;#{NcC=_aWWCWh`w85RM-VIdWjW~JH5Miv2KW%-^#{@F?1 z$zFwFCR|B*!Iojg*+E6&-cdmY-Y&%%7O6R*CS@5;5v5VyVcO=!Sth;}7J;P^fn~lvt`_E{fn1kYiI#cq zRZtd)x$^OobfCKRoUG#4NJ+Z1~A}uVlSMUtVqzTRg+? z%=Jg_H{Rk{)uYbinWuWyv1f+$?TL~OJ2qPS7@tqP66x!CDB)dy-WxV?>yjd??|K0( L7yI9FT^9oYtFY#q literal 1440 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5t--_o_0f zGW7~eGR+N*@J#me2n{N=EVcA4_bd)h@eem~&WbdubWF-NjN~$`$~1@wP1g=^$_V!@ zGW0C3a?H!jDi6+eGOH>L4av_i@G0=gG4%1xPe!-RB%mrPKV88w#H6IeDa|suq%=Pu zJUhrJCCke>Bsa%2&8;#(JHS1pA}H89#I>+2!;vdJ(9EqWvZ6dEs=U;@+&$be-y}J$ytI;HN5?c%H&3qQ@G3LY!jb|fQ?IDP;<)3P%S%!7OkbMv_z-O2-VJu*`&Eko0NvdcovE3(5Qs!9q%A}k}#i@gmkiwezB zOnjo!ibK(DE3`=UN>5iXN-YeiGzoPH$qIzpBhBG1)mFJtDxPz#!ZyG9BG-X_<+JseuYE z28m_f&RHJ5X#pjE#wNwi6(va_p4kOO;okb*`WfD#q2+l&#Z}slj_F*%-X8ja`kvuo z-lZWvX&L?@21%vi>1D-5PQm8IAr+Nrt`(k9&e|DK!Nusdc~&|47CI`Jr5R+G1)F<% zCzj?q89OEhCj~@BX*;L*<`!iJ`+4PfnERGz7!(;^XcamS;fU>+o3sWPD zsJukaP*WpcFHh|p$E?CEw@|KP3-`#P5Z|C&W8biJud)zJ=VX_N(8OG$)LiGv5Q|ik zNO!N)B=>OFJQH-=pdpzZXi->P6zE@=ZERFgm2OmEQj+aaVxHyiotYmLXcA%R?p>9e z7g28EXu@R{R%}+Ho#q;5o?7bb<(QOP6`5;TrCnL%o<7?l-KmS5uOT@oIi6w0Nm ztE&*@WNKbyQ0V0p<{a!9RZ?6MW~5yeRB0GwP?=)r<{26lQj+eO7?I*qWWY7|!fMS$ z-eH*$MtgLFKAt=9D*kNBB7WhOm%Dn7RmH6UC-)n8Y*787Ve$J_r%s%c0=IxR!?nbqdEUOwtESwQote{LvU%k`wepWCj?cu- zaunq+PWbjV_qm3~45{u9Z!Nb9h@O90_xAFkAG#;LZ2$Vw{@Up@S&4X`gvst%2X$-D MZ>_N2;KTR;01_7Q0ssI2 diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index d1e20c2..02fdf3f 100644 --- a/secrets/nextcloud/pw.age +++ b/secrets/nextcloud/pw.age @@ -1,20 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA wC7Nch41YKEjrwpf/sDR+SUWKm1porqP2DyQhz/MLh0 -Mu8NGcxWphZZLgb0F7h10EJGCPiontn6y2lWNSldNGw --> ssh-ed25519 4PzZog 6H6fsEDq6xiIkmIy6gUUGL+Mm03HSEaSGnjel3EO8EU -xzqv1RZijhQqeiWIFq7ReVzh2JLtBoo9HmZJ1VXrMPU --> ssh-ed25519 dA0vRg UC9Vm0pLH8N9XGxKAZ/3Efe/9SRvx/rlxCYx0u5oljg -gF4IFYdCIXfvPPrOsJFvGMf1PzrSyureKpOP66ZHB1Q --> ssh-ed25519 5Nd93w 338ts/scFEwjZ+3f4Vcd8C9Q//E/ZGoSxIutAxKgpAo -C0vs3fiisD9FsZ8gYJZj/I81mT3Psw3g1jN5ztyuDQ4 --> ssh-ed25519 q8eJgg eIHEYfE/50IRNy+gnNmqQD4jtVgJRla4ilAQp2gYfjE -bFNJA6KPlBiZWrB5vjyTilXC+rkW+xqVSWcvHln9H/8 --> ssh-ed25519 KVr8rw Kq/0pxm2r136ezrKRugC1So2cIIx2VTShPv6WTc6m1E -W7VrsPf9jkkxqndVjrFuGBwqJR3v4hwig7Fed9xJSAI --> ssh-ed25519 fia1eQ 1sA1YfEKVatTzHV5Wd/tzqwRiIPUBQlfoKZkJpxRYig -lLtPzvg8H0y+FpfGfF/Q5g1nCap1TgW2wipIKU+Q+WA --> ssh-ed25519 YFaxCg zUYYpsC6BXvPRcIignITwUmvBhfhy9EnxFeCFg1niQk -QcmAhpDajw2lJyttDX9kn+0bdugmYYifSl1esaa3xpU ---- 0sQ4g4YxMBe/VBe39F9ZfwVh9XEOHYHqgiX5oakBzPU -¦cò±hðWÚp@å ‘ "L·åÒ[)’ØtŠ¼/+”MyÍä¾ò' -‘8K¼ƒ[©m›}·qÿÈ1«{²µ¯]·OS%ᙯ>» \ No newline at end of file +-> ssh-ed25519 V1pwNA ZlR8h9qHUL9sOogTAS4jhOkSqgeWOMgrI2jpzZeB43E +c1B+g2ke5kRtFZ1us5Sb8gxYdb7DUx5l1IzVAfbXxW4 +-> ssh-ed25519 4PzZog uPUS/whEnUBue936Q95LCG31yz987AGVTULqCLfQrSs +cGgATnRDcpNJ7CRUkouyoDk80EYB/QgzkX5snfs2qjg +-> ssh-ed25519 dA0vRg gabrxTdlYIjZWYnRMdID7aLu3hgHKmTG6RQHMMnsdjM +HIKk6j8Cntw6/SAtbAjDTSDqXhRzItris/gcm3UQT2w +-> ssh-ed25519 5Nd93w 9enbyAo/XabNmXWppWZWC0Do+6hwzjLPc/RgpFSsOkY +tLBW23QTKZKYZ0nlJ1WDdqsu8u0vsyNoZ10qrk06p3E +-> ssh-ed25519 q8eJgg 4Un1ZATrDODVT5Nr1qNkQzfhBeWcDkujxvFmXumHKl4 +MW1gkllR6yl4FiR/84jV04TgN/B4WEPbmrIWPVG7yKg +-> ssh-ed25519 KVr8rw ld3Xw4y/UIN6RADoJt+2gwnMbcl7qC4sF2X/pJcdJjU +8b3N70CMfQpXY01EjNxn4dZJ2PwbWG7JgYgfOlGfZT8 +-> ssh-ed25519 fia1eQ 5J0q5b+gAlELovtLXXTwr9jfhOl5L5SEy7+qRxUicCQ +k4Xd1ypatsY4rFPAVZoA89V6NrnLxrIrWBhYCY0BEis +-> ssh-ed25519 YFaxCg UgvKYVP36n85x6AaAIGysm9Kzl4TrMip9GTxVMRuWgM +HuTioTpbARDViBacuvqHM2WDNvL+hDyDCb8YJW2uukE +--- ig5Vtym6PTLi2FyPk/bdMBeQV8qICqxGONQGU2lGfxI +z|^Ú¬~Á0‹ƒ]é|Ѹ"ù¸¯¡Qzb§“¡"¢ª—ùú¸gm¸rëƒu¤ ð‰y±õÃe®ñÖëÚÁ¿$çËûc \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 9a9b5bf..f473e25 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -33,6 +33,7 @@ let marvin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAme2vuVpGYX4La/JtXm3zunsWNDP+SlGmBk/pWmYkH root@marvin"; calculon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsmeBfh4Jw2GOL7Iyswzn4TVNzalDbxDgh7WuQotFxR root@calculon"; ariia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4kV6W1/tP/nf2ZWNhRoV1mK04R4pS+c5vdsA1n5gpN root@ariia"; + optimus-test = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFv0Hb4qfzXUll+Hct1NQOE0bCf0MpE24Cqskd8vAFyj root@optimus-test"; systems = [ agentjones @@ -40,6 +41,7 @@ let vigil galatea optimus + optimus-test glados wheatly kitt @@ -88,6 +90,7 @@ let galatea # Games optimus + optimus-test # skynet is a webserver for users skynet # our offical server diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index ee6ab1ca90c527cefcfbd446b361346e0aa72260..c91deb681ff928b31b06507081aee6a24fd2730a 100644 GIT binary patch delta 3123 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 nsig7K(a*tmDs_T^+ghwK{w?0tiP delta 3123 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 diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 5173592c9b3681b5df999d7bf2b42ba8193ebc7d..31b96ee529b1522538a04715aa5bca3dce6a7e23 100644 GIT binary patch delta 1826 zcmbQvKb?PqPJLoVqHDHycyVxOfOCPTb5KD^S&^fcw`F!lK!j^$XsL-;hH+F`l2L@a z373CWcuGK3o^z_RZ&`4rnNM(bX>L%3qrX>_vw>fgc~O>Ma)y()X<>FqK9{bYLUD11 zZfc5=si~o*f=NJCRDQZbW}=guPfm75c%g~Ed1zLtzMGj-s!2+IQB_ivnNhHNkyl=^ zqrYoeiC?8Bmqk@tm|2ubMvzlMVRmV0Xpm!}ey&e$sAZ-kE6ukxnLQewL|W1^L;gDgGImex~`8;~B-nQ$q4Ql034C zBiyyK40C-v9rN?U9LuuGEHcae%>9cJquf0GD>I6c3mo&gaw4jtLUMd6D@^n~Q%o$) zbG_4&-HKiFlYFxxLtOmzlfw+E{IV+j!UJ6=pJf!Uj|%cNH1o~RHStdgPWDO<&hRlR zPw~&o_NgebFf+e0vQ)>sAV>4clJbh&Jk$E*+#(CJqzJ?O zR8P~8fYj8|3T^Gcz(Qk#WUg%A^!)O2i@@R}%L-#tr?A8l!(v07oGXe8Q_YQX{L{VMs)`JAO|^@YwUd)FQbU5X zOd~BUjFXJZUGurzD=Yks4KlMGLrwDnJS##hjEd5Wll`JXeWMCo3|vb}J*)IRE8NSf z!Yn2yvWVB4Mw)p>75gOn_~i%cr=<9Kq`9XidAj-}hUiBg znK+pSni^H5d07NRdZg+*`llL1B?p$91O>TfSQJEsgqm0;`Q zzp^CXB{0atsj5t0JG8REqdvmlT|d~&HzhYBBqU6~IMpe_)x**_F{Q$l%ilL7!!6LP zvbem`(6iXxD>*;3q&(2qGutfP-zz;cEF>yS+s8jK%A`CQ-8zpXgUo_J1&?C=s(io5 zlF*Rg5_j_moCqkPk{sKE4s z(lQq>i~KxK!_-8}RR1z}uZk+8++6=0r%IO!UvS8IXQvbeX1YbV`&bkg7^FJ8Rh3w# zIR^T<78RAddSnOsXnO@$rjgp<#M!6ZA`WvU_Mpgx7hr5*o86>(F`e;{_76$nw=4KZ9 z7be%|copPUlsFr3*=#t=Q=pLM?dKEnK7F$P{ge5xYUl9?_%a^ewEpNpxn0l7ef1el zvi7xY5A0NwXy^L&z`xLsllQS>)R`G}>W9y)xYa$o^1jZQneDPuB>VY0+(kC;cHGv! zEJVQds+Ue`ot|J(|Gw)jOL*b-FM3Xeg*)#p)L1uX*&%O-F#ECFQ*$Ue4DJ(!TI)#-M8GG4BhpOHm%kA{1t9*LsA$l9jACaO1V_FT_Ea- z(1gyQ>g_65EK}<}_eP%M*Sy?)*ZJtlmu4Fu&O1>$=e)V{e}$TFYU+taZO^^`{gue` z?U=Y~-I)M}MGqqr#5h*OSt(r>k3BX$Ea%tqtmWJWA{W)2U7IU69{aNQ>H09hxwxVwuFDDfr*tNUiY2W)} z#y#_U=d2a0;=L0%-I`~~f6wK&r(TbaJ91hucG@+iA3P7ASzq2zq8xPN=pU_*HkR#& zv{e{|m$#-xv~XPB_xNwWLz$dI{i`|3?FxT>_$H)ra@}-y&{*EEW}eWKk_yT2KX;gO zi~G)BeVlM{S4rGN_sr6FxqId=UbAO7sz2ALlZriE;)1NzdCfwgNm!*w2VbRnJhxR}I-d4R? r)w#1S^}$;GRc<+V{>P>{DkR_jSjWncE_@><@lo3`wt&u`xBR^TF)6{S delta 1826 zcmbQvKb?PqPQ7HR6vq>NQ6g- z30I||TdH4{erSb-c~xn)YgMXirM{D=M}CnO--wET(qkygCaeQ z5?xZlT)oY!e3C*!E3#4wjU4kMOHM0mt?+V-@+{1B%dE_E3h@X_ zDGG@+3&}Dw%s2D$EOOSi$TTSn%g!<3G72fnboTQwHBR+U(GCiAO0RMZswgWr)6Or= z^Uw~-&I^q+F$xXx$SHM1j{)znB8#GOg^KLds`6m3oWPuH?MPEMbMJb~uwqje3&(P& z(h{RoUjsisGYhu>g9^W@d@g?%LxWUN0;?jaDzr1|kqLlDTpQwKiR#cB0S2+Fsq~_x!%mfH89`6Gq57P#KO}rsWdMqLc1v3+}I_M%eOQy!!sy5 z)yT6lB-64m)7U_}EYv04B{j&qz{1@3G6R%Kh z-$HMbAlHJRkWg(`!>G*4@SwERC@+`v3QK*{%3!1Lis109bgqIz3lEcEkIKq`l+0@FLL{3WGv-qsV->pin>KVsOa0qdKVcv7VGDw zMW$J#1?H7iIT~enCpmKI>gp=Eghdr)him)jCmH0Fn3NP|dgU0Dl{)%*l^eJfTUvy9 zSeVyG`C6tJxMlfrt)2H__oZ2lnOPp!JHG6gCN4f}??v4+(cSlFGx{x7TJ74jb(yS) zfpm~>1+Wno(@4Csf?M*gzTy3y%_2CXqHRTD}nhS2OO1OAer|7)dcI^un zk8jVnys$Lo*Dc13gNM1YPfR;zbURz<_*BLn+rK(Lsi^0(z2Q~5XUUS97yGQ#5AGCg z{imREMlWwtWpOu8Z&GP^es7R>+qH)#YyEF$i(L#cI?C}$`q7*<8UoQ17uT1Xu24Vt zYq`-uwMPsS_XS-MU$FkG>BI|{c0T|0Nj+}Qrcw=`isl;WpW7bK{l)$(rtP!{HDdOt6NX1aP59puVtHZ_?=y0 z5&zU=n>`nG0zGyes5zNic+Rv#S?`Ih_H+H_Q-?kEIWDy?vN&_|%9`1%4k~Zj^Zqwa zW>PxW*lm;6b?2AU%HPKlfA3cP!NAz!{_>sXL2K9TbvE3-rxL6zw`%L0ez)$gl=zYz z3=V4RSbTiG>dV=rc5;yuVwuz&Trmm_G@Am-|oa*wqgs; Date: Wed, 4 Dec 2024 20:09:32 +0000 Subject: [PATCH 399/563] feat: code from https://github.com/pelican-dev/panel/issues/533#issuecomment-2466168233 Gives us a start for workign on pelecan in nixos --- applications/pelican/nginx.nix | 110 ++++++++++++++++++ applications/pelican/panel/panel.nix | 64 ++++++++++ .../pelican/panel/pelican-install.nix | 28 +++++ applications/pelican/panel/pelican-update.nix | 46 ++++++++ applications/pelican/wings/package.nix | 19 +++ applications/pelican/wings/wings.nix | 42 +++++++ 6 files changed, 309 insertions(+) create mode 100644 applications/pelican/nginx.nix create mode 100644 applications/pelican/panel/panel.nix create mode 100644 applications/pelican/panel/pelican-install.nix create mode 100644 applications/pelican/panel/pelican-update.nix create mode 100644 applications/pelican/wings/package.nix create mode 100644 applications/pelican/wings/wings.nix diff --git a/applications/pelican/nginx.nix b/applications/pelican/nginx.nix new file mode 100644 index 0000000..b1bb259 --- /dev/null +++ b/applications/pelican/nginx.nix @@ -0,0 +1,110 @@ +{ lib, config, pkgs, ... }: +with lib; +let + appUser = "nginx"; + name = "panel"; + module = "pelican-panel"; + cfg = config.modules.nginx.${name}; + serverName = "${name}."; + dataDir = "/var/www/pelican/public"; + port = 443; +in +{ + options.modules.nginx.${name} = { + enable = mkEnableOption "Enable ${name}"; + }; + + config = mkIf cfg.enable { + modules.${module}.enable = true; + networking.firewall.allowedTCPPorts = [ port ]; + + services.phpfpm.pools.${appUser} = { + user = appUser; + settings = { + "listen.owner" = appUser; + "listen.group" = appUser; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; + }; + + services.nginx.virtualHosts."${serverName}" = { + root = "${dataDir}"; + listen = [{ inherit port; addr="0.0.0.0"; ssl=true; }]; + + forceSSL = true; + enableACME = true; + + extraConfig = '' + index index.html index.htm index.php; + charset utf-8; + + access_log off; + error_log /var/log/nginx/pelican.app-error.log error; + + client_max_body_size 100m; + client_body_timeout 120s; + + sendfile off; + + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; + ssl_prefer_server_ciphers on; + + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header Content-Security-Policy "frame-ancestors 'self'"; + add_header X-Frame-Options DENY; + add_header Referrer-Policy same-origin; + ''; + + locations = { + "/" = { + extraConfig = '' + try_files $uri $uri/ /index.php?$query_string; + ''; + }; + + "/favicon.ico".extraConfig = '' + access_log off; + log_not_found off; + ''; + + "/robots.txt".extraConfig = '' + access_log off; + log_not_found off; + ''; + + "~ \\.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${appUser}.socket}; + fastcgi_index index.php; + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param HTTP_PROXY ""; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + fastcgi_connect_timeout 300; + fastcgi_send_timeout 300; + fastcgi_read_timeout 300; + ''; + }; + + "~ /\\.ht".extraConfig = '' + deny all; + ''; + }; + }; + }; +} \ No newline at end of file diff --git a/applications/pelican/panel/panel.nix b/applications/pelican/panel/panel.nix new file mode 100644 index 0000000..c5bc198 --- /dev/null +++ b/applications/pelican/panel/panel.nix @@ -0,0 +1,64 @@ +{ inputs, pkgs, lib, config, ... }: + +with lib; let + cfg = config.modules.pelican-panel; + dir = "/var/www/pelican"; +in { + options = { + modules.pelican-panel = { + enable = mkEnableOption "Pelican Panel"; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.curl + pkgs.gnutar + pkgs.unzip + pkgs.php83 + pkgs.php83Packages.composer + pkgs.php83Extensions.gd + pkgs.php83Extensions.mysqli + pkgs.php83Extensions.mbstring + pkgs.php83Extensions.bcmath + pkgs.php83Extensions.xml + pkgs.php83Extensions.curl + pkgs.php83Extensions.zip + pkgs.php83Extensions.intl + pkgs.php83Extensions.sqlite3 + ( import ./pelican-install.nix { inherit pkgs; inherit dir; } ) + ( import ./pelican-update.nix { inherit pkgs; inherit dir; } ) + ]; + + systemd.timers."pelican-cron" = { + wantedBy = [ "timers.target" ]; + timerConfig = { + OnBootSec = "5m"; + OnUnitActiveSec = "1m"; + Unit = "pelican-cron.service"; + }; + }; + + systemd.services."pelican-cron" = { + script = '' + ${pkgs.php83}/bin/php ${dir}/artisan schedule:run >> /dev/null 2>&1 + ''; + serviceConfig = { + Type = "oneshot"; + }; + }; + + systemd.services.pelican-queue = { + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + User = "nginx"; + Group = "nginx"; + Restart = "always"; + ExecStart = "${pkgs.php83}/bin/php ${dir}/artisan queue:work --tries=3"; + startLimitInterval = 180; + startLimitBurst = 30; + RestartSec = "5"; + }; + }; + }; +} \ No newline at end of file diff --git a/applications/pelican/panel/pelican-install.nix b/applications/pelican/panel/pelican-install.nix new file mode 100644 index 0000000..75e3f53 --- /dev/null +++ b/applications/pelican/panel/pelican-install.nix @@ -0,0 +1,28 @@ +{ pkgs, dir }: + +pkgs.writeShellScriptBin "pelican-install" '' + DIR=${dir} + + echo "Installing Pelican panel to $DIR ..." + if [ -d $DIR ]; then + echo "Directory $DIR already exists, exiting" + exit 1 + fi + echo "Creating directory ..." + mkdir -p $DIR + cd $DIR + + echo "Downloading Pelican panel ..." + curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv + echo "Installing Pelican panel using composer ..." + yes | composer install --no-dev --optimize-autoloader + + echo "Setting up the environment ..." + yes "" | php artisan p:environment:setup + + echo "Setting permissions ..." + chmod -R 755 storage/* bootstrap/cache/ + chown -R nginx:nginx $DIR + + echo "Pelican panel installed successfully" +'' \ No newline at end of file diff --git a/applications/pelican/panel/pelican-update.nix b/applications/pelican/panel/pelican-update.nix new file mode 100644 index 0000000..d359d44 --- /dev/null +++ b/applications/pelican/panel/pelican-update.nix @@ -0,0 +1,46 @@ +{ pkgs, dir }: + +pkgs.writeShellScriptBin "pelican-update" '' + DIR=${dir} + + echo "Updateing Pelican panel in $DIR ..." + if [ -d $DIR ]; then + echo "Directory $DIR found, entering maintenance mode ..." + else + echo "Directory $DIR does not exist, exiting" + exit 1 + fi + + cd $DIR + php artisan down + + echo "Downloading Pelican panel update ..." + curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv + + echo "Setting permissions ..." + chmod -R 755 storage/* bootstrap/cache + + echo "Updating Pelican panel using composer ..." + yes | composer install --no-dev --optimize-autoloader + + echo "Clearing compiled template cache ..." + php artisan view:clear + php artisan config:clear + + echo "Optimizing Pelican panel ..." + php artisan filament:optimize + + echo "Updating the database ..." + php artisan migrate --seed --force + + echo "Setting permissions ..." + chown -R nginx:nginx $DIR + + echo "Restart Pelican queue service ..." + systemctl restart pelican-queue.service + + echo "Exiting maintenance mode ..." + php artisan up + + echo "Pelican panel updated successfully" +'' \ No newline at end of file diff --git a/applications/pelican/wings/package.nix b/applications/pelican/wings/package.nix new file mode 100644 index 0000000..fa483e9 --- /dev/null +++ b/applications/pelican/wings/package.nix @@ -0,0 +1,19 @@ +{ stdenv, lib, fetchurl, docker, gnutar }: + +stdenv.mkDerivation rec { + pname = "pelican-wings"; + version = "v1.0.0-beta6"; + + src = fetchurl { + url = "https://github.com/pelican-dev/wings/releases/download/${version}/wings_linux_amd64"; + hash = "sha256-a2T4BjqS8Hy5YqwDEJpbvGqqsrVjdRhxvJLgk3MCXag="; + }; + + buildInputs = [ docker gnutar ]; + + phases = [ "installPhase" ]; + + installPhase = '' + install -D $src $out/bin/wings + ''; +} \ No newline at end of file diff --git a/applications/pelican/wings/wings.nix b/applications/pelican/wings/wings.nix new file mode 100644 index 0000000..0dd8b24 --- /dev/null +++ b/applications/pelican/wings/wings.nix @@ -0,0 +1,42 @@ +{ inputs, pkgs, lib, config, ... }: + +with lib; let + cfg = config.modules.pelican-wings; +in { + options = { + modules.pelican-wings = { + enable = mkEnableOption "Pelican Wings"; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = [ 8080 8443 ]; + + virtualisation.docker.enable = true; + + environment.systemPackages = [ + ( pkgs.callPackage ./package.nix {} ) + ]; + + systemd.services.pelican-wings = { + description = "Wings Daemon"; + after = [ "docker.service" ]; + requires = [ "docker.service" ]; + partOf = [ "docker.service" ]; + + serviceConfig = { + User = "root"; + WorkingDirectory = "/etc/pelican"; + LimitNOFILE = 4096; + PIDFile = "/var/run/wings/daemon.pid"; + ExecStart = "/run/current-system/sw/bin/wings"; + Restart = "on-failure"; + startLimitInterval = 180; + startLimitBurst = 30; + RestartSec = "5"; + }; + + wantedBy = [ "multi-user.target" ]; + }; + }; +} \ No newline at end of file From de1aea7abddb43318ed9df75ae7a0acc46606b14 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 9 Dec 2024 23:08:39 +0000 Subject: [PATCH 400/563] feat: got teh panel working --- applications/pelican/nginx.nix | 29 ++- ...-install.nix => pelican-panel-install.nix} | 10 +- ...an-update.nix => pelican-panel-update.nix} | 10 +- .../package.nix => pelican-wing-package.nix} | 15 +- applications/pelican/pelican.nix | 244 ++++++++++++++++++ flake.nix | 4 + machines/{retired => }/optimus.nix | 10 +- 7 files changed, 294 insertions(+), 28 deletions(-) rename applications/pelican/{panel/pelican-install.nix => pelican-panel-install.nix} (93%) rename applications/pelican/{panel/pelican-update.nix => pelican-panel-update.nix} (95%) rename applications/pelican/{wings/package.nix => pelican-wing-package.nix} (73%) create mode 100644 applications/pelican/pelican.nix rename machines/{retired => }/optimus.nix (79%) diff --git a/applications/pelican/nginx.nix b/applications/pelican/nginx.nix index b1bb259..587db71 100644 --- a/applications/pelican/nginx.nix +++ b/applications/pelican/nginx.nix @@ -1,6 +1,10 @@ -{ lib, config, pkgs, ... }: -with lib; -let +{ + lib, + config, + pkgs, + ... +}: +with lib; let appUser = "nginx"; name = "panel"; module = "pelican-panel"; @@ -8,15 +12,14 @@ let serverName = "${name}."; dataDir = "/var/www/pelican/public"; port = 443; -in -{ +in { options.modules.nginx.${name} = { enable = mkEnableOption "Enable ${name}"; }; config = mkIf cfg.enable { modules.${module}.enable = true; - networking.firewall.allowedTCPPorts = [ port ]; + networking.firewall.allowedTCPPorts = [port]; services.phpfpm.pools.${appUser} = { user = appUser; @@ -36,7 +39,13 @@ in services.nginx.virtualHosts."${serverName}" = { root = "${dataDir}"; - listen = [{ inherit port; addr="0.0.0.0"; ssl=true; }]; + listen = [ + { + inherit port; + addr = "0.0.0.0"; + ssl = true; + } + ]; forceSSL = true; enableACME = true; @@ -71,7 +80,7 @@ in extraConfig = '' try_files $uri $uri/ /index.php?$query_string; ''; - }; + }; "/favicon.ico".extraConfig = '' access_log off; @@ -83,7 +92,7 @@ in log_not_found off; ''; - "~ \\.php$" = { + "~ \\.php$" = { extraConfig = '' fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_pass unix:${config.services.phpfpm.pools.${appUser}.socket}; @@ -107,4 +116,4 @@ in }; }; }; -} \ No newline at end of file +} diff --git a/applications/pelican/panel/pelican-install.nix b/applications/pelican/pelican-panel-install.nix similarity index 93% rename from applications/pelican/panel/pelican-install.nix rename to applications/pelican/pelican-panel-install.nix index 75e3f53..da372e4 100644 --- a/applications/pelican/panel/pelican-install.nix +++ b/applications/pelican/pelican-panel-install.nix @@ -1,5 +1,7 @@ -{ pkgs, dir }: - +{ + pkgs, + dir, +}: pkgs.writeShellScriptBin "pelican-install" '' DIR=${dir} @@ -22,7 +24,7 @@ pkgs.writeShellScriptBin "pelican-install" '' echo "Setting permissions ..." chmod -R 755 storage/* bootstrap/cache/ - chown -R nginx:nginx $DIR + chown -R nginx:acme $DIR echo "Pelican panel installed successfully" -'' \ No newline at end of file +'' diff --git a/applications/pelican/panel/pelican-update.nix b/applications/pelican/pelican-panel-update.nix similarity index 95% rename from applications/pelican/panel/pelican-update.nix rename to applications/pelican/pelican-panel-update.nix index d359d44..a159659 100644 --- a/applications/pelican/panel/pelican-update.nix +++ b/applications/pelican/pelican-panel-update.nix @@ -1,5 +1,7 @@ -{ pkgs, dir }: - +{ + pkgs, + dir, +}: pkgs.writeShellScriptBin "pelican-update" '' DIR=${dir} @@ -34,7 +36,7 @@ pkgs.writeShellScriptBin "pelican-update" '' php artisan migrate --seed --force echo "Setting permissions ..." - chown -R nginx:nginx $DIR + chown -R nginx:acme $DIR echo "Restart Pelican queue service ..." systemctl restart pelican-queue.service @@ -43,4 +45,4 @@ pkgs.writeShellScriptBin "pelican-update" '' php artisan up echo "Pelican panel updated successfully" -'' \ No newline at end of file +'' diff --git a/applications/pelican/wings/package.nix b/applications/pelican/pelican-wing-package.nix similarity index 73% rename from applications/pelican/wings/package.nix rename to applications/pelican/pelican-wing-package.nix index fa483e9..088ed4f 100644 --- a/applications/pelican/wings/package.nix +++ b/applications/pelican/pelican-wing-package.nix @@ -1,5 +1,10 @@ -{ stdenv, lib, fetchurl, docker, gnutar }: - +{ + stdenv, + lib, + fetchurl, + docker, + gnutar, +}: stdenv.mkDerivation rec { pname = "pelican-wings"; version = "v1.0.0-beta6"; @@ -9,11 +14,11 @@ stdenv.mkDerivation rec { hash = "sha256-a2T4BjqS8Hy5YqwDEJpbvGqqsrVjdRhxvJLgk3MCXag="; }; - buildInputs = [ docker gnutar ]; + buildInputs = [docker gnutar]; - phases = [ "installPhase" ]; + phases = ["installPhase"]; installPhase = '' install -D $src $out/bin/wings ''; -} \ No newline at end of file +} diff --git a/applications/pelican/pelican.nix b/applications/pelican/pelican.nix new file mode 100644 index 0000000..395f155 --- /dev/null +++ b/applications/pelican/pelican.nix @@ -0,0 +1,244 @@ +{ + inputs, + pkgs, + lib, + config, + ... +}: +with lib; let + name = "pelican"; + cfg = config.services.skynet."${name}"; + php_pool = name; + domain_panel = "${cfg.panel.domain.sub}.${cfg.panel.domain.base}.${cfg.panel.domain.tld}"; +in { + imports = [ + ]; + + options.services.skynet."${name}" = { + panel = { + enable = mkEnableOption "Pelican Panel"; + + dir = mkOption { + type = types.str; + default = "/var/www/pelican"; + }; + + domain = { + tld = mkOption { + type = types.str; + default = "ie"; + }; + + base = mkOption { + type = types.str; + default = "skynet"; + }; + + sub = mkOption { + type = types.str; + #default = name; + default = "panel-test"; + }; + }; + }; + + wing = { + enable = mkEnableOption "Pelican Wing"; + }; + }; + + config = mkMerge [ + (mkIf cfg.panel.enable { + services.skynet.acme.domains = [ + domain_panel + ]; + + # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide + services.skynet.dns.records = [ + { + record = cfg.panel.domain.sub; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + + environment.systemPackages = let + dir = cfg.panel.dir; + in [ + pkgs.curl + pkgs.gnutar + pkgs.unzip + pkgs.php83 + pkgs.php83Packages.composer + pkgs.php83Extensions.gd + pkgs.php83Extensions.mysqli + pkgs.php83Extensions.mbstring + pkgs.php83Extensions.bcmath + pkgs.php83Extensions.xml + pkgs.php83Extensions.curl + pkgs.php83Extensions.zip + pkgs.php83Extensions.intl + pkgs.php83Extensions.sqlite3 + (import ./pelican-panel-install.nix { + inherit pkgs; + inherit dir; + }) + (import ./pelican-panel-update.nix { + inherit pkgs; + inherit dir; + }) + ]; + + systemd.timers."pelican-cron" = { + wantedBy = ["timers.target"]; + timerConfig = { + OnBootSec = "5m"; + OnUnitActiveSec = "1m"; + Unit = "pelican-cron.service"; + }; + }; + + systemd.services."pelican-cron" = { + script = '' + ${pkgs.php83}/bin/php ${cfg.panel.dir}/artisan schedule:run >> /dev/null 2>&1 + ''; + serviceConfig = { + Type = "oneshot"; + }; + }; + + systemd.services.pelican-queue = { + wantedBy = ["multi-user.target"]; + serviceConfig = { + User = config.services.nginx.user; + Group = config.services.nginx.group; + Restart = "always"; + ExecStart = "${pkgs.php83}/bin/php -q ${cfg.panel.dir}/artisan queue:work --tries=3"; + startLimitInterval = 180; + startLimitBurst = 30; + RestartSec = "5"; + }; + }; + + services.phpfpm.pools.${php_pool} = { + user = config.services.nginx.user; + group = config.services.nginx.group; + settings = { + "listen.owner" = config.services.nginx.user; + "listen.group" = config.services.nginx.group; + "listen.mode" = "0600"; + "pm" = "dynamic"; + "pm.max_children" = 75; + "pm.start_servers" = 10; + "pm.min_spare_servers" = 5; + "pm.max_spare_servers" = 20; + "pm.max_requests" = 500; + "catch_workers_output" = 1; + }; + }; + + services.nginx.virtualHosts."${domain_panel}" = { + root = "${cfg.panel.dir}/public"; + + forceSSL = true; + useACMEHost = "skynet"; + + extraConfig = '' + index index.html index.htm index.php; + charset utf-8; + + access_log off; + error_log /var/log/nginx/pelican.app-error.log error; + + client_max_body_size 100m; + client_body_timeout 120s; + + sendfile off; + + ssl_session_cache shared:SSL:10m; + ssl_protocols TLSv1.2 TLSv1.3; + ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; + ssl_prefer_server_ciphers on; + + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header Content-Security-Policy "frame-ancestors 'self'"; + add_header X-Frame-Options DENY; + add_header Referrer-Policy same-origin; + ''; + + locations = { + "/" = { + extraConfig = '' + try_files $uri $uri/ /index.php?$query_string; + ''; + }; + + "/favicon.ico".extraConfig = '' + access_log off; + log_not_found off; + ''; + + "/robots.txt".extraConfig = '' + access_log off; + log_not_found off; + ''; + + "~ \\.php$" = { + extraConfig = '' + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; + fastcgi_index index.php; + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_param HTTP_PROXY ""; + fastcgi_intercept_errors off; + fastcgi_buffer_size 16k; + fastcgi_buffers 4 16k; + fastcgi_connect_timeout 300; + fastcgi_send_timeout 300; + fastcgi_read_timeout 300; + ''; + }; + + "~ /\\.ht".extraConfig = '' + deny all; + ''; + }; + }; + }) + + (mkIf cfg.wing.enable { + networking.firewall.allowedTCPPorts = [8080 8443]; + + virtualisation.docker.enable = true; + + environment.systemPackages = [ + (pkgs.callPackage ./pelican-wing-package.nix {}) + ]; + + systemd.services.pelican-wings = { + description = "Wings Daemon"; + after = ["docker.service"]; + requires = ["docker.service"]; + partOf = ["docker.service"]; + + serviceConfig = { + User = "root"; + WorkingDirectory = "/etc/pelican"; + LimitNOFILE = 4096; + PIDFile = "/var/run/wings/daemon.pid"; + ExecStart = "/run/current-system/sw/bin/wings"; + Restart = "on-failure"; + startLimitInterval = 180; + startLimitBurst = 30; + RestartSec = "5"; + }; + + wantedBy = ["multi-user.target"]; + }; + }) + ]; +} diff --git a/flake.nix b/flake.nix index 6ae4c98..bf876fe 100644 --- a/flake.nix +++ b/flake.nix @@ -148,6 +148,10 @@ # metrics ariia = import ./machines/ariia.nix; + + + # games server - panel/host + optimus = import ./machines/optimus.nix; }; }; } diff --git a/machines/retired/optimus.nix b/machines/optimus.nix similarity index 79% rename from machines/retired/optimus.nix rename to machines/optimus.nix index 6f36726..e766795 100644 --- a/machines/retired/optimus.nix +++ b/machines/optimus.nix @@ -16,8 +16,8 @@ Notes: ... }: let # name of the server, sets teh hostname and record for it - name = "optimus"; - ip_pub = "193.1.99.112"; + name = "optimus-test"; + ip_pub = "193.1.99.85"; hostname = "${name}.skynet.ie"; host = { ip = ip_pub; @@ -26,7 +26,7 @@ Notes: }; in { imports = [ - ../applications/games.nix + ../applications/pelican/pelican.nix ]; deployment = { @@ -39,7 +39,7 @@ in { services.skynet = { host = host; - backup.enable = true; - games.enable = true; + #backup.enable = true; + pelican.panel.enable = true; }; } From 58787628d224ac8b139306e5b20ca06fbe202d1b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 10 Dec 2024 00:43:48 +0000 Subject: [PATCH 401/563] nix: fmt --- applications/pelican/panel/panel.nix | 39 ++++++++++++++++++---------- applications/pelican/wings/wings.nix | 23 +++++++++------- 2 files changed, 39 insertions(+), 23 deletions(-) diff --git a/applications/pelican/panel/panel.nix b/applications/pelican/panel/panel.nix index c5bc198..a1bcfd4 100644 --- a/applications/pelican/panel/panel.nix +++ b/applications/pelican/panel/panel.nix @@ -1,5 +1,10 @@ -{ inputs, pkgs, lib, config, ... }: - +{ + inputs, + pkgs, + lib, + config, + ... +}: with lib; let cfg = config.modules.pelican-panel; dir = "/var/www/pelican"; @@ -26,12 +31,18 @@ in { pkgs.php83Extensions.zip pkgs.php83Extensions.intl pkgs.php83Extensions.sqlite3 - ( import ./pelican-install.nix { inherit pkgs; inherit dir; } ) - ( import ./pelican-update.nix { inherit pkgs; inherit dir; } ) + (import ./pelican-install.nix { + inherit pkgs; + inherit dir; + }) + (import ./pelican-update.nix { + inherit pkgs; + inherit dir; + }) ]; systemd.timers."pelican-cron" = { - wantedBy = [ "timers.target" ]; + wantedBy = ["timers.target"]; timerConfig = { OnBootSec = "5m"; OnUnitActiveSec = "1m"; @@ -49,16 +60,16 @@ in { }; systemd.services.pelican-queue = { - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; serviceConfig = { - User = "nginx"; - Group = "nginx"; - Restart = "always"; - ExecStart = "${pkgs.php83}/bin/php ${dir}/artisan queue:work --tries=3"; - startLimitInterval = 180; - startLimitBurst = 30; - RestartSec = "5"; + User = "nginx"; + Group = "nginx"; + Restart = "always"; + ExecStart = "${pkgs.php83}/bin/php ${dir}/artisan queue:work --tries=3"; + startLimitInterval = 180; + startLimitBurst = 30; + RestartSec = "5"; }; }; }; -} \ No newline at end of file +} diff --git a/applications/pelican/wings/wings.nix b/applications/pelican/wings/wings.nix index 0dd8b24..af32740 100644 --- a/applications/pelican/wings/wings.nix +++ b/applications/pelican/wings/wings.nix @@ -1,5 +1,10 @@ -{ inputs, pkgs, lib, config, ... }: - +{ + inputs, + pkgs, + lib, + config, + ... +}: with lib; let cfg = config.modules.pelican-wings; in { @@ -10,19 +15,19 @@ in { }; config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [ 8080 8443 ]; + networking.firewall.allowedTCPPorts = [8080 8443]; virtualisation.docker.enable = true; environment.systemPackages = [ - ( pkgs.callPackage ./package.nix {} ) + (pkgs.callPackage ./package.nix {}) ]; systemd.services.pelican-wings = { description = "Wings Daemon"; - after = [ "docker.service" ]; - requires = [ "docker.service" ]; - partOf = [ "docker.service" ]; + after = ["docker.service"]; + requires = ["docker.service"]; + partOf = ["docker.service"]; serviceConfig = { User = "root"; @@ -36,7 +41,7 @@ in { RestartSec = "5"; }; - wantedBy = [ "multi-user.target" ]; + wantedBy = ["multi-user.target"]; }; }; -} \ No newline at end of file +} From 34b2ef6a8464b811b003f93a5f19c502d9939148 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 10 Dec 2024 00:44:38 +0000 Subject: [PATCH 402/563] feat: got teh wing working its not 100% ready for prod yet as there is no way to transfer from ptero yet --- applications/pelican/Notes.md | 16 +++++++++++++++ applications/pelican/pelican.nix | 35 ++++++++++++++++++++++++++++++++ flake.nix | 5 ++--- machines/optimus.nix | 8 +++++++- 4 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 applications/pelican/Notes.md diff --git a/applications/pelican/Notes.md b/applications/pelican/Notes.md new file mode 100644 index 0000000..8516be7 --- /dev/null +++ b/applications/pelican/Notes.md @@ -0,0 +1,16 @@ +# Notes on Pelican + +## Panel + +* ``pelican-install`` is in env that can be used to isntall +* then go to ``panel-address.skynet.ie/installer`` to finish the setup + +## Wing + +In the config the ssl must be set as so: +```yaml + ssl: + enabled: true + cert: /var/lib/acme/skynet/fullchain.pem + key: /var/lib/acme/skynet/key.pem +``` \ No newline at end of file diff --git a/applications/pelican/pelican.nix b/applications/pelican/pelican.nix index 395f155..e0ecce1 100644 --- a/applications/pelican/pelican.nix +++ b/applications/pelican/pelican.nix @@ -44,6 +44,10 @@ in { wing = { enable = mkEnableOption "Pelican Wing"; + + node_name = mkOption { + type = types.str; + }; }; }; @@ -211,6 +215,26 @@ in { }) (mkIf cfg.wing.enable { + services.skynet.acme.domains = [ + "${cfg.wing.node_name}.${domain_panel}" + ]; + + # using https://nixos.org/manual/nixos/stable/index.html#module-services-gitlab as a guide + services.skynet.dns.records = [ + { + record = "${cfg.wing.node_name}.${cfg.panel.domain.sub}"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + services.nginx.virtualHosts = { + "${cfg.wing.node_name}.${domain_panel}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".proxyPass = "http://127.0.0.1:8080"; + }; + }; + networking.firewall.allowedTCPPorts = [8080 8443]; virtualisation.docker.enable = true; @@ -219,6 +243,17 @@ in { (pkgs.callPackage ./pelican-wing-package.nix {}) ]; + users.groups.pelican = {}; + users.users.pelican = { + #createHome = true; + isSystemUser = true; + #home = "/etc/pelican"; + group = "pelican"; + extraGroups = ["docker" "acme"]; + # X11 is to ensure the directory can be traversed + #homeMode = "711"; + }; + systemd.services.pelican-wings = { description = "Wings Daemon"; after = ["docker.service"]; diff --git a/flake.nix b/flake.nix index bf876fe..6699f9e 100644 --- a/flake.nix +++ b/flake.nix @@ -149,9 +149,8 @@ # metrics ariia = import ./machines/ariia.nix; - - # games server - panel/host - optimus = import ./machines/optimus.nix; + # games server - panel/host + optimus = import ./machines/optimus.nix; }; }; } diff --git a/machines/optimus.nix b/machines/optimus.nix index e766795..dbc085a 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -40,6 +40,12 @@ in { services.skynet = { host = host; #backup.enable = true; - pelican.panel.enable = true; + pelican = { + panel.enable = true; + wing = { + enable = true; + node_name = "node01"; + }; + }; }; } From 88db47d13d87768245e759a4666b7b305f1bf160 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 1 Jan 2025 18:58:37 +0000 Subject: [PATCH 403/563] feat: set the panel folder to a better path --- applications/pelican/pelican.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/pelican/pelican.nix b/applications/pelican/pelican.nix index e0ecce1..32dadb6 100644 --- a/applications/pelican/pelican.nix +++ b/applications/pelican/pelican.nix @@ -20,7 +20,7 @@ in { dir = mkOption { type = types.str; - default = "/var/www/pelican"; + default = "/var/lib/pelican_panel"; }; domain = { From d9ce8c5a793809adcc29f4562b4eda2016b93750 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 1 Jan 2025 18:59:15 +0000 Subject: [PATCH 404/563] feat: panel now installs properly when enabled --- applications/pelican/pelican.nix | 91 +++++++++++++++++++++++--------- 1 file changed, 65 insertions(+), 26 deletions(-) diff --git a/applications/pelican/pelican.nix b/applications/pelican/pelican.nix index 32dadb6..4360334 100644 --- a/applications/pelican/pelican.nix +++ b/applications/pelican/pelican.nix @@ -10,6 +10,30 @@ with lib; let cfg = config.services.skynet."${name}"; php_pool = name; domain_panel = "${cfg.panel.domain.sub}.${cfg.panel.domain.base}.${cfg.panel.domain.tld}"; + + packages = let + dir = cfg.panel.dir; + in [ + pkgs.curl + pkgs.gnutar + pkgs.unzip + pkgs.gzip + pkgs.php83 + pkgs.php83Packages.composer + pkgs.php83Extensions.gd + pkgs.php83Extensions.mysqli + pkgs.php83Extensions.mbstring + pkgs.php83Extensions.bcmath + pkgs.php83Extensions.xml + pkgs.php83Extensions.curl + pkgs.php83Extensions.zip + pkgs.php83Extensions.intl + pkgs.php83Extensions.sqlite3 + (import ./pelican-panel-update.nix { + inherit pkgs; + inherit dir; + }) + ]; in { imports = [ ]; @@ -66,32 +90,7 @@ in { } ]; - environment.systemPackages = let - dir = cfg.panel.dir; - in [ - pkgs.curl - pkgs.gnutar - pkgs.unzip - pkgs.php83 - pkgs.php83Packages.composer - pkgs.php83Extensions.gd - pkgs.php83Extensions.mysqli - pkgs.php83Extensions.mbstring - pkgs.php83Extensions.bcmath - pkgs.php83Extensions.xml - pkgs.php83Extensions.curl - pkgs.php83Extensions.zip - pkgs.php83Extensions.intl - pkgs.php83Extensions.sqlite3 - (import ./pelican-panel-install.nix { - inherit pkgs; - inherit dir; - }) - (import ./pelican-panel-update.nix { - inherit pkgs; - inherit dir; - }) - ]; + environment.systemPackages = packages; systemd.timers."pelican-cron" = { wantedBy = ["timers.target"]; @@ -124,6 +123,46 @@ in { }; }; + systemd.services.pelican-panel-setup = { + wantedBy = ["pelican-queue.target" "pelican-cron.target"]; + partOf = []; + path = packages; + serviceConfig = { + Type = "oneshot"; + User = "root"; + Group = "root"; + TimeoutSec = "infinity"; + Restart = "on-failure"; + RemainAfterExit = true; + ExecStart = pkgs.writeShellScript "pelican-panel-install" '' + DIR=${cfg.panel.dir} + + echo "Installing Pelican panel to $DIR ..." + if [ -d $DIR ]; then + echo "Directory $DIR already exists, exiting" + exit 1 + fi + echo "Creating directory ..." + mkdir -p $DIR + cd $DIR + + echo "Downloading Pelican panel ..." + curl -L https://github.com/pelican-dev/panel/releases/latest/download/panel.tar.gz | tar -xzv + echo "Installing Pelican panel using composer ..." + yes | composer install --no-dev --optimize-autoloader + + echo "Setting up the environment ..." + yes "" | php artisan p:environment:setup + + echo "Setting permissions ..." + chmod -R 755 storage/* bootstrap/cache/ + chown -R ${config.services.nginx.user}:${config.services.nginx.group} $DIR + + echo "Pelican panel installed successfully" + ''; + }; + }; + services.phpfpm.pools.${php_pool} = { user = config.services.nginx.user; group = config.services.nginx.group; From 55fe2c81edbbc861613b48a7a7bc61715b48b883 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 1 Jan 2025 19:32:47 +0000 Subject: [PATCH 405/563] feat: by default the wing will look in a specific location for teh certs, which isnt teh right one for us, so provide a symlink to teh right ones --- applications/pelican/pelican.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/applications/pelican/pelican.nix b/applications/pelican/pelican.nix index 4360334..1232b4e 100644 --- a/applications/pelican/pelican.nix +++ b/applications/pelican/pelican.nix @@ -313,6 +313,11 @@ in { wantedBy = ["multi-user.target"]; }; + + systemd.tmpfiles.rules = [ + "L+ /etc/letsencrypt/live/${cfg.wing.node_name}.${domain_panel}/fullchain.pem - pelican acme - /var/lib/acme/skynet/fullchain.pem" + "L+ /etc/letsencrypt/live/${cfg.wing.node_name}.${domain_panel}/privkey.pem - pelican acme - /var/lib/acme/skynet/key.pem" + ]; }) ]; } From e9bc5e389b9055307ff0d680b17e0aae389fd168 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 1 Jan 2025 19:38:06 +0000 Subject: [PATCH 406/563] feat: some changes to begin to switch over to the new panel --- applications/pelican/pelican.nix | 2 +- config/dns.nix | 22 +++++++++++----------- machines/optimus.nix | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/applications/pelican/pelican.nix b/applications/pelican/pelican.nix index 1232b4e..a03980d 100644 --- a/applications/pelican/pelican.nix +++ b/applications/pelican/pelican.nix @@ -61,7 +61,7 @@ in { sub = mkOption { type = types.str; #default = name; - default = "panel-test"; + default = "panel.games"; }; }; }; diff --git a/config/dns.nix b/config/dns.nix index 8383746..30f2b85 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -32,17 +32,17 @@ value = "193.1.99.114"; server = true; } - { - record = "optimus"; - r_type = "A"; - value = "193.1.99.90"; - server = true; - } - { - record = "panel.games"; - r_type = "CNAME"; - value = "optimus"; - } +# { +# record = "optimus"; +# r_type = "A"; +# value = "193.1.99.90"; +# server = true; +# } +# { +# record = "panel.games"; +# r_type = "CNAME"; +# value = "optimus"; +# } { record = "bumblebee"; r_type = "A"; diff --git a/machines/optimus.nix b/machines/optimus.nix index dbc085a..a30296e 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -16,7 +16,7 @@ Notes: ... }: let # name of the server, sets teh hostname and record for it - name = "optimus-test"; + name = "optimus"; ip_pub = "193.1.99.85"; hostname = "${name}.skynet.ie"; host = { From a0ba2d09031247df6851ffb916ce697fd01b2cb2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 2 Jan 2025 22:19:39 +0000 Subject: [PATCH 407/563] fix: optimus will occupy the same ip address as its predicessor --- machines/optimus.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/machines/optimus.nix b/machines/optimus.nix index a30296e..40c6e85 100644 --- a/machines/optimus.nix +++ b/machines/optimus.nix @@ -17,7 +17,7 @@ Notes: }: let # name of the server, sets teh hostname and record for it name = "optimus"; - ip_pub = "193.1.99.85"; + ip_pub = "193.1.99.90"; hostname = "${name}.skynet.ie"; host = { ip = ip_pub; @@ -39,13 +39,9 @@ in { services.skynet = { host = host; - #backup.enable = true; + backup.enable = true; pelican = { panel.enable = true; - wing = { - enable = true; - node_name = "node01"; - }; }; }; } From 7b3fc3a5e1570188ec1085dd264ff84869065b77 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 2 Jan 2025 22:19:55 +0000 Subject: [PATCH 408/563] feat: bumblebee created --- config/dns.nix | 12 ++--- flake.nix | 5 +- machines/bumblebee.nix | 50 ++++++++++++++++++ secrets/backup/restic.age | Bin 2870 -> 2870 bytes secrets/discord/token.age | Bin 1204 -> 1204 bytes secrets/dns_certs.secret.age | 100 +++++++++++++++++------------------ secrets/secrets.nix | 28 ++-------- 7 files changed, 113 insertions(+), 82 deletions(-) create mode 100644 machines/bumblebee.nix diff --git a/config/dns.nix b/config/dns.nix index 30f2b85..0e96e8e 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -43,12 +43,12 @@ # r_type = "CNAME"; # value = "optimus"; # } - { - record = "bumblebee"; - r_type = "A"; - value = "193.1.99.91"; - server = true; - } +# { +# record = "bumblebee"; +# r_type = "A"; +# value = "193.1.99.91"; +# server = true; +# } { record = "minecraft.compsoc.games"; r_type = "CNAME"; diff --git a/flake.nix b/flake.nix index 6699f9e..65b0d23 100644 --- a/flake.nix +++ b/flake.nix @@ -149,8 +149,11 @@ # metrics ariia = import ./machines/ariia.nix; - # games server - panel/host + # games server - panel optimus = import ./machines/optimus.nix; + + # games server - host + bumblebee = import ./machines/bumblebee.nix; }; }; } diff --git a/machines/bumblebee.nix b/machines/bumblebee.nix new file mode 100644 index 0000000..fcdf70f --- /dev/null +++ b/machines/bumblebee.nix @@ -0,0 +1,50 @@ +/* + +Name: https://en.wikipedia.org/wiki/Optimus_Prime +Why: Created to sell toys so this vm is for games +Type: VM +Hardware: - +From: 2023 +Role: Game host +Notes: +*/ +{ + pkgs, + lib, + nodes, + arion, + ... +}: let + # name of the server, sets teh hostname and record for it + name = "bumblebee"; + ip_pub = "193.1.99.91"; + hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + hostname = hostname; + }; +in { + imports = [ + ../applications/pelican/pelican.nix + ]; + + deployment = { + targetHost = hostname; + targetPort = 22; + targetUser = null; + + tags = ["active"]; + }; + + services.skynet = { + host = host; + backup.enable = true; + pelican = { + wing = { + enable = true; + node_name = "node01"; + }; + }; + }; +} diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 75ee0c0091f7e881192ae9a497c868ef1300017b..1910186cc84b9ad68af9ec481b3e011288dceaf7 100644 GIT binary patch literal 2870 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sa%&+;w~ zsj>|6P4)FN@y-r(&NMZ%bPWvkEb=U}Og5=X&(2H=^a(FB&gKdza4zyrPINI(H4G0l zOmqve@QVzn^v_DQ@J;bEk23K$j0`M`h|rJn%0{=%B%mrPKV8AxIWi>4$jmgdB-Gu~ z%-6&)BQVQAJHtQQ%hfW|T-&nDvMjAQ#ksO7Ba|zt%E!YuH@vdU*(@z0tH3SLC^^x~ z-=oMfT)V2+u{@-#tT4$qGAzqGG8Emm6i0)ypmc>qvkc>+oCs&<@X~Nc<4ngCuMi9U zvg|;Us3Oa(EWgl_ zuwb*&O0y)>V#mTlQ&)7`O#MZ3nI$1w7m-T zbJL40eJ#*!E3`=UN>5kNPA)D8OHYgPC^0h#b~gz!a!k%DH_5B;4KqtLbn$j|2{KM8 zOSW)#b2H!yF3&Pf35X~)aSAC<3Uvy|%&E#vGtACR3EE(yy>^OE-*6Pd7og z%{#2fqNrTKw?e6Hgx(r@$m9^ORCE4{v?_%-oVlGZ)98sw@kxs?;L0N~e4$ zeV>f1DubxPT+0XpOOL{&T!S#D@Ce_?0FM&?yin5!uOwe|+w|R&Ow$7uilSU{94nGD zvJx#*g3bI&^Y#7m-O^L@-7E9FN|Q|e3O&;!i=ETT@{P*5Li1BABZJdD!W@0fO${=V z!;MX=vdYba(#i|NokM+$4HAcC~>PYt}-tu%1BDe@=6I!jdD%qDlM@HGj%u9cX9SC3w1UzDa} z+@(0oGtIa#pdbv3Uy9F4RIaekcWE7jF zmYQOeCB7LRzLAa!`eh}~X&%~%nPG<7UIjruxs@d*?q)^WnN>lder1k^fx%S)j#ZHc z8P4TgxsD!&0VSdS*(s)hk^WVdg(c>ORmB#CX{M>UhT$ejX4)wRL8+nX<*pd1#5lDm z+@oB<+1JC^w=hH7A|Tl;A}6@gqa?5(%-biaDlsY4#JIGi(7Y_ipe#4kvOJP2z&FD& zEYd7FGAqj8JHRi=)z`n=&BZM=s6@X!C^$PQ%-q+o%G; z{AVWXbvh0d-zmQVX6pVQDta9`%bX3T(G^#AkDNQTMbjMaCWxroI8e=8^9Di5Xc*fi6B}PDut4 zW???*SuSB|d5NBRfm|6SY3b&np{}{6nI5jiuKt$hc}eFA>RRP}SCP`_zd4|qL zX(#izuw%s3#ctkSo*(9AF?BdoMI-7zaD$k^9ArPxP5DQB%h{~5BC{&j(8t_0)hR!~Dbml<&)7FLI3>iiDk3O7!#6M@2P2gP z7rHp*Ix2WX8Hf6qI$1=O1v=%qCI`70Rh1d}r>2;fq-AfTivdxV= zTmmXea`lTseZuv%{hd9ET@2EFwNp)!jSZ7sQ(e=OxpGp%waaomax>GD%+lS1Q%%i7 z%=H7ZQiA-=9SZ{8i%o(9oKy0`4ZQu5(c>*O$JsSCT_LKf(9JO{DAFa&Bp|%9I4|2P z+sM(t+^yI>yuc#7BF!twCBnS2)G@WPoU1I$tT@WWG|9L)Ah^7+AU(0NvOFt0-z~*A zDmNs{!Xvn_FfGV0I6T7#BfnXcMOiurD&(f*7-afHL>V~x`Wu>BxLQ^jyShYqM!0Bu zQo0h-H|2M!spbkyD~ao=;vN zm#(g^f>BAbOQy4Bs83F2wwH5acv66qg>jjWmv>o2wwr;0Yd~UXh(S<9WWKuzmwUZq zvfZn2FZOo=qD3>Sj~nkj>{=#x%kpxd;ORYy!n=#+JA@fq9bbGp;!c0Zn<$r(0%Zod zug?z$1RmMjoG~^2^i=JWzA}>ew)yn!8TUTFecHR;Q$JI+aPQ)|)dGzRWtnI1 z+#d6P=8huT-kJ literal 2870 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tlPjmp&z z3NjB1ugG-^NUyA{$aV59NYAWHF?V(~FE8}UGS&|AGRRMKa^*4z4@$|kOw!LyOHIqF za4YfiD)R|QvdpzCFLF&v^vg3Y2s1Qxtu!~SvOu@ZB%mrPKV8Aqywb-o!!$C?G|DU8 zE3D8$+a$n0(f1u(lk8Pt(dDc#NXS)AUV>xqFg`Mvpn3-GCjS@ zP}|Kn&#}xP#5FxEKRqWrB-}YWEg9Xm6i0)ypmc>C%XB|yi?Hx0rzBI4ip~h)`qm@X-81b}CpIm5`ZIPPkpA{HTR_W=J7?o^ZS?X<=6Xcp{l4k5? zXkwY@?#Pv%ZBbfQWvm}y?604ZYmr&(UTEr_>X;nhnC5GgW|W^39#B+L=H!tPn2v6n zcUX}{QMp27YMFkDL3uz@W{8Woc|fXrg}JL=o{^=yrM{1eezuc)xLcH=MMg$iMLAbR zW~F6Bs;{3f$#Wo6D;+1W{cj>TMw{{9)2UM>ax z>EXqOein|NsU;P;W~qkyCZVY*DPj7BeikW#Wu_rXmY(Rg>ANSHrUxoyr=`04=KDD6 zyLshjMrFAABpYQ`CcA`}7Wa91TUg2pG;!_Z5oD`H6 zl;`cCpX8V47+_N5lUnK$<{Iqdo}Fc!9-PjlU!Gi)os}Jx6;N)O>{j7lWn%7E5MWqn zP@Wo@7*v# z(orEVKO!w9$Sgf2-z2%j%}d|V#V|K1#4X6FDBZ}=J)<}z(A~n(JkhYKvYaa=sysa{ z*C5Q>wElYD; ztEvhOGF(l{yrK+E^Nsu>ll=3|Dh*N`U4lI-9bE!FeS*E+T)F(iy*wgJ3>}j*qasZ+ z{X;90^4v3BT+Kr(qI?aKjZN~5&5Auu-5s3*G2+d+&_BdIP{BDpEjX{tI4mL(V(!v*wi&IyUbEQy&^2kf-5hmG&eoj+b7G|EH&HBIXg2uIN!wB z#H36=EIHjPBBH3+J1MBb+tkAs!#2+HJ4CmY+ z_p}hlh{UR-!kjc;^fc*_WRO`9sNj`dSz2mdQC{j=6yX?Fl4+Tq;uYX)o@)`|>KtfU zS>WhunV6gEVr&@h$W>wL6PQz;nv(A2nw;mAo8p;j>0Tb1l#-K@?pIKmT%7CZ@0}TB znrPvSQ7Ri3xe$R27w`78+{%MkM8@xdny$hv-KZXN3A>m!$YtM)_JKMic}E z7lcQ6a+$iBx>$r71o#_dR~nh*2l<#J6`BMGcov#v6<1XF1>||SnEI3k1AI6o-M)v>g^peWVU%qcQiyTHrKC#=FR**z)G5#6>>SF^O_Km`M1 z_b}}s{hV@bH^*StyhK+cqe}lQ1MduflPI&)wDdxk;>3`!iV*EUPp(q0l46q}i{dDg zLca*F@U#?j3llf(oIsa=%21C&leB`wY+r5Dst99Wj2sZ@mRRAOu8{gNzUg2io z928RMo9656W?-3I5R{c4ky4gaoNMWmXc8LWo9dF8%%vR><(cPW9_&^YW4DZouJf`G6< zXRqAcq{t#|Pvf9$H&+*o+SH;f%F;PdAw4O~+25nm)hxNx!zkU^*)Px|E!!k0JuRTZ z!=Td4Hzd)q(7iCj(>U0Kt1Pgppft3k$gjAxs3gtZCt2S!GP2y$qbMN4%P%#vz&tR| z*DTeg%q$oqO%~-Am1UJHL=|R+MLPQC>X%lTa`rANACd!}VYl@wSed$@ROXJt7Bdg@!cg%lMy2N$F|7n>FYr58k&x@8t~ z>FVk#ct%y}2UnJ48VCB7XIr>MrDwYvnY-sFr)ETY8Tos9g!}kgn!A;nI~loh#jKF+ zyI{L+yTydM--~*Vo7IKCXe%lFZ)9L77_gjh4VdvO(vdA_+UjL0_ zrty?g$4bu-g|l0AzvNvFTEBLCVeF%vjDzP&%g?5zbiB#fd+Ti0-~5>mjKnv;E;MXg N;NWu2UrfHF3;>9gvl0LR diff --git a/secrets/discord/token.age b/secrets/discord/token.age index a346d9bd6dbec104b3b8803c7707cfe0daecc60e..1550f8cbca817587bb6d7299e16c2f8f89fef451 100644 GIT binary patch delta 1116 zcmdnOxrK9rPQ77dnnyrUqPL}oe`#r1R<2u?xrI?qVq|iXpI<;!c%_L!p+}fgMP`w^ zCzrXmziF7hu|ZI(MPX@Cfn$Y_vw=xycCM4VSww_KnsH=unMIXRrM88U0hg|wLUD11 zZfc5=si~o*f=NJCRDQaGeu|NAqFe0ZjQE>g^_DnQo4)h z#E;@(&iWSV20?*o=_Y<3LY_-ySXPCxmvK~9S!Hp)dA@mZkdt{)rnXNNu9>U0MXqI;mv3%%L0V#EuzRLqX;ij{WkIn^QcgjYE0?aWu0oM_ zdPRPiTW+XhnNgB!NKuY&wvlOytD(7JnNv}4T0xp)nP+ygcco*BE7wH%xD`h$g&rx$ z`ERMrWZ$e^^WxKWnYsl%scgUGmZ)BzrL`|}Lxt(*yW#amCI~6rZ`xzg9bc#2HT7J~ zEe+>PKZbkW_l+`Bw03L~Es|fQWs~K5Mv?Vm(lJfL;yqe6ciwMtoAc5s@Iz|LpM`=f zYZ>ZaYI%H{k{)8ZTxyHv$<_b(rNV#iwP{HJeTR3#RF_C6dq z^W5>oV*&dM#7^Ft8@cNAF|TE*{=uRO=Swg16_pnq72+uM-E=d7@5kX!mBx?%)#k7R E0CYo_egFUf delta 1116 zcmdnOxrK9rPQ7EYnO}0Gn_GHzewlMgrg5roafV@;X+UajzKL6MwnRDK}1xLesP4ScD{aKvRSfGNk*o5aoMJ|*daL1ty4UZ#Z^`6)#KG_l67$w5Oode7r-7L$p zT}<_h{ZrgreAB|yOe4Mgg0xHAy>la-ESwzOT-?HPgB-aEl3a}nQhh5z6Ai2M(~>+a za*b1s^CL1G)2p---6MT6vXb;8B6Ew3ye6Mvl&H_E@JLC`iOfs!uW)xs&ML?*HK+_S zFpG5e%kV7@ipqA>cQ!UFa7yzIF6MH|F)vIt2@FgzvZzchudK{Vadt^ga!D>rH}Ut$ zH!kxDFLB8Zb<2$M#0Y=yup*11as}hOjG_ty7t^G?2%~&2#}u=AA8!+XV*`%>Cy&C4 z5ED-)!yxlC?PT+Ss&p> z)YdOCu}n|ratz8f4#)@%^ezod4$Vp~_Dn5}$}z3*$TG{!*LJcn^)JjU&G#?&jZAk$ zx6ZT5(YMf1A=1*VDl5=8*(E$Xz_&CkC0D<+SU)GnK-=9cqs+-P#5~*3&&j|kr_jlf zE8DTi(IVfgK0Lr6tG`~1Cv&^j|J=oXJmFuVG@fFwf)Pg4V zyGVZ0YIu0*cg@}%3sx1JI=WlO>WJsD>Mo}U@4va#D+TM%YX?pGee9XSh6DfYSQ6hq zC~KT~j!QJ~N54_u{?p>Ei;o^mxLMt`$7Q+AYOxIAl&vla>egErc7dX zGwIAxpA|BKbC|??!e(g)#unWPIKNo`?PIw-FRSyb_AstV{JT%yI6LRC;f&R#jyGRA z9@KqwLwv)exz_s}T|&?NJGDjfekx-`_2q4uTGR6R diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 02a18dc..f146486 100644 --- a/secrets/dns_certs.secret.age +++ b/secrets/dns_certs.secret.age @@ -1,51 +1,51 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA ikotG+f48KCxKj5DIdhwIEYHtspuBfGj9DvlXLchllk -TQ8OlL5uDpwnjveBk1RbpB+cCOpqlPQtOu7c0/LRiqw --> ssh-ed25519 4PzZog ptPetu+OMhjcqwIZD2EtPWojceX/p+xFRu8SdFBEBzk -5HKDrQTBiv+hTKhkLtnYOq7sUO8+dKOS52bXGjGXwxI --> ssh-ed25519 dA0vRg nQ1GTSQwHt806xrFMyqwQ86iBSLbgGDIL+GIWMD3AFw -OPyLNOxp5k40I4WvDStpKun/AdOuWZyEQLPyyFdqtcE --> ssh-ed25519 5Nd93w uYt44+U3T3DOThXDGvl5WPDPGj506O2Fc271qlw/lBo -tcRUll9+PIfcvcdvIzD8fcIU85+d8lw7ThPetfq24nU --> ssh-ed25519 q8eJgg wLIZSQp/YAKSohUD5NsbADyYua8p2qik9lRlzdvZuSk -f/b9Jt8Qk7dcor+5xczk7zRzOxTgknGYstcLQv7ztJA --> ssh-ed25519 KVr8rw InbHZ+pieHIQGGW3LOOfYHS+RkuXRMzxMblHHLOV9Cs -0oHx4kyD8AW5vgpds6EirGHeYznJ+z2WiGmn7+6bPww --> ssh-ed25519 fia1eQ UTuEfUIL1xVc5W/HSXpVvPxeQriwC6Tot1G0vRaT1XM -6mWM2A8DVPMKzp7ccqTj+3go39xsyKIHuu4zZypHD9c --> ssh-ed25519 /Gb5gQ Q6uPEnhxFPRulsd5YWVXfrVUJqSN3oM02g4yK2IYUQc -qqcy7z7RohVz/GDpB2FfjE2V42Bs023N6+G4qIJN9Bo --> ssh-ed25519 NtlN/A F4k9xBWDxeIS+v+DldjlN5e0WQmKH7Pt23XnKxkxTVQ -PgCuox8LSeYaamogydWcXyP4aVCQadeVfnjnFngWC+A --> ssh-ed25519 v2Y09A Dq/SngPnj9Or0XiVOoo7EQNdsh9mby1F9v2zSZOfMH8 -Y6J+nWC58lxZKc+wMFUGeymONf9LOxJhMonP1Vo/LMo --> ssh-ed25519 XSrA6w KnF8xhrzss3txgoF0JK84/M7b81NuFeB9Ir4590LYRw -jilyzwKpL/A4CmO/hMOMjZqPfwGsNYsngAw2trX7hKM --> ssh-ed25519 DVzSig A4EU6+2yqw3S2ISYUBbZYOq4xBEfXoEy1fTUhTzGXV8 -c6CyaaBcdHA6ZNdJApUcQT/ED0hQYPqqyvPF+zwCLME --> ssh-ed25519 MhHMYA ixDHJ+PFXFxsCu41Ye2Vwlk8wVlXofq2ztKIU9qxH0k -8JBxpk9/nQqR2y6i8GU9PpoHfyitJwIHxMr8nb2Y5As --> ssh-ed25519 uZzB3g zZAxSWF9i6321ifYiizQn6kvadhQ17/fNkYSgOyR+x4 -H5jsIQmgVgRoMRRQ11K17eD9HqU78CpKu5ylkgqrtq8 --> ssh-ed25519 CqOTGQ TzL9qPqBl8M3d9whmAaBgx3Wo/hPKc7Q/P6Kt3pPxn4 -BTnEU/156/8BKqdFcWisleg/K69RIiMaNDg6h9MX9og --> ssh-ed25519 IzAMqA +w67jWJmcVuPwjlkKn5Y/ryZBzA7ZzLl4va6KxfMm1I -mO9xeZV3RYUbGu5TJfnRAaJumAzM5u3wmIByawDdFn4 --> ssh-ed25519 Hb0ipQ y/srd2GpXb5EMVySg3BYOr+41u/NnJlx/2sQlhRyEg8 -s3Se3Rf8N4WqP6QdmkAmNtgZKgsvmuWfiOpC6pKGNuo --> ssh-ed25519 3pl/Kw u+QbsaYgVdhbsYBlbuusG/1nOXQ3PLCwtwWE2nUTUFQ -laEpITIyaNx7opXwqT9SHo9qNWCRH0WozQYt8SW1cz0 --> ssh-ed25519 SqDBmA 0dlLmNcgAOBOUrVUT/t0oaF+AcXUWqkDN3fu64rLx0A -y9Xw6atnsCX66Q+iIMHwsq8vxeL4kxTihIbMut+JMlA --> ssh-ed25519 UE6fcQ qBrP+r+1jy06z90mQgk05zLog586HGUMDgHTbExoMj0 -TnZAUZUNNIAJzd8Efqb7KqR/n26YXr4jV6zPvZXu4eA --> ssh-ed25519 YFaxCg SXGoMkrpgduoXNIZXDy93gkzlnKtr1fAOQJxZDcZ6Q8 -jKdd+OufjXk1UYsXcJc/Q4JeiRhCcHW2nrDuBrHu/pw --> ssh-ed25519 elCEeg jPd0A53zK9OFThb4pCF30/My3QxiwGyGiDp64ob1vWA -L0Rj+47bdVVwii4LIMoI2by9qmzk4H1kHoyEc7rUO9w --> ssh-ed25519 8vZ9CQ lgEkLneoENKWwNXRtXRbN5VSm1joh7NDSSUn/bp/81k -X2A6sHl6dFe2p9hfVINA1G6nR8lqMQNjBKc1FvM9cnE --> ssh-ed25519 rmrvjw NX2NPt0SVGc3+2p/ob735mUIb4t9nhwUrdbdFk8CnSY -sL3zmOASMti3QcIfa0CGEcJex95qGX4aeIqO5LS1LFg ---- 9+vokggbkBI5tk1kvqpdPkePahvTIcYWtU1MU1zTyCs -¼ê{—Œû.xX«®qÆ5Áˆ5à˱È{º«ýGzᆄ6á ô:²‡ÓáÊpð²‚6[äÍY„U—Qâ`©—Àíþؼýa’R ±•—S]–Ñušÿ‹±®cÝY–X²H" h äÁ7Þ…6Ú†´o=®*¿ÊˆGèiɨLûA™?ĆÛÑõ†‡TpaKžùÔóùaåÅì2 n`\ºN34îXÝrÍÊ´·I9Adq»Ÿ \ No newline at end of file +-> ssh-ed25519 V1pwNA nMGYHPjBRQ+8FE2j3JLTb2gfqxFvEDSF5XKvVYILgS4 +xoFB5NeaXLMQhM9ELoooDNNnrjJWFCA+f45Y+YtAOBs +-> ssh-ed25519 4PzZog zuhv6HbfpcIlcueD6SyHD7hRcrPnvMDy1hvXcXTLEBY +VI6ZX5745Tsv1AMvjPKrHWEI2YO4rCVtAMDWLQrzsFs +-> ssh-ed25519 dA0vRg U1zhPjiM0ANz4i9iRSaX9ut/kACtrH/uk4VYk/Cmtx4 +DryI/XiQeggMAIBu4Qb9P7Od4cnQUNFFuim2OKwib5M +-> ssh-ed25519 5Nd93w VICIqg3swkEAagNzDppCX2/lDMh5D/pYqi8wjL9ilH8 +DLcvw4k9r1RDrueCD/vqX1iEL55hxld3eJr5MCS7YNE +-> ssh-ed25519 q8eJgg DyH3qYX/PfoltL0P2lBzP4wwH/VmYusidfD7MaS1PBQ +ilj+oIaQwj6jSsDNagpLTJXZywWB2IeLUa6pKlcEvIw +-> ssh-ed25519 KVr8rw +JGGMHN2zMPN4leJIZkBTOrhzb8BYQKMbSrAuIpCU2k +Sa2V0qsQbKPLvuVewBjTdIgv1acTYIN+CMIlB+ExIok +-> ssh-ed25519 fia1eQ jG4Lr4j3f0QNucooo80HUJAOnLiTAg8mxzYRDnjXrFQ +C+cZWCaRemvsiCMJ7wn/6g/12ABvKEaYIaU6b3Fpo8g +-> ssh-ed25519 /Gb5gQ QO7t0R8SjnfqZZ6upxKXALytoi6OFZZ4mFpS7XgnlDQ ++yQd4GdflWOzRutCAplDqvee+0dCNdd/ScT8QZyioNQ +-> ssh-ed25519 NtlN/A Y56En/7BcL9IIzBWbOfPzuAah/nPFANXxu3iN6+q8XM +gqw6EsuuDx49aTb6DWtI1ZACDAGL1VnsKB6LAOH6F0U +-> ssh-ed25519 v2Y09A 9MgpxeQcQDGvHkEyb0+f0vRZfyXE7EUUcBXCyw8w7mk +sdM/6DwpC5kv8yg39edGpm6YV3VzkFLRkIleiwhOKew +-> ssh-ed25519 XSrA6w tp83J4GXjFjQFq14M+Z+PDCmO4ZjJ1qufdQEO6GHzkk +KVri/HL0E/byrA0C3iM8+AMsR0x46pdMrRKipvliSzw +-> ssh-ed25519 MhHMYA Pwi4Tq4iJv8/ylaI4VAEzcGAPPfl+T2S/oUp3JsPTVo +8Q0DSQMe9gunPGxYv6M4ilBapKfNx7qacddEc39lgNY +-> ssh-ed25519 3erWHw vo6DeH1ub4VcT3dnvPYZC95MHxaABkZ4MW8NRxqOBUw +6yHGAoHq/u9pSi06jWCkcN230ntCkYADsCB//ISO+0Q +-> ssh-ed25519 uZzB3g FbeDwGg3Se/SVIVVAhgtRAO9wZM72M4ulGcXKBtw51k ++T7O+KNr/QXoGUG8uULBYgDXRWhrwv4ZImjWp8ltxRk +-> ssh-ed25519 CqOTGQ yG/8YtD4tRo8X5Q4kDyIr0xT5JwBg/Wk9NrkJMMCqgI +ZszCJYQGN1eRnRJ9KLpLrxy7j45bL5CtRTfLt4KwRt4 +-> ssh-ed25519 IzAMqA 9AIaFKdsA4yqORM9NNlFkp4TI2q14uy1dtUUP31a6A8 +9FwzT1ZQABt3om9OTodEKgxxgVU9H+VlV8X9AucxndY +-> ssh-ed25519 Hb0ipQ 2jhZm+mZoKzeBRjt0q5+T2HX+VM/H2Zy/7SyXuTeGxY +J6ds5gRKFv754f7NrbGGCXKLTcad8YGVrM0ndDHlFZ8 +-> ssh-ed25519 3pl/Kw IrzcYOatmG1O2I0CbNz2Phs32G3nz5Jv9Uizj4cqhAE +YDFNtbNUVpAQXyWIZssNANKEc4LoG4cEdmKBRWMFdas +-> ssh-ed25519 SqDBmA erRarQNCMp2QrQBAThQ23RoTAK0Uzz9//SqgBdldFDI +bi/LlSWcaPDHc7lxXuzMJUf6tAlv/6oF/go6NcQEcmA +-> ssh-ed25519 UE6fcQ QjWmHf2lgJ5QctSg9WlvLRueeE1N9WQdV1ZRrDIGsWA +K2IdKT9WpS6bsONh44h28i3Vm64YxhJFDas+rFPRbs0 +-> ssh-ed25519 YFaxCg wUWp3BvPpjSKKySmCb3gsO06P+F6GiYJU/wwfTAqTU4 +1D1+FEXxZES4cVbl/tSaMfiVk5yJlb9y9RsThyaK13A +-> ssh-ed25519 elCEeg jyijilsUuQ14LYrZPzE6CAMxgVmGFaxR2EbIP48l5Cw +kdEeI5a8gfh5d1mVbiMWOgGP9qmxc01EEifN00l51yM +-> ssh-ed25519 8vZ9CQ k55pfEEYf/3sC7M9YyA0zlQdv69N324fvNgW7/0/hxQ +EPJ0Bv///iKOz0y1dVT/jGTobSYjKGW8+Os1lLBMDtc +-> ssh-ed25519 rmrvjw kqTB4IBJ/wr6P2g21TmbqdNQB5XDxCSU9lwVRAPiZhM +3d9tjv3l3ws74DW+LeHVYUDViJWg+zv93mFv1C3mS2c +--- cUHw7QjEwLsUCL+1WhhNByWzfOIFrRmA/4JPbYgukCE +é *8ÿ¶QÙËš=R™=Åyg¯u Œü"¸eSI\ÑË[šŒ¤ŠÏG3.UzÜ Ã»4±—½ïEÊŒýÀ ß\»ý) eðï¼X}H°f§¬X1 ç“Sá¸Ç){¹x+Úcø1ãùù3mc³k?œ ïh:ý„’b’ô‚2“¤¾gB@Ï-á'âÄÿ°å›ÎF/Žœ #ÿŠÆH+Ô–¼s¸•<øå™êÞîþK†ìCÁÁšQ˧ie;¥Â-kžˆRx= (#}i¢à°nße \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index f473e25..ca7480f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -21,7 +21,6 @@ let vendetta = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFvcxiSYE38V1IopHj7Z7ZWP1IqnskYCdhj8yCQohVUM root@vendetta"; vigil = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICDsz1bjNAThqwF48dKIJGOECsCKHTj/Gn5Gh9XyzoSO root@vigil"; galatea = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII3Mke5YtaMkLvXJxJ3y7YAIEBesoJk3qJyJsnoLUWgW root@galatea"; - optimus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIqYbbWy3WWtxvD96Hx+RfTx7fJPPirIEa5bOvUILi9r root@optimus"; glados = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ6go7ScvOga9vYqC5HglPfh2Nu8wQTpEKpvIZuMAZom root@glados"; wheatly = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIPlgCGtyvd3xwYg9ZNyjTJNB/LvUSJO01SzN8PGcDLP root@wheatly"; kitt = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPble6JA2O/Wwv0Fztl/kiV0qj+QMjS+jTTj1Sz8k9xK root@kitt"; @@ -33,7 +32,8 @@ let marvin = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIAme2vuVpGYX4La/JtXm3zunsWNDP+SlGmBk/pWmYkH root@marvin"; calculon = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGsmeBfh4Jw2GOL7Iyswzn4TVNzalDbxDgh7WuQotFxR root@calculon"; ariia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIA4kV6W1/tP/nf2ZWNhRoV1mK04R4pS+c5vdsA1n5gpN root@ariia"; - optimus-test = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFv0Hb4qfzXUll+Hct1NQOE0bCf0MpE24Cqskd8vAFyj root@optimus-test"; + optimus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFv0Hb4qfzXUll+Hct1NQOE0bCf0MpE24Cqskd8vAFyj root@optimus"; + bumblebee = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINF31tsOZTEpPFCu4wZvJjxxvgFhRpxvo9SKyDMNWHZu root@bumblebee"; systems = [ agentjones @@ -41,7 +41,7 @@ let vigil galatea optimus - optimus-test + bumblebee glados wheatly kitt @@ -83,28 +83,6 @@ let ariia ]; - # these need dns stuff - webservers = - [ - # ULFM - galatea - # Games - optimus - optimus-test - # skynet is a webserver for users - skynet - # our offical server - earth - - # nix - - calculon - ] - # ldap servers are web facing - ++ ldap - ++ gitlab - ++ nextcloud; - restic = [ neuromancer ]; From aabb9d0708ec6a86500c485c7c95db72aa92cce3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 2 Jan 2025 22:47:42 +0000 Subject: [PATCH 409/563] feat: small bit of a cleanup of the pelican --- applications/pelican/Notes.md | 10 --- applications/pelican/nginx.nix | 119 --------------------------- applications/pelican/panel/panel.nix | 75 ----------------- applications/pelican/wings/wings.nix | 47 ----------- 4 files changed, 251 deletions(-) delete mode 100644 applications/pelican/nginx.nix delete mode 100644 applications/pelican/panel/panel.nix delete mode 100644 applications/pelican/wings/wings.nix diff --git a/applications/pelican/Notes.md b/applications/pelican/Notes.md index 8516be7..d5cc785 100644 --- a/applications/pelican/Notes.md +++ b/applications/pelican/Notes.md @@ -4,13 +4,3 @@ * ``pelican-install`` is in env that can be used to isntall * then go to ``panel-address.skynet.ie/installer`` to finish the setup - -## Wing - -In the config the ssl must be set as so: -```yaml - ssl: - enabled: true - cert: /var/lib/acme/skynet/fullchain.pem - key: /var/lib/acme/skynet/key.pem -``` \ No newline at end of file diff --git a/applications/pelican/nginx.nix b/applications/pelican/nginx.nix deleted file mode 100644 index 587db71..0000000 --- a/applications/pelican/nginx.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ - lib, - config, - pkgs, - ... -}: -with lib; let - appUser = "nginx"; - name = "panel"; - module = "pelican-panel"; - cfg = config.modules.nginx.${name}; - serverName = "${name}."; - dataDir = "/var/www/pelican/public"; - port = 443; -in { - options.modules.nginx.${name} = { - enable = mkEnableOption "Enable ${name}"; - }; - - config = mkIf cfg.enable { - modules.${module}.enable = true; - networking.firewall.allowedTCPPorts = [port]; - - services.phpfpm.pools.${appUser} = { - user = appUser; - settings = { - "listen.owner" = appUser; - "listen.group" = appUser; - "listen.mode" = "0600"; - "pm" = "dynamic"; - "pm.max_children" = 75; - "pm.start_servers" = 10; - "pm.min_spare_servers" = 5; - "pm.max_spare_servers" = 20; - "pm.max_requests" = 500; - "catch_workers_output" = 1; - }; - }; - - services.nginx.virtualHosts."${serverName}" = { - root = "${dataDir}"; - listen = [ - { - inherit port; - addr = "0.0.0.0"; - ssl = true; - } - ]; - - forceSSL = true; - enableACME = true; - - extraConfig = '' - index index.html index.htm index.php; - charset utf-8; - - access_log off; - error_log /var/log/nginx/pelican.app-error.log error; - - client_max_body_size 100m; - client_body_timeout 120s; - - sendfile off; - - ssl_session_cache shared:SSL:10m; - ssl_protocols TLSv1.2 TLSv1.3; - ssl_ciphers "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384"; - ssl_prefer_server_ciphers on; - - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header Content-Security-Policy "frame-ancestors 'self'"; - add_header X-Frame-Options DENY; - add_header Referrer-Policy same-origin; - ''; - - locations = { - "/" = { - extraConfig = '' - try_files $uri $uri/ /index.php?$query_string; - ''; - }; - - "/favicon.ico".extraConfig = '' - access_log off; - log_not_found off; - ''; - - "/robots.txt".extraConfig = '' - access_log off; - log_not_found off; - ''; - - "~ \\.php$" = { - extraConfig = '' - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.${appUser}.socket}; - fastcgi_index index.php; - include ${config.services.nginx.package}/conf/fastcgi_params; - fastcgi_param PHP_VALUE "upload_max_filesize = 100M \n post_max_size=100M"; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param HTTP_PROXY ""; - fastcgi_intercept_errors off; - fastcgi_buffer_size 16k; - fastcgi_buffers 4 16k; - fastcgi_connect_timeout 300; - fastcgi_send_timeout 300; - fastcgi_read_timeout 300; - ''; - }; - - "~ /\\.ht".extraConfig = '' - deny all; - ''; - }; - }; - }; -} diff --git a/applications/pelican/panel/panel.nix b/applications/pelican/panel/panel.nix deleted file mode 100644 index a1bcfd4..0000000 --- a/applications/pelican/panel/panel.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - inputs, - pkgs, - lib, - config, - ... -}: -with lib; let - cfg = config.modules.pelican-panel; - dir = "/var/www/pelican"; -in { - options = { - modules.pelican-panel = { - enable = mkEnableOption "Pelican Panel"; - }; - }; - - config = mkIf cfg.enable { - environment.systemPackages = [ - pkgs.curl - pkgs.gnutar - pkgs.unzip - pkgs.php83 - pkgs.php83Packages.composer - pkgs.php83Extensions.gd - pkgs.php83Extensions.mysqli - pkgs.php83Extensions.mbstring - pkgs.php83Extensions.bcmath - pkgs.php83Extensions.xml - pkgs.php83Extensions.curl - pkgs.php83Extensions.zip - pkgs.php83Extensions.intl - pkgs.php83Extensions.sqlite3 - (import ./pelican-install.nix { - inherit pkgs; - inherit dir; - }) - (import ./pelican-update.nix { - inherit pkgs; - inherit dir; - }) - ]; - - systemd.timers."pelican-cron" = { - wantedBy = ["timers.target"]; - timerConfig = { - OnBootSec = "5m"; - OnUnitActiveSec = "1m"; - Unit = "pelican-cron.service"; - }; - }; - - systemd.services."pelican-cron" = { - script = '' - ${pkgs.php83}/bin/php ${dir}/artisan schedule:run >> /dev/null 2>&1 - ''; - serviceConfig = { - Type = "oneshot"; - }; - }; - - systemd.services.pelican-queue = { - wantedBy = ["multi-user.target"]; - serviceConfig = { - User = "nginx"; - Group = "nginx"; - Restart = "always"; - ExecStart = "${pkgs.php83}/bin/php ${dir}/artisan queue:work --tries=3"; - startLimitInterval = 180; - startLimitBurst = 30; - RestartSec = "5"; - }; - }; - }; -} diff --git a/applications/pelican/wings/wings.nix b/applications/pelican/wings/wings.nix deleted file mode 100644 index af32740..0000000 --- a/applications/pelican/wings/wings.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - inputs, - pkgs, - lib, - config, - ... -}: -with lib; let - cfg = config.modules.pelican-wings; -in { - options = { - modules.pelican-wings = { - enable = mkEnableOption "Pelican Wings"; - }; - }; - - config = mkIf cfg.enable { - networking.firewall.allowedTCPPorts = [8080 8443]; - - virtualisation.docker.enable = true; - - environment.systemPackages = [ - (pkgs.callPackage ./package.nix {}) - ]; - - systemd.services.pelican-wings = { - description = "Wings Daemon"; - after = ["docker.service"]; - requires = ["docker.service"]; - partOf = ["docker.service"]; - - serviceConfig = { - User = "root"; - WorkingDirectory = "/etc/pelican"; - LimitNOFILE = 4096; - PIDFile = "/var/run/wings/daemon.pid"; - ExecStart = "/run/current-system/sw/bin/wings"; - Restart = "on-failure"; - startLimitInterval = 180; - startLimitBurst = 30; - RestartSec = "5"; - }; - - wantedBy = ["multi-user.target"]; - }; - }; -} From 8334e2be701cdefd7bb4ff46a1ef60376aed5f53 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 3 Jan 2025 00:19:21 +0000 Subject: [PATCH 410/563] feat: created nopde for pelican --- applications/games/minecraft.nix | 56 ++++++++++++++++++++++++++++++++ machines/bumblebee.nix | 5 +-- 2 files changed, 59 insertions(+), 2 deletions(-) create mode 100644 applications/games/minecraft.nix diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix new file mode 100644 index 0000000..b294698 --- /dev/null +++ b/applications/games/minecraft.nix @@ -0,0 +1,56 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: let + # function to create the cname record for eachs erver + create_cname = configs: + lib.lists.forEach configs ( + c: { + record = "${c.address}.games"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ); + + # function to create the srv record + # this allows us to change the port without impacting (java) users + create_srv = configs: + lib.lists.forEach configs (c: { + record = "_minecraft._tcp.${c.address}.games.skynet.ie."; + r_type = "SRV"; + value = "0 10 ${c.port} ${config.services.skynet.host.name}.skynet.ie."; + }); + + servers = [ + { + address = "minecraft.compsoc"; + port = "25518"; + } + { + address = "minecraft-classic.compsoc"; + port = "25518"; + } + { + address = "minecraft-aged.compsoc"; + port = "25519"; + } + { + address = "minecraft.gsoc"; + port = "25521"; + } + { + address = "minecraft.phildeb"; + port = "25522"; + } + ]; +in { + imports = [ + ]; + + config = { + services.skynet.dns.records = (create_cname servers) ++ (create_srv servers); + }; +} diff --git a/machines/bumblebee.nix b/machines/bumblebee.nix index fcdf70f..e8e7a40 100644 --- a/machines/bumblebee.nix +++ b/machines/bumblebee.nix @@ -1,10 +1,10 @@ /* -Name: https://en.wikipedia.org/wiki/Optimus_Prime +Name: https://en.wikipedia.org/wiki/Bumblebee_(Transformers) Why: Created to sell toys so this vm is for games Type: VM Hardware: - -From: 2023 +From: 2024 Role: Game host Notes: */ @@ -27,6 +27,7 @@ Notes: in { imports = [ ../applications/pelican/pelican.nix + ../applications/games/minecraft.nix ]; deployment = { From d7e60b92b410231c0a3a36bf85db513381249696 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 3 Jan 2025 00:19:29 +0000 Subject: [PATCH 411/563] fmt: formatting --- config/dns.nix | 67 -------------------------------------------------- flake.nix | 4 +-- 2 files changed, 2 insertions(+), 69 deletions(-) diff --git a/config/dns.nix b/config/dns.nix index 0e96e8e..9cd7484 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -32,73 +32,6 @@ value = "193.1.99.114"; server = true; } -# { -# record = "optimus"; -# r_type = "A"; -# value = "193.1.99.90"; -# server = true; -# } -# { -# record = "panel.games"; -# r_type = "CNAME"; -# value = "optimus"; -# } -# { -# record = "bumblebee"; -# r_type = "A"; -# value = "193.1.99.91"; -# server = true; -# } - { - record = "minecraft.compsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft.compsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25518 bumblebee.skynet.ie."; - } - { - record = "minecraft-classic.compsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft-classic.compsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25518 bumblebee.skynet.ie."; - } - { - record = "minecraft.gsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft.gsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25521 bumblebee.skynet.ie."; - } - { - record = "minecraft.phildeb.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft.phildeb.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25522 bumblebee.skynet.ie."; - } - { - record = "minecraft-aged.compsoc.games"; - r_type = "CNAME"; - value = "bumblebee"; - } - { - record = "_minecraft._tcp.minecraft-aged.compsoc.games.skynet.ie."; - r_type = "SRV"; - value = "0 10 25519 bumblebee.skynet.ie."; - } ] # non skynet domains ++ [ diff --git a/flake.nix b/flake.nix index 65b0d23..4097942 100644 --- a/flake.nix +++ b/flake.nix @@ -152,8 +152,8 @@ # games server - panel optimus = import ./machines/optimus.nix; - # games server - host - bumblebee = import ./machines/bumblebee.nix; + # games server - host + bumblebee = import ./machines/bumblebee.nix; }; }; } From 45eb4324b73354d8d8f0da39b256a2cf950406cc Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 3 Jan 2025 19:42:19 +0000 Subject: [PATCH 412/563] fix: set teh right token for this --- secrets/discord/token.age | Bin 1204 -> 1204 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/discord/token.age b/secrets/discord/token.age index 1550f8cbca817587bb6d7299e16c2f8f89fef451..c6c06dd99891421e48fcc8dedfb1d6f069342086 100644 GIT binary patch delta 1118 zcmdnOxrK9rPJL#UtCO#`Sz?)=VQ#)tWI=&`sexm-TdGS`h+)2Eu3vFdx<_uXXPB{D zK3AltpG!t)VpdXVcu_!zlaH%GWr4q$S72&LNUE8uV`#8>X}OO$5 zM3}R)TYzIZS8z#sR%p6Wuu*PyM3_f$fLpO&dP$LwpL3>hjzMarUrAz0PFiGfPD!ET z#E;_P$wuy_Ro(%m;RPZ7mBxX7DPDnQc@{}NC1$Q!ZoXB%Ar*lJg&8G&X6gA{hK7d8 z631FEvQoIK1bB2BzY-P}#hld@CO zjIx6reO#RajmwivolU$ljLp5vEt2%zBk~+4pJf!UPc-%RGssDHEDm;cN((5>&~`U= zOZN)RNKDNzkM#6%iYhYpGs};1sme~~DhkOAF9`}Lh%8P{403l*%F;JVDh|kWO||s$ z_i&Byj7%y_jwrM&C`z$Fj{)znB8#GO1=A=G@1$Z=bC1G;DE|VFVxxMm+|;O${J<>t zh{BAVD(_H_91m}=%F-04Y%T-y46l%?jH)c}GGmvFkkV8qqu`RXs@!5{SHDs-7hk`M z@@yXum#V_Fbad;|G7}9`0~Lz$lJbfQd^`*E1Dq?$B7=)vEAm_uoh@7w3rjKr)6&c; z>+}5c{HomiB0{-}s*23Rf|JWriz8i%%Y1#awJklo14F|7qWpr20|L!UO@lox%rc!y za+1-l^Q?08Ep$|HamgDh_qZt_sz64K*t-b5HW9@QcXJs?c`N zaw+C=^!6|hP06cIs`9fe4)gR(F)+0V4KOaLsB{j?PxLo%^6*b`jY=tZHw-u6($&>f zNJ>of%!@E`bIdo*@hwd%4u~+!%Pa|SwlFm}$~E>%$uSH`_DqflC{AcK$_g~qyPX%X72Op1n z%(L-l(ydfJ%bf-J)l$c`Yj5Z43n=-xc$BUB#}W7_&%XTHohse1s^5L#M>1^MW>)FR z-JPU*@Z$-u#GpM6!rG3ZzxZ$HOkQKDcKb+Baii$;)z5D%%+}t{vU$rI+hkw6&nAn+`0%89)gmLW*@;t2w^**IQFG}C%Ve+Q(p(wddi#kYL-N-TU*+82uy0?Rd9{1i GuG0YYo0q@< delta 1118 zcmdnOxrK9rPQ77dnnyrUqPL}oe`#r1R<2u?xrI?qVq|iXpI<;!c%_L!p+}fgMP`w^ zCzrXmziF7hu|ZI(MPX@Cfn$Y_vw=xycCM4VSww_KnsH=unMIXRrM88U0hg|wLUD11 zZfc5=si~o*f=NJCRDQaGeu|NAqFe0ZjQE>g^_DnQo4)h z#E;_P&iWSV20?*o=_Ya+v&}5M z%SyeAJ@XBGEXuu1y^1QLs$6{it6a3bOx;SHB7({s3*6JWyz`B!+(J@a^4$#*y(1I- z^TN{fa|^@L!-~oc0?HGeGMy}4A|msgBT7vspJf!UH}diGcP-5HGYRr8s4DR<2oEha z^h~cX%}a98_wouza`$yKG0rkJPRh#X%E+qBxAe$$jx_NuFHX-aiSSHIE;mj0Ht>t^ zjSA08vGmI;^tP;U2}rU)j{)znB8#GOh1_D_5GOMu$M7<*?8Jh!VEuaIw4|(%^nj?a z(n`OGNS_GDu!z*;3b)GaNUjW%@}OdW?-Zv>f9C+NeCKj~)1pv)Z{x@UXK!}{@5&Ni zkFsRT)YPalj0jK5Of*alRPb~Oj?5`BG%N|Vs0cB&aLqS!iE_*>&j|Aft29sX49(20 zuQD+)_benxHO_M{&C>Tx@F2xQ^+zTMDcx_{W6>R7r`R)Pke4COUV!B*vi{|7DS5n^m`m-Q(^`x7r9}3Icu6@{Qym3{!dSAAZR|a>) z>4l4=^2$`_&pN+O;N$ktTQ_&>pGpw0<-f#LpWUc@%C7e>AA4fQTIu|!Z(dX-7Jv3W z960mb@x)^R`wPTQ-kKY^>hv+MWvTwbq6+6rFY^_Z7abMiDD~ZRGlB2N;ZK#ukN?%? Gumb?}DVPNS From b804b40a5657fe55ecd6f18a23b959c78b27811a Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 3 Jan 2025 20:00:35 +0000 Subject: [PATCH 413/563] 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 1083040..f91d34e 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1732974570, - "narHash": "sha256-y7DflW/V4/9Df/0/FncvzBOnEVTK/p4hCh2K0/TCaM0=", + "lastModified": 1735934280, + "narHash": "sha256-4JE4CYd7kG/WMVTcAfvjPklHT8E6OO9W9i6kRQPRf+U=", "ref": "refs/heads/main", - "rev": "b7d36de976ca8a0e2e9724043b1890e6eb4d3e10", - "revCount": 172, + "rev": "a9d3af024ea16cc8f0db4acb42d4fdd2106e21b8", + "revCount": 173, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 46b0d36ceeb5badaf72c3dfeac7489a4de93be09 Mon Sep 17 00:00:00 2001 From: sysadm Date: Fri, 3 Jan 2025 21:03:41 +0000 Subject: [PATCH 414/563] 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 f91d34e..4063660 100644 --- a/flake.lock +++ b/flake.lock @@ -926,11 +926,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1735934280, - "narHash": "sha256-4JE4CYd7kG/WMVTcAfvjPklHT8E6OO9W9i6kRQPRf+U=", + "lastModified": 1735938087, + "narHash": "sha256-Vx44a4GTL8+p6Xy4Ot3lKHvBngnqosTFdWbzq4vIdjU=", "ref": "refs/heads/main", - "rev": "a9d3af024ea16cc8f0db4acb42d4fdd2106e21b8", - "revCount": 173, + "rev": "0a4f5281a545281c11c68185836ded2c17453306", + "revCount": 174, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 9ac74c1c8625cf0f9a06ceb7ca5b4a60e31390cb Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 5 Jan 2025 19:13:24 +0000 Subject: [PATCH 415/563] feat: added example machiene --- machines/_template.nix | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 machines/_template.nix diff --git a/machines/_template.nix b/machines/_template.nix new file mode 100644 index 0000000..36a1189 --- /dev/null +++ b/machines/_template.nix @@ -0,0 +1,56 @@ +/* +Name: Link to where information on the name can be found +Why: Why is it named this +Type: VM/Physical +Hardware: - if its a VM, the hardware (PowerEdge r210) if its physical +From: 2023/2024/2025/... +Role: What role does it have in teh cluster +Notes: +*/ +{ + pkgs, + lib, + nodes, + ... +}: let + # name of the server, sets teh hostname and record for it + name = "name"; + # Assigned IP address + ip_pub = "193.1.99.000"; + + # dont need to change these + hostname = "${name}.skynet.ie"; + host = { + ip = ip_pub; + name = name; + hostname = hostname; + }; +in { + # what configurrations to import, email in this example + imports = [ + ../applications/email.nix + ]; + + deployment = { + # dont need to change these + targetHost = hostname; + targetPort = 22; + targetUser = null; + + # deployment option: active-dns/active-core/active-ext/active + tags = [ + "active" + ]; + }; + + services.skynet = { + # pass in the details of the host server + host = host; + + # enable the backup service + backup.enable = true; + + # enable the imported service + email.enable = true; + }; +} From ac2ee93cb6524dfd4bd31b46a10f2125bc938761 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 5 Jan 2025 21:32:29 +0000 Subject: [PATCH 416/563] feat: www.skynet.ie --- applications/skynet.ie/skynet.ie.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index fcb46e7..cb2e778 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -23,6 +23,7 @@ in { config = mkIf cfg.enable { services.skynet.acme.domains = [ + "www.skynet.ie" "discord.skynet.ie" "public.skynet.ie" ]; @@ -34,6 +35,11 @@ in { r_type = "A"; value = config.services.skynet.host.ip; } + { + record = "www"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } { record = "discord"; r_type = "CNAME"; @@ -47,9 +53,8 @@ in { ]; services.nginx = { - virtualHosts = { - # main site - "skynet.ie" = { + virtualHosts = let + main_site = { forceSSL = true; useACMEHost = "skynet"; locations = { @@ -62,6 +67,10 @@ in { }; }; }; + in { + # main site + "www.skynet.ie" = main_site; + "skynet.ie" = main_site; # a custom discord url, because we are too cheap otehrwise "discord.skynet.ie" = { From ea0e5ff7f598e3b99e151f136da02011a126f99f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 6 Jan 2025 00:15:47 +0000 Subject: [PATCH 417/563] feat: update the pelican-wing --- applications/pelican/pelican-wing-package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/pelican/pelican-wing-package.nix b/applications/pelican/pelican-wing-package.nix index 088ed4f..8b0aa7b 100644 --- a/applications/pelican/pelican-wing-package.nix +++ b/applications/pelican/pelican-wing-package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "pelican-wings"; - version = "v1.0.0-beta6"; + version = "v1.0.0-beta9"; src = fetchurl { url = "https://github.com/pelican-dev/wings/releases/download/${version}/wings_linux_amd64"; - hash = "sha256-a2T4BjqS8Hy5YqwDEJpbvGqqsrVjdRhxvJLgk3MCXag="; + hash = "sha256-YaS1bthNSeWXH5drc2yensRqsRAOa2VXvivJOaPybqc="; }; buildInputs = [docker gnutar]; From ba8b14878418db720d5994f489e9c81f34e99ba3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 6 Jan 2025 16:45:58 +0000 Subject: [PATCH 418/563] feat: nixpkgs --- flake.lock | 138 ++++++++++++++++++++++------------------------------- 1 file changed, 58 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 4063660..78efad6 100644 --- a/flake.lock +++ b/flake.lock @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1719514321, - "narHash": "sha256-ys1nJdZ8zB8JlpUbQmnj0hZalg03bEPgQdZN30DhETE=", + "lastModified": 1733729059, + "narHash": "sha256-5xYai0KZirUX2EQpNMMCWoC27932n/i1E4KeVRIss7s=", "owner": "kamadorueda", "repo": "alejandra", - "rev": "d7552fef2ccf1bbf0d36b27f6fddb19073f205b7", + "rev": "6db88764334bd6a8b7a33cb312c318baad1d5e93", "type": "github" }, "original": { @@ -67,15 +67,14 @@ "inputs": { "flake-parts": "flake-parts", "haskell-flake": "haskell-flake", - "hercules-ci-effects": "hercules-ci-effects", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1729444465, - "narHash": "sha256-+lCi3cQlFNGAGKaVeUNhTeR40zvMy9JX4hp1JA0dLwE=", + "lastModified": 1733918465, + "narHash": "sha256-hSuGa8Hh67EHr2x812Ay6WFyFT2BGKn+zk+FJWeKXPg=", "owner": "hercules-ci", "repo": "arion", - "rev": "94d092fffd5cfd4f09b8988aca1b857a9d37c4d6", + "rev": "f01c95c10f9d4f04bb08d97b3233b530b180f12e", "type": "github" }, "original": { @@ -124,15 +123,16 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", "nixpkgs": "nixpkgs_3", "stable": "stable" }, "locked": { - "lastModified": 1728263678, - "narHash": "sha256-gyUVsPAWY9AgVKjrNPoowrIr5BvK4gI0UkDXvv8iSxA=", + "lastModified": 1734897875, + "narHash": "sha256-LLpiqfOGBippRax9F33kSJ/Imt8gJXb6o0JwSBiNHCk=", "owner": "zhaofengli", "repo": "colmena", - "rev": "b0a62f234fae02a006123e661ff70e62af16106b", + "rev": "a6b51f5feae9bfb145daa37fd0220595acb7871e", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1668234453, - "narHash": "sha256-FmuZThToBvRsqCauYJ3l8HJoGLAY5cMULeYEKIaGrRw=", + "lastModified": 1730615655, + "narHash": "sha256-2HBR3zLn57LXKNRtxBb+O+uDqHM4n0pz51rPayMl4cg=", "owner": "nix-community", "repo": "fenix", - "rev": "8f219f6b36e8d0d56afa7f67e6e3df63ef013cdb", + "rev": "efeb50e2535b17ffd4a135e6e3e5fd60a525180c", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1722555600, - "narHash": "sha256-XOQkdLafnb/p9ij77byFQjDf5m5QYl9b2REiVClC+x4=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8471fe90ad337a8074e957b69ca4d0089218391d", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -281,27 +281,6 @@ "type": "github" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "arion", - "hercules-ci-effects", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "id": "flake-parts", - "type": "indirect" - } - }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -322,11 +301,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -356,11 +335,11 @@ "flakeCompat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -416,28 +395,6 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "arion", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1719226092, - "narHash": "sha256-YNkUMcCUCpnULp40g+svYsaH1RbSEj6s4WdZY/SHe38=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "11e4b8dc112e2f485d7c97e1cee77f9958f498f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -548,6 +505,27 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "colmena", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1703013332, @@ -724,11 +702,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1722630782, - "narHash": "sha256-hMyG9/WlUi0Ho9VkRrrez7SeNlDzLxalm9FwY7n/Noo=", + "lastModified": 1733212471, + "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d04953086551086b44b6f3c6b7eeb26294f207da", + "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "type": "github" }, "original": { @@ -740,11 +718,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1725103162, - "narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -798,11 +776,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1730200266, - "narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=", + "lastModified": 1736012469, + "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd", + "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", "type": "github" }, "original": { @@ -865,11 +843,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1668182250, - "narHash": "sha256-PYGaOCiFvnJdVz+ZCaKF8geGdffXjJUNcMwaBHv0FT4=", + "lastModified": 1730555913, + "narHash": "sha256-KNHZUlqsEibg3YtfUyOFQSofP8hp1HKoY+laoesBxRM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "45ec315e01dc8dd1146dfeb65f0ef6e5c2efed78", + "rev": "f17a5bbfd0969ba2e63a74505a80e55ecb174ed9", "type": "github" }, "original": { @@ -1095,11 +1073,11 @@ }, "stable": { "locked": { - "lastModified": 1724316499, - "narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=", + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", "type": "github" }, "original": { From 078e12cbd737e880eedb5323d26516989857397f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 6 Jan 2025 16:47:23 +0000 Subject: [PATCH 419/563] feat: enable the whiteboard --- applications/nextcloud.nix | 45 +++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/applications/nextcloud.nix b/applications/nextcloud.nix index 04f52fa..bc7b1ae 100644 --- a/applications/nextcloud.nix +++ b/applications/nextcloud.nix @@ -59,11 +59,11 @@ in { r_type = "CNAME"; value = config.services.skynet.host.name; } - # { - # record = "whiteboard.${cfg.domain.sub}"; - # r_type = "CNAME"; - # value = config.services.skynet.host.name; - # } + { + record = "whiteboard.${cfg.domain.sub}"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } ]; # /var/lib/nextcloud/data @@ -87,6 +87,7 @@ in { extraApps = { inherit (config.services.nextcloud.package.packages.apps) richdocuments; }; + extraAppsEnable = true; settings = { trusted_proxies = ["193.1.99.65"]; @@ -96,15 +97,15 @@ in { }; }; - # environment.etc."nextcloud-whiteboard-secret".text = '' - # JWT_SECRET_KEY=test123 - # ''; - # - # services.nextcloud-whiteboard-server = { - # enable = true; - # settings.NEXTCLOUD_URL = "https://nextcloud.skynet.ie"; - # secrets = ["/etc/nextcloud-whiteboard-secret"]; - # }; + environment.etc."nextcloud-whiteboard-secret".text = '' + JWT_SECRET_KEY=test123 + ''; + + services.nextcloud-whiteboard-server = { + enable = true; + settings.NEXTCLOUD_URL = "https://nextcloud.skynet.ie"; + secrets = ["/etc/nextcloud-whiteboard-secret"]; + }; nixpkgs.config.allowUnfree = true; # impacted by https://github.com/NixOS /nixpkgs/issues/352443 @@ -122,14 +123,14 @@ in { useACMEHost = "skynet"; locations."/".proxyPass = "http://127.0.0.1:8000"; }; - # "whiteboard.${domain}" = { - # forceSSL = true; - # useACMEHost = "skynet"; - # locations."/" = { - # proxyPass = "http://localhost:3002"; - # proxyWebsockets = true; - # }; - # }; + "whiteboard.${domain}" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/" = { + proxyPass = "http://localhost:3002"; + proxyWebsockets = true; + }; + }; }; }; } From b46eca16b0b207d14e173d4e40286160749c5c07 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 9 Jan 2025 22:53:14 +0000 Subject: [PATCH 420/563] fix: switch over to usign ``active-git`` instead of ``active-gitlab`` --- .forgejo/workflows/deploy.yaml | 2 +- .forgejo/workflows/deploy_forgejo.yaml | 2 +- .gitlab-ci.yml | 4 ++-- README.md | 6 +++--- machines/glados.nix | 2 +- machines/wheatly.nix | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.forgejo/workflows/deploy.yaml b/.forgejo/workflows/deploy.yaml index 0d0e32f..b3f6453 100644 --- a/.forgejo/workflows/deploy.yaml +++ b/.forgejo/workflows/deploy.yaml @@ -37,7 +37,7 @@ jobs: # - run: colmena build -v --on @active-core # - run: colmena build -v --on @active # - run: colmena build -v --on @active-ext -# - run: colmena build -v --on @active-gitlab +# - run: colmena build -v --on @active-git deploy_dns: runs-on: nix diff --git a/.forgejo/workflows/deploy_forgejo.yaml b/.forgejo/workflows/deploy_forgejo.yaml index 8a07870..0fee7f9 100644 --- a/.forgejo/workflows/deploy_forgejo.yaml +++ b/.forgejo/workflows/deploy_forgejo.yaml @@ -8,5 +8,5 @@ jobs: runs-on: nix steps: - uses: actions/checkout@v4 - - run: colmena apply -v --on @active-gitlab --show-trace + - run: colmena apply -v --on @active-git --show-trace shell: bash \ No newline at end of file diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a921fc..8b6254c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -124,7 +124,7 @@ build: - colmena build -v --on @active-core - colmena build -v --on @active - colmena build -v --on @active-ext - - colmena build -v --on @active-gitlab + - colmena build -v --on @active-git # dns always has to be deployed first deploy_dns: @@ -167,5 +167,5 @@ deploy_gitlab: <<: *deployment stage: deploy_gitlab script: - - colmena apply -v --on @active-gitlab + - colmena apply -v --on @active-git when: manual diff --git a/README.md b/README.md index f98fd97..1990b82 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ colmena build --on @active-dns Deploying is putting (apply-ing) the config tat was built onto the server, there is no need to build first, it will automatically do so. While the ***recommended way of deploying is using the CI/CD process*** there are times when you will have to manually deploy the config. -One such case is the ``@active-gitlab`` group if either Gitlab or Gitlab-runner got updated. +One such case is the ``@active-git`` group if either Gitlab or Gitlab-runner got updated. Another is if ye have fecked up DNS. Your ``~/.ssh/config`` should be set up as follows and you should be a member of ``skynet-admins-linux`` @@ -60,10 +60,10 @@ Then you can run the following commands like so: ```shell colmena apply colmena apply --on @active-dns -colmena apply --on @active-gitlab +colmena apply --on @active-git ``` -The CI/CD pipeline has a manual job that can be triggered to update ``@active-gitlab`` if you know it wont cause issues. +The CI/CD pipeline has a manual job that can be triggered to update ``@active-git`` if you know it wont cause issues. ### Agenix diff --git a/machines/glados.nix b/machines/glados.nix index cb2040e..842da0c 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -35,7 +35,7 @@ in { targetPort = 22; targetUser = null; - tags = ["active-gitlab"]; + tags = ["active-git"]; }; services.skynet = { diff --git a/machines/wheatly.nix b/machines/wheatly.nix index cbd6d4f..f38000b 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -33,7 +33,7 @@ in { targetPort = 22; targetUser = null; - tags = ["active-gitlab"]; + tags = ["active-git"]; }; services.skynet = { From 6d5d025e75accbcc6ca350709547b8c8f0e763be Mon Sep 17 00:00:00 2001 From: sysadm Date: Sat, 11 Jan 2025 18:27:13 +0000 Subject: [PATCH 421/563] 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 78efad6..bcfc466 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1732373358, - "narHash": "sha256-r4VUwCzbh59wDj8fYGWwrqLqCMxQ4UB54kPBPWx+tQ4=", + "lastModified": 1736620004, + "narHash": "sha256-4EkXBaZiOpmDlz+8SjNWDau/f6+v14LSd+6WR51Par0=", "ref": "refs/heads/main", - "rev": "3ca52f0a3dc81c73b11565d0f3611a7e0a4e1ca6", - "revCount": 114, + "rev": "e1da7f7c9a053205b1f0e970b2fa2f2d86567029", + "revCount": 116, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 3a7e23569a6fd379e49e3ffb2a3b95a79d91e606 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 15 Jan 2025 20:56:34 +0000 Subject: [PATCH 422/563] feat: add dns allocation for anime&manga minecraft server --- applications/games/minecraft.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/games/minecraft.nix b/applications/games/minecraft.nix index b294698..9dce4bb 100644 --- a/applications/games/minecraft.nix +++ b/applications/games/minecraft.nix @@ -45,6 +45,10 @@ address = "minecraft.phildeb"; port = "25522"; } + { + address = "minecraft.anime"; + port = "25523"; + } ]; in { imports = [ From fcde956c939ba77ae6c8cac26b653f84621f877a Mon Sep 17 00:00:00 2001 From: sysadm Date: Sun, 26 Jan 2025 20:09:24 +0000 Subject: [PATCH 423/563] 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 bcfc466..b04cbc8 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1735938087, - "narHash": "sha256-Vx44a4GTL8+p6Xy4Ot3lKHvBngnqosTFdWbzq4vIdjU=", + "lastModified": 1737922006, + "narHash": "sha256-IcD9wXppeoP6SRWIJTV784XiuTKhU7SaKOH2SWscgHM=", "ref": "refs/heads/main", - "rev": "0a4f5281a545281c11c68185836ded2c17453306", - "revCount": 174, + "rev": "5fcc24a867c98be772eec8c6a65eddfbe52ab070", + "revCount": 175, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From b3732cfb166d1aca1f69f196d0b03ae160afa125 Mon Sep 17 00:00:00 2001 From: eliza Date: Thu, 6 Feb 2025 19:11:26 +0000 Subject: [PATCH 424/563] Log rule for Minecraft Bedrock servers Some UDP ports have been opened for Bedrock --- ITD/Firewall_Rules.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 64f2e32..d59d1c3 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -42,4 +42,5 @@ SKYNET_FIREWALL_00030,Add,i24-06-04_017,Complete,193.1.99.83,SKYNET00020,193.1.9 SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020,"80, 443",-,Web interface for Metrics server SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server -,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' \ No newline at end of file +,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' +SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,23318-23325 UDP,-,Ports for Minecraft Bedrock on the main games server. \ No newline at end of file From f84d4342f3d3829be6822b0be075f07f63b8a150 Mon Sep 17 00:00:00 2001 From: eliza Date: Thu, 6 Feb 2025 19:11:57 +0000 Subject: [PATCH 425/563] Update ITD/Firewall_Rules.csv --- ITD/Firewall_Rules.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index d59d1c3..1563996 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -43,4 +43,4 @@ SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020," SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' -SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,23318-23325 UDP,-,Ports for Minecraft Bedrock on the main games server. \ No newline at end of file +SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. \ No newline at end of file From c190f527eec9de92f55b6de3a5046470453d94af Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 9 Feb 2025 21:22:52 +0000 Subject: [PATCH 426/563] 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 b04cbc8..d8aa587 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1736620004, - "narHash": "sha256-4EkXBaZiOpmDlz+8SjNWDau/f6+v14LSd+6WR51Par0=", + "lastModified": 1739136116, + "narHash": "sha256-JOgNm1WkPs1rpoVihRztRJEF8niIogiFfz6gvyEA+OY=", "ref": "refs/heads/main", - "rev": "e1da7f7c9a053205b1f0e970b2fa2f2d86567029", - "revCount": 116, + "rev": "96822e7b2fd693bb45bae11a1763ba52f7d3af82", + "revCount": 118, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From f866767c89cf0196fcfdc97c5209d0ef316a24fb Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 9 Feb 2025 22:30:21 +0000 Subject: [PATCH 427/563] feat: update nixpkgs to get teh new forgejo version Roundcube is failing to build though --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d8aa587..3965e0d 100644 --- a/flake.lock +++ b/flake.lock @@ -776,11 +776,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { From 2f3fd4f56532094fb6d50a514043af07cb2b2ac0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 9 Feb 2025 22:39:39 +0000 Subject: [PATCH 428/563] feat: update lix --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index 3965e0d..07ea4f0 100644 --- a/flake.lock +++ b/flake.lock @@ -419,15 +419,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1729298361, - "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", - "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", + "lastModified": 1737234286, + "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", + "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" } }, "lix-module": { @@ -440,15 +440,15 @@ ] }, "locked": { - "lastModified": 1729360442, - "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", - "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", + "lastModified": 1737237494, + "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", + "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" } }, "naersk": { diff --git a/flake.nix b/flake.nix index 4097942..2d96432 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs.url = "nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; From bff4e873663564ee14c0caf7fcb0de9aa949033e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 10 Feb 2025 00:00:40 +0000 Subject: [PATCH 429/563] 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 07ea4f0..22ba51d 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1739136116, - "narHash": "sha256-JOgNm1WkPs1rpoVihRztRJEF8niIogiFfz6gvyEA+OY=", + "lastModified": 1739145015, + "narHash": "sha256-xjp0xVnmV5Swg/7TOEC6yeTmxPGhOMQF4qegArwXapY=", "ref": "refs/heads/main", - "rev": "96822e7b2fd693bb45bae11a1763ba52f7d3af82", - "revCount": 118, + "rev": "b4d202739efe473f473b38d5ceec926a17239aa9", + "revCount": 120, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 1c608bbb76d89e27ec67ee27ac3e71a72cdeafbe Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 10 Feb 2025 00:09:28 +0000 Subject: [PATCH 430/563] 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 22ba51d..365ce6a 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1739145015, - "narHash": "sha256-xjp0xVnmV5Swg/7TOEC6yeTmxPGhOMQF4qegArwXapY=", + "lastModified": 1739146138, + "narHash": "sha256-EtXWx3wg0Y8bKLdTPwm7GzA72CnT2GckYvzRaKf66Zk=", "ref": "refs/heads/main", - "rev": "b4d202739efe473f473b38d5ceec926a17239aa9", - "revCount": 120, + "rev": "b2c134d950e4fa736b0608a295abbc3fc37c2626", + "revCount": 121, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 6fe6c531cc55538f011666e55c2ff015d35c941a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 11 Feb 2025 19:29:35 +0000 Subject: [PATCH 431/563] temp: adding Shay for reasons related to a template for the user_deploy --- config/users.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/users.nix b/config/users.nix index 770260f..51ec6d2 100644 --- a/config/users.nix +++ b/config/users.nix @@ -78,6 +78,8 @@ in { "evanc" "eliza" "esy" + # for temp reasons + "peace" ]; trainee = []; lifetime = []; From 8824d7c62a3fe3cef110954b5cdab63a2e45f72f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 12 Feb 2025 14:21:06 +0000 Subject: [PATCH 432/563] feat: bump nixpkgs to get gir building properly again --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 365ce6a..e6ed1e0 100644 --- a/flake.lock +++ b/flake.lock @@ -776,11 +776,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", "type": "github" }, "original": { From 66e8436133d224878fafe138d374546672be2bfd Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 12 Feb 2025 15:09:16 +0000 Subject: [PATCH 433/563] 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 e6ed1e0..7f72b07 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1739146138, - "narHash": "sha256-EtXWx3wg0Y8bKLdTPwm7GzA72CnT2GckYvzRaKf66Zk=", + "lastModified": 1739372916, + "narHash": "sha256-biW8No02zuEfwu9Xxo02LEEkDB2n7W5DGmixC1Rezug=", "ref": "refs/heads/main", - "rev": "b2c134d950e4fa736b0608a295abbc3fc37c2626", - "revCount": 121, + "rev": "b6f4f3b1bae936343a1ed94b4e2b8a02bd3509d1", + "revCount": 122, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From ba8999b419ff42fd04e646606f2191ec961a46ec Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 13 Feb 2025 17:59:34 +0000 Subject: [PATCH 434/563] 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 7f72b07..3804a6b 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1739372916, - "narHash": "sha256-biW8No02zuEfwu9Xxo02LEEkDB2n7W5DGmixC1Rezug=", + "lastModified": 1739469536, + "narHash": "sha256-WjumGLWkAeVoXWQ7eqC1ki32ehU626n9HfrWwefMwWI=", "ref": "refs/heads/main", - "rev": "b6f4f3b1bae936343a1ed94b4e2b8a02bd3509d1", - "revCount": 122, + "rev": "ad79fb617da1204097e1d04aaf65b159db042a98", + "revCount": 123, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 7ed5cf1b807516a80677199ceb0b44abba111067 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 15 Feb 2025 00:45:59 +0000 Subject: [PATCH 435/563] 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 3804a6b..aef7599 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_11" }, "locked": { - "lastModified": 1739469536, - "narHash": "sha256-WjumGLWkAeVoXWQ7eqC1ki32ehU626n9HfrWwefMwWI=", + "lastModified": 1739580335, + "narHash": "sha256-n9LuI33Ycen3bLS/F5b6df7F61A2wpCRG7Cf1FeVRlc=", "ref": "refs/heads/main", - "rev": "ad79fb617da1204097e1d04aaf65b159db042a98", - "revCount": 123, + "rev": "1df4c0bcd32414fee9bd7ef47bed1137d9f4576a", + "revCount": 126, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From c57ca6ab119defca7be507e16e19f37ef3559f9d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 12 Feb 2025 22:30:23 +0000 Subject: [PATCH 436/563] feat: adding another runner to speed up deployment Closes #139 --- applications/git/forgejo_runner.nix | 56 ++++++++++++++-------------- machines/glados.nix | 5 +++ machines/wheatly.nix | 5 ++- secrets/forgejo/runners/ssh.age | Bin 1381 -> 1491 bytes secrets/forgejo/runners/token.age | 19 ---------- secrets/forgejo/runners/token1.age | Bin 0 -> 1138 bytes secrets/forgejo/runners/token2.age | 21 +++++++++++ secrets/secrets.nix | 6 ++- 8 files changed, 63 insertions(+), 49 deletions(-) delete mode 100644 secrets/forgejo/runners/token.age create mode 100644 secrets/forgejo/runners/token1.age create mode 100644 secrets/forgejo/runners/token2.age diff --git a/applications/git/forgejo_runner.nix b/applications/git/forgejo_runner.nix index 29029cb..c43ecec 100644 --- a/applications/git/forgejo_runner.nix +++ b/applications/git/forgejo_runner.nix @@ -15,21 +15,23 @@ in { options.services.skynet."${name}" = { enable = mkEnableOption "Skynet ForgeJo Runner"; - runner = { - name = mkOption { - type = types.str; - default = config.networking.hostName; - }; + name = mkOption { + type = types.str; + default = config.networking.hostName; + }; - website = mkOption { - default = "https://forgejo.skynet.ie"; - type = types.str; - }; + website = mkOption { + default = "https://forgejo.skynet.ie"; + type = types.str; + }; - user = mkOption { - default = "gitea-runner"; - type = types.str; - }; + user = mkOption { + default = "gitea-runner"; + type = types.str; + }; + + secret = mkOption { + type = types.path; }; }; @@ -40,23 +42,23 @@ in { ]; age.secrets.forgejo_runner_token = { - file = ../../secrets/forgejo/runners/token.age; - owner = cfg.runner.user; - group = cfg.runner.user; + file = cfg.secret; + owner = cfg.user; + group = cfg.user; }; # make sure the ssh config stuff is in teh right palce systemd.tmpfiles.rules = [ - #"d /home/${cfg.runner.user} 0755 ${cfg.runner.user} ${cfg.runner.user}" - "L+ /home/${cfg.runner.user}/.ssh/config 0755 ${cfg.runner.user} ${cfg.runner.user} - ${./ssh_config}" + #"d /home/${cfg.user} 0755 ${cfg.user} ${cfg.user}" + "L+ /home/${cfg.user}/.ssh/config 0755 ${cfg.user} ${cfg.user} - ${./ssh_config}" ]; age.secrets.forgejo_runner_ssh = { file = ../../secrets/forgejo/runners/ssh.age; mode = "600"; - owner = "${cfg.runner.user}"; - group = "${cfg.runner.user}"; + owner = "${cfg.user}"; + group = "${cfg.user}"; symlink = false; - path = "/home/${cfg.runner.user}/.ssh/skynet/root"; + path = "/home/${cfg.user}/.ssh/skynet/root"; }; nix = { @@ -94,14 +96,14 @@ in { # give teh runner user a home to store teh ssh config stuff systemd.services.gitea-runner-default.serviceConfig = { DynamicUser = lib.mkForce false; - User = lib.mkForce cfg.runner.user; + User = lib.mkForce cfg.user; }; users = { - groups."${cfg.runner.user}" = {}; - users."${cfg.runner.user}" = { + groups."${cfg.user}" = {}; + users."${cfg.user}" = { #isSystemUser = true; isNormalUser = true; - group = cfg.runner.user; + group = cfg.user; createHome = true; shell = pkgs.bash; }; @@ -118,8 +120,8 @@ in { package = pkgs.forgejo-actions-runner; instances.default = { enable = true; - name = cfg.runner.name; - url = cfg.runner.website; + name = cfg.name; + url = cfg.website; tokenFile = config.age.secrets.forgejo_runner_token.path; labels = [ ## optionally provide native execution on the host: diff --git a/machines/glados.nix b/machines/glados.nix index 842da0c..5e499d8 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -28,6 +28,7 @@ in { imports = [ ../applications/git/gitlab.nix ../applications/git/forgejo.nix + ../applications/git/forgejo_runner.nix ]; deployment = { @@ -43,5 +44,9 @@ in { backup.enable = true; gitlab.enable = true; forgejo.enable = true; + forgejo_runner = { + enable = true; + secret = ../secrets/forgejo/runners/token2.age; + }; }; } diff --git a/machines/wheatly.nix b/machines/wheatly.nix index f38000b..cb9cdb6 100644 --- a/machines/wheatly.nix +++ b/machines/wheatly.nix @@ -39,6 +39,9 @@ in { services.skynet = { host = host; backup.enable = true; - forgejo_runner.enable = true; + forgejo_runner = { + enable = true; + secret = ../secrets/forgejo/runners/token1.age; + }; }; } diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age index 7a716d1b83c03bf40c05fa613d047819829ce36a..ffda5eb6e8a0c5b981cac03e17035e0102c69a43 100644 GIT binary patch delta 1406 zcmaFLb(wpDPJNVDcA`OcVP0lpNlA`{d3r@=c13}=Wm05bmX}wtxqnb#NvLUxi$QXb zFIQlqab#IlNO`iCr*pV*X^LTbfU#$Icz8vMS$=9zWKxx%UxcTnxsiFI1(&X!LUD11 zZfc5=si~o*f=NJCRDQZbL12YfQDB8*Xm(MOc6qp0qML=6X}OPcnqg#VWM-*fxl6jA zK|y$VX_i|#S6EtlsF8EIiCaZPRar=qwo!PAcR)yxSyn-1xsOv&d1|3$xv8^3N{XlF z#E;_P6^Z8FA$cyPnNCK=RjD4iMQ$beP8o$k`eqebUcM12C5|4J#=(y6*;~B-n%&H8Fs~lam z%REc93(Lxbf{I+DJS%)HgCi^gQ$sz1o$^Z!{e3M`oLpSF94$)IjeQbBlfuFRf~(A3 zwaWudojnrMQv59pGK}4gjSBoTy#14$G6E)_VU(y3H8G5EFLy~bHE^^j4AwXGERXax zO0vidam_HZa4Gb&NbyQc%?&d2&I#l)&MnHyND3@5GpI@nG&S?~Gz=;!GOx-t%k}Uq zb}uu^cg`s{^G^>-s&qw<0PnCOi=uLc%A(-J{3^%t^um;+NY_G3&-$W3m!zOf{alOk z{9Lp0f`Fiski@jiG@rb5uA;oa(mapk@&Z#&*WmR0Eb}bq3ZuYC18?`LQpW<55XY)~ z=a2v=Gar8gbnDVG6Ae=X74rR4a&o-^n)`JokA?? zgPc-Bg9BUwL%A$m%2SdIjZ!R<9YZ3LBHgo!Op6P`Lk*L1ioGq(Ow--WT+OpGj9nc~ z1JSK>F7yv^4^#;9Eis8SE;5OzFiUg|P0WbQFUxW%F)>TgHwf@|GPiVg_ILEj3XBRd zbma<8EORt8DX5QhGdGK>2zL(;&MGYR$qq?$^7X262`F~cPSbaB^fYs;GIT_@t~9F3 z$v9mh(ySuXD^1%n(Zn||D9_9(D$L8E(lXu6Bgd_(GFiXWJlokMr^F*a!oz|qC^EQM zJ2A)5&CJ_8#GpK|Fw(C$HK(ei-pAaj(8$ZZG~LZ7(A3+@#I3@WOIKG{At9rWW^z97zJ;cn(%$+j zMz3alymfJ%z25l`$2SLlUVAg}%F`3?uiUAxTR!`0;O^4JYma_CaATR)=T)Ly^;d4U zykwc*D7Ak{<+~*(>euC(@HHBT-ClV-o@xHktNiQjK3^(7aZ92x|IqE(e^Qd~U73;l zzvSKR$>u!jSEnlGSFC2@KGY@qs6xiYo=w?xZ^8uYLyMOMEOWnlxMK&axkSd~Os}O( zleV>;CgA{_hjv{L*%G&MeylS;a9n(BePzTg+9oG-^JJKU8z!4p)+AM?Y?DPhW= f4~5Mo3u==ex-xrBK3y>9MLgeP-T9mM^@afeh87SR delta 1296 zcmcc2{gi8hPQ7bpP+qb{Rho-)rlpyAslQ*2TVi2`Z%~!FXPJ+QSx`V#L~(|1qP~BG zCzn}Zu#rKKb5yQ{pI2yTkhg(Pgn3A0Ns7O5NnwqVFoUqd5#qZez`ubz8Tst=3QZ|6Ez2}8am@2e zHg*Y0bayHW@vKZr%=alwkBT((uFU7kG>R(o@C@|O*A6H%sPaj!GIDn|3e3$b^EB~G zE_6>e$#C_^i3-WI%t=O%0PnCOi=uLc($sKwDJ9H$^l1E-=A(|XsmiWEN+_plJ> z$nu=TGHug>GRvSaePiQvu7a{E56`ev6QlA{--3`Z=O|AOj83a-J_gbi~X|-UA&F! zJ;MVX!%`DneYs2v0#bsU13XgvGP0c`iZb=1+`~LV4U0`HJd3@(5{rzC%cH^qyc?EcP@B za^-;&M?Z()^~LaEYFNE3rMQ)_0P!9D6h)S$jf!NG&4>0G4%6xwJ7GwygFC)nDE>8 zRY{$iF0%`I4m%iddXQ8lpT^hqJpFIwmh~SLEqfVw{^V8tXvr0;z6VVIF3uWw&c5)=Kl4pT z_Z=$>jI@z(^Re}3-XyTHh@Wxl`qa0F?HT1F#C{%2UUS;B{fHwc&zrhi9Q!5Zw{^Zc z9JX*?Oqc1?^|1w;rM3i_vhI<}@SLV*62tVd&ZFYRH^%v<&TX1bZ_hZqP_IwhZIi5A zm2&@t4a*%y7Nb)atJPWLCc55R`L5&D*~S>t=}QtT4{f<7(R$2KGEymS%HALPYQI?P z-aT8lLVb(k!Y5l)6dAX~RNh)77?O$mE$I+?R6QtWCiU2AV>LmaG diff --git a/secrets/forgejo/runners/token.age b/secrets/forgejo/runners/token.age deleted file mode 100644 index 2bdb872..0000000 --- a/secrets/forgejo/runners/token.age +++ /dev/null @@ -1,19 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 V1pwNA kZ6MC1GXuminn2Hlomkep1wIv1lp6KpJOJcpXkhQWWM -K1B58FSyb4QpINlhuvVv4dGFNjTChU1KNoezZcS/a6Y --> ssh-ed25519 4PzZog pbxwzRvcsOgY9hd48BZEOH6VHFLn93gJ8yDHQyNIiSI -Fa/Z6si9vyox/pmPvWTndyYCQxo7tcvdlRuTgw6IY9g --> ssh-ed25519 dA0vRg OW2y/LkN/287NVuRRlSpihR+k/MZ+a0R5cIrHFne6RI -U0ZqipfDlpz9LeXKNWkl7tYCnsBjSQz8q4mETBVEalI --> ssh-ed25519 5Nd93w jDy3i1Z1NWYqdVdw4h+maaBjokVWNrSfHtSQotb2bWg -PtgX9L78wpJHiX4lmP+H0bfRZd/tNfHrUEAShJ38ss8 --> ssh-ed25519 q8eJgg BCaUEZ3H3BglgKPAbl/ITQaEv9Jc2rRAoFuPXhy4WFI -DMqJu0vjDJ8rIXLSL17Dx4Aoq8Uhdo4jU8g1jTSvMK4 --> ssh-ed25519 KVr8rw dKk0SN9SXTQsPwMFiKKMuoRwzTHJB8kr33nadRzBoDc -m2xPKYFMC/y5fKkgaBc+5TVg9ZH+zVSM9I4I3htSm7I --> ssh-ed25519 fia1eQ NGl1o/38iTm6QiQB7pl0NBkohMZGLMeaXZ37TV184B4 -zk/DTLhuGfhDU3gNA7S0BjGOowteEhR9v5oNmOkWTGU --> ssh-ed25519 CqOTGQ JbZYKqGfWeVu/JEAAeC6wE4QvKLEeidvggQnm6beJxA -ArogOkTDAnvC1SKPkSGapNix2W6yvku1QFOFs9bvuGA ---- yWZoUAOfSIL4FbWSAvhVkOEbUA1u3XPGKB1gNka/xfo -Á¡þzòõ´lÐþÈ‘ L‚´C$’ì?Hc´®ìì|¥çÛ¹„.-øýÜå¡jõ ©lÂ}9:KÓ®U…Á^§í¯Ì“ôŽIO6µ \ No newline at end of file diff --git a/secrets/forgejo/runners/token1.age b/secrets/forgejo/runners/token1.age new file mode 100644 index 0000000000000000000000000000000000000000..50ad61e1019d108e153f0a30a0a6bd6fa460a806 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!v5N-8eP z$TBuAu1YN|$urMQ4=we{t;#9Sb~nliD$Ub2H8eIX^eM>-b>;H5a1A!IOw$fDN;kDI zG4S?F2{5xX^)pGzEb?~=bn++*Dou4uu1pLHaYeVyB%mrPKV8AY!=x%Z%sV49+n~ZM zBE2Hr-^iuZ!^y3*z~3!1#K6?l+$}AwFt4mA%#q8(E7-&@C@s*`*ef`>!oxp3JIgXp z-`6WU(Z|f(Ff!T9Lf_r5vNFj#JR9A%6i0)ypmc=-=ZqBRDg#5aynt*|e|L|_3 z63gUr4-*TQsw`u}%5-$wO#Ms89O)Vk=^YWqs4a`$h91Q}ha(xT6 zb3(H$$_&tLE3`=UN>5kts7lRn$_WZIH})zBH#c+)cGV9t%P+$)jmpipNOjD1^v0Ia^;vT5rr=L^ewg}6p~XMl44~HRp91xUcV47|ik&_rzQD~lTnvzuH8;D_BX;hVyak_$!VY;E8K~Ys`u6|}nMQL_! zNK|E!cVwxdae8@4W^sXmuaAYFet^4=vm;lQsaHs3W~Nb&d%1p*pSyXMV^v~OW@2W! zdwHlyq_&U0dtiiRP;f!2ejt~wuC9WwpKnA^UXnqcvv+_|rfX5DM@F!*zNKMWvRS!V zNTyj?MPWp?Q%;D1aXwebR#!12;aRy)j@jI5TFapBl_(LgRo7)Je_iv%-V2qrcV@Ch xOV3Z=Bi;4z?=L>D``4l-Zn@m>u{<~1_wvTvI-e><57$oH)YpsZI#%dE1^_c)ahw1E literal 0 HcmV?d00001 diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age new file mode 100644 index 0000000..3c1c894 --- /dev/null +++ b/secrets/forgejo/runners/token2.age @@ -0,0 +1,21 @@ +age-encryption.org/v1 +-> ssh-ed25519 V1pwNA DmSENr+7db9t/epcMdOAjr2qt4rSHWopkuS3/xyz+xY +ClfO4iYTReIp6jvUBqQutkXx4XRJ++u8EsspNdDZ8kw +-> ssh-ed25519 4PzZog QzQ5iPiSSruoDS+PDNI+/6PnIYEnnFTvnrxK4W2ZK3Y +iTETtsauc6clML06hoMr7kinsOirURTECfB/PzJaFT4 +-> ssh-ed25519 dA0vRg UCPTgYh2/8JTajlTIgvk64eKNNMHe4ZxIDILxIGAL18 +Qj0ZS/iNwusCONf9Rh05ftd4cHSmWz7bLZ8HHtQewMo +-> ssh-ed25519 5Nd93w D/87p469o+CW9TOqQb4C+3a9+xRvZ4bzk7vr0wXhdRk +E/uvMfpOPvWosWS4s18f+xmexQcpJ0NED1N35pL5IjI +-> ssh-ed25519 q8eJgg pSW+R1LjAdCTL/ys1X93jSSC+ga1phB8iYqAJ1Ic0yw +IFl+195woVbHjz23w3mxBPkjtbfke3C+jYacWWKOpio +-> ssh-ed25519 KVr8rw KfPs+1IA7M7dYqkUW9vty+xl/8loMZDgVFee/ZR+F0M +mTK9yjQR18aKfw/xEdfsnGXPKxqDi1bKPj2mLtB2Xg4 +-> ssh-ed25519 fia1eQ M7nASBk9cGmZmMHf115JAazAEx3tS+sIVB49KlXltWc +YJ48iqVSJQooltbXvw+olKC4ZZt9a92TR2uQ0xROAPY +-> ssh-ed25519 CqOTGQ CeIqatgAbFS8oNy3fOOJdIkLM0X9AwV2zbpQHcOcICM +qAHOkFsbM5fTxcpLFz9Iz16MVBA1oVqlxUADrLxDRrA +-> ssh-ed25519 uZzB3g eA/GpdA5UKoleGcq9BHwj59Hz86YX7oF3LoG6zZ1ogE +sIs5D3s72gVGglG37S0eDLUTEzuy2U9Nbi03aOJ3W4c +--- rkCxZNLeKI9HMNZnwiFRaL1AsIUYtXYJT/YyJ1UMRqc +!VpÒ-p®|ô†ùÞÞ_toüÎá UÈkÝïútÓ`˜@ ¼ÞxzWÚº³ •GüîF÷=Ë]i»YÌ;YOiéÌ}¤J™÷/Ö, \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index ca7480f..cad986a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -77,6 +77,7 @@ let gitlab_runners = [ wheatly + glados ]; grafana = [ @@ -117,7 +118,8 @@ in { "gitlab/runners/runner01.age".publicKeys = users ++ gitlab_runners; "gitlab/runners/runner02.age".publicKeys = users ++ gitlab_runners; - "forgejo/runners/token.age".publicKeys = users ++ gitlab_runners; + "forgejo/runners/token1.age".publicKeys = users ++ gitlab_runners; + "forgejo/runners/token2.age".publicKeys = users ++ gitlab_runners; "forgejo/runners/ssh.age".publicKeys = users ++ gitlab_runners; # for ldap @@ -130,7 +132,7 @@ in { "backup/restic_pw.age".publicKeys = users ++ restic; # discord bot and discord - "discord/token.age".publicKeys = users ++ discord; + "discord/token1.age".publicKeys = users ++ discord; # email stuff "email/details.age".publicKeys = users ++ ldap ++ discord; From af828b56e5d454a30e9e4878d72906e4a3f17892 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Feb 2025 11:52:13 +0000 Subject: [PATCH 437/563] doc: updated the servers list --- ITD/Server_Inventory.csv | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index dfbc30d..f4c6ed9 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -14,11 +14,14 @@ SKYNET00012,skynet,Active,193.1.96.165,Nixos-24.05,Skynet server. (DMZ) SKYNET00013,neuromancer,Active,193.1.99.080,Nixos-24.05,Local Backup Server SKYNET00014,cadie,Active,193.1.99.077,Nixos-24.05,"Services VM, has nextcloud to start with" SKYNET00015,marvin,Active,193.1.99.081,Nixos-24.05,Trainee testing server -SKYNET00016,optimus,Active,193.1.99.090,Debian-12,Games server manager (replacing SKYNET00006 soon) -SKYNET00017,bumblebee,Active,193.1.99.091,Debian-12,Game server - Minecraft +SKYNET00016,optimus,Retired,193.1.99.090,Debian-12,Games server manager (replacing SKYNET00006 soon) +SKYNET00017,bumblebee,Retired,193.1.99.091,Debian-12,Game server - Minecraft SKYNET00018,calculon,Active,193.1.99.082,Nixos-24.05,"Public Services such as binary cache, Open Governance and Keyserver" SKYNET00019,deepthought,Active,193.1.99.112,Nixos-24.05,Backup Test Server using restic SKYNET00020,ariia,Active,193.1.99.083,Nixos-24.05,"Metrics, Grafana and Prometheus" SKYNET00021,ash,Active,193.1.99.114,NA,Server Room Network access SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host -SKYNET00023,optimus-test,Active,193.1.99.085,Nixos,Testing flake for Pelecian \ No newline at end of file +SKYNET00023,optimus-test,Retired,193.1.99.085,Nixos,Testing flake for Pelecian +SKYNET00024,optimus,Active,193.1.99.090,Nixos,Games server manager (replaced SKYNET00016) +SKYNET00025,bumblebee,Active,193.1.99.091,Nixos,Game server - Minecraft (replaced SKYNET00017) +SKYNET00027,Raspberry Pi,Active,193.1.99.085,Raspbian,Proxmox Qurom server \ No newline at end of file From 8b168f3b11afd0c01105c1c138a5144dea51abc0 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 14 Feb 2025 11:52:37 +0000 Subject: [PATCH 438/563] doc: add teh pending port request for teh forgejo runner --- ITD/Firewall_Rules.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 1563996..b8b1b97 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -43,4 +43,5 @@ SKYNET_FIREWALL_00031,Add,i24-06-04_017,Complete,All,-,193.1.99.83,SKYNET00020," SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET00016,8080,-,Had incorrectly opened 8080 on the main panel SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' -SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. \ No newline at end of file +SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. +,Add,,Pending,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server \ No newline at end of file From 82108776ce97bd4d782d1ed48e3cd09f4fe00378 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 19 Feb 2025 10:00:58 +0000 Subject: [PATCH 439/563] doc: updated teh spreadsheet for the ports --- ITD/Firewall_Rules.csv | 2 +- ITD/Server_Inventory.csv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index b8b1b97..c955339 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -44,4 +44,4 @@ SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET0001 SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. -,Add,,Pending,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server \ No newline at end of file +SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server \ No newline at end of file diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index f4c6ed9..d9a63f5 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -24,4 +24,4 @@ SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host SKYNET00023,optimus-test,Retired,193.1.99.085,Nixos,Testing flake for Pelecian SKYNET00024,optimus,Active,193.1.99.090,Nixos,Games server manager (replaced SKYNET00016) SKYNET00025,bumblebee,Active,193.1.99.091,Nixos,Game server - Minecraft (replaced SKYNET00017) -SKYNET00027,Raspberry Pi,Active,193.1.99.085,Raspbian,Proxmox Qurom server \ No newline at end of file +SKYNET00027,vision,Active,193.1.99.085,Raspbian,Proxmox Qurom server \ No newline at end of file From d212d0c820199de597501b6e6d1b8ac37c6ae5db Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 19 Feb 2025 10:59:51 +0000 Subject: [PATCH 440/563] 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 aef7599..61f5e76 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1737922006, - "narHash": "sha256-IcD9wXppeoP6SRWIJTV784XiuTKhU7SaKOH2SWscgHM=", + "lastModified": 1739961054, + "narHash": "sha256-ojss5zsq3wL809hT+Arl+XOyFdEQcdc4G/hd0YJdrUE=", "ref": "refs/heads/main", - "rev": "5fcc24a867c98be772eec8c6a65eddfbe52ab070", - "revCount": 175, + "rev": "25fcc04287741b9b9e38c82a10753a3e33138f12", + "revCount": 218, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From a7c6dde11d3fb9ac3f3ea35515defde749e6b2af Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 19 Feb 2025 11:55:35 +0000 Subject: [PATCH 441/563] feat: updated token id for teh second runner --- secrets/forgejo/runners/token2.age | Bin 1138 -> 1138 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age index 3c1c894e8a0d0f4dcb66440e643746d1c5610ca3..bd13ac11352095ddded648bba2cf40a7d46164f7 100644 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tqa74GwB%mrPKV88m%iX&oqeMT~!XV0{ zJUc0)*sU_nI3+N}C_gJK#oREhAS=r-+tA-U!-OltJH0H}(bqW9&@rVr!?Cy`IY_(8 z+&`?aBH7|M}xAUbcG_*^kAP#A0vx03uoi(B!lwAjG&_Q zOt+wdP`^~OAQy{>l1gJkzcQc9d@f7#!cs3MvvkYSjN&X)gObA3RNsK8kbGmm$TIgz zcYo7di=u*J53kI`a&*6$`lVPJmn#_fdl+ly8krks1(v!;CYMDNex+GS4mAK~wJ4fUN zxcfQ=S)kiiXp!obo~~fv=v)+@>k;4=7FO&P>gns^=@c27Ym}5*Y*HEFXd3RFn&xR) zRi5V>=*X2>Wn7+OTICd+o2g%vTWDxn=w)b76y#HwmTnPfT;!G+YMPxxS^?eYH^isu(`Xtv15`^T0}u+Nin)@X_<+JseuYr zrCz25iKb!t?s3ciDee%`Z?uUp&8D3#aSt-5$RmMQJGGbCgE;* z`j!TH24-Q!euhc;Zsp<5`hiBN`X#w8-W~;kIX(q>h8TWxF7yv^4^(iA(9W;OD)GxK z&W@;bFLo@BNVN1Ri;D6H@HeRn%lCFk@=Y`Lv&=0COXo7RwDbrz%nK^c&-MyWb@$KA zcJeJxHYiPsiV95i@e8XmH?DLs@(;)}_C)tvX;hVyak@gbex-JCRCZFOyMBpVmXS$L zaba?Sp-Z5Xqf3>urEi|AMUJh{p;=i)Nj8_RuC79;qfcsXN{U%Xuve~2fw`%#Z$XZ>W2U!HZmFqP zc9})Exld6=L}<3RTOgO(tF0ch?$3$O6TT4Pe?hkS%O#f^ON#zpRlGE3>iVMJTbFxF y-HJ4Mb-259k!aG%(|a~aWqw?4T*dg-r{Yg(Cd2K<*n?W1lL~?sb5+ldi~s<834Nyk literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5wB24R-Y_ z(l$>?vMkY0ElBoF@psHBGAb-FDGK%o&o9U>4K~)VsI1bih~#q4N%J?!j0_1%^(-*U zDhqWg3@k0lj;Jt+2=da_F12tiE-vs(af!0XE=RY`B%mrPKV2cPD$q1DATv0)s5IXt zSUbSQ&r@69EFjM_(lsy7Eu<{3sKVPM+$hT1IFc(f#5JU(II%R@EIG&5$G|Kj-?zv- zJ2S7?KeH$_D8$t{%}GC?$}7<=#01^86i0)ypmc>$=YWv($P6QW3$KvGtegd%KVOejlc)+$7f+uGPj^QjLkq6JEQ6?E{Y<~|(qday&C7}m$|EvTg0i_>^-Ifq(+d0p%EI%D!-GwV4K32ND{@mS0+S284E$VO4E>Bv z3w%sHvpmslE3`=UN>5iP2oBc{GW5xEOmPnJ(XT8vjIcD$3J!MGPERx}$Z)dAj4X8Y zGW1L~s4VC5bj#5;v@|Wx4@>gMsxmSzH_oka3dqhXNlMF3HFnm{icCxn5BK&j$i(oQ zcUX}{QMrP5T0pV3p{Jv{uX##jVRmS^Wm!q3c14c9MNYnNluLS;TWYF)RFJltfiG8X zh__{BR$!2!MWT0FxqgLfN?LKAdqjYDMWIWkVUl-1mQk)xiIY)8I!3&uWhNS?1}gZP z=Q##DWm_h@=SJoFdZZZ|ntC}VRyn#>7?%WV7kh>|nOJ(~MC6o&Cv!!5nOI~Nh6Q^C z=I7^>Bt?{!Yv<>9JDWsBl~^WP8ifQIl?EDA1o=A#M52eJbD@8Td!T}Is%K$hNxEZ_ zTd+mGU!`%HzrR8L4>7ad6-dEQbC|cvVXFtvoBYnqlbUCTXB-FX8@PGp2emv#>M7F>0$2aIqt^h!3L==KA|D5 zRi%|ip_YD0nFhv*{$9r6Cdpj7y1EKQ+0GSFem<$*o|YcIeo=YlnQlReK8B9Po}rN? z5s_XY`jM4hhM~Seg~?osVFj0T3)c15d};f6?_PXK{-1LX5J; xS>8P|_bRHw`EKpn%q=<9z5mZUx9_&6V>5S0p0SSf&wR;urgn+f% Date: Wed, 19 Feb 2025 12:03:03 +0000 Subject: [PATCH 442/563] tmp: remove ariia from active deployment Thankfully this server is ephemeral --- machines/ariia.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/machines/ariia.nix b/machines/ariia.nix index 121dd63..724d115 100644 --- a/machines/ariia.nix +++ b/machines/ariia.nix @@ -34,7 +34,9 @@ in { targetPort = 22; targetUser = null; - tags = ["active-core"]; + tags = [ + # "active-core" + ]; }; services.skynet = { From 28843e5c8a57227c9b6b7b41360f32f3e9d6da19 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:42:01 +0000 Subject: [PATCH 443/563] 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 61f5e76..0eb2887 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1739961054, - "narHash": "sha256-ojss5zsq3wL809hT+Arl+XOyFdEQcdc4G/hd0YJdrUE=", + "lastModified": 1739968720, + "narHash": "sha256-KyDeIzhAZA5LVG5OV6MPftbaJqQVdmFFSBkTd4+rtzk=", "ref": "refs/heads/main", - "rev": "25fcc04287741b9b9e38c82a10753a3e33138f12", - "revCount": 218, + "rev": "8645a9b3ce01129d2db4981c83493e0acac2c14a", + "revCount": 220, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From d03d45143c8aba9ac825540dc2a74848b9e6e93b Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 19 Feb 2025 22:41:16 +0000 Subject: [PATCH 444/563] 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 0eb2887..22929f4 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1739968720, - "narHash": "sha256-KyDeIzhAZA5LVG5OV6MPftbaJqQVdmFFSBkTd4+rtzk=", + "lastModified": 1740004599, + "narHash": "sha256-xVSjBplK98+OycOudlopTDFV+Uj9kS3xGSBn1mn5wz8=", "ref": "refs/heads/main", - "rev": "8645a9b3ce01129d2db4981c83493e0acac2c14a", - "revCount": 220, + "rev": "348020ecfee0963ef97458db25d16f5ddf1653a9", + "revCount": 221, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 62ea725950525c7498b977bb5c6ee2aceb49bd0e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:01:53 +0000 Subject: [PATCH 445/563] 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 22929f4..32dfcad 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740004599, - "narHash": "sha256-xVSjBplK98+OycOudlopTDFV+Uj9kS3xGSBn1mn5wz8=", + "lastModified": 1740415462, + "narHash": "sha256-uIYEHckBibf6FvFeF2GllzbbHXL47Vf3D76GnaVdD14=", "ref": "refs/heads/main", - "rev": "348020ecfee0963ef97458db25d16f5ddf1653a9", - "revCount": 221, + "rev": "9ce5b8136b42b5a390381e5aa08f9ec2fb7a053f", + "revCount": 222, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f365a6770ac08ca2605670f9486b523f2030b548 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:15:37 +0000 Subject: [PATCH 446/563] 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 32dfcad..a187f09 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740415462, - "narHash": "sha256-uIYEHckBibf6FvFeF2GllzbbHXL47Vf3D76GnaVdD14=", + "lastModified": 1740416846, + "narHash": "sha256-SFoMn+bL1b/KxoXWuyLHy6mlGDlYfnj16Bp1VmL3ph0=", "ref": "refs/heads/main", - "rev": "9ce5b8136b42b5a390381e5aa08f9ec2fb7a053f", - "revCount": 222, + "rev": "6481fcb89fa7684cb22d083812ce829730f1f309", + "revCount": 223, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From bee0c476e8619286aa8b2bfed26a54801cd6fc4f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 24 Feb 2025 17:33:35 +0000 Subject: [PATCH 447/563] 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 a187f09..0af1f3e 100644 --- a/flake.lock +++ b/flake.lock @@ -924,11 +924,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1731940725, - "narHash": "sha256-W909eUlyTlvS/ty5Ns4p042NuSMppbC0N19zGpVCG0w=", + "lastModified": 1740417868, + "narHash": "sha256-huFGMY58DU5vh4n9KZUpxkvRr+xe5eqqjaHphZdGJV8=", "ref": "refs/heads/main", - "rev": "0b397369d185edee7d890f09786fd3450355d89c", - "revCount": 235, + "rev": "faa6233ecb734ca567ca25a40299e7fa54bac7f0", + "revCount": 236, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 87469cc6c31d2dca91af59651f138e169e6152f1 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 25 Feb 2025 17:40:01 +0000 Subject: [PATCH 448/563] 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 0af1f3e..3efeecf 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740416846, - "narHash": "sha256-SFoMn+bL1b/KxoXWuyLHy6mlGDlYfnj16Bp1VmL3ph0=", + "lastModified": 1740504873, + "narHash": "sha256-I0XkJmBzEYOeskh4P8K0XA8NMPE/A2iEC9K7IszJfvA=", "ref": "refs/heads/main", - "rev": "6481fcb89fa7684cb22d083812ce829730f1f309", - "revCount": 223, + "rev": "b67894fc6e7d883aa24a004a4f19fcb47dc40f5e", + "revCount": 224, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 51eab3faf85dfa5eb6799b99c488fc63c58049df Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 25 Feb 2025 23:14:30 +0000 Subject: [PATCH 449/563] feat: create a vanity URL for teh committee server --- applications/skynet.ie/skynet.ie.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index cb2e778..5082080 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -25,6 +25,7 @@ in { services.skynet.acme.domains = [ "www.skynet.ie" "discord.skynet.ie" + "*.discord.skynet.ie" "public.skynet.ie" ]; @@ -50,6 +51,11 @@ in { r_type = "CNAME"; value = config.services.skynet.host.name; } + { + record = "*.discord"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } ]; services.nginx = { @@ -78,6 +84,16 @@ in { useACMEHost = "skynet"; locations."/".return = "307 https://discord.gg/mkuKJkCuyM"; }; + "compsoc.discord.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://discord.gg/mkuKJkCuyM"; + }; + "committee.discord.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations."/".return = "307 https://discord.gg/D6mbASJKxU"; + }; "public.skynet.ie" = { forceSSL = true; From fbb77fda9db9f92e4d13ab31d90144e9cd8eabac Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 26 Feb 2025 14:50:50 +0000 Subject: [PATCH 450/563] 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 3efeecf..8232a57 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740504873, - "narHash": "sha256-I0XkJmBzEYOeskh4P8K0XA8NMPE/A2iEC9K7IszJfvA=", + "lastModified": 1740581082, + "narHash": "sha256-En4BRHTocnYml3LGCgP2wF6JxfThSyNsUYX7TzLenWA=", "ref": "refs/heads/main", - "rev": "b67894fc6e7d883aa24a004a4f19fcb47dc40f5e", - "revCount": 224, + "rev": "09ce45f70fcb088baccef85535af5ffd86d336ff", + "revCount": 225, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 39b72522f34e6054d7f89251605b682c9d1ea667 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 26 Feb 2025 16:01:07 +0000 Subject: [PATCH 451/563] 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 8232a57..79d9445 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740581082, - "narHash": "sha256-En4BRHTocnYml3LGCgP2wF6JxfThSyNsUYX7TzLenWA=", + "lastModified": 1740585342, + "narHash": "sha256-/8yS/itZ/qI77yQBg8DqHaTwJoCUKxik62t4AzupxZM=", "ref": "refs/heads/main", - "rev": "09ce45f70fcb088baccef85535af5ffd86d336ff", - "revCount": 225, + "rev": "7406f0e6206b3fcec4c471949d6c428503fa9e91", + "revCount": 226, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From fbfdb84a1a03515ca29e913d5be76c21d2df55ae Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 26 Feb 2025 17:08:11 +0000 Subject: [PATCH 452/563] 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 79d9445..2bd6cdd 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740585342, - "narHash": "sha256-/8yS/itZ/qI77yQBg8DqHaTwJoCUKxik62t4AzupxZM=", + "lastModified": 1740589618, + "narHash": "sha256-bnpYreruqF9tq8pRWRivaTC2J7f6EgHhqYp7rtSzFXg=", "ref": "refs/heads/main", - "rev": "7406f0e6206b3fcec4c471949d6c428503fa9e91", - "revCount": 226, + "rev": "6a5f651ba2419639323e6c7d7219b82d4b8a7f9d", + "revCount": 229, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 19fbcaa51db1b3ead42617e223a42454e146ea06 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 28 Feb 2025 00:10:26 +0000 Subject: [PATCH 453/563] 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 2bd6cdd..477c2b2 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740589618, - "narHash": "sha256-bnpYreruqF9tq8pRWRivaTC2J7f6EgHhqYp7rtSzFXg=", + "lastModified": 1740701157, + "narHash": "sha256-EXW+GvlA+i19n39RQR7hFrbg2KvqBQX8ldfw6CvVI8k=", "ref": "refs/heads/main", - "rev": "6a5f651ba2419639323e6c7d7219b82d4b8a7f9d", - "revCount": 229, + "rev": "b43f760fb1ff965e171bbde0440531ac17e46a9b", + "revCount": 236, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 9d57662b160d38d7f99d24f784727b7cf0768093 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:02:17 +0000 Subject: [PATCH 454/563] 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 477c2b2..cac7d90 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740701157, - "narHash": "sha256-EXW+GvlA+i19n39RQR7hFrbg2KvqBQX8ldfw6CvVI8k=", + "lastModified": 1740740324, + "narHash": "sha256-GOn77Y8MgAdmHNFAOAOBv7ji9+KXPxvauFGcm1dSjS4=", "ref": "refs/heads/main", - "rev": "b43f760fb1ff965e171bbde0440531ac17e46a9b", - "revCount": 236, + "rev": "058f8a7a7dc04bd9dcb26105b2a07e711fad9b93", + "revCount": 237, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From a9ea0583a7579451fa28b305e41c4dfa743c6cb9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 3 Mar 2025 18:33:09 +0000 Subject: [PATCH 455/563] committee: removed Emily and Sean --- config/users.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/users.nix b/config/users.nix index 51ec6d2..ea5ff0a 100644 --- a/config/users.nix +++ b/config/users.nix @@ -55,8 +55,6 @@ in { "silver" "eoghanconlon73" "nanda" - "emily1999" - "dgr" ] # Committee - OCM ++ [ From 1d946308b6814c082c560c7b5de757f5994b2a37 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 3 Mar 2025 18:34:53 +0000 Subject: [PATCH 456/563] feat: scream test for Gitlab --- machines/glados.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/machines/glados.nix b/machines/glados.nix index 5e499d8..c5be714 100644 --- a/machines/glados.nix +++ b/machines/glados.nix @@ -26,7 +26,6 @@ Notes: Each user has roughly 20gb os storage }; in { imports = [ - ../applications/git/gitlab.nix ../applications/git/forgejo.nix ../applications/git/forgejo_runner.nix ]; @@ -42,7 +41,6 @@ in { services.skynet = { host = host; backup.enable = true; - gitlab.enable = true; forgejo.enable = true; forgejo_runner = { enable = true; From 6fba8bdec4835ffb4c3246a5327c6fe2ee3fe263 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 3 Mar 2025 23:01:15 +0000 Subject: [PATCH 457/563] 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 cac7d90..02beeb2 100644 --- a/flake.lock +++ b/flake.lock @@ -924,11 +924,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1740417868, - "narHash": "sha256-huFGMY58DU5vh4n9KZUpxkvRr+xe5eqqjaHphZdGJV8=", + "lastModified": 1741042377, + "narHash": "sha256-DdoRaiqXTu49D3VR6Xf8Ms5LBUhtjiLokwmVZpjrAlQ=", "ref": "refs/heads/main", - "rev": "faa6233ecb734ca567ca25a40299e7fa54bac7f0", - "revCount": 236, + "rev": "9178a16f95a872562f3e022842fb66a7c633db51", + "revCount": 237, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 2790848de9b5de155c920adeb955599c316b29fc Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 4 Mar 2025 10:50:26 +0000 Subject: [PATCH 458/563] Updated flake for skynet_ldap_backend --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 02beeb2..d4a4318 100644 --- a/flake.lock +++ b/flake.lock @@ -924,10 +924,10 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1741042377, - "narHash": "sha256-DdoRaiqXTu49D3VR6Xf8Ms5LBUhtjiLokwmVZpjrAlQ=", + "lastModified": 1741084972, + "narHash": "sha256-YiiAXFN6hhA2h5IQx7FCHnDYookYqNLYS6a/gYVq3OM=", "ref": "refs/heads/main", - "rev": "9178a16f95a872562f3e022842fb66a7c633db51", + "rev": "d0d25b77e8aff7f10aaea5a4c8415b47934b3f1d", "revCount": 237, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" From b195208462dec8440d02ebec6f03464578cfa99d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 4 Mar 2025 23:42:09 +0000 Subject: [PATCH 459/563] Updated flake for compsoc_public --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index d4a4318..7267d0d 100644 --- a/flake.lock +++ b/flake.lock @@ -148,11 +148,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1732723930, - "narHash": "sha256-25w50gGNTIyPgkcQa39XSFFX8gYVVniL01CX+IXfC8w=", + "lastModified": 1741131635, + "narHash": "sha256-W65UdgryecEzfS6myQ+1Sj5P3yBCJRlGRf+fU78Ei2g=", "ref": "refs/heads/main", - "rev": "744777c990434c9a84304ce6fd8c4582e6078a4c", - "revCount": 110, + "rev": "b5089910d0d0b303b634c7e125ac0b9ba8728bd9", + "revCount": 111, "type": "git", "url": "https://forgejo.skynet.ie/Computer_Society/presentations_compsoc" }, From 4d83ecb584baabbea6485559a28710eed6c692f3 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Mar 2025 13:14:40 +0000 Subject: [PATCH 460/563] feat: we have to handle the old lists domains --- applications/email.nix | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/applications/email.nix b/applications/email.nix index 519f3e0..4d0c905 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -50,6 +50,10 @@ with lib; let account = "contact"; members = ["committee"]; } + { + account = "committee"; + members = ["committee"]; + } { account = "dbadmin"; members = ["admin"]; @@ -291,6 +295,12 @@ in { # the number is the priority in teh case of multiple mailservers value = "10 mail.${cfg.domain}."; } + { + record = "@"; + r_type = "MX"; + # the number is the priority in teh case of multiple mailservers + value = "10 lists.${cfg.domain}."; + } # basic one { @@ -298,6 +308,11 @@ in { r_type = "A"; value = config.services.skynet.host.ip; } + { + record = "lists"; + r_type = "A"; + value = config.services.skynet.host.ip; + } #DNS config for K-9 Mail { record = "imap"; @@ -429,6 +444,7 @@ in { fqdn = "${cfg.sub}.${cfg.domain}"; domains = [ cfg.domain + "lists.skynet.ie" ]; enableManageSieve = true; From 02969ba8947f744208adc7db8f3aa0750c2fd63b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 6 Mar 2025 13:15:13 +0000 Subject: [PATCH 461/563] feat: added milan to teh sistem committee --- config/users.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/users.nix b/config/users.nix index ea5ff0a..fe8063a 100644 --- a/config/users.nix +++ b/config/users.nix @@ -67,6 +67,7 @@ in { # Committee - SISTEM ++ [ "peace" + "milan" ] # Admins are part of Committee as well ++ cfg.admin From 1ef8b0ddcede57217c0451607dffc5f57511e63d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 6 Mar 2025 19:27:40 +0000 Subject: [PATCH 462/563] 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 7267d0d..81d7dd4 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1740740324, - "narHash": "sha256-GOn77Y8MgAdmHNFAOAOBv7ji9+KXPxvauFGcm1dSjS4=", + "lastModified": 1741288877, + "narHash": "sha256-11cMTAJyWoBAL3AaR57xHdFn4HYXtd7FBrbA1l21usQ=", "ref": "refs/heads/main", - "rev": "058f8a7a7dc04bd9dcb26105b2a07e711fad9b93", - "revCount": 237, + "rev": "3a39084f407392ea7f7c6a797bd0b4567d2c5f1d", + "revCount": 238, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f41221f67b7541aff3953e3e1428da7b83275c71 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 6 Mar 2025 21:45:11 +0000 Subject: [PATCH 463/563] 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 81d7dd4..7482172 100644 --- a/flake.lock +++ b/flake.lock @@ -904,11 +904,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741288877, - "narHash": "sha256-11cMTAJyWoBAL3AaR57xHdFn4HYXtd7FBrbA1l21usQ=", + "lastModified": 1741297347, + "narHash": "sha256-X+yD0wk7vHsT6MNL2yoTVqs7tv2x/FiY99CcXlGOoyY=", "ref": "refs/heads/main", - "rev": "3a39084f407392ea7f7c6a797bd0b4567d2c5f1d", - "revCount": 238, + "rev": "f307fcea43fe0d002c96921fb4b819c8e78cca84", + "revCount": 243, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 6788aa249dd75ea0dbe3909719111630b03f5158 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 11 Mar 2025 01:19:31 +0000 Subject: [PATCH 464/563] Updated flake for skynet_ldap_backend --- flake.lock | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 7482172..f30fc54 100644 --- a/flake.lock +++ b/flake.lock @@ -492,11 +492,11 @@ "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1686572087, - "narHash": "sha256-jXTut7ZSYqLEgm/nTk7TuVL2ExahTip605bLINklAnQ=", + "lastModified": 1739824009, + "narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=", "owner": "nix-community", "repo": "naersk", - "rev": "8507af04eb40c5520bd35d9ce6f9d2342cea5ad1", + "rev": "e5130d37369bfa600144c2424270c96f0ef0e11d", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "nixpkgs_10": { "locked": { - "lastModified": 1687011986, - "narHash": "sha256-ZNSi/wBw12d7LO8YcZ4aehIlPp4lgSkKbrHaoF80IKI=", + "lastModified": 1741462378, + "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c09e8eb8717e240ef9c5727c1cc9186db9fb309", + "rev": "2d9e4457f8e83120c9fdf6f1707ed0bc603e5ac9", "type": "github" }, "original": { @@ -573,16 +573,16 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1686921029, - "narHash": "sha256-J1bX9plPCFhTSh6E3TWn9XSxggBh/zDD4xigyaIQBy8=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7ff1b9b95620ce8728c0d7bd501c458e6da9e04", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.05", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -924,11 +924,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1741084972, - "narHash": "sha256-YiiAXFN6hhA2h5IQx7FCHnDYookYqNLYS6a/gYVq3OM=", + "lastModified": 1741655438, + "narHash": "sha256-oUpa/82OF6YJJ2Aj52P0IQZGw0MH+bKGyacnRQycL+Q=", "ref": "refs/heads/main", - "rev": "d0d25b77e8aff7f10aaea5a4c8415b47934b3f1d", - "revCount": 237, + "rev": "b00b5cac6d119a30fa60a1703d3e526985015477", + "revCount": 244, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, @@ -1392,11 +1392,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { From 970c449efbc87f1b158e7cefb870adb1b6c3cbd4 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:15:58 +0000 Subject: [PATCH 465/563] Updated flake for skynet_ldap_backend --- flake.lock | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f30fc54..b5364ce 100644 --- a/flake.lock +++ b/flake.lock @@ -557,6 +557,22 @@ "type": "indirect" } }, + "nixpkgs-mozilla": { + "flake": false, + "locked": { + "lastModified": 1740762144, + "narHash": "sha256-I7a6e3IYJAp9u3PwUSW1+oilO1tAfnbeN3/YJQ+ObCo=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "e35b0e071cae97469d80222be988fdd972b22c3b", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, "nixpkgs_10": { "locked": { "lastModified": 1741462378, @@ -921,14 +937,15 @@ "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_11", + "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_4" }, "locked": { - "lastModified": 1741655438, - "narHash": "sha256-oUpa/82OF6YJJ2Aj52P0IQZGw0MH+bKGyacnRQycL+Q=", + "lastModified": 1741691220, + "narHash": "sha256-OSRyKWVqSdeciy1DGYh63fxs7SbppeGRu8/ui54sTtc=", "ref": "refs/heads/main", - "rev": "b00b5cac6d119a30fa60a1703d3e526985015477", - "revCount": 244, + "rev": "35896efa04bb50e2342946e33367245b1cb4460e", + "revCount": 246, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 3f82622e97a5f53df7d781bf109c4a3beaea49ae Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 14 Mar 2025 04:09:42 +0000 Subject: [PATCH 466/563] 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 b5364ce..86cca21 100644 --- a/flake.lock +++ b/flake.lock @@ -920,11 +920,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741297347, - "narHash": "sha256-X+yD0wk7vHsT6MNL2yoTVqs7tv2x/FiY99CcXlGOoyY=", + "lastModified": 1741925000, + "narHash": "sha256-hq5jVJJw6Xf+nIKsWPfHk3TYH31d/t89p5Tvv8SGkpM=", "ref": "refs/heads/main", - "rev": "f307fcea43fe0d002c96921fb4b819c8e78cca84", - "revCount": 243, + "rev": "b44518c467b61650eab420d979f46166680c8a8a", + "revCount": 246, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From b3a40b9d0493248e448dab809e1d6dd1b5f7d2f0 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 14 Mar 2025 04:49:19 +0000 Subject: [PATCH 467/563] 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 86cca21..2d6e9af 100644 --- a/flake.lock +++ b/flake.lock @@ -920,11 +920,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741925000, - "narHash": "sha256-hq5jVJJw6Xf+nIKsWPfHk3TYH31d/t89p5Tvv8SGkpM=", + "lastModified": 1741927472, + "narHash": "sha256-OMnHKUpVk5oEij6q2WduoO0vJkmXXCDD6TGeF9vOLVA=", "ref": "refs/heads/main", - "rev": "b44518c467b61650eab420d979f46166680c8a8a", - "revCount": 246, + "rev": "a90724398683c245be2a5647fbeca78b2e7f5b5c", + "revCount": 247, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From bf10347dca6c56ca59947a9471323911176a9b62 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 14 Mar 2025 05:03:10 +0000 Subject: [PATCH 468/563] 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 2d6e9af..ce99479 100644 --- a/flake.lock +++ b/flake.lock @@ -920,11 +920,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741927472, - "narHash": "sha256-OMnHKUpVk5oEij6q2WduoO0vJkmXXCDD6TGeF9vOLVA=", + "lastModified": 1741928371, + "narHash": "sha256-IhZQ8XJsQ1hmf3+plWSYEqw7dFjcgbPUhRWkpsQOrOk=", "ref": "refs/heads/main", - "rev": "a90724398683c245be2a5647fbeca78b2e7f5b5c", - "revCount": 247, + "rev": "7f7e7ac598f4a9e03c5bd205f1507cd7a76394fe", + "revCount": 248, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 70263f4b1f1a645f0e0b5edd9aed04fc7a4157f6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 21 Mar 2025 16:54:25 +0000 Subject: [PATCH 469/563] feat: setup the mail filter --- ITD/Firewall_Rules.csv | 3 ++- ITD/Server_Inventory.csv | 3 ++- applications/email.nix | 10 +++++++++- config/dns.nix | 6 ++++++ 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index c955339..76cd029 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -44,4 +44,5 @@ SKYNET_FIREWALL_00032,Remove,i24-06-04_017,Complete,All,-,193.1.99.90,SKYNET0001 SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8080,-,Websocket for admin panel on games management server ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. -SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server \ No newline at end of file +SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server +SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter \ No newline at end of file diff --git a/ITD/Server_Inventory.csv b/ITD/Server_Inventory.csv index d9a63f5..c7a57f1 100644 --- a/ITD/Server_Inventory.csv +++ b/ITD/Server_Inventory.csv @@ -24,4 +24,5 @@ SKYNET00022,ultron,Active,193.1.99.084,Proxmox,VM Host SKYNET00023,optimus-test,Retired,193.1.99.085,Nixos,Testing flake for Pelecian SKYNET00024,optimus,Active,193.1.99.090,Nixos,Games server manager (replaced SKYNET00016) SKYNET00025,bumblebee,Active,193.1.99.091,Nixos,Game server - Minecraft (replaced SKYNET00017) -SKYNET00027,vision,Active,193.1.99.085,Raspbian,Proxmox Qurom server \ No newline at end of file +SKYNET00026,vision,Active,193.1.99.085,Raspbian,Proxmox Qurom server +SKYNET00027,mimi,Active,193.1.99.086,Proxmox-Mail-Gateway,Proxmox Mail Gateway \ No newline at end of file diff --git a/applications/email.nix b/applications/email.nix index 4d0c905..2129de2 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -288,8 +288,16 @@ in { # set up dns record for it services.skynet.dns.records = [ - # core record { + # This is the mail gateway, try to send all mail to it first + # Lower number = higher priority + record = "@"; + r_type = "MX"; + # the number is the priority in teh case of multiple mailservers + value = "5 mimi.${cfg.domain}."; + } + { + # this is the main email server record = "@"; r_type = "MX"; # the number is the priority in teh case of multiple mailservers diff --git a/config/dns.nix b/config/dns.nix index 9cd7484..636dede 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -32,6 +32,12 @@ value = "193.1.99.114"; server = true; } + { + record = "mimi"; + r_type = "A"; + value = "193.1.99.86"; + server = true; + } ] # non skynet domains ++ [ From 69ec3abb3b131cb03b7928ccb280acdde9d124a1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 23 Mar 2025 00:06:29 +0000 Subject: [PATCH 470/563] feat: we now have a sso/oauth server ther we can use to connect services to Currently works with Proxmox (VE and MG) and Forgejo --- applications/sso.nix | 77 +++++++++++++++++++++++++++++++++++++++++ machines/kitt.nix | 3 ++ secrets/keycloak/pw.age | 20 +++++++++++ secrets/secrets.nix | 7 ++++ 4 files changed, 107 insertions(+) create mode 100644 applications/sso.nix create mode 100644 secrets/keycloak/pw.age diff --git a/applications/sso.nix b/applications/sso.nix new file mode 100644 index 0000000..3bae2c2 --- /dev/null +++ b/applications/sso.nix @@ -0,0 +1,77 @@ +{ + lib, + config, + ... +}: +with lib; let + name = "sso"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Keycloak server"; + + datasource = { + name = mkOption { + type = types.str; + }; + + url = mkOption { + type = types.str; + }; + }; + }; + + config = mkIf cfg.enable { + services.skynet.dns.records = [ + { + record = "${name}"; + r_type = "CNAME"; + value = config.services.skynet.host.name; + } + ]; + + services.skynet.acme.domains = [ + "${name}.skynet.ie" + ]; + + age.secrets.keycloak_pw.file = ../secrets/keycloak/pw.age; + + services.nginx.virtualHosts = { + "${name}.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + locations = { + "/" = { + proxyPass = "http://localhost:${toString config.services.keycloak.settings.http-port}/"; + }; + }; + }; + }; + + services.postgresql.enable = true; + + services.keycloak = { + enable = true; + + initialAdminPassword = "sharky_loves_sso"; + + database = { + type = "postgresql"; + createLocally = true; + + username = "keycloak"; + passwordFile = config.age.secrets.keycloak_pw.path; + }; + + settings = { + hostname = "${name}.skynet.ie"; + http-port = 38080; + proxy-headers = "xforwarded"; + http-enabled = true; + }; + }; + }; +} diff --git a/machines/kitt.nix b/machines/kitt.nix index 71a0fe0..93298ac 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -31,6 +31,7 @@ in { ../applications/discord.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix + ../applications/sso.nix ]; deployment = { @@ -54,5 +55,7 @@ in { # committee/admin services vaultwarden.enable = true; + + sso.enable = true; }; } diff --git a/secrets/keycloak/pw.age b/secrets/keycloak/pw.age new file mode 100644 index 0000000..7792aed --- /dev/null +++ b/secrets/keycloak/pw.age @@ -0,0 +1,20 @@ +age-encryption.org/v1 +-> ssh-ed25519 V1pwNA /0giXND9iXet45Qdm45LbVQlIN1JYDiIJ1EFpMn+QgM +qxCesmTuF6auI9upI0V9rJSiSfzENLLHXIMrDewjvf4 +-> ssh-ed25519 4PzZog iSvze8+tKCozFbiXcc8BGfQ0qrlVUHNEPc0E13505wY ++queuxWzkBHBR7q1pHhBahdSqgKYmpOZ2avC+S4u2tk +-> ssh-ed25519 dA0vRg MAQ9mfNn3wwB0hFaV/Wg6nxM1vafopAeJynREcbSvAA +VjD1Sy41PEy1TQ5Wc/R9gh1gN/T8y/bUAdItWRz64GQ +-> ssh-ed25519 5Nd93w RAh3fYyjUmldiUFkw59/JZDTgZ+jrVd31akiV1UgYGM +HvoJTTxM+sCkXIDv0+FtN4ACkTy7tqr/BNeTrR8Jumo +-> ssh-ed25519 q8eJgg c4+/61Jhm+/QyV0s3ikemMqhWBRb+ous4kl7Psx5/WU +GUqakK0Rrsgg48U9QkcpV20zvQAswk/anoACzORuxiU +-> ssh-ed25519 KVr8rw /mBl8ejPUBEwVsDVFcwWfW1i0tIG5JH/OWlRSrRk+TM +K3SJpjAm6VDtsBk6HyDdLgbImh4If5Od2qu+sL8Dj9Y +-> ssh-ed25519 fia1eQ khFHXNgPUQ39oTpd1lWycrMUin8Ii2pawwFY1vIhRSs +2XhIsPrtN+XOBlTR/sEaaG5XCLlsIroYspOaEz+cM2U +-> ssh-ed25519 IzAMqA u6W5klKqqGx22yCJx0yGgwPs3vs+iAeH5z36isWL8Co +Ij4ncciynno2m9ZKtAegFy5mjAGS86jM7NrCL73LROc +--- mINzTQYjXCu318AiJxgsF7az4LUGc9iVS7hcyfFNTQs +m½Ö.ØÝ>iõ~‡ 8$§pB†ÀÑzhœä:´Ôq “'S£:„LdðšÿÚ +¡” ñŸQQøLÙŠÏ{,;ѵÙä~© # \ No newline at end of file diff --git a/secrets/secrets.nix b/secrets/secrets.nix index cad986a..9757a3f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -99,6 +99,10 @@ let bitwarden = [ kitt ]; + + sso = [ + kitt + ]; in { # nix run github:ryantm/agenix -- -e secret1.age @@ -148,6 +152,9 @@ in { "bitwarden/secret.age".publicKeys = users ++ bitwarden; "bitwarden/details.age".publicKeys = users ++ bitwarden; + # Keycloak/sso + "keycloak/pw.age".publicKeys = users ++ sso; + # grafana "grafana/pw.age".publicKeys = users ++ grafana; } From 2ae2caaa94984b05cb3932112c2fab27db9e46a2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 30 Mar 2025 19:10:41 +0100 Subject: [PATCH 471/563] feat: properly set up grafana Currently works with Proxmox (VE and MG) and Forgejo --- applications/grafana.nix | 2 ++ secrets/backup/restic.age | Bin 2870 -> 2870 bytes secrets/backup/restic_pw.age | 38 ++++++++++----------- secrets/bitwarden/details.age | Bin 1155 -> 1155 bytes secrets/bitwarden/id.age | 36 ++++++++++---------- secrets/bitwarden/secret.age | Bin 1012 -> 1012 bytes secrets/dns_certs.secret.age | Bin 2924 -> 2924 bytes secrets/dns_dnskeys.conf.age | 42 +++++++++++------------ secrets/email/details.age | 49 +++++++++++++------------- secrets/forgejo/runners/ssh.age | Bin 1491 -> 1491 bytes secrets/forgejo/runners/token1.age | Bin 1138 -> 1138 bytes secrets/forgejo/runners/token2.age | Bin 1138 -> 1138 bytes secrets/gitlab/db_pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/ldap_pw.age | 37 ++++++++++---------- secrets/gitlab/pw.age | Bin 1111 -> 1111 bytes secrets/gitlab/runners/runner01.age | Bin 1065 -> 1175 bytes secrets/gitlab/runners/runner02.age | Bin 1065 -> 1175 bytes secrets/gitlab/secrets_db.age | 38 ++++++++++----------- secrets/gitlab/secrets_jws.age | Bin 2660 -> 2660 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1110 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1110 bytes secrets/grafana/pw.age | 36 ++++++++++---------- secrets/keycloak/pw.age | Bin 1024 -> 1024 bytes secrets/ldap/details.age | Bin 1637 -> 1637 bytes secrets/ldap/pw.age | 51 ++++++++++++++-------------- secrets/nextcloud/pw.age | Bin 1024 -> 1024 bytes secrets/secrets.nix | 2 +- secrets/stream_ulfm.age | Bin 3194 -> 3194 bytes secrets/wolves/details.age | Bin 1943 -> 1943 bytes 29 files changed, 167 insertions(+), 164 deletions(-) diff --git a/applications/grafana.nix b/applications/grafana.nix index 3bce51b..953b02e 100644 --- a/applications/grafana.nix +++ b/applications/grafana.nix @@ -49,6 +49,8 @@ in { domain = "${name}.skynet.ie"; port = port; + settings.server.root_url = "https://${name}.skynet.ie"; + settings.security.admin_password = "$__file{${config.age.secrets.grafana_pw.path}}"; provision = { diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 1910186cc84b9ad68af9ec481b3e011288dceaf7..8f7c0425ea8ab0fe4651961ea1c328003fd1f320 100644 GIT binary patch literal 2870 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 diff --git a/secrets/backup/restic_pw.age b/secrets/backup/restic_pw.age index ea0bc3b..941d6a4 100644 --- a/secrets/backup/restic_pw.age +++ b/secrets/backup/restic_pw.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA mGy7a3SPHMxFaJ5S68jaRkPk16Ahxqp7C2YGnK6A4nM -TrEf7fz6yY7G2HXNxhnM4v7QkVrR5D6vdh+eUVbWbdQ --> ssh-ed25519 4PzZog 5ixIvICVbbk2z8gqvodMAhCevBWdnfmpskWupnpMm04 -r33h6oeu1jQQGs3mP15xtbRq50FGpKwtbbqWbSTQ1jE --> ssh-ed25519 dA0vRg gUxwHHDBhxpYMxBE+UfTYJ4I8nY7cEdWG1XBSLLWtlY -pNawroXlES4EyNZSUUiEPNy+WNdG9AnHnUl+7qLB5Os --> ssh-ed25519 5Nd93w AchMesYdEdLHtphyfCumqrdCRFABzNOEf7KfFgQWFAk -Xnier5jnPDl9n8F5r/R4CjBoEvmwAJRLQWnoWoAudec --> ssh-ed25519 q8eJgg AgmUpmYT5z1qAFZ+uUY5a7huZ8Bhifs1ZuDBlg7ZJxU -kgaKF9t8cEKBc715dNocxA3o+2dwpK8erRo42NzeP9A --> ssh-ed25519 KVr8rw AafFkG0axLsqGVs/k0DrzLFsKk4uXtqRbJIFhuAmj18 -shiQFq5ZznBovnNXWfTNvSVX/O1X47hK6g13P8r6xN4 --> ssh-ed25519 fia1eQ AKbaMyAtdDHSpP5taXQQjaunzvO6yZuCOUjgV2+4iDc -yDFZ54QNklvVHUD1AkiaQ0sntqiRxkMGZw9yos/IvcI --> ssh-ed25519 3pl/Kw KD86EfxdUwpfFW7wqf283Wmdw8o/qnVzXxTCrtNPsWI -L1a9WXktp4a9s1GxF6O7VV14ZPQOp/VqwS286Dqa3Tk ---- +jytGaOhLk0unuAlkbbtAFNde8Z+tKJ/3l3Y3tBgcFQ -€¡VV÷õÍ7Pø =ñOý]àbZêëj§p¸QKaXIúµNl¢_vž -ŠÐHsh3~F«ŒW/¿ŸÝÌ ^áa\´¼Ô #/¤Ú‡i[÷Üfbó¶•áúXøØ \ No newline at end of file +-> ssh-ed25519 V1pwNA mN/1o9VKKc+kBc0s2DEmjHJn6AUbCQUoaCsvswNHzUM +SlqlUx/Ok6lrc71g7uJYG4/Y+DG9nnumw0GsHtFH9Ao +-> ssh-ed25519 4PzZog Hm/dzRXkAtX8iopSdsrRw0rIAKtagbRtS9zGnFZdjAk +dIhBGvUOUd7SgqADywQnnv/lggussXa+AxOdxI/gp4E +-> ssh-ed25519 dA0vRg mP3xepL4DnV1V0sYrS8n5a9XFaY3HlYn88IjukBW2C4 +KpUv1UGZdzx3kHH8LlkqCIgGK9DAOZSyN+bLfaPABcU +-> ssh-ed25519 5Nd93w E8tGoDN/aQoe9gmMkIWxB7vsgQ5fJ8WzjO6+NefmcXM +HY65eZHHm3GovuZoVgOMh8kveA1aaxyYBvXDMuw5Ry4 +-> ssh-ed25519 q8eJgg j86zF1fq/TSyxl0CTlvnJw0MJVVtG03oqGDumyovogI +gNZY0eSlLIstaHlbY/6n44/BKaQITXqD8qNOJGotplI +-> ssh-ed25519 KVr8rw 7T8vLuXcc0jrtvQTu/FU3ZZC963YkAizU5Q79OQEvxg +R9YC1AZsrJa6PZ0Vzum9TKCwFPd5EWJ4McJqtNgQQ34 +-> ssh-ed25519 fia1eQ bzqIMpD3LmkKUPRZ8HibiqJDZfR2lIcMCICputpX2w0 +2TMqO/yxAMPB4b13/r6jBytD5lhbhauxTrmCx95w/4s +-> ssh-ed25519 3pl/Kw 9qEhAIqJFP6XrMsT5ju8XQeG5dNG/U0/wTUiPYT7xHU +gT+zRjaAhAK/BUOZXAWNUq90F1I9T/y6qZuGRnbHroQ +--- QGGO/WedFvcHW4JxdpMHP1PbfaB1ITP4KVb5vWF3Kzc +Y@Ò·›â/å­Ü» ÁKç‡ïhA@ð0K +.uÔÐÎq‘_9`Ï, ÓÕW%ØTnÞÇÎÈø`C€”ÌʯªÃ·‰1ŠÕnì3äï?ŹєǡV]­Ó \ No newline at end of file diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 7c53a8d075d8c11ddcd27be00e352781b4e3e5e7..4777128a8e12ba8668dd82eff7893033a22bc17a 100644 GIT binary patch delta 1069 zcmZqXZ04MxQ(t0QoSWxf;qB(AUvA-A8JJX@T=sp-YEtZ$rk|B)nCD#SY>}Q? z5Rze<;}KHMW#ZzLWl$Voo|jz~>Kf&o8tm>HSQ=;%k*1xS7@litQsHB69_;9D5Lg&E z@uPTndX{TpUQ$q&ucxPHVuhP!aY&+JuwkWPLAF zSU`cNWr22viA7|Nk#}CWUqHHNdA66Yc~N?mYgTb)RGMd~pJ)E$ct-K?$izg8tVqvH zlk~LUAnnS+;vy$g?aXB3qRPMmw-mp~^a$6elI*Nv|B!qx*W|)-k5bcusBrVdT>ZSl zpp3lG0>>iH$XvtZ48Ozz|HP0gKYi_dpUlX~XBoxo(|nThT}msnD$4`I{N23G44f-M z%Oiq9!xD=MeY6Yx-3%f<%>znyP!O>*wHXKJ0v36Ej7}x$}v1J%EQ8> zI6ula-QU?T65YDA%tXV~Km|Xqj0zK%6qD4{Y%t$WNQp;2)&-`MSH2w5~QkTGBZ?i}fgCdgxbF<{KqQXdXzYwo9 zY)^FSJgXdi3mp|qyeiC0k}Lf(i#;;E{3AmQLz6>1y$o|Rsxm8$JS=>@jl8QIbApP~ za*Mf~l1+-V1O4h<{9RLna&t=!GRj@k@-s8sErNqG9W(t>N-7-7!_C}`(kj!rbaizV z3L zndG2(m5cR1d;In3>v^x+e=~S^INd|zy;>1dW6rs*XThe|3td*O-}mwAeg5^87dh{h ze2)3`XsV&FLc7baQ-PcL1>K!B=WeXK@XmKp-Vd?W%)B?;9z@){VE?+kJo-lMytyaN zYQ%c`B=VeI-p3UDKzHk7l??q^(z65;9`j^vHvO05asPCmfJ%H;{Nw*Nzl)gIRuq|= HuN4FUALN1I delta 1069 zcmZqXZ04MxQ=e)Oo}c0pZeVWilwMMvogA8(wKq7L*(s z%9ZWx;v10anqQt3P-zxsW@uiVW|EX>7@6rEVya&dWFF~iVxXO9uI*i%%%y9mP+Xj$ zo0?)|YHDbyU=mOjm7lJVpJ-@q9BH7RU6y50rC(B&?Plo}92$}5?jIcCoNpeHYZ|Uy zk>ZygXzA?By(nF?PzRS8Dd)Kn_q5doS1K96zG#Z z@uPUSVPS-MO1h_inW<4=wr74wK|qy%vX@Drx1*U$Wo}w=Zh2IOeqecMad0`8i)VIH zpi7Z^WT0C{igQ4oc|@qcb3vJbe^G!%flF3Wx3-cmp z?{d$w%FLjuoMMB@Ot-)w{fbmq59eG910RFQXBoxo!?pdqBmE0J3WxOz0fo(BeB9KLOaJ%+sQaG%f!pnRXf8p zyDYLI+}kie9o@RL%tXV~Km~VG=kfyW5*PhU?c~tXVDIn@gW^2TqJVrSbAL0#^rYbA z`tnGNaQzIgN)s+0KgaZx5}*7W@1P=6W5+~`kfhSe9Ovwy^q_KQKhLPBvIwu7vaHaG zC=+z+JgXdi3mp}b^Ham!N|H>SUG+^PO*4wZwGD$J-E;j76T`CIg3}^>4I|AW12gme zbMm<|Gg5%zd0)jSQS!EM0?=GJ?u8%)A_pLh@a?baizV zJRFM({8Mt0b4`u>!adT;jh##bOtihq(z4Txb8||wONu-lBl9dmf)g#cPBd>S;oms% z)Rwu8XEv3{cwRZZn$x(x*+}e+^91SNtud!?4ATd7o-QMG^i2hFS_Pm1=uIc$`i*Esdbk*hVk-UaE_GftQiX>+My zt8U?exzQY()gyky diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 7c2ae23..4ea38d7 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA +Bzh++C1+jxdz1VwwhxPpO3XWn8fy7bsP2wX4mlQ63A -1GZxY76fwUOo/t/XeoCOEuxxq+oiU8+GDaasH7VTOkA --> ssh-ed25519 4PzZog lkqPlBejVuYcBQwAZX96296VjJqyz3Q7J7O7OzfSDmw -x+bGIiw4SYhEePIkF5PLK6KK7EJ8Iay1oQIOJ18DtQY --> ssh-ed25519 dA0vRg o0tqstSEhdxxdu4Bu8T/r8al3XJpIHvXp7xe8YNbJgo -m1OKX0L8Nn6ZrXI0Sk61fe8JIRbh+os7p0wzCMtdi6Y --> ssh-ed25519 5Nd93w pYmPUfDB3HfJZDPgNh4Vmdu3UlTimrX4+EtUzSONyw4 -C/URv/SZEtUlI2SBPNTfni4oI+bsYZ/Wq3xilcS6mMc --> ssh-ed25519 q8eJgg k5Ml805g9vQ5Wv3hozSCAq8EGzvczTfpssrOeBlB+GE -IxRgNIg7Xi1RN9MthSqjsHoaLpsFWoUVd9f+ak9Qm08 --> ssh-ed25519 KVr8rw 5YvUQVmarpS4FgsFI8EFLz8tucmvs3V3Q8I0hT9q1i8 -Lifm2EUWhv5hDU9mwkOu4fH8zyjEtGXW1qVBbC4dfvs --> ssh-ed25519 fia1eQ sSzTT/AeSH5y4vyKt1Vl0bnkT11ZXINQi/pGU+M3oh0 -Qm0ktboSsC0/+HBCIsOu2Oa+EAdT/DlStNLRpC+EOtw --> ssh-ed25519 IzAMqA DhHry81R6JO3xWujL4l3uOmtqvdmk40srcWuXCU03kg -L4AWjbf1+bNXSMfBpC6DTKU1hvql+1mIRemeHZCFXos ---- Jlkn7bKGiezveI2e56iV/3B08/z/JxsJxgyvgZ6WhN0 -·Ô|’s ÆX#Ï┘²?ÿWÔÊÆîÙº«Wñ(¡ßåˆ@†L [^tŒní‚ÃhGc÷¢Šæ\¿zž^¡>¤­üå^D{*.! b \ No newline at end of file +-> ssh-ed25519 V1pwNA H7YH2bTxZIlSQR6h9LTj/rdgIH1FzrT3zGujEGWa/T0 +EB/hy708s62jz9yhqVMp/iouRC3Hf/GahvtZzgTK6Uk +-> ssh-ed25519 4PzZog 0UlgzFAlGE4dOOHlGaI9DNBu2UaNTGOzjICpA218m1E +guZIR8Czh3zt4W4mKkHzp0VzhdK2nzM1hDB94t4AyFY +-> ssh-ed25519 dA0vRg 7J2jo8Y7mlp91/N41e+cuv4Y46Ui+DKnNhfeXd2dsj8 +HqAFiScEAKMK4z4bfx+7PQQJQwm80GxjzjBghplVQtg +-> ssh-ed25519 5Nd93w VIsfbZTy3Ima3RoXrVDmzm/bBlPRT7vgzwKLkQ+7WCE +ZTX0Gryg/XoQ7Pu0jmBb0MBKv0ee6GUFuOj27SThHIo +-> ssh-ed25519 q8eJgg FOcmChMzV93MYDuFEraXcksxUi2YSxM0t1VXXmZOVXk +vBdFZBUquAmb1GQV+Gs8wLzzK0IS2yV/o9cnYiMGBPs +-> ssh-ed25519 KVr8rw qC6uMcLvYz4gIK4Ajrfqzr1PBC4Iqgw6elBPRztTUzM +ww7UnTYn+ZwUwTg2xpNIp9cmPCxRztn+NWGzVfSgCMs +-> ssh-ed25519 fia1eQ o3z/yAM9iwIYMJnmp/uJ/ul7nNp447VgumnKzSQyvig +dUXr5Za7VZzHJSmMwUw76TptIRHdtBRdHv4IRKfzZog +-> ssh-ed25519 IzAMqA otPdEEaDoxx4CiZkn+Ho+Vp+l+BPC2a5vkSv1DCg4Bw +FCFjzX4tueayqW2vhzowZfntufX8uR5ViGFH78r82J4 +--- Tnv8fDlZG/DndtKdjbuxPnw6d36W0lZ0uetXa1VcaOs +5m PåÅñ_”\@%Ç–2Á€¡Æº¶ÌÊãòÉMCyäz¾Ó*=QMÐ>öXØ3Ý/1æÞÄú 4‘A5(c´ð²Š¬ƒ4îãgfô«µ,k \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index fde27b6aa93e4768b604aab66b9ba4953a30eb32..f48af48ef1bda0cb2d10b69f4678b2d88de6df4c 100644 GIT binary patch delta 925 zcmeyu{)K&lPJOCVs9|PFrb%W+azMD5Yo%XhK}uk5d9F!LPPkz}xPfDEdPZKkzQ0>| zI#)@gS$0vOaZzDTazLeLPH>8aesE#2pP#3Xv$kd{;7#><<7oboiS%JcLnh)VM>4KyyX z^!N8kGY{8KN-FmD_AIGPwM;Y!cXQ0QUiT`Pj3T%Z6nuEeed+LD8Hn@iWD;w z$569^N`tBbPju_jG7}9`0~NB2Q?&hx(@KrPd?LL-|Hb{7lQj0`s|i{0;Se1AV=cGXjgXBeT52+`_!P%_?(zt4a-v${ZalLaItFN{b@0 zBGS>V^Q?08Ep${UaCddpx5x|2$xQPJatSjJ^NTEWbTe?t%{DYDk8%z(bf zFv(5#anJRN@C)$>EYx<(GY&O(it_SEGA?pAaEVMd@ee36$}lX+3XSyS%G`K&%f_>6 z{(k~iEsDErNJ+lGr&+PKVY!ojuxW|O z#E;_PrKQ2anU3jIt^w(38QNimu10}rPTCe}*O+a#?B`GWfcZohWTzz z`YA5Kfk6eyt|1Xgrk)j%!G*!@=J}o$kp`Lixs^_4o{3(CC85ca;~B-nqoN#*Dsy~| zbDc~ovMPM5d~%B-{YtaKLz1(?iqpM=syrjZigN>k3nM(aj1AHaO)4|A3;a!T^MlIr zQY<4XQVsP311oY}jWUd?JOV6p3-c^eLVc1apJf!U&&du5tuoaw%QG~{%gr`0c1(3N z4A(bHD=;oet1L?KDb&tR&kr(n&Z;!vO7kemiYm#9bT_mp56{Rbi;6T(&NFtasPM{+ zG%>6SOgA*kDJe~HDowROj{)znB8#GO1y>{g%q-W;Y|D~>G>?@}M+=gDj7+mb9kaPgOAaV|4;Hw!g%$uo7$EKLqHEYI;a(bg|7PpyhD%L?)2($&>f zNb_+__SQ~wO|&pJc26mEEK73HF7_-k3d;=k2uv(73=d2X$j{HVG;vJll3UZg=HS{5 z70+iq^j!aHf2P*|LlLKHu1L)9);c6Q&#s~VrQ$zU@2L~r=ZiEizG?n0|Lg-z*U*KX Mv(0aZPUx5m0C9Icv;Y7A diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index f146486594541c9e73bc894bc4801296ec2c6eed..2f4966b5c71bb8a5e9d37cb94e88694436c538c5 100644 GIT binary patch literal 2924 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yVl(sl_C z$tl+NC@c<6G7HpCHjT_nDfTQ)ElW0a_O~>%NOlSi%QY^owBRx*@-@jfjL411HT9^- zFHZG!Dh^67b;))PjY=}fNiGh|aW6E8sLTv-@kO`IB%mrPKV2cp!#}aq&Coxfpg35& zAju=ZML*TsyV9jROy9+;xWu%`JJ7|))za9zDw#_^H#{RXyCh#&e_G}qrS zH!(FV#ls}2#52XoASBzkJh0ryKO5b)6i0)ypmYWE(4_3FN^PIyAfLj(tjLfeBYjtW z_b^jSOOG6*qMV4T%HZPcl2BKta$hb-3lp;pPalK80K=m2#Hfm-jJ#0SkWlSnFUulJ zOG~HVio)O$eHX*<)MRwqO#M5jaGRyG^DDWsubuTWga;wa#Fifp*4GDM3ElM;gGIR|#jxtX1 zcds-E3@+yi3QP7Zi!9O4@=VXn4=ggxHTTrcN_2C}ceD&~bBip<3C>P-wk-4wj4VdC z%{#2fqNrTK#~?Q-$0#HvHQ&i2%gewyC)v9+wK&hoJJrK4DAh7G(y<^f&@$2^)Xm$GRq8aW0$HR z_k2f-L`P!-Gowlme|M+M2p@}zEE5A4?Z7At)?UA-+cd~+hXit}8G1A>zEv;FlWgB{DV z!hFjL%OfL_!%DLZoJ@Q|!h@nB1B$$JOOr4{(yt`PPv23&y)-a2+utzB#U)(3D#tZ2 zFh8##(8aMb%FQdd)Fi^fH8e7$(#$Z$&BK+;FtEfcEGD$=}V* z(y7$Ltis2vsKg{ZJh>pOD9r%fZ)HZ229}NrmD%1wj=3H|-jQJjK4~U7*%n?FK>;4V zu8{^#S)sl;IflvQMj_6rWx*y~h5`B^6$MUtq1xH$d6wp`sV3>}g~6_Au0FwjUIEEr zA&w!=Wo}g_K^_+9wnYRNIhvI#1Uh*Z6lpt_1_f35YC9)ac;y&*c)1xAmt}-RW`$aq zCkLgMX9k89L`0Nxm4&97Tjmry2NnconFd5exCG|2xF&j~xTa^hxtOLzMOqpr zmS*Im+vc0$;T!3w5Rn&=mzQQ@mTI1n=bRkmtMBhpZt0Q|7~vW2lkA$~S{m%`Vd$J6 zRvc=a@0nv_7U_WzlE$e; z;U47*p~VpqImW3*RZbb@1r`7D1NYK@ovrE>*rBR-cj^UAhQD*sWkzrmKRu(>Bxmv2RIk{hqwnSWagw*MTC2l8Tn@g zJB9}qnpe4br+9{082X!4MHFZ|1$#QD=X*Ful;kCIC0P`d=DL~Xr6fj_x_dc=86-v) zR^)ql8Wu)+dRV5KxaE6hrX^dHgrsBC0iIQkzJ-noC9Wo=!7kx}mX#5HQEA17#hJl@ zhUHG#>E)>Q5_S+E6{zIJJ-Z*H2Ud4W+@Nl-w3UXgxqrN3vDlaXVTi&IoUp0-Cy zQDjPqqdrEBV_cA6%yJmz!-G?C*&l zZ^4BwPPvW>=7oh}##v!eIRT!P>4uJu{*^%m#<|837DkZ<;hEZ&fnKIgULl@&#*Us` z{`o~wg-#}ZfmOj~1#ZSB7WxsDRS_OhW=83j-sxVMA<2e$W(7_Lj#U^rAk@_?Ejdsj z+g;nj)7K;`(7CuYAkU=I#i=qm!#A@$*gL|@)ugJZ($}#nud*;HyF8N1w=yWtEWj|W z#K+aUz@(@sC@DNE$Jog|FFP>B(;`15#n{56GTT4Nq!go^jC4z^a86fnGdI-tHw!Q= zbxBMO4-P2ubIhqUv?z=+@Ttm6F?4jVG%7GKstR>U3{2+=^vX>1i72=9_R4klbMg1{ z%qTC*b4?3&^D*$ra7j1UPf08;t1|PeN_9mK$#nj9JE7@Qaoo*WvM zuU!;wWab`d!ex{e>E-BX5S3c!qV1be7Hkq=p6(JE;++$o=i^zFT9#dsZk*?3?2_V{ z&84fWt59H=9}w)M@2_tj=^UbMniLgfURjxy6;>AP;Zv1dkY46uRORlRSfU>s$QA$n zGQWk1oqps(^@0MafQ-v2kN=C*t(@9e@F687lySj82gpq&g1;mkSYD@ zx~Nx6gzLtm(=No_(aU<`?#Xgo@yC_RUcm=%_2tSRvYPe3c;U`W)832%haGD*UnT}N zuQAMc<9@X_jD3nnOZ7qKgzn`Re(s-CoAzq!v#5|7If0Wrz5X)8VQv#uXG{z$xZ!=!65kvB|soZtLV^5dea^7{#) U3+6q#)VeW5NbCOOH48og0JYP|rT_o{ literal 2924 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 V2&%B<)KIR?Tr~GV ssh-ed25519 V1pwNA UBWTUleT3gH3VTd/ahMfx1iSc1JTTlZWKxD4Sx61Dmk -rGgE6UbDrVFRBbCfw2+o49aIlk4qOHDNYD5nQnt97vU --> ssh-ed25519 4PzZog OGYMrxkoi+q8ysF/6+HYm+RQshv6jhZyjqQr+d5/vlk -1PY3xrn9dHVnXOOlEukTwnF0S5KL6AsDRXh5MvWioyo --> ssh-ed25519 dA0vRg eVrtU8/e3XSCjOHFeujDNIZHPWDq3qcot/+RXmBwYyk -mOFaEqWEnYtKxlilozF2QRyKPsOP3HvNWnQ3KLRON9Q --> ssh-ed25519 5Nd93w WXvBheSNZ8CJOtyxeK6GBLRgt3n1hgYGGnksp4pUhBM -0mr6EjSJnnJezPk1nXIEpaIMmn30tAFJj7pmpS7vHzc --> ssh-ed25519 q8eJgg SLkAt5hvW2niDBIqeKjcYZvDR9CkJzu4wf1y+0Fizzo -ZNm7qSf+Bl981GJuZPPjRL1HcCJbZ58eOUQe+jFE7K0 --> ssh-ed25519 KVr8rw xfJAoIGIRNVyRsPxjlARAFXm3jDnYxBZws0/8mkqr2E -w//2SGsPl3BjEgGIWAsomH8jGwnOKCpn0SJsbb4y2EU --> ssh-ed25519 fia1eQ MjtOJN21srAeob/eGpKQON1FGebBqvZo1bKfQFz2bhY -eSRZ3DTQ/HfueI4k56nkAmUdy7MARgcNYgPGD5amCTM --> ssh-ed25519 NtlN/A n5uN0giDnRaRrfa0jCpqkDnzx1x6hQipumVP/dM9Sw0 -J5Z3ETAYMQbugOUsak+k0suWd3SInz2kfRDrJhP5ObA --> ssh-ed25519 v2Y09A KxmOke5LEOx90sSm3W5gdNHTxk9Smrwya36g8rxFyhw -2FUiiEe5v1CUG/Gkyu1Gw0/tmo64wCIq/vsCjevL3l8 ---- eFkoeakUQHfc0nofk2Sm/k0ujxlkKkahdm/MmMqPHrg -Å   -üúa -–Î5ùäÁ'?åc0øí ¿5SÚîh hª mÈfœZ–’Gõ¢+>6øçu½¹Ï¿rèôâ«ïzYЋá•Þ¯ÇѦJé|ä·a>îò»˜Å7iÕ݃‡Y«˜a‘‰.P&ðÖdKZS£Ì©/J±r;ñ×¾ioÜå±9hN¸Ã¦ç˶ \ No newline at end of file +-> ssh-ed25519 V1pwNA bfDBtLa7MSSEgZq6q64mkMwGcra6xtlATR/S9dFN/lI +4un/JaBnt4N3ngrxiTpKl401sFRTJ8OxzSPa1iSwCyA +-> ssh-ed25519 4PzZog sWxeGJic+1kkrMf9DNNAQ/EyxXhXy3QT0t7okQSJiQw +tOEBzods/724JTETOyzmY4DHbMssaQjB3rkLKlG8I9g +-> ssh-ed25519 dA0vRg 87wl9rQyDUMz3Saacc8YdDUqBSMgQEGsDW017ADdwkU +GLPkwXaS1MAi3L9T9NRsRabQ3N+4b0T2q2K7ezGQfG4 +-> ssh-ed25519 5Nd93w +O5uYPYYHF1ocJzVLw7sM6BeetboqoOFsI5B1l5lYi0 +qgq9suCE/JxRI/1vDqE0DtqTnJ1sNLfTsYheTZPimoU +-> ssh-ed25519 q8eJgg ymbogv1TZLM/yTyyVx6IF6EoWC9eUPYkwfP0mjmmCGg +F5haIRqiWoeJ9ZNk2XriYHJTiUtLq04r9o0c5uS2nWw +-> ssh-ed25519 KVr8rw XcHHH2VwKPrb7Xk3G4nxBfVzqZqQItTRXlm3j15O1zY +Oz4R27q7EeVKoCq5CAui9zQxlr9ESaAC5XkKun2kmKk +-> ssh-ed25519 fia1eQ xC9LxTGN4aLjBwea1lt/J1m1eSJFV/SJtNlLcd/mTX0 +JwvVaXTDNslhhsXyAskV4zpJz6g0NhLx7DosrD/b7yM +-> ssh-ed25519 NtlN/A akFElU7sdSYVTmNrji5lAOt6cVzTHprTZaJT+w22HgY +1Xe7+C8SyYhVnoB5FsuSY8mXkpyLpS6FmqVXnceWuMI +-> ssh-ed25519 v2Y09A +ROUvtp1wJt2HmtsB465uVPNxHPuEd254znvk+7VRmA +P8+NmCIY3nGHIBoAVPW/CknO325q5f4lIaNhUUEh0TE +--- LfSoY4IcP9WX5VHX4ECx8E29AMKQzLI5lhCK0Qgy+kU +½ú3x9 9¤‚LF´'E4“¸RÛ¶8Z„–±§R%ÖT’•…bé›XÂÛ¼Õ5ጢ1=ñ¡=ÿ¬á‡}lÿ•‚8LƒŠ¼×ëúªl‚YºLÍWÄÉÅfº3¤ú;Ý#/4çcZào± S¦Ô­€~®[+V:2]mÉ»ñÏ?¡äµND[o›Ñœ]© \ No newline at end of file diff --git a/secrets/email/details.age b/secrets/email/details.age index d8c9aa5..aee60aa 100644 --- a/secrets/email/details.age +++ b/secrets/email/details.age @@ -1,25 +1,26 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA rR7/KSP2skc5HZDN98g30IIXuNDJsghQWfyVF57glW0 -oSpYnVqLObrE/MQNHonzOmpGk/BcDyMxwPPQauUB8Zo --> ssh-ed25519 4PzZog bUKm5Fqx40JQ/8BdJvP15xQvIjwTAxuAqsoPIAyRDi0 -xGvp4hTdaiqD7cxjJTjmJHgehY8VCOVqvvXNIQoGrRU --> ssh-ed25519 dA0vRg Ty2EEwt35A8ZigOkVmYlLgXbMePI3WALtM1McsFtQnQ -ygu01cCNYlaW9e0APNrDGPjfJE1KkNq1nqi5d6fwqm8 --> ssh-ed25519 5Nd93w UwOXbO00n1/2pxpz98BZ7yIaEr1PXEvOg7F3Nl80yTY -+E2VbVQXngXUHUQlc2P6ebU0/anioRu/EZgpdf/N8/Q --> ssh-ed25519 q8eJgg 82IpLMlE/9Wp4fD8PHIiKsff9jJYJtoPF58xCnb6GAU -Ip27egoy6jMgvvTRg6q5NXeTlv9EFhK9PM8rCFu8LhU --> ssh-ed25519 KVr8rw xEE59aHcuIIB/5pbH3bZuZQ7W2CDUCoyT6EmdOWiZ2s -2uaA7Nx8DNbmGvY/ns/DRHZ1zTZ+JifkR4eVtSzCRd8 --> ssh-ed25519 fia1eQ /YtGDHVjZTzDO7baOphkGvY0zCgElNT9UMpMhhjFCEw -03+ungOpBCqgTj/kyH1hz1LWTHSlkZ6Qb0c4i9bwOZ0 --> ssh-ed25519 IzAMqA kSa3Kbz9SyIe1pXTBi39RxVMi6QQV0rjAPgdbEmmJRA -SO7M5B6LR1aZ8r7mFjFAF+Zl1tlsq3j/3/BVkSPWFcE --> ssh-ed25519 uZzB3g 1WjjfJ50NZO2C7qKp4WOtDHEUlkF0CFmiehMsY8/6Wk -TP6FwDJp0nKd+FaB0tnZa9XoD8tQponT8wK2xZ/k/A4 --> ssh-ed25519 Hb0ipQ vRwS9w7tO0yryHoip+sqbsD67lqXLD+6hJDNi9YClAU -NiIy//77gNuQ9UJgvt1UPqD99QJzfbh4WFld7Ln0GtE --> ssh-ed25519 IzAMqA J5spaIE4OAKJsvd1hOy3M2cCbmAG0/9l0dsnKlZfxi4 -RT95kFe4vKr0HQVz+6Gfm7pat7HvSahle2zMhEaQ8DM ---- ag6/92VREDBr8oQUKcFbj25qK4gcMdHa+ej3hf+igbc -År:ºûÛÓfÆ)sºûß;˲fI[±g<'­òª3rûÃrœõ’Åk×™‡âÝB™º+c‡WÌç|÷䘨~ŒË”7ÓãªãϵU}ì ECò ýʺžq!jÉ7¬Å1VŽ¥Î®SØ4ÿG8i9:™ßíHl9VµDmnvS¹Š \ No newline at end of file +-> ssh-ed25519 V1pwNA P8uCL9OgS5BrRWrGEFOSqvO4KsGc3Y3q02OL4sFBQCg +XuuBTNDWEkcDzcO/aFgh7d3XhRmj/8maHx2U6l4KOgc +-> ssh-ed25519 4PzZog 20A9EEcTrw/ZJjkvawiiUqHmMaNmwuP72VErLL8Z3B8 +w2Pl4/J0+MI07Blk3rRLAULbxMbFNLQpZkdJPhnoTK8 +-> ssh-ed25519 dA0vRg jn2VA10+qrRAktjhSARaE+MAS5HsHsoIZfc1/ao/mV8 +3ahsWtZ8/Bb3tpQnLSyEPFHeW7dsX9uEaLZbJ200u7E +-> ssh-ed25519 5Nd93w WKXWwcQBExcz6niKqBYT3JcL8EHfY2VeYfnTIEtEfGs +gzJOdp1j4QX3bWDzJgBig4/vDxlRRQl+jsGmcp95drE +-> ssh-ed25519 q8eJgg I1J3jOc15TsBijQW8/DZbRETY+233V81vPLKfGI0ji0 +SLtoYZ+8T72c+FWAi8dz57VJ8wweJY737AKPF0PQEtE +-> ssh-ed25519 KVr8rw CQZs4smVwaFAaFbLeyTFi/IaJyle199te4X8Zq0AfjA +/74zAyuwEmB1KcGBZK4QGgwShhqxOcEQ5wlpmtAT7Xw +-> ssh-ed25519 fia1eQ CkkfDdt9iAaUxUZt+aD+VDMPUcMegomtFiR6CCux/UY +WQcE9ck0HuSXYCWqsy6NOXAHOlE4VIRUkgz/i+7AVQE +-> ssh-ed25519 IzAMqA 2pbs+DJzOw4rgM80o0lUFzIgdMN/X0/7wrUh/OAxykA +291gUsUfOEEsf9o/qVoVI3s3gHmPK400NCEmpxNsefw +-> ssh-ed25519 uZzB3g YP3htz8c1QJzFyAyGopjelQCKPyTx0SOOTVEL/uTK1I +iupAfrSbl5ybwi9Le655pU3Kw+KKndFZI9M+AlSrBWk +-> ssh-ed25519 Hb0ipQ odISOFTymnTj8TnenWHMHeU0Qh4OSGYFy6vJUieehhE +G+Jje+2S+l9bSnKKrwGV5V2xLczDDPFXlZ8MsrL6jHs +-> ssh-ed25519 IzAMqA HIG1qsEisRUws33TxC8yGSrITlwDxuL/RIL6lkdjwUk +IWMnSXxQzv8cAQKNmiY/+hRb86aAuFloQk9WFFcCSWY +--- UK7VzqqXFlN+IVB2hl81+7o1d1NjbFNY7tYRbTvnKmo +(¬ÎmyHC´©|B¶,ì# ûkWsI{KæöµHfŽÆâ¡’Å4µFâ,zXúá‡vÌ +W1Ú!þ*Ë{B‹ëÝ)R°°eGžK«‹¥=@Q>üBžšÇœeL6’œ°†÷D( °GNà $„²=òA—“_‡¹ÃñY!Û÷½0tGãqŒ¤wK1n0atmc%@53vU6ZbfLl>SxV}kofq#K(sIjkpZe)R* zhi_VVvQMxHm%Cd^hP%I+v9U=+Nq&^RSBPgwl|huROHf&`S&Bh;rmMF_WKuw3foDMZ z#E;_PPX1=@W>GoWu7S=z?%|dG;qEzJCQeDF&ORP)nZbS@q53IRWhRFCzIlOMB>`?u zMK0xrA#Tnl-sxFp9ucJ>-Y!*M>4~m}ei=df75c@=`H@x5>AohD;~B-nbG@s)B7-AM za>`93yxrVG3*217BO;7V%Je-wBHeP5%{)x}b4tq0!h_4X5`D`8Gm46`OMQGi+}%Ts zU9x?hgL56tP24SAi;azZ%2HB{oh*wTos3K-pJf!U*G~5>OLDIY@=VT*vMARNNXaZI z4hYOo$+I*LNX^sFu`KZP^ENcebW1PhvM4DG57&}$9LtpOO6?NU5W`@jh-Bl^5HtOtbiaTq_h66w zD$DY$@N5gqP;~3kG7}9`0~NfI3$=>^v@896O7%mFEP~BboxKgSDwEuNa`RkrjH&{h z>(k4P@-s~;GCa9_TuLG;!pigg!izIgd?F3aybbdFOUs;0Q$36d(vnNv&CCfm@id7lboC0-cPmWH_IJ)K5AilmHpug} zH1_232@DF2@^-Fw@eT?IFiFZO&I)&Nt_U~CG4yfqEH8Bl4=ykA%Sey1Ow4gax2`m* z%E>rg!6d9QCDp(s+{rsXG1Dd3*{q~6)Y9L=*R3Sb&(XEWD=;ZD&o$W8!mZMm%Oxr^ z)g{ZUBG<@0!z|4&B(mJKAiFHAsNOs)ry!&-si?%c%q7t~IJej}kV{urSHUCHB0n*> zDBR6IvfMZ_%q%CoFg!W1yu>*>LOa{TJfomE-!RF<#Lzd`gv*}I@}K>JFF8*4%-3?B z?yfssSNu41iDr319k0NYbXmn?M`T3BRntDatmgRp^Jb)9-g9m{p`0ieW~GDmOM)ku zu6j7FM#f{eP~g_n6Yd>g)R=A2erSpK5x!Q5yB#~^I{P*)Ixn#1Z|zLAiVrH!UsWbb z?AibI>dx;~B-n&8iHGs~lam z%REc93(Lxbf{I+DJS%)HgCi^gQ$sz1o$^Z!{e3M`oLpSF94$)IjeQbBlfuFRf~(A3 zwaWudojnrMQv59pGK}4gjSBoTy#14$G6F0npJf!U4>d82a4&aBH8pUwC=Av&^(>F{ zHA=F`3~|jcvv4W&vq;^19a=sG7}9`0~PZ9Q*v^={4Jf03(}IZ0*l=v3@UStD=JI8!}NnQ5}iUU z>Vuq8LxTfc0zrgA=0cO)GJNfGSS30FDTE)I8hSB&Wn9Kf=R;D=0F! zSUWMt(9O)-Jj9?purSiEI5nrLq~6EesnE#Fy)@m;C(zW}%fzk1l}lGwS0T$i#iF3p zF+43h+at@kFvT~$GEqN2&B8D(SKrjq(y%Dgzof)WyTBy1oaBKXFTQ|>K=2xs{;y%qCo|1uS#Fdbnc;tGPtR%n zOp~^?o{w?5%)8;Jv({;kzkJi@N9>b%_rmT}Sp9syQ16jo}Hq$0YA1sNDl2{OPxBONX zgWT0%hohxM5uUkOEKy%sY+ScUTTj_KPuEg@S4WFoq@diMW2?GETf&l!&9v+tEiY9i zNgohu+cvw*Qd@WCluDoG^einc2ARkHId(R>tAF(v9{c2G{KfJ4gNXU6+~>UZ&hKEH zuDN}si0A6|yl#tF(*8fE#~<^<$|+&W gpAUu2B@1ekAG$JoO+H;P=S4iz>% diff --git a/secrets/forgejo/runners/token1.age b/secrets/forgejo/runners/token1.age index 50ad61e1019d108e153f0a30a0a6bd6fa460a806..bf7d1d52639c29aecf771ce66bfe70974b7a75d2 100644 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zhS@C?*8 zC@m{2b#e+djq(dj%ghYTF9_7n%umU82@Y^64)=3(cJwRAPUbRq49Yc1E_Msi&xwpo zPR=$qG)m9YE_6%HHA@c8^vEE#0`ZC?hE<#F49@FvBa#BPz?yIm^=DsL5kt_lz*FD9#NG4bRICiA?qJE%tFVFfptsu5$Cs4fZS5Pbp5R zEH*9naZTsScF)jGba69qO?ECW3P~|e_3$k7NG>pos?yFgG&J!mOV!SFv`q2xb1O%; z%{#2fqNrRUA}2Y|(aY1=Ak)j&!!RP#$i>yyFVrjCDX}oIG|w$CG_)|wJJiBGKew1m zzsk)$+b_s8Slc4mDLFSUDAR{P!(dH8ReUm=5E3jRb1hn78$N@RA`oym#ghr8tmv7;Nf4I zUu5iF;pOLEQsrWq;}l}#l9SA(tE;P!q-|*)kgV;LVU$yz9cbjAk(1_LQV?Qbnp0Ko zl$7gN5m{*-Qjr~4mgvZ}I?3Qp;&RcB>R&aRWOS?9n|-*%ZyVcW3UwSgEiF1{d-3A+ yU%u@R^@+W@w5#;;>nqt8gj)FBg$3Pya+EaB-SJv{;skfm@ZA>7qKsRn6#xJb*L4#B literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!v5N-8eP z$TBuAu1YN|$urMQ4=we{t;#9Sb~nliD$Ub2H8eIX^eM>-b>;H5a1A!IOw$fDN;kDI zG4S?F2{5xX^)pGzEb?~=bn++*Dou4uu1pLHaYeVyB%mrPKV8AY!=x%Z%sV49+n~ZM zBE2Hr-^iuZ!^y3*z~3!1#K6?l+$}AwFt4mA%#q8(E7-&@C@s*`*ef`>!oxp3JIgXp z-`6WU(Z|f(Ff!T9Lf_r5vNFj#JR9A%6i0)ypmc=-=ZqBRDg#5aynt*|e|L|_3 z63gUr4-*TQsw`u}%5-$wO#Ms89O)Vk=^YWqs4a`$h91Q}ha(xT6 zb3(H$$_&tLE3`=UN>5kts7lRn$_WZIH})zBH#c+)cGV9t%P+$)jmpipNOjD1^v0Ia^;vT5rr=L^ewg}6p~XMl44~HRp91xUcV47|ik&_rzQD~lTnvzuH8;D_BX;hVyak_$!VY;E8K~Ys`u6|}nMQL_! zNK|E!cVwxdae8@4W^sXmuaAYFet^4=vm;lQsaHs3W~Nb&d%1p*pSyXMV^v~OW@2W! zdwHlyq_&U0dtiiRP;f!2ejt~wuC9WwpKnA^UXnqcvv+_|rfX5DM@F!*zNKMWvRS!V zNTyj?MPWp?Q%;D1aXwebR#!12;aRy)j@jI5TFapBl_(LgRo7)Je_iv%-V2qrcV@Ch xOV3Z=Bi;4z?=L>D``4l-Zn@m>u{<~1_wvTvI-e><57$oH)YpsZI#%dE1^_c)ahw1E diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age index bd13ac11352095ddded648bba2cf40a7d46164f7..aec16c6e23de8fe0b497f35b5aa1b68cd158e1e1 100644 GIT binary patch literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5ux9cJ?$* z39KkiG>UT0Fo-G(D~+lQ%W=<0%5`y%$|wlXH;nSnH_0%_GvO+Z3QN=u&h_`sPfH3c z^vO?7b`EncO)gDxa*5LRHS@{}Fwc#2F)R*9$w#-%B%mrPKV6|LG_p9=I4C_l)YT)* zG`t`&BtJhQ#62h{swlwEGN{ZnJH5aq(9JZd%9G2)IU>w0w9?th&o9l-t)##&!ooB# zsjRY~%srzpx3J72Im)e~IMt#s(gNMK6i0)ypmc?_EGM7BV1MHrf5&XMEYHw1fqx{O8y(>H_gECW# z3QPPQ^$pN%E3`=UN>5kFu8K5qa|+7L^$7Q`aB?;=2=Vtxa*XiEN>7c*4=VEVOAPa< za`w#3a4zP`@G&Y*N%2oB4J!yYNDMOYj0i2yamvdG&8#RWFUd8^^RtNZaVyXBuE6k{ zcUX}{QMp21S(2xRk(*C|wqasHly7igQfRJwnY*Q)ET->q@g2O_+ zqKvc?L&A$P^SlE63eCfubEAA+4bqY=9nFK&1JX-MvI5asZt%`)IBbaOQKb@jC{s&Y*6PEHAP zs>sc(C4t(GBZK9tu(62$v9oX-y^5cG{ViVv>+)b#5Kt` z(>Nit+1jv$kkUn#H5@{S65fTExml8#w^<+kip< literal 1138 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tqa74GwB%mrPKV88m%iX&oqeMT~!XV0{ zJUc0)*sU_nI3+N}C_gJK#oREhAS=r-+tA-U!-OltJH0H}(bqW9&@rVr!?Cy`IY_(8 z+&`?aBH7|M}xAUbcG_*^kAP#A0vx03uoi(B!lwAjG&_Q zOt+wdP`^~OAQy{>l1gJkzcQc9d@f7#!cs3MvvkYSjN&X)gObA3RNsK8kbGmm$TIgz zcYo7di=u*J53kI`a&*6$`lVPJmn#_fdl+ly8krks1(v!;CYMDNex+GS4mAK~wJ4fUN zxcfQ=S)kiiXp!obo~~fv=v)+@>k;4=7FO&P>gns^=@c27Ym}5*Y*HEFXd3RFn&xR) zRi5V>=*X2>Wn7+OTICd+o2g%vTWDxn=w)b76y#HwmTnPfT;!G+YMPxxS^?eYH^isu(`Xtv15`^T0}u+Nin)@X_<+JseuYr zrCz25iKb!t?s3ciDee%`Z?uUp&8D3#aSt-5$RmMQJGGbCgE;* z`j!TH24-Q!euhc;Zsp<5`hiBN`X#w8-W~;kIX(q>h8TWxF7yv^4^(iA(9W;OD)GxK z&W@;bFLo@BNVN1Ri;D6H@HeRn%lCFk@=Y`Lv&=0COXo7RwDbrz%nK^c&-MyWb@$KA zcJeJxHYiPsiV95i@e8XmH?DLs@(;)}_C)tvX;hVyak@gbex-JCRCZFOyMBpVmXS$L zaba?Sp-Z5Xqf3>urEi|AMUJh{p;=i)Nj8_RuC79;qfcsXN{U%Xuve~2fw`%#Z$XZ>W2U!HZmFqP zc9})Exld6=L}<3RTOgO(tF0ch?$3$O6TT4Pe?hkS%O#f^ON#zpRlGE3>iVMJTbFxF y-HJ4Mb-259k!aG%(|a~aWqw?4T*dg-r{Yg(Cd2K<*n?W1lL~?sb5+ldi~s<834Nyk diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index ea6ef850b0b1732f52f20ee3993a06ab41d63d71..0e130b3d50070bb8b63b7e1376260407b999bdc7 100644 GIT binary patch delta 1024 zcmcc4ah+p=PQ7cntGQD}aD|DFPeiV7QF(ZBj<2D=M}=dKbCpR^g=&c?&W16=B_4_;~B-njf~Q&j7pM= zEK4$c99`U;D+-GX^xcECLyN+Eiy|^}{X#ADOI$r8!?PW^vb}Q(Ov_v=Lju!FLi0@w zw2eZYolRU#GtFFlvmGmf@}l&;Elet_ob>}IpJf!U*LO;EO(``uH>*n0_e~2A%*-;- zt_-gVwPOJ-h-+%1yXTO#&UGT%0R>@`^p2O3Ex#jf*1uoD;L$%gW7C&BDX7!+ebmGt4U@ z-Sg3{D~+mhGEP@0a&{{#%BieO4oeL;3(yZMDM>4E3M#1dDez9NFpJ6$^!Ls8aLTsu z&IshH@H8%PGEJ?wG%L*w^v?D6^iJ0fP4PFb2y{#jjmj#wh)5|aEcdOftgMLS($&>f z@UJWg_jard$kESBOpmmT%JuXv57jTr2`NZ-O|C4+DGM+#jLfz$HS&n$nyBfuPp6I@ zTxr~W?(sJJqh~(oXv}tGe74@d@hR`Kf3p1R`3f7Kz25V73y*rX%ogoyPjjM7vu3L9 MbE~>DdCF&10QkmlJ^%m! delta 1024 zcmcc4ah+p=PJKv8MWKg_agvv(fr(jggqxY6vv*p7OOU6whet?IL9%{kRi3ABN?>Ma zF;{qadajXwN?t%#mXT$NXOW|CqEWGzv!82XkWprcV~&1?Z(4v)nNeVVB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGfv07Lwu`w-R#16qLAFP@i(9C-XN6Zzm{VwYd6IKTkYQeh zMQE~Xu31Dnm!D^3Rc3CayJNmZeyOFglYU86R<4tww|PdXQAtFlNrZ1uW_gZFp{GIi z#E;_PhN0SqX`!X5rAFE2Zi$f=?qPl=PL4^LZsvymW!_2d{>~=(Q6{-z#@YE?`f1)3 zxvp;E`aYJ9`i5yPo+YWNA<0$x!Tx1NCLVstB^DO>iP#_^b3rA9nC`0JR+*XBg!0otGqMH_45oSpJf!U&-Hf+EpiS>vvhaNtT4z*3`q12 zEjB4HHgvIc@-@jQ^+@tI$}KK22=*}HGA~T3@YN4bv@Gx~a54|c3XDp3%Fl`jGA(rR z3U!JqE66D>@-%Zz3HCQYj{)znB8#GOg~}wS%utV9SO3b?;_!-;5ZC%dL!W?hPg5`b zfWX9x$V>yHKrd&<(#T48M=qcIpg=>@jKGvIcb_cF0w~Ueicc-#Y?W8=% zM5C0dqHO<26Ljm+G7}9`0~G>GjevJPqTyjh;-3_?R60_3{1N4)^U6$% z^fA&`X;hVyak@fOW7l0hVw#k-d?&UDKQ z);^oXr}OM~oOo{TJCFTk34O{RgybjM8!TA;V95o$n-e46m+usius*k&N9L)|@vuou z78`71udG>A>?%Kpuj6Hg@a0EhC!2g;Xf!8W`FmVxUX-`MyX2jQd-Q7DZ%91-{M_EY zH}&R;g8ujyk7u41I5=_Vo7+pSF&$&&dh&34-}$PSKlxubmI? ssh-ed25519 V1pwNA 2mRcx22kddqldRvOQY7i32z0sMwCuGlbCkJJ8vlJKDY -aL+OgWP6uTute1b5dlPG5Tz12KHeFlCG/Su9+MBTceo --> ssh-ed25519 4PzZog 67PxsXDuqXhmcyvNAu2jZrDtd+XgUQnEakPw4pR150Y -nOCZQmAhHCptlAz134hin/UKKpuIL+ueRJ7Kzhf5Aiw --> ssh-ed25519 dA0vRg tiN/eg2X6g4x6KndLJs6ze8i8brhXcsBqP1ZWq2s0T4 -1lx0Qqo81L12eIG4XfQUWYgpimEfgaPweZQ65GTHSaI --> ssh-ed25519 5Nd93w Iq6wxlnODEkmZaYpf1s3XxKmROa/JwXLdXOtCpXuM3g -0oENjjsAh2c5tIHNEghw1TE50xRfU5yWHnZenYT2UgA --> ssh-ed25519 q8eJgg HrJ8YlZTp7YhRpKpv5ZBUbxv/777ATRtYzcbGH1JVhI -Cytu763lKuwmLLUhFJo8VunzHxYn75YRLiN3vnhxyL0 --> ssh-ed25519 KVr8rw s60G0Eusw0rEW3woOFeE++5C4vI8L6NOUXATml2egBo -tPGsNcE3H9crSOCXCkktBzjRq5JyaGvgmx0ZIs3ehOQ --> ssh-ed25519 fia1eQ P7oFu5pYYdJu2fcqTYbKuENBWiFnNVQxg2N8QAXNVhg -aZUyPG6FpfFo7GixaofYbCeajExpKFME6PBb6fTzk6s --> ssh-ed25519 uZzB3g hP2SPeZNhsmePX55N6g4Y8q2KIwRONPBEAqSp273Mzk -y2c9S06vYQl9v0G/7IrbEx+kGv3DOnpz6+9+vo1o1wA ---- 7prlMrCmXuXHtiD1+44Pg0LV05OvyIEF9fYkCiLEv1k -_Á2¾":GËoã‰*çë.TÀ5 .Ð(Nö£4OS6U1ø ÅCáíµ§ÂÒcO§’á·[Q èýä¥ZÈäŒ#I›Ÿ1 cÓM;÷/~Ä`=ñ&²'ü?ºn}e#ž/°›µqó‘ ÎÛ±`xj¨¦¹hŠ:û¸?´Î¥Â/±æÜJ3 .‰ÞÿÀ+ÓOxkÑYâbkdÏ¿Ï \ No newline at end of file +-> ssh-ed25519 V1pwNA HYKtH5eSIXo8kMrS2Y15Dk5h1rACkzbFp2Au/2JExHc +ei3/hAN9Uars2aH62Ri6ue9N+tX29yxV0cTdxDThXMI +-> ssh-ed25519 4PzZog HtprLR1voqpk5ESBcCBNUfh34Q6EsU/3K2X/8Vbth2o +vbYCsZvSXCSB20fLNGwWbUgLkPrx7aRqwMFAnWdy38E +-> ssh-ed25519 dA0vRg ix/hHlYzo63deUYDx9UnW5DkJlb6bY9InUZ3uaICtmk +qjDwnXymOM0k9pgvfw/XNOVq1UoqZVdCx+vvPiPUDng +-> ssh-ed25519 5Nd93w O77U44+F1MkFUQeHufrlXFagp4saKodduMmbBG6J8Ck +zriyFrdnZ61OuMBUtUIvye4vUZ4AFaySsNwTiJmeq2k +-> ssh-ed25519 q8eJgg bzoTPXyLF5wiScYUKyob6E9BE5/cA22DJJhSL+jLgEE +0oXd/EqGnpxpAaKgWPHw3Keks4UEldfpbc9zMc0nrVM +-> ssh-ed25519 KVr8rw g+ht9Go3cMVPAzUkxhsM1zj5CrADjKqbWNVgPTIJ2Hk +ryMzelkyfOY/IZDiE0gURovSm6fzuBsJfwr4row3J0o +-> ssh-ed25519 fia1eQ K7HJ1EJQmjVeYLu6zYpTjWbUDOTZe3m1GwSIbnWa8Ck +WSFnQ6RMQMU6YXNFwEPRRymlFMTSPCW0B7wE67k8JTg +-> ssh-ed25519 uZzB3g 0/9ETo7Do0PxXog0PM+/rylYK/lf3dgcv1AvVS871A4 +/PUIHJx8tsX7vb+ID7W8t/WPVoFj/6iiVRFdhs8sEfo +--- j0TLY296m7nfn9xagQQqMMYGTcLt1bn0Uu33CqNKPCg +b‘]“P3xM{Jmu –Î RŘ÷ýŸ]§B¡óéò(;g­O÷é rðšñ¤6Õ Ü—Z÷ÿ0nT€R8]¸|T¾&«)W̵ + õ ›M"‘z¢Q(½Ã{T²$\Nàì\T=d‰Ï¯wé):Ú¹1[*öÃNÚ1ÆÁÞðNnLœ'ôKÆ9~MiJ5[ú‘H!W \ No newline at end of file diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index 6ef6846a207a94a4c0b5d046a9c194c60c504abc..9002d809236e5e59015ed2570fcaecaf173d3f18 100644 GIT binary patch delta 1024 zcmcc4ah+p=PQ8hROR;IVlZSCgMo^M_WO#&YR&t=ZTZVySa$r$ju6B~AOHoipXtASv zF_&*@Vr7_Ra+IT4im_|HX<2HPQ(8n-W};(=QMqqPlzU=kWQLKxnQLZHB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGb9Sy@q;Gj)xqfkpfn#>LzFW9+QBX)&gm;pmqi154yPtP@ zglBe6VPR!9S8kGNv2n6-nPE;rR;G4Qgj2AmYgk}PW_o3SiBW!0N z3jBO5($kYt{gQnm3IiNV)4~c&BP@f%&HVExpJf!U&k2gmEO$09Pc$ql*Y)6;PRjA*%F9Yh4-a+r%Pt8mNe^}`&Z#VOsSGfW2=?*P z5BEs6F!3tZ4l*zBbIUJBj{)znB8#GOg|O_@Qe)@J^wdNr{|No0(&T!7*F=}ns0_pW z+@hrN(0q3%OUu9tmjDx2UoNxEq|{Om%OaEDTwm>o(tNLCZEpkDs6sP+AKwTUQ~gR8 z|1h^mrwUU~Pju_jG7}9`0~K=9{L`G=Q;GsBe9FCwi}HfJvV9AyEOK03{L1{(11emS z>QnNPv~#`uB7C{3QmXumjEX&dt3tB06Z0*NlH3Emj0@eoN(=%F%(R^oUHwd*LQS0f zvmDW_D~+mhGEP@;4)D(__AE{gsB-cP_b4~aH*yY2cFZ*?i7+zq(XK4dcXY`z^$kc$ zEl=k%D2((@jqt0l3NAB_GR+9djx6$v^fxv1H1y<)($&>f zh;Ru{&Nt03H1_f-j<6_madb<}F*Pp;%*?j13=K|BOU!XiGc}5|EHO*w3S}(5(BsM) zY4Y{3B%kiS2an2?lGr1wb5B2*crEk>vt@MNx!u1uF6J|hD`zTXxt@A7!uofaC_{LH z(1Tw)c59?sEm-pSo}ZCV&P3-B1>G$<=h<|xFg@>Qn0J+JH=9-Y`S{~P*kibX|GaipbwX;pfWU$|wKsc)fCag=_JmvfF|Vs2(eVNQOKVUbB* zI#)(&u3@@`hfk6vX}Eq^NQP;CNL09!S#oxAMpTkhHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGtG;8FlUZR%RZ5zLiLYmrvzt?zlezrmLg2myc(-xo>h>PHJF&L2gdq z#E;_P-kuR&0mUwUe)^7KA%W$EE;+_VDQTHiS;pBBDFMN5#@a@u`B}bUY1zJ9ULo#2 zZaF!A?pa=;&MC&(p}tQ3dF5%^nME1Sxh5%<=6+d*MFAnHnNG=*;~B-n!@R@N3q1S{ zOntq*(zGp8%Co%76N8g8^72cgDswFjGqNgzGyH-*Lh`b?9QC6d-Td^8igLXYlUyw$ zJS!4QJu1V@Qrs-GlZ}I2A{?VUjLjl_EZlr2pJf!UcMNvROb;n6bq)zP%PPq;%W^C( z$uQFQjH>Vm@HX^xPtgv|_sI1!4>AnoDl@8ZHOuyo2rJIYbSyWFH1W<)DNHIi({?cl zj!G)eGxAFb_A^c~ajFVLj{)znB8#GOg~EUo_oVOw^Q@>!kANyacY}J@O7BD$x3o%FrglS9K&U6Z*&a&r7r+#~WmtISL)EK2kI3td73%9HXueDYj^T$3`&Oe_mL3N6iD z(=mKk8dc?FoUV}S>gAqoVPssE?cy7lWSE>>nOjzDnOYcRWab@QTv3o?ZkAtQVc}k8 zoX-`MooixgT2h}K?pIXqU0#&#mYSAc>g8o(;gjc9Tx#ZNYM8F?mtzrW66DIItE;P! zQx%?HZj$Zi7?EROl9cUXmRaOjS{xo`Y-CuTpPP|b6z*!45@DY0k)O}S+aUDrRd>(a zH%DXsZdBaM67{u;p+w8;?VOp$tGP}cdD9{%`0t**>M514<#U?0ZBza5a^vm!ii(;n z-!I&fOLTwoJN<*JgWFCyU)@cS&$SaX&(B<7X7#VftZ3z*M_JM)WeXZk8sA@YEV|!~ zvC`z{Q@6J_r&=D`eEFW@de?N$o?51s-*XbT$OisxHqEnN`XX}D^tNBG|1V8^7j$c; LgMmTfjKUNEoXBm& diff --git a/secrets/gitlab/runners/runner01.age b/secrets/gitlab/runners/runner01.age index 59a5614c6c56fa7b10b14165914d10e98c07e747..60eddc91c081b64600afd01f38c193836cfe7729 100644 GIT binary patch literal 1175 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tnHcFIgn zOZNA4weZOfax70ZbIJ5~k4Q}q^0Leb4J>mhOY%+jOm!@9apWp8@JaIV*7pnZ^-1&% z%+2x1HTNA8 z%Ox-^*dW5hx6CP|Ks(v8Af?JAB*iBrInUkIz?CaG*xBF3E2-4W!zjO`)UYC`q98ZS zH^;v)CC{iVvM|gwv9dU;ydvDcFdf~t6i0)ypmc@I)Ih)TtnB3Es7%kCfIN54z%-W- z3y)ND|LpXTVo!H(&yXO0qZAVtqjau9)8ar^w|s5$h>CI_{Yr~WGc(gdv&@PpLv8(} zNXvkzO5}^a^9w42s>0mTq9WY_qsq+E$_k>&LOn_{%sj#z zgTtNN%zV*pE3`=UN>5jCb@nuO4%W`d4omgacS&~3Hp>pM@F)(=&ML~P3<@;%_4hII z$;(Xi3@zp=_6!a&@J=uCadA%xa?y|QbIUXd^UButb571JGd6Isj0#Wm%k_JTIm$FL*;L=8$jcx-tR&N-Aj37JJS3E> zO1~n+tlTrbEL=amQrp5&+a(~oGO;i%FG)YG)Gxij(ZoEYGPyJ}x6A`lYO8p=w{oG_O3lFE9kce~- z|Hz1x5@%l@r;x-fr{K^i$GiZuDu452lid82#K;^AGfxb^IT!kexCbg^==8C;0>xx+a?j7dr+81_q-0tu(62$v9mhAUi81S358?%_zhmBc~+G z(b6ro(85XIz$-nm*dV7QTszg(qAI{YC@`HX)Xz87%_}X?(JZPYGPkgx&@wE`)Fje7 zD97E*z{o2#v)nf`)3V&HG~bm=S65dd#XmCNNk7A|D#XJmC?~z3EX~QsHM7LsH77Bu ztSYSB-=!ch$+gVI$UmDax6o5))#k5_pA275TPL_mRN?4XSG|+7m}lk$Pq$EKke=W$ z^VzJ8v)p^mwC$HT6<@IVSi94Pc}<7^9PV7&QQJOm%JB^gs>13YtJZElobr-k#q(WD m3^TVjRCS8nXk?0!D1UgJnJYTKY;xoI$zf?tE2p+?-VOlz2#cct delta 976 zcmbQvxsqdoPJKjVWq?;@WM)Q`ae=;Twpp6DYgwXSsEJcB)ZS7Kv3Q*&*SH`7R}{CBYVDslMfj;hEl*76G|==9TGAuCCh71{PfUP63G} zQJIBh+O8Rvm1P;_>4Dz)xsGXp2IW462KjD*X|66I+8Nn-DZZ2A8O6g=vO*J9eM}2eQ%amt3-VHZ47^fY zs~js$^0dnf67!4-{VNK6gPr{IgDVZR!zQ0$l&DWGF>^P_Pj)giFwICc$TLhbbSW^% z&yMuYDtGqC)-O#nP6^8m(ofCLaOA42Dh&+@EDkL`M{`l`gV5dFyfBI6|2 ztQ>O#H~mCsXY-)KNY_BF^1J~3vdB!2+@hS^JTK!2AJf2;LJLdZEZ4LY?=+v3Ec0M} z?+~{XOJ@x0(lQebQv($Wj7kd%ozkO9%yTV`y>l{4jmsj#3!TG#JpJ7>(mYKoE$WN) z9drFWlMJ%CTmsF@+>4Dv15I4Z^Na%$lL`w`volK*0}}&0-78A`{4KRJj0!A_EW^vu zedk>0AL1UUkWn6*9p&hj5fJEOl35Yy9uSaPROucW>Yb93>X_u>YMc{T=H-`Co)MPM z<&mCIU|8i;?-E&&SQt?dlvEL%RUGPH>RC}y?iN*9?&|9tS)gy`n&+4i$fc{Rs}LS( z78O*ST;UyB8BtXkQW)&vmsR3Z*uVhT>gP zeofk+jgwAlZMIqR@OkvQ%>5fpR7I_N)A^>qd-KZdz!XomG^cQpU4I`HT@ZIW@p<>n zMP-J66nL_2Hh;)jBAVCc#vD9NE&9{(XLEzI`;Levoy>Zs>6fs0B5y|fk(0OLvtPvT M`ZA64imH4%0FA*@od5s; diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 4df759a7c80bd0cccd87c9bcee8a133f8a88f794..50405a419dadb2f1b9f589bb16c1a2bdefaeeb0a 100644 GIT binary patch literal 1175 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tnLFLp9Y z^a?lhH8#|D@h;~&PKP*B%mrPKV6|Lx6(YkqRh z(4;W0Ksz$i$o(g?OZoA&m?cp#AE~Qz#OM! z*RT**gW$wSuMo@JNS_RSx1vgROS6(plgc7eobtI+g0x*yOdTt|Gs2QxlB4vq^*!?(!z{uxEHaWU!+cUh)5|Lg zavdGZD_zlTE3`=UN>5iP^h!>1t&GaC%#SQLF-kTL42m%E3@QkBEh_O(^2~EBjdUuh z3JHxgG>YWPDD$(-&MO)IW+%F%WXii-5|$|{a>^)E-a z%{#2fqNrRUKO?dCfU&x&NOf<&*tKtIpi zL^nULY=7gjyqqvI%K{U>%)+32XGaqQUyqcmjI7i!&rnZv+nfviL)-%uj7s#&!z)tU zT_asA_5Fh@(hZEu3r&)9@?A~RN=nU>jSCDCJ;M!h(!=A@vt-w%kuFu4RSLra&dPLGA@WLFAU1(($5TcO3p3uHqJLP2zIIRHV(}fFe*0miVR8j@(FNvE6(>XayJQxaXf?y$nB^M9wccxM+d>@ATr1b1|ph-2Sbx zqUa8LQPm&rhl^%%h45Uv79sp$w@Ao?hO>Odyvf|p|Ez5?y63jTZe;+M@u3xBOAfy{ m{!(k9YvCNsFHV delta 978 zcmbQvxsqdoPQ9UintxJBL}5m#S+;X_l~0bJzQ0qFVM=9iVTxNxmV173K)6qeXJ|y0 zE0=a=zHf+SnNewWaducvS$bNseuPg@Ns(K&OF@{Mp=Dx@L6}itMR`$nB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGk3ogAzOzAYsfU+AxM#9ovYVN+nMZ25Nko!yWNDOkWMGk3 zWtfLckw=IlmziNzRYbaTMV^nbQAn|YQJ$%1RjOB%X?kLDV48PeK!jzAX_0n$N}_4< z#E;_P8Ga=`MZuZAQ6ZM0+Qn5x?&*cb`WeZg?iCRpP6k1R=A}Mv&fekqM&Yhp$r)x| z$%d%~q5k?tZdE0z*_npsdFCPRW`X5dZoWn3xk<^vCS}Ebg~sKR;~B-nP0QTU%=`__ z{e3+hlgm;f@~d3E&8nO{z4Wu)3i2yc{5O3qA9^>)t4@JugE(l5+QHw!Yd$ni2x*Ei2f z40AO~E_cbut8h#TvGg=Rj{)znB8#GOg{1tjLYEAm$jUS`pR6!npX~bF0`HLI@}M*? z?aUP85a_!1JpGcAa{{^2jFN*xQ_QncyvowejH4B}XYW3S03Kv{ITGsB<)^~FXKR0vU2I);*4@K5rvt-qpWU}P#6y;@G%-x=~ OO!C_?GsLLtsWt%bT~TrX diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index 3043014..f5f2ba7 100644 --- a/secrets/gitlab/secrets_db.age +++ b/secrets/gitlab/secrets_db.age @@ -1,20 +1,20 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA AbGjaacp7Tp3DYhUzCOUzzNlUGXYDTU9vEv1DJpzqww -grRQCuht2PKdwsdbABRIO/QLX2HikbnnPDYDfRNeeOY --> ssh-ed25519 4PzZog loCPiNwbEIOtBgQnBRSuiCuizZdrh/l4lbdvv1/SYCQ -WMu8NXj0LYaWS0qxcuBsG/GdH/E8C8OmbYb2mYuRkrc --> ssh-ed25519 dA0vRg 4UnugzCjQxs4Xqii2PWA7prXrjS4wP3wJQtUbrQi4QU -HqjVoiYSZ70DdNRui4yZjR5oGiCyR6Rly+CoM0MEbxI --> ssh-ed25519 5Nd93w +PwbmFGDmpdwKvuHWLQOJExFZm2P8pl15RpRqeM17Vk -HvDt20lZsSpyZ8z2BShXHlAOzIM+15UpMonz3sqSwR8 --> ssh-ed25519 q8eJgg SYtYX+5Q35sygmo6PdlUzG04g2bGnSyVGgnYPkJKoCI -nrZN3mp0jxSQfblj0pDE/7/pO2jAg0byTm4HQOQzQBU --> ssh-ed25519 KVr8rw CzJ3Fn25Lq8zZOAHKKbLsiHhTHlAMDNHv3yLa7gaqSk -O1gss3s7y0VfE6ZS2GkdskeCfLJNytTNfFWz/bzEebY --> ssh-ed25519 fia1eQ WWju+k3tswiyQfc7XR/txDAIaIjX7Xfnv2IcbKH/s2k -mAxPhLCJjwX68AwGSkJxMSF5PkGPQDSCkBMoCi1Ozf0 --> ssh-ed25519 uZzB3g EbWWbRWM+8jrtg/ZX8AC8VKMOtf3ch0QrBn5QCia6TQ -8/TISW7rN55/vfkBH9HKx7GKaWAMIEVz6xmtCh5fjfw ---- +L6TvqJA1YZEmK9PDIzh2r5wtzB1BI+qz+i9JotMejk -úµÄ }“sIc’ïø>}ö5bîTì«ê§Ð¢ÙrÂN1ñó,ˆ4æONÁÔRzfíÝ=اŽèNx7ˆûÓÒ»[ÇÓä)×G òÄgè‘Øw¥ˆÄ!sõN‘>#ggâGÒ©¿³\üÐÿÓkت2šíg#@èÅÊaoï„—‹†ÏÓ47åwxû6mfC„Q2H -„>ËmaH”ï/uv \ No newline at end of file +-> ssh-ed25519 V1pwNA 51Y21teSJryE0zPWFftIdmaw+ajp7Fom8Xoc5EnZWBs +iDvtT3UwjuPf8MRwxnxKGbfGPg7y24JQWcm/WjOP3qQ +-> ssh-ed25519 4PzZog qZgoJXZsAfqAXKnIsktzB5nl00eErrn0hjevF9pcu1U +xUYDshqLKabFlmW4QRo+OewDFHFFuvLONaJnx5jbBQM +-> ssh-ed25519 dA0vRg sWKzaacPSC6AnLXWKPBT5etAHGqtzzse6UVsIIC/6yw +l1TZMSwnz6e6w6UZgPEOzG29DMCF9InQ5dK1H9XuPAA +-> ssh-ed25519 5Nd93w EgPejsyAUBLjgPwQmSH6KVjgNrFA7Y2UiKuAUjjqpxM +mUypoPJQJx49NDQ9esdzAi0KbfwcjQXGXa7IPB9T/SA +-> ssh-ed25519 q8eJgg EZgoUSh7Cjs4/VeGw8N7dEGaFcqA6FbdKfdTirlQfBM +wL5BVBG4lVJuj/3wkBy7Y/PMXDU9SvKSNmh7KVw1rHk +-> ssh-ed25519 KVr8rw E9d6+qCeB8S4ZWOzbXfNRgrYfKy2qfYj6ZT9cMfFAWk +GtNuM3DBYy5TyFZ3aw97BjRiIrSBkZ/g5p3QRMNhP/c +-> ssh-ed25519 fia1eQ Z1QtqqvvSEGVbJJSxU+8MizwWlDtoiT/V66Hoxw3Mjg +dKBCDtW+PfFKRkvAHh6oNNp1rHvfBXtpgIvOlxFs3Zk +-> ssh-ed25519 uZzB3g XqKGXqaeUiGOnvASUbdcB5BDTCRNrN7uqUO545F9zxs +Whs8NFVFoUZ7wY5FKKd3kplc8bVIudvxUUyZ0AzeXeM +--- S9gM1mjnuKGKAmZazNYfjNUAoQfqMmOUYCTxAvj1W8M +¾Þ›‘éXÌý¤èòMVù³)Ž³Ï=3xÐû¿ø™ïݶ?¿þ,yïn!#'—wƒˆÎÈÀý»ÑËhJ››F£h#Ék õ³p=9_X8†º(ÐÛÀ»lN þ´5Ã@ïÖŽ”nÖÕÀûäQ¥âŽÛ€ +žè S›LOÎLúuoÙ ³Â<õé¢Hdoª‘€·„Ô+–1)i¥>âcÊ \ No newline at end of file diff --git a/secrets/gitlab/secrets_jws.age b/secrets/gitlab/secrets_jws.age index 25926fdc3eae492e990abedc4491e15fd9276b93..c7747b10eb0eb849495212013da2a3e0cb5ac77d 100644 GIT binary patch delta 2586 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 L&RKp=%WMY#kydSU diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index 60b9321c64a1de3d3664693e0b0a2c0ab2c452a8..621e1b82cae3a34d69fcfcd630e39b316b792288 100644 GIT binary patch delta 1022 zcmcb{agAewPJK$Te~FVU`g_oI8s#A85TbQF!m~oY*YiVvopru<_ zF;_@_YCxK4Qc;nao3>-ViHlo+cSVSEq+xbcxoJqSXF*bFSx8x7L8-Y#B$uw8LUD11 zZfc5=si~o*f=NJCRDQaGaZq-#MTuj$L4aj=qJO4|i)(sHQbDdoXhD{7Qecitc2bn1 zm${3%V_s+|mxoVAuxpNGxQnY>rjNI4Rb^g*vwn7Ev2%)lMo?ZvV6MJPMPg;Tce&rh z4-(;(>Hbb0#ZIm{*`|432F}i5p4u)Ej&30tg(hjvNhKzs9{y3LX?dx6+1XsCC0CeaxG0QJj}JjTtYoP!%Gr_ilh9CogK@{(*wdnf<3vaB8<|b0`xaEJ{NwlL|d6 z0@1B2jjD1oPFE<4Do8Ig@kmKA(GRb5GD&kuwFq*{b9Ky)3JP=c){b-zb4)b~jVSUm zO6MvJw(t!OGpmi%fA3)i0?uDbMH9)zwwV z_A4_?4RX#3C{GOWv&al^3CXAo4Jf1=IFDR2JWF6ndeB(<8g%eBPJe>aHQjBj0GaSgq4>7Uc+yUtf7V z=v(rp3I2by)+$V%%63wu@+&LX-kNlu23F2)=T&@UKhPJ1LCzr0BLUD11 zZfc5=si~o*f=NJCRDQZbsbjujfTg)XxJinUzI%3nwyQ}yB9v<0|W<}<%+U7;(A>nSumf8WS9{E8fc_v)0ksgJ4 zPG$b#r4jjVS^3$1!7e44X3lx}QKeO7W+g#^xw%C?S*51NUgeYH8O6i%yebWYLftA8 zT@#bFLrmQCjr0S}w2i_ugA=RD({o%yiqdielQNz1jZC=G!jn>q4Lwc0%qnwDoxS}- z@`{}@11d5MT}++RQmV`=!pi*JJ;HN6GeakzWfZT^EOpHF4h=T6$S93+DRIy8uSm+) z_jj)>Ff1-hcQrQ%Ez1qb4@kB!a7pH>vMe@t3e@%qbMnr}@HMndHMFQI%BW0<(yl0V zPc{n)(k?LdH8&`542VRJ0PnCOi=uLcP@k&gq^NKM*8+>Aw8#Jx_j=FV%y6Gl%Ro=3 zaP7n>kAmd%)a;^&G?&~^F2m%Aij*op|MW1w40qq`?G5m zWXsZ&e9sb$_)g1AG)xUt2r#eG_6R66&o#@5s&EN2;fks#bd1z@cMXUPwa5tY^oc0(Obre6b#+cNFikEsPRdHn^(ZLHFvzhi zNB3Q6RF#u)x`K9DN~Kv=dPJG8sd1jAw@*Q0L}sx?u}`*{S*U+iWR7--f4NJ9r@4Dz zHdkIrv39;mczt%JmuZ!`fuT>fWl(08rD2Mze^yjwWJY07s(xfdaZz}=e<+u(uC9Vl zrlF;KUa+NpzIUiwW=^74xl5W!iKnG;hFfJ)RAE|SPFjJxdrDS$h6R`YvOn{qC0+_% zV=!NxI)BE~*FRHD54Gp^*(ztd1zX5CPkQIeaC60~&y$qOt{r#V{q0Cdipjy*Ut$6! z7TkZ<_VU}ja}{YPt3LWMw^b@`n9aTMY-_8N;4PnkhYcY`a|~zhu4=FI4*CBf^5l}F z-J8q3CfLq3*pi$zoAtbkO61p;PoK?rKNW60l#}>-7OTRW?VETR4+u=@UR?f@>)@Zx K?2Rn@{{R3XFlzGv diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index ace35e4..44dbbc7 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,19 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA CGCG7vFUJ9hUdJWRax68aDpHZEREFnrjo3expN7oUTM -/eCKERrmnmceosD45BENTxtoyLmjGmGVvxkGWAtCRyI --> ssh-ed25519 4PzZog DSUIoivSmbzN0AvKIPXhtjTBft9D9AaRioe6biuh6XQ -XlV7xKGi2BY+sCgJCEiSB9AlpXFoQnbeIxKxNhPRetY --> ssh-ed25519 dA0vRg sYBG5Ld7lMw+cm5zUgVR9Bi8YVwDrRglII36Tj8Jfl8 -cQMY6UyMrRtfoU6mn0pg47Vf4DB2KcjwiRHEmvU/Rmg --> ssh-ed25519 5Nd93w H3k1nFMs8wkqsVKzGp3n4CE7MuyxJWRZ+xgSgDbnuzw -2fff1rsfvE5NikWjF9gkvHuthgLKLOey3PebYG26yNs --> ssh-ed25519 q8eJgg UR21V4UAJ7/ALE7IcfMVYO3mD2jbanhBu1fj1iEjpBI -8Yl7/sLlQmCvGJvKZt1B4lJMSnPt6gHi/k1u6Gm2sII --> ssh-ed25519 KVr8rw ur14/Gp1Z9ODFFVaUf50i4+ELKy9RHmsXjbaj5h9IGI -FTZn1ZuBixaehBW3hnVjfXrt2m8co1KSp5aUTA+TRdg --> ssh-ed25519 fia1eQ 5bmpon54otL6GnIhyYT7CbLuCR8vk0td3kPBGxsSWCU -PSngrN6yQODB/Vmu8ka3vvDv5DkShktyOWrhzC9K1LQ --> ssh-ed25519 rmrvjw J6YtkhTuDaUtc8LUp/zfvQD3LST00arsbe37bZw4nAY -r3TDmtyB0Cc7Mx8EXb1yytvpF3+4//6cy4jkK+cWTls ---- mSjAJK/sd2Qj4Ffuee/T5LTADcNLVTCcKL/4VlqZvd0 -RêÛÖU$ìòži‘ŸU«áXô¯ÍsÁÓòñãfá—_âƒo/’&cØ&{*¶‡ÙŠ/äh¬Â\œßLµ[%®=,Qòqè \ No newline at end of file +-> ssh-ed25519 V1pwNA wg5YKE7/sMO2/uHVH21A5Ezp5jTGyWICQE0hjgdOPFI +0BdMLvNfdkdawh6+binpY5cP3+SUih9GqXqGRjIMuPU +-> ssh-ed25519 4PzZog ig5HQ0wsF9mdSplrAA+k47YEnLKXxsq0mbLSBcuhLz8 +j7lejLu7Nm7rscsILqxJ7c2CTV52a8auuzRfuyT8tyc +-> ssh-ed25519 dA0vRg A3FTxSbl06XeRXwqtSEdp8zrbNRrYEhIzxggBa87yFw +MDLSG1m3Ss7mRB1D18VL1XzEPJqUJTay2BCgRrR2MTk +-> ssh-ed25519 5Nd93w 7FA1lC5wmw07jEoTAJteqj25VU9LgpS4aS+UDhfJ3Us +ss6DD0KevDM1MWr9ZtUi/ZwvRi6KxAHUvQoQlhDvhso +-> ssh-ed25519 q8eJgg tynydC/TKwdRGYYFhkOUeBSQhbReny5WqFiksVBfhik +uuvgLJZGfeCIudTGb/E91YUWtMuX4Q4+dP/ixM5ppr0 +-> ssh-ed25519 KVr8rw 0PrEzDMMr5NRKLPwh5FUdsK+IgmmOaR+vsjkRlaPaW0 +12tS3tR3BAEBTVQunX//RAXefZ+b422Q2uaDViMPcmw +-> ssh-ed25519 fia1eQ Phy3mMJqUjc+np7zDI0UVeHEMF9aDJGBKQGeNDWWcC8 +/B5W/0j5Ziq/ToQKswSHyLaVw7cl5DyQ0PhhQK8MnkI +-> ssh-ed25519 IpLDOw g8f5bCJc2CSqqNi5ZbzykknpsWFEffdEjT+ZxHkUZ3g +sSfMc85BkNYiDO7JKm3yzK+dA94qry15c/GyZx4sTLE +--- iE3MElTwsLIYXZDjxLu2iz9LU/NieS1hbcuFfMn1erk +?×øQµ°ø1é˜uL×L*›ç;ï)°ƒ!EðªÑk³.qLÚ† Š¢hF±Õ<ìÖ<íöHÌòfuQIÁŒÙ2EǘÀ4 \ No newline at end of file diff --git a/secrets/keycloak/pw.age b/secrets/keycloak/pw.age index 7792aed75adcb2cbe477be470e7fe192b45595e5..cb13415ecd01af9be1f42c1299432120737e7654 100644 GIT binary patch delta 937 zcmZqRXyBNjQ=j3J9+8|K=wlfanG&4jnwDm68d;o?S>Tcu=;9V=5n^EETcexndGIPSm>RRXIi4~Vj584?wOVx=#k@|0{y=>ExCgP?YJO;_DpY?B!S#7#{3n7Lr!zT;W=2;Z{&$nq`zf z@uPTnV!D5TWmb`QT0~Mrg+)M_iC=1@UzkyLdS+rlczAAjNQkk1XhlheZ>9y8Ns_Nu zUPP&ZZ(c=CWQwO*QDI1xv6p#CR!XsJREcGPzL7_`X_QNrzoqBoct-JXU;P3P^GYXk zpLG57V8?VvCyShjRR7EzCyNL}lkgnhf*^}v$HFQI+pR5$0@WNcrd_$8WS7U=5zXB(hoZQgKXBoxoL-gIu{0&N-3JT4A%gPKwoyzik zoRTbaG7OE(%Unz>%=JUvTwS%DE7Egn zTyoM9{VGdROLGlE{fe{EW57GC$fBrRA*(ne(m6ZC%|9zDKQq%K)u28#H!m?fG1)C7 zF}xx;(J8g4Ff=*eIV>!sn5!(?H^bB<$s^aqI6pG9EG)>_FuB4YIW)*QJT;0nP9TT<9b1PjV9m9;w!(2+jqx6F+O@iD@&C5)k6Z1m3n2)$S+x=17 z%)V53uZ696QlFgPGq>eRx(st3-49GqJaR|AE#R=E^MY3!6pV^_yXQ@}nB(bZ=oRUb>FH(Y>Q>;JryZE? z%T-w6oLZb4QtD=wSn6q6THt9AW?AGFoEe-}i7+!li4cP+Xj$ zo0?)|YHDbyU=mOjm7lJV8C+JCYN1`??VMlbmXsNh?3QfdW8jx(@ zYG`a~U|Jr@rCnH>T3QiamF?u=6l7j#Sm2T2l$encT$t`1nOoo=Wt3RvtQ~ApYE+Uv z@uPUSuVbKPZkk`7ae29uL55pmn0|P=Szd*&VOe5Yet~1ES7lz1YjRR>nWH0DSeA=n zaHWZ1fNP~;NT6wWvVM?ddWK=TpMHo%rG8SVV~S@6gTW57GC$fBrRK|j|i$09W=Ak@jVJgnFy%&k7TJUlJjFw>yK z)7{j|L*G9@#52v*KgFo9 zRJ+*6!X?Wx65YDA%tXV~K!xlKH;)Lv^nlPnW6S)If)vA?@XF*O-_XoF3(riWg2eLj zdbdc!GS7^l;9@SLhz!r-fT9vV?FfIToRA>>V%Nk(chd-GpPXXPqWs9>0{=wUD(z%n zBMjepRyq0>Ix3W!g_~yQco!DBR~Q*pI(tDcYrh1rG8JlGmhx=GK z=W}^xndBuWXVzEd<>edYT1I)7IHsn%Rhs5zIl2d1m}U8z`xQC+m>c^9`6qMf>gp=w zdiqs`1V&~>IF}k5S~zBURiqcYnI~46_=LJATV{p@n`b0frn&ir1Qv6#j`hW@H=oq4d%f)hLy diff --git a/secrets/ldap/details.age b/secrets/ldap/details.age index 3317f9c781e97deeb182539d180a94b617759a22..1c763b952341230441de35f6d9c59f1c55c9e9e1 100644 GIT binary patch literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sZq%eJrx zNh>lBjwp5s@iR6}^oz{#(XVn(^Nh?Z&8;dZ&T%Tu$t*CgaOLvKD>M%9Hge0&_BAdy z%m^?nNQ=tKt@1T2&#f{m_YZYR(Kd|oFE79yey@-xHKTs+axn5vpmf^*OMzbE6Uj{tgtdK)5$p3z%$j^D9S(B zOh41t(Jk1&D7ehCz$>F9#X~#IsT|$56i0)ypmYUCvjWp7)7)IM)bz5H;INdclnVE% zk_fNN3eU(8law+)m+Yhh9}i#cjBKtv?~1TM@8ZgIV@u;aS1&J*tWx8&3Rfee9OLA2 zXZOsos)C{{ZxfRu-)wZ-O#MgFUlLBD9NrqfDGj5+i)V3$qN;ohm&t@}k_! zvrKdJb21#A42!Egb6vSYLQIoW@=B@_i#5iP%GWlkEJ@F;$g40a^em_<$_%q`$u3PVj&wIluhMtQND20; zbW15M2@d2k3@q|7v4}L$E^#V0&UW&Sa1D3#OHYmn^)U%F2=}PSEUWTJ4++jl4m3fx z%{#2fqNrRU%&Rce#KO-@-?>=Z*V(|t$R#(kFx17>wID+~E7jOD-Lfnqv^c%g*xi>a zD99|r!_+UYswz)kJ2JxCwAj+!OWQ5d%rnE?(A7N9$lSchsLVXCJSPy{wzSMd!_+_p zzX<)bs)EAY{7?(iaFZkx-zxvaw6u~uXV<98M7P9JS8Wr&phVLEM}tr<@6yWj!Z5?a zVpHP)-;^L1Q;Wcoe1Cm|Qn#Qm(_C*C7mJi~Cv5`{_fm{B=~?CITj;2eSR7?gR+%4~ zW9;gbX=!fepQ|0{=9(F75|(9T5LJQrBPK*#_0;h=^p7B-q{6ap`PWX;ejdP z8IdNDuKHmm0TxD4WvTh8Mv;+WF69QUPJvueKJNM@9^pY{+TK}J1_1^x{w0Z(Zss|D z{%#@KS-!bZ$!0~`l@(dxk@@H$>5*iRSrDj@9qH}sk{RY}=#rFLl>>^!AfwzAC*QP+ zLf-=Oih?BLH1|NCLj7VR6Rtpyh_qt;0ACMBulyW~%3%Hc0JoBm5c3@UyyP^C;z$e6 z$ZU_YJywZS6S65ddr6k46KeZ^QG(0)U ztEHHih zJ;CdbfYO2RU2&J#HHwxm6YEQIdNg&1z_DE$-sswYefs3ZHU|;SE1!S=yHWjd<7?A{ zZj$~pO9kuNTxK8p?>1fAHSWZ=+vd_<; zBF$0HMdD%Rln-}W%Rkh~Xx!B+2(CSuIYYAU*o#gc!-hjgRp)%Jb!l9@PP}pZ&z+?~ kuQlRYLfQ@8cbzz5f1^dz--$u{*lLw6)7GkgJO6Jg02%-`p8x;= literal 1637 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yV>s`M>) zG)ngkakH#Q3QOD;1A%H}GrtSm7rk90SUFstwm zH!CdgFLE}{uQW~x^)w1`_BSyI)Hd_T$SJnWOh>oPB%mrPKV3mP&?hM+Jv_0}*`mm? zA|=G!D90kx*VVt+(=(;qrJ%~)JE^e9Jj&0pGMURI!aY62F~u=4B{aAsJT*Viz&Fgo zz&p#(+04ScAl==-xhTBCs35Z3-51@q6i0)ypmc@O>;RuYUrSRXBbVY7&s4+IsA5ys z#L~2KAAhGpFLx7XmtxoS(1=Wb4_~e-r@)}xz>0{%usq+quuSiaqAYXoyquJ*azFok zmnt7WZ{PCru)J)aEDXPy`lVPJmn)QKrR9WXdFQ8S8-!>V<+^5tRd|QHBzuSZS7v*Z z`MBiyxjC8z6dISi6?5gKmxXwlr-UVzW*1vJ`sP|%)!8knJk&WPpfJaGtH8GQ#_K44Jysjk{ydoybUt-4b1XN+`XJlEmG1#1G)Tt zvRz%>oQs2fG73XHqe{!Xiu0VaL(Fp0%&QDDliefz$}K&OOOkRb4A5;$%S<#(4ODOn zFe)j_cP%b)FE(^^N-YgDNcRcO%5}=i2r5e}DK?HuG7s}NFwRL#cjYoK&n~nK@sDsS zHngw^@=tcFs&We|_p2}u_Hqm;_VLS3PPR-mwWvr+!U##vDo5W!M+NOD{ZQwm?9vR& z!l;0Jb8jQJl2o7Ubm#0M&w%{&;=J@!qp+-OgW|#pM=rmV(5jH&vWmc@LQ8|p9Fyck zL&xNh+`O_}Lw83Lx4;Uc2#??(_mJE`S1z>tRvK01WSp*$7ZF}*oMVy`9*`6k9AZ{c z5}X=n8D&{g8d>RHP?(!!5aFX8>7AYD?h?pV>ZP6T>YZg8njYyC5K*30pzT#$Y2p!* zXIP*e?o*KC5mc3Ks-ITnlV*W#n@5sCWXkcJsUbcBrdS)?KURJ2Tk)^v|L}s#2epo?KqHj=XX+>UCZl0NOsfl-1 zP_k2IVpN%nzad5{freycnxlDDh^wP%N>xOXrL$vIx{HyMWs+sENxq?hMTKXgdtR}2 zUU7DbOEFhOdAPGjMNUaUL|SlJkeQKtqM3zRc!{H_i+6rlZf1_ZuXbKZZf=lgNjbXT zptgl)wKXLC80WQAEc z`Bg-kmU}0bzQM@Hq8g{6A=2I{+4MCR<2LyTNl!R-C zxfHpTo0bRZhdP(}1?T!#lopp{JC&OTdT8rs2fFHqgmQTneyL6HIPyfsQf|^^@g@Zo zq3rK*o|QAs9VwPg$yuHd`0UTlX8sGB^4&{rH`;zO4PJXXDfdDb@QiHMicH@%B3 z_ws)@?I^zYW&JbG&hx7AwGXce0fvH@FU(`=1*W5S%&5Z!Y=RT7*G6jB>c&MKC mY2BQ_pmgS0hjSmq)QC8o`TsQFKx7z)UwxZ}_tUr9%!dJB`#YKd diff --git a/secrets/ldap/pw.age b/secrets/ldap/pw.age index e5deda4..057cdcb 100644 --- a/secrets/ldap/pw.age +++ b/secrets/ldap/pw.age @@ -1,26 +1,27 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA gbttBwmYtq67vkhosksaN3pMFRD+yIZ9c3jkUqLjzwc -sKzCx+fRVT08lE9SROuhsKk4umCokWSafCQtK6NzX3s --> ssh-ed25519 4PzZog 1n6kEJ2pIjIt1u6DUG2P0PL8s8k2316YnPR4cGLgW0I -EFE4bJ9AkJFAITUIMUSVaFszK01rpffnzg2HXLSskFU --> ssh-ed25519 dA0vRg g9Xtgji4q1bjaGGiTqvBW9f/N9D2qZQimo9Wz8aNb10 -zj/0VlNRk3jX054Nu9hZGP+Vpx6YsBtxUTdjOOUyzUc --> ssh-ed25519 5Nd93w xwTEItzkfxNRvwPcncZGqUGeOpY3eSJSYP7vkhWjlmg -sTTlm+WdWTTKfr+KTUVa5nLJAHv8UcsWJDXAuFqFZOY --> ssh-ed25519 q8eJgg Jj02qd+MlAOSGLWEsaosZtfo3f0zZyzdT0czSauQr3I -aKHrwFMt4KvICBXm4fdt57ZaaGkilv1Eau7Y6TPB3ls --> ssh-ed25519 KVr8rw DKp/IrXZ3Cqh7b7coO22iDR/InZ5xY8iLcm1KFgUCSI -YUQJ05y952NIoUeChUDcuvO9ku6S7qoBafRwSmCzLUk --> ssh-ed25519 fia1eQ w1p/K436VeeWLjTtxZAGeOl0oZWeE88C2OfAg4Vc6Vg -eLcoL3kV2fhtZREEmgIEiX6ci05tU4PypX+WrRaoC4w --> ssh-ed25519 IzAMqA ItqYQQFlBcabTg8ydW0EEq9ZO7SamcZUGCtZUCAtSmo -RvtyYRdWEmMhU6uA8WSFhuzow8CsXWZmyJR9m+CDo/g --> ssh-ed25519 uZzB3g gG0Ku+k9Ct8D7ZuHPsD9IZO0+O36jKps6QDYEyhYSy0 -4npr5UCPapsWmyANaX08JVVCmU3mpgD93kGWvEFP4F4 --> ssh-ed25519 Hb0ipQ jO43lRL6JA0dLRfei2uR4xo7b+hKItvQmYEjauLEvkU -3RuQqq+Z6V0qASF1EhtiDhn5MZ65sdmJ8hzebRmAlK8 --> ssh-ed25519 IzAMqA 8q3O2zg4eX41Gbh8PSVTxy6ukc28PVvoIROkbKcJqV4 -bnS9VskRrWKZR0KDsh8elU4vhBXuZKV+7sj4Mx8QuXw ---- 3yQiKJMfU9JyNxvcZLea+2FlHsoGWpaAeKQvMLE87uQ -ÓªvK½ #\ÔñòQ';¼Â—W‹¼Áy¸:·%æ8]¡‹¹^÷ë|>ûÍJMF+!Zð2»<»‰¶@Ê2²6S?`Ð ‘CŽÙèñ\˘ôÅ„KÃŒb½ÍWÉžêJéÓ„£˜1Ì×âï±ÚªŒ' In%ÕAŒ˜;Û‘@¸±9L3ÏaÔYMIÂ`înì;tr:÷.P„Ñî -× \ No newline at end of file +-> ssh-ed25519 V1pwNA U0WP4K92oRNJ1Dz7siaR+8IcCuKO+diy9VhnuyMQ3w8 +Ral58VncypJzKyBweTNDn0uyFfmqbVBsZAgsxd16I8s +-> ssh-ed25519 4PzZog ADJzfpJ3mw+42CriE25RkMq49zMrkaQM+mYO450fDBo +lkz7JlpkgOOg/clVAOJ3BBnSmo84u+hxHAqxgj4VfgQ +-> ssh-ed25519 dA0vRg TbBXDcY0qSdQ8X+CsumrUV8DATgyjybFmMSr7vKcvEQ +VA0TrtKta0ObYcXio/usanpsD/cAtS/FSd6IcOLYzaQ +-> ssh-ed25519 5Nd93w dFpBpeouKn6S84QDP3mvQmecCnGO1DbEFRf4IgnsHjc +9xoxDilLBwS1QxXnXk2CUaoyQs8udAZJqbgwMpj5ivI +-> ssh-ed25519 q8eJgg 7bSXg/HPIYoAMK/aLs+IrN9Y9BEPUyTsIo3PLEmH4yk +l0Pe13zucVpLKDE9LnBtQMkdQQuAbR/hCYhjmji6xHo +-> ssh-ed25519 KVr8rw cDXOR2vdFmc8V0cDFzJd+7024ez99Th7v+i/7aK6Zwg +av5jiCaB5Q4Pa6Jbmeyx7RFwrj/qkmIN+BC7d8IMP+g +-> ssh-ed25519 fia1eQ 1VFDFHIJ58+ybs3uUVIXHMpOCweDRBH1h/9b/qfUc1Y +W74hrPdMJ8sriTxN7FMoGkY22Ba3uq8DB+H1Rb4AGII +-> ssh-ed25519 IzAMqA pIdk0fdfM7FZB/TTA9EN38qzBxVO1IMgDSi03tpJR3s +f4UURtxj2/YnmepYeoiFeSVwsWo4u/YYZzPZr+vybVY +-> ssh-ed25519 uZzB3g JhwS814323gjfUA4JxkPFuBfNppmI5N4sN2bLxOXTVY +Up6477aZtVmbVV0s+dAafQZm1Fk4L3zA5nGG/JOMnX8 +-> ssh-ed25519 Hb0ipQ 7eBD6LAaLzBep1Ihw5ElMkeT8lYTeaQJGoYlsN6AVm8 +9QLQ1Uja0PfiQdpnB4ykW8GAXdzDZUfertdRB1V/+/Q +-> ssh-ed25519 IzAMqA TPkc8WaH/jYOcTvFD43lwQR6fgnJ9bLdMJI5ns49hX0 +FoUbMUqIfkiFxk8YqwHmeVb5/k7H+0EJcFDzNZoPs8s +--- Rfu7lKgz3e8yBtCwf1rlh2lH5pMTtBeCAR2HtL8Lehw +X_¶ÇÈ™æb­p®9eŠ ™+ÖKÛ¬£‚‰OåÛp™ +… 8ºputJâ†[WÉÑÃã±â:Q¥ç§þ +™¯\SW½zuœ3ÈcÙç&`­JþT˜öõÈX®Ý’òR†ýÓKÃ8ͳu8[º¶SK`¡[3?hç§T7atLç1|õH—‘`nÛ¡á;ü¸i­2 \ No newline at end of file diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 02fdf3fc198303e2ea6417601ecf49e25c2f48f7..1e381170f4ea55290d3993a2b167a7b92b09066d 100644 GIT binary patch delta 936 zcmZqRXyBNjQ=e!SU|5=5lpCB}>Qhw} z$faK#VB%x$r|lG$7El!E9ch}I;S^rvmhR&2m0p=q;_YW>>E$0$fawiP+Xj$ zo0?)|YHDbyU=mOjm7lIqVc~0%>1UAa>m2E75oTPT<(A_T78z<59Bf{sou3+LQ0V26 zm2c)}Q5KQRRi2Skq8(Wk>YQAXAMWCkZt7xaQsro9no%6?=u==>T$Wkt7!Z--VX5yq z@uNgoR#uc*h=)&pVVX->QAA;6MnQUNQF@TKNm_7aq(w+hg-c;Zrlr1XXe5_*aezy* zZ=SiAkw=L|qM4ItdX;%pS$d#Tlv`kcw?T$wrm0bCRg$5ff$!vaM)B}KmsHa#r}E0w zyp%HiBCnw297}DBuwv&(w~XL4Z6D*RoS@{8%%XH7cUP{!%81ZR=K!B_3sXPOsE{nn zoT`u#Poq*N^PpTem;6M_66df&&+y1l3&+W48O7_1^ed9mTmzHJqdc_>aAJkQ*zEYmVkJ1Q$YvA)Q_AkV)dFDu(9 z*r>|Wr!p_q!#v0>&^#-dtI$8q)GRI3ye!lwwK6a%H^?&I*vQ|k$knJI&#BP7I4L{X z*(p0L%BRc#-MX~QM8niT1;^C#OivGgH^*{!<5K-V_eggir>fwzBzKpLV)MYrq@v3D zqMS%W3j^mc3oheS=PKXIpdbUIe2d_`$jUGeKR1u0ywXVR^rDI3&^nLWx$~=q0ywd~Cz5S9RGP6s9+`NpVqEey^bF!n# zeYpxt^|MP#GU~nj+}w@yqs)sv4T{Yx1Dy*i^sBO}QbO~6Le2eB@(e??Ez-Gkb#)aI zUEKpygHwEy+|1KVO3bT*9V0w_^aH{Ti^9u&5?#}b%iR1-G75`*^ewo;PfN?L(dMXc zWH|Tbyyf<)NBX)g>qAd}TX|j9UcNupEjr%t?`yl~OIKe~;5Prg=aSCXwAM7?uN5y^ W4`*$WJrH|krqM~$?nITxKNSFaK|U`4 delta 936 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 From 6e496b48678ca45b930e073030b8bfedd9a64ef4 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Apr 2025 14:41:44 +0100 Subject: [PATCH 472/563] feat: results of EGM, Hans is now core, Lorcan is now also core --- config/users.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config/users.nix b/config/users.nix index fe8063a..f7c3f84 100644 --- a/config/users.nix +++ b/config/users.nix @@ -55,10 +55,11 @@ in { "silver" "eoghanconlon73" "nanda" + "skyapples" + "generically" ] # Committee - OCM ++ [ - "skyapples" "eliza" "amymucko" "archiedms" From 07b6e478ccda8d43f701847d409c361e8db2217b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Apr 2025 22:32:32 +0100 Subject: [PATCH 473/563] feat: slight reworks and added the 2006 site --- applications/skynet.ie/old_site.nix | 26 ++++- applications/skynet.ie/skynet.ie.nix | 19 +++- applications/skynet.ie/wiki.nix | 5 - flake.lock | 139 ++++++++++++++++++++------- flake.nix | 3 + 5 files changed, 144 insertions(+), 48 deletions(-) diff --git a/applications/skynet.ie/old_site.nix b/applications/skynet.ie/old_site.nix index 1e43255..18f80df 100644 --- a/applications/skynet.ie/old_site.nix +++ b/applications/skynet.ie/old_site.nix @@ -9,10 +9,6 @@ with lib; { imports = []; config = { - services.skynet.acme.domains = [ - "${year}.skynet.ie" - ]; - services.skynet.dns.records = [ { record = year; @@ -27,6 +23,28 @@ with lib; { forceSSL = true; useACMEHost = "skynet"; root = "${inputs."skynet_website_${year}".defaultPackage."x86_64-linux"}"; + # Handle any of the old php sites + # https://stackoverflow.com/a/21911610 + locations = { + "/" = { + index = "index.html index.htm index.php"; + tryFiles = "$uri $uri.html $uri/ @extensionless-php"; + }; + + "~ \\.php$" = { + extraConfig = '' + fastcgi_pass unix:${config.services.phpfpm.pools.old_sites.socket}; + fastcgi_index index.php; + ''; + tryFiles = "$uri =404"; + }; + + "@extensionless-php" = { + extraConfig = '' + rewrite ^(.*)$ $1.php last; + ''; + }; + }; }; }; }; diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 5082080..147174d 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -15,6 +15,7 @@ in { (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2017";}) (import ./old_site.nix {year = "2009";}) + (import ./old_site.nix {year = "2006";}) ]; options.services.skynet."${name}" = { @@ -23,10 +24,8 @@ in { config = mkIf cfg.enable { services.skynet.acme.domains = [ - "www.skynet.ie" - "discord.skynet.ie" + "*.skynet.ie" "*.discord.skynet.ie" - "public.skynet.ie" ]; services.skynet.dns.records = [ @@ -103,5 +102,19 @@ in { }; }; }; + + # Some old sites need a php pool running + services.phpfpm.pools.old_sites = { + user = "nobody"; + settings = { + "pm" = "dynamic"; + "listen.owner" = config.services.nginx.user; + "pm.max_children" = 5; + "pm.start_servers" = 2; + "pm.min_spare_servers" = 1; + "pm.max_spare_servers" = 3; + "pm.max_requests" = 500; + }; + }; }; } diff --git a/applications/skynet.ie/wiki.nix b/applications/skynet.ie/wiki.nix index 6d1aa57..19250b3 100644 --- a/applications/skynet.ie/wiki.nix +++ b/applications/skynet.ie/wiki.nix @@ -17,11 +17,6 @@ in { }; config = mkIf cfg.enable { - services.skynet.acme.domains = [ - "renew.skynet.ie" - "wiki.skynet.ie" - ]; - services.skynet.dns.records = [ { record = "renew"; diff --git a/flake.lock b/flake.lock index ce99479..4a4262b 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_18" + "nixpkgs": "nixpkgs_19" }, "locked": { "lastModified": 1719514321, @@ -632,11 +632,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -646,11 +646,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -673,6 +673,20 @@ } }, "nixpkgs_17": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -686,7 +700,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -702,20 +716,6 @@ "type": "github" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1724395761, - "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -732,6 +732,20 @@ "type": "github" } }, + "nixpkgs_20": { + "locked": { + "lastModified": 1724395761, + "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ae815cee91b417be55d43781eb4b73ae1ecc396c", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_3": { "locked": { "lastModified": 1734119587, @@ -849,6 +863,7 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", + "skynet_website_2006": "skynet_website_2006", "skynet_website_2009": "skynet_website_2009", "skynet_website_2017": "skynet_website_2017", "skynet_website_2023": "skynet_website_2023", @@ -992,11 +1007,30 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, - "skynet_website_2009": { + "skynet_website_2006": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "lastModified": 1743715699, + "narHash": "sha256-BgXlk7bT9q+cOE9u74ZfmqxxW0zIHZ/ebLyldO682Zg=", + "ref": "refs/heads/main", + "rev": "616040e0e7636c1e33a06262cc20fb1bf1fb61b6", + "revCount": 15, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2006" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2006" + } + }, + "skynet_website_2009": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "lastModified": 1732375097, "narHash": "sha256-LthEi+y3a+i/VNLBlQZ1v9nkffgJMykMjonFtTt8Yxg=", @@ -1013,8 +1047,8 @@ }, "skynet_website_2017": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "lastModified": 1689960297, @@ -1032,8 +1066,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "lastModified": 1696876711, @@ -1051,8 +1085,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "lastModified": 1727122069, @@ -1071,8 +1105,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_19", - "utils": "utils_11" + "nixpkgs": "nixpkgs_20", + "utils": "utils_12" }, "locked": { "lastModified": 1739580335, @@ -1194,6 +1228,21 @@ "type": "github" } }, + "systems_15": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1336,6 +1385,24 @@ "inputs": { "systems": "systems_13" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "inputs": { + "systems": "systems_14" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1350,9 +1417,9 @@ "type": "github" } }, - "utils_11": { + "utils_12": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1710146030, @@ -1463,11 +1530,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2d96432..2554929 100644 --- a/flake.nix +++ b/flake.nix @@ -58,6 +58,9 @@ # this is more of 2012 than 2009 but started in 2009 skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; + + # these are from a snapshot archive + skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; }; nixConfig = { From 8f47404b0e7cc22b6a04043605867c624ab0f53d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Apr 2025 23:28:38 +0100 Subject: [PATCH 474/563] =?UTF-8?q?feat:=20added=20the=202003=20website,?= =?UTF-8?q?=20recovered=20by=20Lorc=C3=A1n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- applications/skynet.ie/skynet.ie.nix | 1 + flake.lock | 145 ++++++++++++++++++++------- flake.nix | 1 + 3 files changed, 108 insertions(+), 39 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 147174d..3e1ffb5 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -16,6 +16,7 @@ in { (import ./old_site.nix {year = "2017";}) (import ./old_site.nix {year = "2009";}) (import ./old_site.nix {year = "2006";}) + (import ./old_site.nix {year = "2003";}) ]; options.services.skynet."${name}" = { diff --git a/flake.lock b/flake.lock index 4a4262b..8db4d9b 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_19" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1719514321, @@ -646,11 +646,11 @@ }, "nixpkgs_15": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -660,11 +660,11 @@ }, "nixpkgs_16": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -687,6 +687,20 @@ } }, "nixpkgs_18": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_19": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -700,22 +714,6 @@ "type": "indirect" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1668226844, - "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "dd4767bf613bf9553eee6ff37c0996b9c876e7d8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -733,6 +731,22 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1668226844, + "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dd4767bf613bf9553eee6ff37c0996b9c876e7d8", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable-small", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -863,6 +877,7 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", + "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2009": "skynet_website_2009", "skynet_website_2017": "skynet_website_2017", @@ -1007,11 +1022,30 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2017" } }, - "skynet_website_2006": { + "skynet_website_2003": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "lastModified": 1743701395, + "narHash": "sha256-5QNUdhjPIP55WIdzEmYHMryMxs3msmfB1z0X502GSPU=", + "ref": "refs/heads/main", + "rev": "e3774b2c7a75b838a0cd6424ce0e0e9a41c443c4", + "revCount": 10, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2003" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2003" + } + }, + "skynet_website_2006": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "lastModified": 1743715699, "narHash": "sha256-BgXlk7bT9q+cOE9u74ZfmqxxW0zIHZ/ebLyldO682Zg=", @@ -1028,8 +1062,8 @@ }, "skynet_website_2009": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "lastModified": 1732375097, @@ -1047,8 +1081,8 @@ }, "skynet_website_2017": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "lastModified": 1689960297, @@ -1066,8 +1100,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "lastModified": 1696876711, @@ -1085,8 +1119,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "nixpkgs": "nixpkgs_19", + "utils": "utils_12" }, "locked": { "lastModified": 1727122069, @@ -1105,8 +1139,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_20", - "utils": "utils_12" + "nixpkgs": "nixpkgs_21", + "utils": "utils_13" }, "locked": { "lastModified": 1739580335, @@ -1243,6 +1277,21 @@ "type": "github" } }, + "systems_16": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1403,6 +1452,24 @@ "inputs": { "systems": "systems_14" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "inputs": { + "systems": "systems_15" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1417,9 +1484,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1548,11 +1615,11 @@ "systems": "systems_11" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2554929..778558c 100644 --- a/flake.nix +++ b/flake.nix @@ -61,6 +61,7 @@ # these are from a snapshot archive skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; + skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003"; }; nixConfig = { From f668dc0d5590df70e1d2ecdd816c568997ee265e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 3 Apr 2025 23:07:57 +0000 Subject: [PATCH 475/563] Updated flake for skynet_website_2003 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 8db4d9b..4ee5719 100644 --- a/flake.lock +++ b/flake.lock @@ -1028,11 +1028,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1743701395, - "narHash": "sha256-5QNUdhjPIP55WIdzEmYHMryMxs3msmfB1z0X502GSPU=", + "lastModified": 1743721206, + "narHash": "sha256-n9JGscEsckoasfmvpWKJ0kifQp1KPw8MbWPHhmmkLCU=", "ref": "refs/heads/main", - "rev": "e3774b2c7a75b838a0cd6424ce0e0e9a41c443c4", - "revCount": 10, + "rev": "855b4c7139caeb3c520d75c9a02393f74fdb3be1", + "revCount": 14, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2003" }, From a89f8144211b3fc3814e070cd0e9f84a2fa9c607 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:26:58 +0100 Subject: [PATCH 476/563] feat: properly set the 2016 site as 2016 --- applications/skynet.ie/skynet.ie.nix | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 5 +---- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 3e1ffb5..6fcf74e 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -14,7 +14,7 @@ in { # at teh end of teh year add it here (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2017";}) - (import ./old_site.nix {year = "2009";}) + (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) ]; diff --git a/flake.lock b/flake.lock index 4ee5719..8737553 100644 --- a/flake.lock +++ b/flake.lock @@ -879,7 +879,7 @@ "skynet_website": "skynet_website", "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", - "skynet_website_2009": "skynet_website_2009", + "skynet_website_2016": "skynet_website_2016", "skynet_website_2017": "skynet_website_2017", "skynet_website_2023": "skynet_website_2023", "skynet_website_games": "skynet_website_games", @@ -1060,23 +1060,23 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2006" } }, - "skynet_website_2009": { + "skynet_website_2016": { "inputs": { "nixpkgs": "nixpkgs_16", "utils": "utils_9" }, "locked": { - "lastModified": 1732375097, - "narHash": "sha256-LthEi+y3a+i/VNLBlQZ1v9nkffgJMykMjonFtTt8Yxg=", + "lastModified": 1743722645, + "narHash": "sha256-uelPrPuv/Z3i4NZ01BlbAqmpB4IlA6zaFL4DlaDWHuo=", "ref": "refs/heads/main", - "rev": "42a1ca5c83a6c21c734d4cc10eec2b06ae25f7ec", - "revCount": 16, + "rev": "316da6b20fe26a6c4c751e74ee214a23265a8205", + "revCount": 18, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "url": "https://forgejo.skynet.ie/Skynet/website_2016" }, "original": { "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2009" + "url": "https://forgejo.skynet.ie/Skynet/website_2016" } }, "skynet_website_2017": { diff --git a/flake.nix b/flake.nix index 778558c..d26ce5c 100644 --- a/flake.nix +++ b/flake.nix @@ -56,10 +56,7 @@ # this is not 100% right since this is from teh archive from 2022 or so skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; - # this is more of 2012 than 2009 but started in 2009 - skynet_website_2009.url = "git+https://forgejo.skynet.ie/Skynet/website_2009"; - - # these are from a snapshot archive + skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003"; }; From 6bf65a55d78d20a84b234e8f15206d4cabbcc931 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:36:38 +0100 Subject: [PATCH 477/563] fix: properly got teh start date of teh new website --- applications/skynet.ie/skynet.ie.nix | 2 +- flake.lock | 16 ++++++++-------- flake.nix | 9 ++++----- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 6fcf74e..a73b695 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -13,7 +13,7 @@ in { # import in past website versions, available at $year.skynet.ie # at teh end of teh year add it here (import ./old_site.nix {year = "2023";}) - (import ./old_site.nix {year = "2017";}) + (import ./old_site.nix {year = "2021";}) (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) diff --git a/flake.lock b/flake.lock index 8737553..e0c3973 100644 --- a/flake.lock +++ b/flake.lock @@ -880,7 +880,7 @@ "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2016": "skynet_website_2016", - "skynet_website_2017": "skynet_website_2017", + "skynet_website_2021": "skynet_website_2021", "skynet_website_2023": "skynet_website_2023", "skynet_website_games": "skynet_website_games", "skynet_website_wiki": "skynet_website_wiki" @@ -1015,11 +1015,11 @@ "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "revCount": 29, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, "skynet_website_2003": { @@ -1079,7 +1079,7 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2016" } }, - "skynet_website_2017": { + "skynet_website_2021": { "inputs": { "nixpkgs": "nixpkgs_17", "utils": "utils_10" @@ -1090,12 +1090,12 @@ "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, "skynet_website_2023": { @@ -1109,12 +1109,12 @@ "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2017" + "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, "skynet_website_games": { diff --git a/flake.nix b/flake.nix index d26ce5c..c28a21a 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,11 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2017"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021"; - # these are past versions of teh website - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; - # this is not 100% right since this is from teh archive from 2022 or so - skynet_website_2017.url = "git+https://forgejo.skynet.ie/Skynet/website_2017?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + # past versions of the current website + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; From c57b7679418484a71206a1068f77c502bdf526b2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:46:33 +0100 Subject: [PATCH 478/563] ci: have had issues with websites not being updated properly in nixos --- .forgejo/workflows/update_websites.yaml | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .forgejo/workflows/update_websites.yaml diff --git a/.forgejo/workflows/update_websites.yaml b/.forgejo/workflows/update_websites.yaml new file mode 100644 index 0000000..e517f25 --- /dev/null +++ b/.forgejo/workflows/update_websites.yaml @@ -0,0 +1,39 @@ +# The websites can sometimes cause issues when being built and deployed +# This pipeline is to update the inputs from the server + +name: Update_Flake_Websites + +run-name: "[Update Flake Websites]" + +on: + workflow_dispatch: + +jobs: + update: + runs-on: nix + + permissions: + # Give the default GITHUB_TOKEN write permission to commit and push the + # added or changed files to the repository. + contents: write + + steps: + - uses: actions/checkout@v4 + with: + ref: ${{ github.head_ref }} + token: ${{ secrets.PIPELINE_TOKEN }} + - run: nix flake update skynet_website_2003 + shell: bash + - run: nix flake update skynet_website_2006 + shell: bash + - run: nix flake update skynet_website_2016 + shell: bash + - run: nix flake update skynet_website_2021 + shell: bash + - run: nix flake update skynet_website_2023 + shell: bash + - run: nix flake update skynet_website + shell: bash + - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 + with: + commit_message: "Updated flake for Websites" \ No newline at end of file From b943e5ec0d823f7e086cb2803c08043728df62a1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 00:58:37 +0100 Subject: [PATCH 479/563] fix: some errors with teh websites also add 2024 snapshot --- .forgejo/workflows/update_websites.yaml | 2 ++ applications/skynet.ie/skynet.ie.nix | 1 + flake.lock | 16 ++++++++++------ flake.nix | 5 +++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/update_websites.yaml b/.forgejo/workflows/update_websites.yaml index e517f25..c27629e 100644 --- a/.forgejo/workflows/update_websites.yaml +++ b/.forgejo/workflows/update_websites.yaml @@ -32,6 +32,8 @@ jobs: shell: bash - run: nix flake update skynet_website_2023 shell: bash + - run: nix flake update skynet_website_2024 + shell: bash - run: nix flake update skynet_website shell: bash - uses: https://github.com/stefanzweifel/git-auto-commit-action@v5 diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index a73b695..98a401a 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -12,6 +12,7 @@ in { imports = [ # import in past website versions, available at $year.skynet.ie # at teh end of teh year add it here + (import ./old_site.nix {year = "2024";}) (import ./old_site.nix {year = "2023";}) (import ./old_site.nix {year = "2021";}) (import ./old_site.nix {year = "2016";}) diff --git a/flake.lock b/flake.lock index e0c3973..ced0274 100644 --- a/flake.lock +++ b/flake.lock @@ -674,11 +674,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -1087,12 +1087,14 @@ "locked": { "lastModified": 1689960297, "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", + "ref": "main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "revCount": 6, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { + "ref": "main", "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" @@ -1106,12 +1108,14 @@ "locked": { "lastModified": 1696876711, "narHash": "sha256-WdZQBLTX6WK8iT7FwvD6sNEefGwtAWmzxZzCvvmDxGo=", + "ref": "main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" }, "original": { + "ref": "main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_2021" @@ -1435,11 +1439,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c28a21a..95f2a0e 100644 --- a/flake.nix +++ b/flake.nix @@ -52,8 +52,9 @@ skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021"; # past versions of the current website - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; - skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885"; + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; From 5143b683e483fd6099aca1e8fe64510898726977 Mon Sep 17 00:00:00 2001 From: silver <+silver@users.noreply.github.com> Date: Thu, 3 Apr 2025 23:59:32 +0000 Subject: [PATCH 480/563] Updated flake for Websites --- flake.lock | 101 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 85 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index ced0274..88a74f1 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_20" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1719514321, @@ -674,11 +674,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "type": "github" }, "original": { @@ -702,11 +702,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1695978539, - "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -731,6 +731,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1695978539, + "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "bd9b686c0168041aea600222be0805a0de6e6ab8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -746,7 +760,7 @@ "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -882,6 +896,7 @@ "skynet_website_2016": "skynet_website_2016", "skynet_website_2021": "skynet_website_2021", "skynet_website_2023": "skynet_website_2023", + "skynet_website_2024": "skynet_website_2024", "skynet_website_games": "skynet_website_games", "skynet_website_wiki": "skynet_website_wiki" } @@ -1121,11 +1136,32 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2021" } }, - "skynet_website_games": { + "skynet_website_2024": { "inputs": { "nixpkgs": "nixpkgs_19", "utils": "utils_12" }, + "locked": { + "lastModified": 1732375016, + "narHash": "sha256-Y+bJw85TNOp8N369OV0VrDdm3oDy8CXG+GUuG6pZjbo=", + "ref": "main", + "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", + "revCount": 29, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2021" + }, + "original": { + "ref": "main", + "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_2021" + } + }, + "skynet_website_games": { + "inputs": { + "nixpkgs": "nixpkgs_20", + "utils": "utils_13" + }, "locked": { "lastModified": 1727122069, "narHash": "sha256-GOPYcXDc+KN6LmxMqobFUOn6e9e0khBW3SrFLj6+2i4=", @@ -1143,8 +1179,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_21", - "utils": "utils_13" + "nixpkgs": "nixpkgs_22", + "utils": "utils_14" }, "locked": { "lastModified": 1739580335, @@ -1296,6 +1332,21 @@ "type": "github" } }, + "systems_17": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1439,11 +1490,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -1474,6 +1525,24 @@ "inputs": { "systems": "systems_15" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_13": { + "inputs": { + "systems": "systems_16" + }, "locked": { "lastModified": 1694529238, "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", @@ -1488,9 +1557,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1710146030, From 5f5e54efd6cc38465eaee4c6acc08c89d6013aed Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 4 Apr 2025 01:44:31 +0100 Subject: [PATCH 481/563] feat: added teh 2022 site --- applications/skynet.ie/skynet.ie.nix | 2 +- flake.lock | 46 ++++++++++++++-------------- flake.nix | 8 ++--- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 98a401a..8a625f3 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -14,7 +14,7 @@ in { # at teh end of teh year add it here (import ./old_site.nix {year = "2024";}) (import ./old_site.nix {year = "2023";}) - (import ./old_site.nix {year = "2021";}) + (import ./old_site.nix {year = "2022";}) (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) diff --git a/flake.lock b/flake.lock index 88a74f1..65c6161 100644 --- a/flake.lock +++ b/flake.lock @@ -674,11 +674,11 @@ }, "nixpkgs_17": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", "type": "github" }, "original": { @@ -894,7 +894,7 @@ "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2016": "skynet_website_2016", - "skynet_website_2021": "skynet_website_2021", + "skynet_website_2022": "skynet_website_2022", "skynet_website_2023": "skynet_website_2023", "skynet_website_2024": "skynet_website_2024", "skynet_website_games": "skynet_website_games", @@ -1030,11 +1030,11 @@ "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "revCount": 29, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_2003": { @@ -1094,25 +1094,25 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2016" } }, - "skynet_website_2021": { + "skynet_website_2022": { "inputs": { "nixpkgs": "nixpkgs_17", "utils": "utils_10" }, "locked": { - "lastModified": 1689960297, - "narHash": "sha256-+43nNv4RSQMXMRGdN8xVKYs2B13w5FJtefuykYcpywM=", - "ref": "main", - "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", - "revCount": 6, + "lastModified": 1743727062, + "narHash": "sha256-myrgO0BU23zCD+mZnLfjmr/txjCWQizqlR72Hjv+E3s=", + "ref": "2022", + "rev": "687a0b1811987cfc27c2e6f5a625c4d59ef577c2", + "revCount": 30, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { - "ref": "main", - "rev": "edd922c5b13fa1f520e8e265a3d6e4e189852b99", + "ref": "2022", + "rev": "687a0b1811987cfc27c2e6f5a625c4d59ef577c2", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_2023": { @@ -1127,13 +1127,13 @@ "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "revCount": 12, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { "ref": "main", "rev": "c4d61c753292bf73ed41b47b1607cfc92a82a191", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_2024": { @@ -1148,13 +1148,13 @@ "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "revCount": 29, "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" }, "original": { "ref": "main", "rev": "8987e33cb709e7f2c30017e77edf9161b87d9885", "type": "git", - "url": "https://forgejo.skynet.ie/Skynet/website_2021" + "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, "skynet_website_games": { @@ -1490,11 +1490,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 95f2a0e..5c7dc2b 100644 --- a/flake.nix +++ b/flake.nix @@ -49,12 +49,12 @@ ################# # this should always point to teh current website - skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2021"; + skynet_website.url = "git+https://forgejo.skynet.ie/Skynet/website_2023"; # past versions of the current website - skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885"; - skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; - skynet_website_2021.url = "git+https://forgejo.skynet.ie/Skynet/website_2021?ref=main&rev=edd922c5b13fa1f520e8e265a3d6e4e189852b99"; + skynet_website_2024.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=main&rev=8987e33cb709e7f2c30017e77edf9161b87d9885"; + skynet_website_2023.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=main&rev=c4d61c753292bf73ed41b47b1607cfc92a82a191"; + skynet_website_2022.url = "git+https://forgejo.skynet.ie/Skynet/website_2023?ref=2022&rev=687a0b1811987cfc27c2e6f5a625c4d59ef577c2"; skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; From e5554963d1520772c9e855b6e4d08cff531b9e28 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 00:07:38 +0100 Subject: [PATCH 482/563] feat: enable better repo searching --- applications/git/forgejo.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index c7b3572..aa8fd86 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -105,6 +105,11 @@ in { DEFAULT_ACTIONS_URL = "github"; }; + indexer = { + # Will consume more disk space, but we have plenty of that + REPO_INDEXER_ENABLED = true; + }; + # Allow for signing off merge requests # "repository.signing" = { # SIGNING_KEY = "5B2DED0FE9F8627A"; From 9059554c586cea4a02215dd9fff0a2c1800f1135 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 23:44:22 +0100 Subject: [PATCH 483/563] feat: re-enable the dns for the nuked server --- config/dns.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/dns.nix b/config/dns.nix index 636dede..ccb1df3 100644 --- a/config/dns.nix +++ b/config/dns.nix @@ -38,6 +38,11 @@ value = "193.1.99.86"; server = true; } + { + record = "nuked"; + r_type = "CNAME"; + value = "neuromancer.skynet.ie."; + } ] # non skynet domains ++ [ From cef7588212206d35c6bd3fcaac85fe6c43d24c80 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 23:49:22 +0100 Subject: [PATCH 484/563] feat: got the 1996 site up and running --- applications/skynet.ie/skynet.ie.nix | 1 + flake.lock | 161 +++++++++++++++++++-------- flake.nix | 1 + 3 files changed, 116 insertions(+), 47 deletions(-) diff --git a/applications/skynet.ie/skynet.ie.nix b/applications/skynet.ie/skynet.ie.nix index 8a625f3..fb1bf69 100644 --- a/applications/skynet.ie/skynet.ie.nix +++ b/applications/skynet.ie/skynet.ie.nix @@ -18,6 +18,7 @@ in { (import ./old_site.nix {year = "2016";}) (import ./old_site.nix {year = "2006";}) (import ./old_site.nix {year = "2003";}) + (import ./old_site.nix {year = "1996";}) ]; options.services.skynet."${name}" = { diff --git a/flake.lock b/flake.lock index 65c6161..ee90678 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_22" }, "locked": { "lastModified": 1719514321, @@ -659,6 +659,20 @@ } }, "nixpkgs_16": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_17": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -672,7 +686,7 @@ "type": "indirect" } }, - "nixpkgs_17": { + "nixpkgs_18": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -686,27 +700,13 @@ "type": "indirect" } }, - "nixpkgs_18": { - "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_19": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", "type": "github" }, "original": { @@ -731,6 +731,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -744,7 +758,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -760,7 +774,7 @@ "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -891,6 +905,7 @@ "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", + "skynet_website_1996": "skynet_website_1996", "skynet_website_2003": "skynet_website_2003", "skynet_website_2006": "skynet_website_2006", "skynet_website_2016": "skynet_website_2016", @@ -1037,11 +1052,30 @@ "url": "https://forgejo.skynet.ie/Skynet/website_2023" } }, - "skynet_website_2003": { + "skynet_website_1996": { "inputs": { "nixpkgs": "nixpkgs_14", "utils": "utils_7" }, + "locked": { + "lastModified": 1744063133, + "narHash": "sha256-MAevnJsxpaimUzJepL2BpbxlbRVCq3l9G990+LxNKEY=", + "ref": "refs/heads/main", + "rev": "3f9ef8b4ca0d65b059c0be1277bd2f0c7a9968fb", + "revCount": 10, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_1996" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/website_1996" + } + }, + "skynet_website_2003": { + "inputs": { + "nixpkgs": "nixpkgs_15", + "utils": "utils_8" + }, "locked": { "lastModified": 1743721206, "narHash": "sha256-n9JGscEsckoasfmvpWKJ0kifQp1KPw8MbWPHhmmkLCU=", @@ -1058,8 +1092,8 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_8" + "nixpkgs": "nixpkgs_16", + "utils": "utils_9" }, "locked": { "lastModified": 1743715699, @@ -1077,8 +1111,8 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_9" + "nixpkgs": "nixpkgs_17", + "utils": "utils_10" }, "locked": { "lastModified": 1743722645, @@ -1096,8 +1130,8 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_10" + "nixpkgs": "nixpkgs_18", + "utils": "utils_11" }, "locked": { "lastModified": 1743727062, @@ -1117,8 +1151,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_11" + "nixpkgs": "nixpkgs_19", + "utils": "utils_12" }, "locked": { "lastModified": 1696876711, @@ -1138,8 +1172,8 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_19", - "utils": "utils_12" + "nixpkgs": "nixpkgs_20", + "utils": "utils_13" }, "locked": { "lastModified": 1732375016, @@ -1159,8 +1193,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_20", - "utils": "utils_13" + "nixpkgs": "nixpkgs_21", + "utils": "utils_14" }, "locked": { "lastModified": 1727122069, @@ -1179,8 +1213,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_22", - "utils": "utils_14" + "nixpkgs": "nixpkgs_23", + "utils": "utils_15" }, "locked": { "lastModified": 1739580335, @@ -1347,6 +1381,21 @@ "type": "github" } }, + "systems_18": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1489,6 +1538,24 @@ "inputs": { "systems": "systems_13" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_11": { + "inputs": { + "systems": "systems_14" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -1503,9 +1570,9 @@ "type": "github" } }, - "utils_11": { + "utils_12": { "inputs": { - "systems": "systems_14" + "systems": "systems_15" }, "locked": { "lastModified": 1689068808, @@ -1521,9 +1588,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1539,9 +1606,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -1557,9 +1624,9 @@ "type": "github" } }, - "utils_14": { + "utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -1706,11 +1773,11 @@ "systems": "systems_12" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5c7dc2b..214862d 100644 --- a/flake.nix +++ b/flake.nix @@ -59,6 +59,7 @@ skynet_website_2016.url = "git+https://forgejo.skynet.ie/Skynet/website_2016"; skynet_website_2006.url = "git+https://forgejo.skynet.ie/Skynet/website_2006"; skynet_website_2003.url = "git+https://forgejo.skynet.ie/Skynet/website_2003"; + skynet_website_1996.url = "git+https://forgejo.skynet.ie/Skynet/website_1996"; }; nixConfig = { From 82848f6f5ac18d7d428bbfa9ca3473d028b93e33 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 7 Apr 2025 23:51:45 +0100 Subject: [PATCH 485/563] tmp: leaving this here to work on teh ldap after my fyp demo day --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 214862d..fe31021 100644 --- a/flake.nix +++ b/flake.nix @@ -32,6 +32,7 @@ ### skynet backend ### ###################### skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; +# skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1"; skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; From 555d3d465df2cbbc58ea503243da320dc1cf2526 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 8 Apr 2025 00:15:39 +0100 Subject: [PATCH 486/563] feat: joys of being an admin, able to bend the rules for myself --- applications/git/forgejo.nix | 1 + flake.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index aa8fd86..51f2869 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -70,6 +70,7 @@ in { locations."/" = { proxyPass = "http://localhost:${toString cfg.forgejo.port}"; extraConfig = '' + add_header Content-Security-Policy "frame-ancestors 'self' https://silver.users.skynet.ie"; client_max_body_size 1000M; ''; }; diff --git a/flake.nix b/flake.nix index fe31021..c773a8c 100644 --- a/flake.nix +++ b/flake.nix @@ -32,7 +32,7 @@ ### skynet backend ### ###################### skynet_ldap_backend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_backend"; -# skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1"; + # skynet_ldap_backend.url = "git+file:/_college/CompSoc/Skynet/ldap_backend?shallow=1"; skynet_ldap_frontend.url = "git+https://forgejo.skynet.ie/Skynet/ldap_frontend"; skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; From 74c2a029cc6b22efa00a3077532bc62bfbbd9d6e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 8 Apr 2025 13:21:04 +0000 Subject: [PATCH 487/563] Updated flake for skynet_website_1996 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index ee90678..0e5fc9e 100644 --- a/flake.lock +++ b/flake.lock @@ -1058,11 +1058,11 @@ "utils": "utils_7" }, "locked": { - "lastModified": 1744063133, - "narHash": "sha256-MAevnJsxpaimUzJepL2BpbxlbRVCq3l9G990+LxNKEY=", + "lastModified": 1744118392, + "narHash": "sha256-0W+9obJUFjArArqULQ8pqJuFN5cY5ir0yRZPfhReh8I=", "ref": "refs/heads/main", - "rev": "3f9ef8b4ca0d65b059c0be1277bd2f0c7a9968fb", - "revCount": 10, + "rev": "19ec9fa4c4dafc68ce8b24653782598834a5405d", + "revCount": 13, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/website_1996" }, From c6a50e2d20731c2991302c2157d2d54d8d72a31d Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 8 Apr 2025 23:29:44 +0000 Subject: [PATCH 488/563] 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 0e5fc9e..023973d 100644 --- a/flake.lock +++ b/flake.lock @@ -980,11 +980,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1741928371, - "narHash": "sha256-IhZQ8XJsQ1hmf3+plWSYEqw7dFjcgbPUhRWkpsQOrOk=", + "lastModified": 1744153580, + "narHash": "sha256-/De9zVIAGnAhvP2HxVukKQTHoAM8v9F4DhuaUsYGdv8=", "ref": "refs/heads/main", - "rev": "7f7e7ac598f4a9e03c5bd205f1507cd7a76394fe", - "revCount": 248, + "rev": "e7425588a6aa93af44b7f9f33d3b318992306bdb", + "revCount": 249, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From f7412b08fb57b9818a4aebe6f457f360ce16f392 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 24 Apr 2025 03:50:05 +0000 Subject: [PATCH 489/563] 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 023973d..fb653aa 100644 --- a/flake.lock +++ b/flake.lock @@ -1217,11 +1217,11 @@ "utils": "utils_15" }, "locked": { - "lastModified": 1739580335, - "narHash": "sha256-n9LuI33Ycen3bLS/F5b6df7F61A2wpCRG7Cf1FeVRlc=", + "lastModified": 1745466454, + "narHash": "sha256-st63Yf+KzhrontRBVdlQ/TR6TXAqpoOHvP0VqEYTDY4=", "ref": "refs/heads/main", - "rev": "1df4c0bcd32414fee9bd7ef47bed1137d9f4576a", - "revCount": 126, + "rev": "e135e90a8ee46e57f35e6d74799a8e4ccaea70a9", + "revCount": 151, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 6390d090590b6212a1d3ccf2af9d25d98a10b522 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 29 Apr 2025 01:01:55 +0100 Subject: [PATCH 490/563] feat: all mail from our own internal mail gateway gets put into its own folder for everyone --- applications/email.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/applications/email.nix b/applications/email.nix index 2129de2..2341952 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -113,7 +113,11 @@ with lib; let address :domain ["To", "Cc"] "skynet.ie" ){ if address :matches ["To", "Cc"] "*@skynet.ie" { - if header :is "X-Spam" "Yes" { + # handle spam reports specifically for teh service accounts in each users inbox + if address :matches ["From"] "postmaster@mimi.skynet.ie" { + fileinto :create "''${1}.Spam_Report"; + stop; + } else if header :is "X-Spam" "Yes" { fileinto :create "''${1}.Junk"; stop; } else { @@ -122,6 +126,13 @@ with lib; let } } } + + # handle spam Reports for general users + if address :matches ["From"] "postmaster@mimi.skynet.ie" { + fileinto :create "INBOX..Spam_Report"; + stop; + } + if allof ( address :localpart ["From"] ["${toString create_config_to}"], address :domain ["From"] "skynet.ie" From b71a516fe44380becf635fca03f6bae0d4ebb9b2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 8 May 2025 17:12:34 +0100 Subject: [PATCH 491/563] doc: add the request to open teh TF2/CSGO2 ports --- ITD/Firewall_Rules.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ITD/Firewall_Rules.csv b/ITD/Firewall_Rules.csv index 76cd029..ebc5333 100644 --- a/ITD/Firewall_Rules.csv +++ b/ITD/Firewall_Rules.csv @@ -45,4 +45,5 @@ SKYNET_FIREWALL_00033,Add,i24-06-04_017,Complete,All,-,193.1.99.91,SKYNET00017,8 ,Add,i24-07-15_112,Denied,193.1.99.75,-,-,-,22,-,Response from ITD - 'Our IT Security team have advised that port 22 and port 2222 are only to be allowed through the VPN and will not be opened to allow inbound ssh connections directly from the internet' SKYNET_FIREWALL_00034,Add,i25-01-26_075,Complete,All,-,193.1.99.91,SKYNET00017,-,23318-23325,Ports for Minecraft Bedrock on the main games server. SKYNET_FIREWALL_00035,Add,i25-02-14_114,Complete,193.1.99.75,SKYNET00008,193.1.96.165,SKYNET00012,22,-,Allow our forgejo runner to access and deploy to teh external server -SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter \ No newline at end of file +SKYNET_FIREWALL_00036,Add,i25-03-11_125,Complete,All,-,193.1.99.86,SKYNET00027,25,-,Email Filter +SKYNET_FIREWALL_00037,Add,i25-03-30_018,Complete,All,-,193.1.99.91,SKYNET00017,27015/27016/27020,27015/27020,CSGO/TF2 Ports \ No newline at end of file From a7a7b8489a34f649e27fed2088ef600810793e75 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 May 2025 14:49:35 +0100 Subject: [PATCH 492/563] fix: sieve script had errors involving teh if else --- applications/email.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 2341952..72fd7ea 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -117,19 +117,21 @@ with lib; let if address :matches ["From"] "postmaster@mimi.skynet.ie" { fileinto :create "''${1}.Spam_Report"; stop; - } else if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; } else { - fileinto :create "''${1}"; - stop; + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; + } } } } # handle spam Reports for general users if address :matches ["From"] "postmaster@mimi.skynet.ie" { - fileinto :create "INBOX..Spam_Report"; + fileinto :create "INBOX.Spam_Report"; stop; } From 5e33119b147696794422ecbee035c17d7800c5eb Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 May 2025 15:21:06 +0100 Subject: [PATCH 493/563] feat: better sieve script --- applications/email.nix | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 72fd7ea..4808c35 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -106,10 +106,11 @@ with lib; let require ["fileinto", "reject"]; require "variables"; require "regex"; + require "subaddress"; # this should be close to teh last step if allof ( - address :localpart ["To", "Cc"] ["${toString create_config_to}"], + address :user ["To", "Cc"] ["${toString create_config_to}"], address :domain ["To", "Cc"] "skynet.ie" ){ if address :matches ["To", "Cc"] "*@skynet.ie" { @@ -118,12 +119,21 @@ with lib; let fileinto :create "''${1}.Spam_Report"; stop; } else { - if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; + # no detail, proceed normally + if address :detail ["To", "Cc"] "" { + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; + } else { + fileinto :create "''${1}"; + stop; + } } else { - fileinto :create "''${1}"; - stop; + # user+subdir + if address :matches ["To", "Cc"] "*+*@skynet.ie" { + fileinto :create "''${1}.''${2}"; + stop; + } } } } From 575a617a10adf85e52edaf334034790d1d2db967 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 13 May 2025 16:17:07 +0100 Subject: [PATCH 494/563] fix: the gateway does spf checking, so no need to do it twice --- applications/email.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/email.nix b/applications/email.nix index 4808c35..8c49dcd 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -490,6 +490,10 @@ in { # 20MB max size messageSizeLimit = 20000000; + policydSPFExtraConfig = '' + skip_addresses = 193.1.99.86/32 + ''; + ldap = { enable = true; uris = cfg.ldap.hosts; From 14732ead0fda42ab64427a392472bb12dead2e0b Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 15 May 2025 00:41:15 +0100 Subject: [PATCH 495/563] fix: simplify sieve script --- applications/email.nix | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 8c49dcd..ec5e2a6 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -118,23 +118,21 @@ with lib; let if address :matches ["From"] "postmaster@mimi.skynet.ie" { fileinto :create "''${1}.Spam_Report"; stop; + } + + # user+subdir + if address :matches ["To", "Cc"] "*+*@skynet.ie" { + fileinto :create "''${1}.''${2}"; + stop; + } + + # no detail, proceed normally + if header :is "X-Spam" "Yes" { + fileinto :create "''${1}.Junk"; + stop; } else { - # no detail, proceed normally - if address :detail ["To", "Cc"] "" { - if header :is "X-Spam" "Yes" { - fileinto :create "''${1}.Junk"; - stop; - } else { - fileinto :create "''${1}"; - stop; - } - } else { - # user+subdir - if address :matches ["To", "Cc"] "*+*@skynet.ie" { - fileinto :create "''${1}.''${2}"; - stop; - } - } + fileinto :create "''${1}"; + stop; } } } From b600af4ff5d87f4976531ee1fa34294690bc5f2a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 15 May 2025 00:44:17 +0100 Subject: [PATCH 496/563] feat: add the gateway ip to teh rspamd whitelist --- applications/email.nix | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index ec5e2a6..9c972b4 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -563,14 +563,23 @@ in { }; # tune the spam filter - /* - services.rspamd.extraConfig = '' - actions { - reject = null; # Disable rejects, default is 15 - add_header = 7; # Add header when reaching this score - greylist = 4; # Apply greylisting when reaching this score - } - ''; - */ + services.rspamd.locals = { + "multimap.conf" = { + text = '' + IP_WHITELIST { + type = "ip"; + prefilter = true; + map = "/etc/rspamd/local.d/ip_whitelist.map"; + action = "accept"; + } + ''; + }; + + "ip_whitelist.map" = { + text = '' + 193.1.99.86 + ''; + }; + }; }; } From 53c1869f8a656f58977ec121466fdffa6117ec52 Mon Sep 17 00:00:00 2001 From: silver <+silver@users.noreply.github.com> Date: Fri, 6 Jun 2025 16:21:50 +0000 Subject: [PATCH 497/563] 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 fb653aa..6d50b52 100644 --- a/flake.lock +++ b/flake.lock @@ -1001,11 +1001,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1741691220, - "narHash": "sha256-OSRyKWVqSdeciy1DGYh63fxs7SbppeGRu8/ui54sTtc=", + "lastModified": 1745459480, + "narHash": "sha256-ER4nCZQrbTmeRE+P+xm1T9GjBf4YvgeTMrOMGandmkE=", "ref": "refs/heads/main", - "rev": "35896efa04bb50e2342946e33367245b1cb4460e", - "revCount": 246, + "rev": "b714571b85bcd80600c743d3da4c840ff83adb86", + "revCount": 247, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From d1929bfca25e3463c94977b90f8b94b98b713c9f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 16 Jun 2025 13:20:09 +0000 Subject: [PATCH 498/563] 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 6d50b52..0b48129 100644 --- a/flake.lock +++ b/flake.lock @@ -980,11 +980,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1744153580, - "narHash": "sha256-/De9zVIAGnAhvP2HxVukKQTHoAM8v9F4DhuaUsYGdv8=", + "lastModified": 1750079273, + "narHash": "sha256-Z3N6AsyKLwFyJzUrBgrpWV8oXSIfplhNVYn7IyZYG0U=", "ref": "refs/heads/main", - "rev": "e7425588a6aa93af44b7f9f33d3b318992306bdb", - "revCount": 249, + "rev": "8560ed6de541dbe64f00b8ea1bb3a334a9d33f70", + "revCount": 252, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 8591ccd97c6dc442696e36c804e5134cd6844ae2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 16 Jun 2025 21:10:53 +0100 Subject: [PATCH 499/563] fix: for some reason this secret had gotten renamed --- secrets/secrets.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 2428526..db5670f 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -136,7 +136,7 @@ in { "backup/restic_pw.age".publicKeys = users ++ restic; # discord bot and discord - "discord/token1.age".publicKeys = users ++ discord; + "discord/token.age".publicKeys = users ++ discord; # email stuff "email/details.age".publicKeys = users ++ ldap ++ discord; From ef5cc7dba879b3bc86c6bbb1ee4d42c530af3718 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Mon, 16 Jun 2025 21:12:02 +0100 Subject: [PATCH 500/563] feat: added ``COMPSOC_DISCORD`` and expanded ``COMMITTEE_CATEGORY`` --- secrets/wolves/details.age | Bin 1943 -> 2048 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/secrets/wolves/details.age b/secrets/wolves/details.age index 27a607684bf92907023fdfcfe23453a9f1c69d55..2dd6bfac53a4a5d0cb6c04b5a539f823304f5429 100644 GIT binary patch delta 1932 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 From 1131f51382f2c50b3d5c037c76149120155c78a5 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 17 Jun 2025 16:33:17 +0000 Subject: [PATCH 501/563] Updated flake for skynet_discord_bot --- flake.lock | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 0b48129..5975f6d 100644 --- a/flake.lock +++ b/flake.lock @@ -558,6 +558,22 @@ } }, "nixpkgs-mozilla": { + "flake": false, + "locked": { + "lastModified": 1744624473, + "narHash": "sha256-S6zT/w5SyAkJ//dYdjbrXgm+6Vkd/k7qqUl4WgZ6jjk=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "2292d4b35aa854e312ad2e95c4bb5c293656f21a", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "nixpkgs-mozilla_2": { "flake": false, "locked": { "lastModified": 1740762144, @@ -977,14 +993,15 @@ "inputs": { "naersk": "naersk_2", "nixpkgs": "nixpkgs_9", + "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, "locked": { - "lastModified": 1750079273, - "narHash": "sha256-Z3N6AsyKLwFyJzUrBgrpWV8oXSIfplhNVYn7IyZYG0U=", + "lastModified": 1750173717, + "narHash": "sha256-eyBR9LqrzTH6pSKJi3sgZC4ascjcmqBaaLUZUpTQ1BY=", "ref": "refs/heads/main", - "rev": "8560ed6de541dbe64f00b8ea1bb3a334a9d33f70", - "revCount": 252, + "rev": "3a56d7bba5fa2ca562ab5288f8799339cdc947e3", + "revCount": 286, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, @@ -997,7 +1014,7 @@ "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_11", - "nixpkgs-mozilla": "nixpkgs-mozilla", + "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, "locked": { From 6bd5061c04b32874491d9be75df65507cb77b0bf Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 17:41:24 +0100 Subject: [PATCH 502/563] feat: some minor improvements to teh devshell --- flake.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index c773a8c..b1402af 100644 --- a/flake.nix +++ b/flake.nix @@ -64,7 +64,6 @@ }; nixConfig = { - bash-prompt-suffix = "[Skynet Dev] "; extra-substituters = "https://nix-cache.skynet.ie/skynet-cache"; extra-trusted-public-keys = "skynet-cache:zMFLzcRZPhUpjXUy8SF8Cf7KGAZwo98SKrzeXvdWABo="; }; @@ -82,7 +81,7 @@ formatter.x86_64-linux = alejandra.defaultPackage."x86_64-linux"; devShells.x86_64-linux.default = pkgs.mkShell { - name = "Skynet build env"; + name = "Skynet"; nativeBuildInputs = [ pkgs.buildPackages.git colmena.defaultPackage."x86_64-linux" @@ -90,7 +89,7 @@ pkgs.buildPackages.nmap ]; buildInputs = [agenix.packages.x86_64-linux.default]; - shellHook = ''export EDITOR="${pkgs.nano}/bin/nano --nonewlines"; unset LD_LIBRARY_PATH;''; + shellHook = ''export PROMPT_DIRTRIM=3; export PS1="[Skynet] \w:\$ "''; }; colmena = { From 5744a0575f7dae9f6ef1df7a329f76c10b1f576c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 19:53:44 +0100 Subject: [PATCH 503/563] feat: update nixpkgs and the mailserver --- applications/email.nix | 12 +++--- flake.lock | 86 +++++++++++++++++++++++++++++++++--------- 2 files changed, 75 insertions(+), 23 deletions(-) diff --git a/applications/email.nix b/applications/email.nix index 9c972b4..d7a6381 100644 --- a/applications/email.nix +++ b/applications/email.nix @@ -470,6 +470,8 @@ in { mailserver = { enable = true; + stateVersion = 1; + fqdn = "${cfg.sub}.${cfg.domain}"; domains = [ cfg.domain @@ -488,9 +490,9 @@ in { # 20MB max size messageSizeLimit = 20000000; - policydSPFExtraConfig = '' - skip_addresses = 193.1.99.86/32 - ''; + # policydSPFExtraConfig = '' + # skip_addresses = 193.1.99.86/32 + # ''; ldap = { enable = true; @@ -504,13 +506,13 @@ in { searchScope = "sub"; dovecot = { - userFilter = "(skMail=%u)"; + userFilter = "(skMail=%{user})"; # can lock down how much space each user has access to from ldap userAttrs = "quotaEmail=quota_rule=*:bytes=%$,=quota_rule2=Trash:storage=+100M"; # accept emails in, but only allow access to paid up members - passFilter = "(&(|${create_filter cfg.groups})(skMail=%u))"; + passFilter = "(&(|${create_filter cfg.groups})(skMail=%{user}))"; }; postfix = { diff --git a/flake.lock b/flake.lock index 5975f6d..804e475 100644 --- a/flake.lock +++ b/flake.lock @@ -247,11 +247,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -379,6 +379,54 @@ "type": "github" } }, + "git-hooks": { + "inputs": { + "flake-compat": [ + "simple-nixos-mailserver", + "flake-compat" + ], + "gitignore": "gitignore", + "nixpkgs": [ + "simple-nixos-mailserver", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749636823, + "narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "623c56286de5a3193aa38891a6991b28f9bab056", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "simple-nixos-mailserver", + "git-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1709087332, + "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "haskell-flake": { "locked": { "lastModified": 1675296942, @@ -542,19 +590,20 @@ "type": "github" } }, - "nixpkgs-24_05": { + "nixpkgs-25_05": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { - "id": "nixpkgs", - "ref": "nixos-24.05", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-mozilla": { @@ -864,11 +913,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "type": "github" }, "original": { @@ -970,17 +1019,18 @@ "inputs": { "blobs": "blobs", "flake-compat": "flake-compat_2", + "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-24_05": "nixpkgs-24_05" + "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1723233349, - "narHash": "sha256-0NqGJ+wFxmK6DEEvlZ+jGMdDkIaQ+S54kBStwkGUaO8=", + "lastModified": 1750183846, + "narHash": "sha256-owKJ2rsa/0WVZQAprlbqgVAAGlz3MFuvgNea3+ic4fs=", "ref": "refs/heads/master", - "rev": "a98a93cf22cd53a92143703a0a5b6f76438a15ba", - "revCount": 594, + "rev": "c097bd662c9e1aea8c1fca10d57188e81c5574a0", + "revCount": 743, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/misc_nixos-mailserver" }, From f010291c57017e45bba736e79c7091a4e448b855 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 20:13:48 +0100 Subject: [PATCH 504/563] feat: dont tie lix to nixpkgs This will mean that it will only be built again once the package is updated --- flake.lock | 156 +++++++++++++++++++++++++++++------------------------ flake.nix | 2 +- 2 files changed, 86 insertions(+), 72 deletions(-) diff --git a/flake.lock b/flake.lock index 804e475..f922c31 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_23" }, "locked": { "lastModified": 1719514321, @@ -483,9 +483,7 @@ "flake-utils": "flake-utils_3", "flakey-profile": "flakey-profile", "lix": "lix", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1737237494, @@ -519,7 +517,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1721727458, @@ -537,7 +535,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1739824009, @@ -639,6 +637,21 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -652,7 +665,7 @@ "type": "indirect" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -667,7 +680,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -681,7 +694,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -695,20 +708,6 @@ "type": "indirect" } }, - "nixpkgs_14": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_15": { "locked": { "lastModified": 1741037377, @@ -738,6 +737,20 @@ } }, "nixpkgs_17": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_18": { "locked": { "lastModified": 1690026219, "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", @@ -751,7 +764,7 @@ "type": "indirect" } }, - "nixpkgs_18": { + "nixpkgs_19": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -765,20 +778,6 @@ "type": "indirect" } }, - "nixpkgs_19": { - "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1733212471, @@ -796,6 +795,20 @@ } }, "nixpkgs_20": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_21": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -809,7 +822,7 @@ "type": "indirect" } }, - "nixpkgs_21": { + "nixpkgs_22": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -823,7 +836,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_23": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -839,7 +852,7 @@ "type": "github" } }, - "nixpkgs_23": { + "nixpkgs_24": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -912,6 +925,22 @@ } }, "nixpkgs_7": { + "locked": { + "lastModified": 1749794982, + "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_8": { "locked": { "lastModified": 1749794982, "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", @@ -926,7 +955,7 @@ "type": "indirect" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1723151389, "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", @@ -940,21 +969,6 @@ "type": "indirect" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1722995383, - "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -964,7 +978,7 @@ "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_2", "lix-module": "lix-module", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_ldap_backend": "skynet_ldap_backend", @@ -1042,7 +1056,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_9", + "nixpkgs": "nixpkgs_10", "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, @@ -1063,7 +1077,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, @@ -1083,7 +1097,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "utils": "utils_5" }, "locked": { @@ -1102,7 +1116,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_13", + "nixpkgs": "nixpkgs_14", "utils": "utils_6" }, "locked": { @@ -1121,7 +1135,7 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_15", "utils": "utils_7" }, "locked": { @@ -1140,7 +1154,7 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_16", "utils": "utils_8" }, "locked": { @@ -1159,7 +1173,7 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_17", "utils": "utils_9" }, "locked": { @@ -1178,7 +1192,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_18", "utils": "utils_10" }, "locked": { @@ -1197,7 +1211,7 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { @@ -1218,7 +1232,7 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_20", "utils": "utils_12" }, "locked": { @@ -1239,7 +1253,7 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_21", "utils": "utils_13" }, "locked": { @@ -1260,7 +1274,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_22", "utils": "utils_14" }, "locked": { @@ -1280,7 +1294,7 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_24", "utils": "utils_15" }, "locked": { diff --git a/flake.nix b/flake.nix index b1402af..cf722be 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; # utility stuff From 4ff68b45f78820f6cded83f9f2dce6e49811df8e Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 17 Jun 2025 20:50:01 +0100 Subject: [PATCH 505/563] feat: bump the lix version This will mean that it will only be built again once the package is updated --- flake.lock | 20 ++++++++++---------- flake.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.lock b/flake.lock index f922c31..b55bbe0 100644 --- a/flake.lock +++ b/flake.lock @@ -467,15 +467,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", - "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", + "lastModified": 1746827285, + "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", + "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" } }, "lix-module": { @@ -486,15 +486,15 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1737237494, - "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", - "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", + "lastModified": 1746838955, + "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", + "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" } }, "naersk": { diff --git a/flake.nix b/flake.nix index cf722be..034dd7b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs.url = "nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; # inputs.nixpkgs.follows = "nixpkgs"; }; From 79167f3966ee777e30b010b2b397274497ee051f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 01:57:35 +0100 Subject: [PATCH 506/563] fix: dnssec-validation needed to be set to auto, which is now its default value. https://bind9.readthedocs.io/en/v9.18.13/reference.html#namedconf-statement-dnssec-validation --- applications/dns/dns.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/dns/dns.nix b/applications/dns/dns.nix index da8577f..3286a98 100644 --- a/applications/dns/dns.nix +++ b/applications/dns/dns.nix @@ -369,7 +369,7 @@ in { # piles of no valid RRSIG resolving 'com/DS/IN' errors extraOptions = '' - dnssec-validation yes; + dnssec-validation auto; ''; # set the upstream dns servers From dfdc1e0fcc581887d023b8c495f499a4bab31216 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 02:25:55 +0100 Subject: [PATCH 507/563] feat: the changes have been merged in, use the upstream module --- applications/proxmox-lxc.nix | 96 ------------------------------------ machines/_base.nix | 5 +- 2 files changed, 2 insertions(+), 99 deletions(-) delete mode 100644 applications/proxmox-lxc.nix diff --git a/applications/proxmox-lxc.nix b/applications/proxmox-lxc.nix deleted file mode 100644 index 9f1c970..0000000 --- a/applications/proxmox-lxc.nix +++ /dev/null @@ -1,96 +0,0 @@ -/* -Once https://github.com/NixOS/nixpkgs/pull/267764 is merged this can be removed -*/ -{ - config, - pkgs, - lib, - ... -}: -with lib; { - options.proxmoxLXC = { - enable = mkOption { - default = true; - type = types.bool; - description = lib.mdDoc "Whether to enable the Proxmox VE LXC module."; - }; - privileged = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable privileged mounts - ''; - }; - manageNetwork = mkOption { - type = types.bool; - default = false; - description = '' - Whether to manage network interfaces through nix options - When false, systemd-networkd is enabled to accept network - configuration from proxmox. - ''; - }; - manageHostName = mkOption { - type = types.bool; - default = false; - description = '' - Whether to manage hostname through nix options - When false, the hostname is picked up from /etc/hostname - populated by proxmox. - ''; - }; - }; - - config = let - cfg = config.proxmoxLXC; - in - mkIf cfg.enable { - system.build.tarball = pkgs.callPackage ../../lib/make-system-tarball.nix { - storeContents = [ - { - object = config.system.build.toplevel; - symlink = "none"; - } - ]; - - contents = [ - { - source = config.system.build.toplevel + "/init"; - target = "/sbin/init"; - } - ]; - - extraCommands = "mkdir -p root etc/systemd/network"; - }; - - boot = { - isContainer = true; - loader.initScript.enable = true; - }; - - console.enable = true; - - networking = mkIf (!cfg.manageNetwork) { - useDHCP = false; - useHostResolvConf = false; - useNetworkd = true; - # pick up hostname from /etc/hostname generated by proxmox - hostName = mkIf (!cfg.manageHostName) (mkForce ""); - }; - - services.openssh = { - enable = mkDefault true; - startWhenNeeded = mkDefault true; - }; - - systemd = { - mounts = mkIf (!cfg.privileged) [ - { - enable = false; - where = "/sys/kernel/debug"; - } - ]; - services."getty@".unitConfig.ConditionPathExists = ["" "/dev/%I"]; - }; - }; -} diff --git a/machines/_base.nix b/machines/_base.nix index 0fa84e6..18da744 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -11,9 +11,8 @@ with lib; let cfg = config.skynet; in { imports = [ - # custom lxc mocule until the patch gets merged in - ../applications/proxmox-lxc.nix - # (modulesPath + "/virtualisation/proxmox-lxc.nix") + # This is required for LXC to function properly + (modulesPath + "/virtualisation/proxmox-lxc.nix") # for the secrets inputs.agenix.nixosModules.default From 4fc1071225184d9ca2e74a04a2a9d54674a1a4aa Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 03:14:04 +0100 Subject: [PATCH 508/563] temp: temp switch the dns servers since the recent changes left them unavailable --- machines/vendetta.nix | 2 +- machines/vigil.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 3cff501..7b89f84 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -57,7 +57,7 @@ in { server = { enable = true; # primary dns server (ns1) - primary = true; + primary = false; ip = ip_pub; }; }; diff --git a/machines/vigil.nix b/machines/vigil.nix index 421ebaa..78527fd 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -41,7 +41,7 @@ in { server = { enable = true; # secondary dns server (ns2) - primary = false; + primary = true; ip = ip_pub; }; }; From 5ca3265cc17bea668fb6c13f8a8b237d2dfbf2ca Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Wed, 18 Jun 2025 03:14:35 +0100 Subject: [PATCH 509/563] feat: fixed how sometimes updating servers mean that ye had to reset teh MAC address in Proxmox. This is done by letting each server manage its own network interface. --- applications/_base.nix | 24 ++++++++++++++++++++++++ machines/_base.nix | 6 +++++- machines/agentjones.nix | 14 +------------- machines/neuromancer.nix | 14 +------------- machines/skynet.nix | 2 ++ machines/vendetta.nix | 16 ++-------------- 6 files changed, 35 insertions(+), 41 deletions(-) diff --git a/applications/_base.nix b/applications/_base.nix index f96d7e4..c9f7f61 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -42,6 +42,16 @@ in { type = types.str; default = "${cfg.host.name}.skynet.ie"; }; + interface = mkOption { + type = types.str; + description = "Will most likely be ``eno1`` for physical servers."; + default = "eth0"; + }; + cidr = mkOption { + type = types.int; + description = "Most of our servers are /26, "; + default = 26; + }; }; }; @@ -60,6 +70,20 @@ in { } ]; + # set + networking = { + hostName = cfg.host.name; + defaultGateway.interface = lib.mkForce cfg.host.interface; + + # needs to have an address statically assigned + interfaces."${cfg.host.interface}".ipv4.addresses = [ + { + address = cfg.host.ip; + prefixLength = cfg.host.cidr; + } + ]; + }; + services.nginx = { virtualHosts = { # for every server unless explisitly defined redirect the ip to skynet.ie diff --git a/machines/_base.nix b/machines/_base.nix index 18da744..44dfadd 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -35,7 +35,11 @@ in { config = { # if its a lxc enable - proxmoxLXC.enable = cfg.lxc; + proxmoxLXC = { + enable = cfg.lxc; + manageNetwork = true; + manageHostName = true; + }; nix = { settings = { diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 1fb3c4e..2c1ae09 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -21,6 +21,7 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) ip = ip_pub; name = name; hostname = hostname; + interface = "en01"; }; in { imports = [ @@ -44,19 +45,6 @@ in { # keep the wired usb connection alive (front panel) # networking.interfaces.enp0s29u1u5u2.useDHCP = true; - networking.hostName = name; - # this has to be defined for any physical servers - # vms are defined by teh vm host - networking = { - defaultGateway.interface = lib.mkForce "eno1"; - interfaces.eno1.ipv4.addresses = [ - { - address = ip_pub; - prefixLength = 26; - } - ]; - }; - # this server is teh firewall skynet_firewall = { # always good to know oneself diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 6e2cbd9..7068310 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -22,25 +22,13 @@ Notes: ip = ip_pub; name = name; hostname = hostname; + interface = "en01"; }; in { imports = [ ./hardware/RM007.nix ]; - networking.hostName = name; - # this has to be defined for any physical servers - # vms are defined by teh vm host - networking = { - defaultGateway.interface = lib.mkForce "eno1"; - interfaces.eno1.ipv4.addresses = [ - { - address = ip_pub; - prefixLength = 26; - } - ]; - }; - deployment = { targetHost = hostname; targetPort = 22; diff --git a/machines/skynet.nix b/machines/skynet.nix index 720e9a3..546596e 100644 --- a/machines/skynet.nix +++ b/machines/skynet.nix @@ -23,6 +23,8 @@ Notes: Does not host offical sites ip = ip_pub; name = name; hostname = hostname; + interface = "eth1"; + cidr = 28; }; in { imports = [ diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 7b89f84..faea1a5 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -22,14 +22,14 @@ Notes: Using the server that used to be called Earth ip = ip_pub; name = name; hostname = hostname; + # only required for physical servers + interface = "en01"; }; in { imports = [ ./hardware/RM002.nix ]; - networking.hostName = name; - deployment = { targetHost = ip_pub; targetPort = 22; @@ -38,18 +38,6 @@ in { tags = ["active-dns" "dns"]; }; - networking = { - # needs to have an address statically assigned - - defaultGateway.interface = lib.mkForce "eno1"; - interfaces.eno1.ipv4.addresses = [ - { - address = "193.1.99.120"; - prefixLength = 26; - } - ]; - }; - services.skynet = { host = host; backup.enable = true; From ffe77907c9e0a7c4ccd529eb469d7b0cb09a66f9 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Wed, 18 Jun 2025 03:05:58 +0000 Subject: [PATCH 510/563] 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 b55bbe0..0274176 100644 --- a/flake.lock +++ b/flake.lock @@ -1061,11 +1061,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1750173717, - "narHash": "sha256-eyBR9LqrzTH6pSKJi3sgZC4ascjcmqBaaLUZUpTQ1BY=", + "lastModified": 1750215424, + "narHash": "sha256-vpvSJIa8q5NPup0dkG3GFtW6lgqasVZ1KOuKCno/Sj8=", "ref": "refs/heads/main", - "rev": "3a56d7bba5fa2ca562ab5288f8799339cdc947e3", - "revCount": 286, + "rev": "1dc5c105df7ba80643b596d3de025a28871aba2c", + "revCount": 287, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 5fd9e297b051d57ea88a519d61a1a21be06befc2 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:17:16 +0100 Subject: [PATCH 511/563] fix: had used the wrong interface --- machines/agentjones.nix | 2 +- machines/neuromancer.nix | 2 +- machines/vendetta.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/agentjones.nix b/machines/agentjones.nix index 2c1ae09..f661104 100644 --- a/machines/agentjones.nix +++ b/machines/agentjones.nix @@ -21,7 +21,7 @@ Notes: Used to have Agent Smith as a partner but it died (Ironically) ip = ip_pub; name = name; hostname = hostname; - interface = "en01"; + interface = "eno1"; }; in { imports = [ diff --git a/machines/neuromancer.nix b/machines/neuromancer.nix index 7068310..ed49d06 100644 --- a/machines/neuromancer.nix +++ b/machines/neuromancer.nix @@ -22,7 +22,7 @@ Notes: ip = ip_pub; name = name; hostname = hostname; - interface = "en01"; + interface = "eno1"; }; in { imports = [ diff --git a/machines/vendetta.nix b/machines/vendetta.nix index faea1a5..1113ab7 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -23,7 +23,7 @@ Notes: Using the server that used to be called Earth name = name; hostname = hostname; # only required for physical servers - interface = "en01"; + interface = "eno1"; }; in { imports = [ From af2613feaabeb2712d0894e16ef9098e93c7777d Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:18:30 +0100 Subject: [PATCH 512/563] feat: create a password so michenes can eb physically logged into --- machines/_base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/_base.nix b/machines/_base.nix index 44dfadd..857e458 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -73,7 +73,7 @@ in { }; users.users.root = { - initialHashedPassword = ""; + initialHashedPassword = "$y$j9T$lf/Z1Db.lAXan2WN/YQEF.$ILMN5CK4eImzrioB04D.VgD7wrV2rwUjcTi..WE5ea6"; openssh.authorizedKeys.keys = [ # no obligation to have name attached to keys From fc1e1c5806c740497ab5ae9de8a7162e6d1a40a9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:19:13 +0100 Subject: [PATCH 513/563] Revert "temp: temp switch the dns servers since the recent changes left them unavailable" This reverts commit 4fc1071225184d9ca2e74a04a2a9d54674a1a4aa. --- machines/vendetta.nix | 2 +- machines/vigil.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/vendetta.nix b/machines/vendetta.nix index 1113ab7..3244ba6 100644 --- a/machines/vendetta.nix +++ b/machines/vendetta.nix @@ -45,7 +45,7 @@ in { server = { enable = true; # primary dns server (ns1) - primary = false; + primary = true; ip = ip_pub; }; }; diff --git a/machines/vigil.nix b/machines/vigil.nix index 78527fd..421ebaa 100644 --- a/machines/vigil.nix +++ b/machines/vigil.nix @@ -41,7 +41,7 @@ in { server = { enable = true; # secondary dns server (ns2) - primary = true; + primary = false; ip = ip_pub; }; }; From 1823ae396f7c50095ab6c5ff690eb7ba89f7f8ee Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 20 Jun 2025 11:20:50 +0100 Subject: [PATCH 514/563] feat: more agressive recovery of storage --- machines/_base.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/machines/_base.nix b/machines/_base.nix index 857e458..36c087b 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -58,10 +58,10 @@ in { # options = "--delete-older-than 30d"; # }; - # to free up to 10GiB whenever there is less than 1GiB left + # to free up to 100GiB whenever there is less than 10GiB left extraOptions = '' - min-free = ${toString (1024 * 1024 * 1024)} - max-free = ${toString (1024 * 1024 * 1024 * 10)} + min-free = ${toString (1024 * 1024 * 1024 * 10)} + max-free = ${toString (1024 * 1024 * 1024 * 100)} ''; }; From d7e1e44f1be6dae31749a9d560293583376a9ed4 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 23 Jun 2025 23:22:09 +0000 Subject: [PATCH 515/563] 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 0274176..a97a824 100644 --- a/flake.lock +++ b/flake.lock @@ -1061,11 +1061,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1750215424, - "narHash": "sha256-vpvSJIa8q5NPup0dkG3GFtW6lgqasVZ1KOuKCno/Sj8=", + "lastModified": 1750720601, + "narHash": "sha256-NDYXjqGEOXfge1kMd/4W5PdHz9HjZuAF2ssOsVYRmkM=", "ref": "refs/heads/main", - "rev": "1dc5c105df7ba80643b596d3de025a28871aba2c", - "revCount": 287, + "rev": "d27befdac6927c686d4bf96e05e6f677f477c79a", + "revCount": 289, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 017d383d0887bd9df98b1df5008cb7ee23f5fe31 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 24 Jun 2025 00:37:08 +0100 Subject: [PATCH 516/563] fix: recovering space was too agressive --- machines/_base.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/machines/_base.nix b/machines/_base.nix index 36c087b..555666e 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -58,9 +58,9 @@ in { # options = "--delete-older-than 30d"; # }; - # to free up to 100GiB whenever there is less than 10GiB left + # to free up to 100GiB whenever there is less than 1GiB left extraOptions = '' - min-free = ${toString (1024 * 1024 * 1024 * 10)} + min-free = ${toString (1024 * 1024 * 1024 * 1)} max-free = ${toString (1024 * 1024 * 1024 * 100)} ''; }; From 319522e4d37501bfd21537962361b54d674ee635 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 24 Jun 2025 01:24:52 +0100 Subject: [PATCH 517/563] feat: properly set a root user password for physical access --- machines/_base.nix | 30 ++++++++++++++++++------------ secrets/base/root_pass.age | Bin 0 -> 2849 bytes secrets/secrets.nix | 1 + 3 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 secrets/base/root_pass.age diff --git a/machines/_base.nix b/machines/_base.nix index 555666e..84abb5c 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -41,6 +41,8 @@ in { manageHostName = true; }; + age.secrets.root_pw.file = ../secrets/base/root_pass.age; + nix = { settings = { # flakes are essensial @@ -72,23 +74,27 @@ in { settings.PermitRootLogin = "prohibit-password"; }; - users.users.root = { - initialHashedPassword = "$y$j9T$lf/Z1Db.lAXan2WN/YQEF.$ILMN5CK4eImzrioB04D.VgD7wrV2rwUjcTi..WE5ea6"; + users = { + mutableUsers = false; - openssh.authorizedKeys.keys = [ - # no obligation to have name attached to keys + users.root = { + hashedPasswordFile = config.age.secrets.root_pw.path; - # Root account - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin" + openssh.authorizedKeys.keys = [ + # no obligation to have name attached to keys - # CI/CD key - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDvexq/JjsMqL0G5P38klzoOkHs3IRyXYO1luEJuB5R colmena_key" + # Root account + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK6DjXTAxesXpQ65l659iAjzEb6VpRaWKSg4AXxifPw9 Skynet Admin" - # Brendan Golden - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb" + # CI/CD key + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBDvexq/JjsMqL0G5P38klzoOkHs3IRyXYO1luEJuB5R colmena_key" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer" - ]; + # Brendan Golden + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb" + + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer" + ]; + }; }; # skynet-admin-linux will always be added, individual servers can override the groups option diff --git a/secrets/base/root_pass.age b/secrets/base/root_pass.age new file mode 100644 index 0000000000000000000000000000000000000000..2313336437c6050b924be3bcd8aa192dcf6d1356 GIT binary patch literal 2849 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 literal 0 HcmV?d00001 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index db5670f..5321af2 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -105,6 +105,7 @@ let ]; in { # nix run github:ryantm/agenix -- -e secret1.age + "base/root_pass.age".publicKeys = users ++ systems; "dns_certs.secret.age".publicKeys = users ++ systems; "dns_dnskeys.conf.age".publicKeys = users ++ dns; From 4061e143f0e52400bf1cb84dfa522e7045e63035 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 29 Jun 2025 22:17:15 +0000 Subject: [PATCH 518/563] 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 a97a824..75e9573 100644 --- a/flake.lock +++ b/flake.lock @@ -1082,11 +1082,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1745459480, - "narHash": "sha256-ER4nCZQrbTmeRE+P+xm1T9GjBf4YvgeTMrOMGandmkE=", + "lastModified": 1751234352, + "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", "ref": "refs/heads/main", - "rev": "b714571b85bcd80600c743d3da4c840ff83adb86", - "revCount": 247, + "rev": "1dae2ecb2623d55c88a237d55198efd51e0fd8fe", + "revCount": 249, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/ldap_backend" }, From 4b3cf6c22e84076e90a16934bbf463cb1baf23e6 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Tue, 1 Jul 2025 17:01:34 +0100 Subject: [PATCH 519/563] [skip ci] feat: added teh logging bot --- applications/discord_t-800.nix | 32 ++++ flake.lock | 292 +++++++++++++++++++++++---------- flake.nix | 1 + machines/kitt.nix | 4 + secrets/discord/t-800.age | Bin 0 -> 1538 bytes secrets/secrets.nix | 1 + 6 files changed, 244 insertions(+), 86 deletions(-) create mode 100644 applications/discord_t-800.nix create mode 100644 secrets/discord/t-800.age diff --git a/applications/discord_t-800.nix b/applications/discord_t-800.nix new file mode 100644 index 0000000..cad630a --- /dev/null +++ b/applications/discord_t-800.nix @@ -0,0 +1,32 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +with lib; let + name = "discord_bot_t-800"; + cfg = config.services.skynet."${name}"; +in { + imports = [ + inputs.skynet_discord_bot_t-800.nixosModule."x86_64-linux" + ]; + + options.services.skynet."${name}" = { + enable = mkEnableOption "Logging Bot"; + }; + + config = mkIf cfg.enable { + #backups = [ "/etc/silver_ul_ical/database.db" ]; + + age.secrets.discord_t-800_details.file = ../secrets/discord/t-800.age; + + # this is what was imported + services.skynet_discord_bot_t-800 = { + enable = true; + + env = config.age.secrets.discord_t-800_details.path; + }; + }; +} diff --git a/flake.lock b/flake.lock index 75e9573..f719ece 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_23" + "nixpkgs": "nixpkgs_25" }, "locked": { "lastModified": 1719514321, @@ -537,6 +537,24 @@ "inputs": { "nixpkgs": "nixpkgs_11" }, + "locked": { + "lastModified": 1745925850, + "narHash": "sha256-cyAAMal0aPrlb1NgzMxZqeN1mAJ2pJseDhm2m6Um8T0=", + "owner": "nix-community", + "repo": "naersk", + "rev": "38bc60bbc157ae266d4a0c96671c6c742ee17a5f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "naersk", + "type": "github" + } + }, + "naersk_4": { + "inputs": { + "nixpkgs": "nixpkgs_13" + }, "locked": { "lastModified": 1739824009, "narHash": "sha256-fcNrCMUWVLMG3gKC5M9CBqVOAnJtyRvGPxptQFl5mVg=", @@ -621,6 +639,22 @@ } }, "nixpkgs-mozilla_2": { + "flake": false, + "locked": { + "lastModified": 1744624473, + "narHash": "sha256-S6zT/w5SyAkJ//dYdjbrXgm+6Vkd/k7qqUl4WgZ6jjk=", + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "rev": "2292d4b35aa854e312ad2e95c4bb5c293656f21a", + "type": "github" + }, + "original": { + "owner": "mozilla", + "repo": "nixpkgs-mozilla", + "type": "github" + } + }, + "nixpkgs-mozilla_3": { "flake": false, "locked": { "lastModified": 1740762144, @@ -652,6 +686,37 @@ } }, "nixpkgs_11": { + "locked": { + "lastModified": 1750731501, + "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "69dfebb3d175bde602f612915c5576a41b18486b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_12": { + "locked": { + "lastModified": 1750506804, + "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4206c4cb56751df534751b058295ea61357bbbaa", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -665,7 +730,7 @@ "type": "indirect" } }, - "nixpkgs_12": { + "nixpkgs_14": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -680,7 +745,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_15": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -694,7 +759,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_16": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -708,34 +773,6 @@ "type": "indirect" } }, - "nixpkgs_15": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_16": { - "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, "nixpkgs_17": { "locked": { "lastModified": 1741037377, @@ -752,11 +789,11 @@ }, "nixpkgs_18": { "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -766,11 +803,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1724114134, - "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -796,11 +833,11 @@ }, "nixpkgs_20": { "locked": { - "lastModified": 1689935543, - "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -823,6 +860,34 @@ } }, "nixpkgs_22": { + "locked": { + "lastModified": 1689935543, + "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e43e2448161c0a2c4928abec4e16eae1516571bc", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_23": { + "locked": { + "lastModified": 1724114134, + "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f02fa2f654c7bcc45f0e815c29d093da7f1245b4", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, + "nixpkgs_24": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -836,7 +901,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_25": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -852,7 +917,7 @@ "type": "github" } }, - "nixpkgs_24": { + "nixpkgs_26": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -981,6 +1046,7 @@ "nixpkgs": "nixpkgs_8", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", + "skynet_discord_bot_t-800": "skynet_discord_bot_t-800", "skynet_ldap_backend": "skynet_ldap_backend", "skynet_ldap_frontend": "skynet_ldap_frontend", "skynet_website": "skynet_website", @@ -1074,13 +1140,34 @@ "url": "https://forgejo.skynet.ie/Skynet/discord-bot" } }, - "skynet_ldap_backend": { + "skynet_discord_bot_t-800": { "inputs": { "naersk": "naersk_3", "nixpkgs": "nixpkgs_12", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, + "locked": { + "lastModified": 1751383566, + "narHash": "sha256-MchpwkTBUlpa8Spj8UJbvPPW1TOaAtffsraQQSJ4a58=", + "ref": "refs/heads/main", + "rev": "4fe416b9e7280d02e6ecc4b5e77c95b8d218f419", + "revCount": 23, + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" + }, + "original": { + "type": "git", + "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" + } + }, + "skynet_ldap_backend": { + "inputs": { + "naersk": "naersk_4", + "nixpkgs": "nixpkgs_14", + "nixpkgs-mozilla": "nixpkgs-mozilla_3", + "utils": "utils_5" + }, "locked": { "lastModified": 1751234352, "narHash": "sha256-OeNGbd3kn2jjJq9nbNcLq7wquc8leOyWkahuWopKnv4=", @@ -1097,8 +1184,8 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_13", - "utils": "utils_5" + "nixpkgs": "nixpkgs_15", + "utils": "utils_6" }, "locked": { "lastModified": 1727122070, @@ -1116,8 +1203,8 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_14", - "utils": "utils_6" + "nixpkgs": "nixpkgs_16", + "utils": "utils_7" }, "locked": { "lastModified": 1732375016, @@ -1135,8 +1222,8 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_15", - "utils": "utils_7" + "nixpkgs": "nixpkgs_17", + "utils": "utils_8" }, "locked": { "lastModified": 1744118392, @@ -1154,8 +1241,8 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_16", - "utils": "utils_8" + "nixpkgs": "nixpkgs_18", + "utils": "utils_9" }, "locked": { "lastModified": 1743721206, @@ -1173,8 +1260,8 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_17", - "utils": "utils_9" + "nixpkgs": "nixpkgs_19", + "utils": "utils_10" }, "locked": { "lastModified": 1743715699, @@ -1192,8 +1279,8 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_18", - "utils": "utils_10" + "nixpkgs": "nixpkgs_20", + "utils": "utils_11" }, "locked": { "lastModified": 1743722645, @@ -1211,8 +1298,8 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_19", - "utils": "utils_11" + "nixpkgs": "nixpkgs_21", + "utils": "utils_12" }, "locked": { "lastModified": 1743727062, @@ -1232,8 +1319,8 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_20", - "utils": "utils_12" + "nixpkgs": "nixpkgs_22", + "utils": "utils_13" }, "locked": { "lastModified": 1696876711, @@ -1253,8 +1340,8 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_21", - "utils": "utils_13" + "nixpkgs": "nixpkgs_23", + "utils": "utils_14" }, "locked": { "lastModified": 1732375016, @@ -1274,8 +1361,8 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_22", - "utils": "utils_14" + "nixpkgs": "nixpkgs_24", + "utils": "utils_15" }, "locked": { "lastModified": 1727122069, @@ -1294,8 +1381,8 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_24", - "utils": "utils_15" + "nixpkgs": "nixpkgs_26", + "utils": "utils_16" }, "locked": { "lastModified": 1745466454, @@ -1477,6 +1564,21 @@ "type": "github" } }, + "systems_19": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1620,11 +1722,11 @@ "systems": "systems_13" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1637,6 +1739,24 @@ "inputs": { "systems": "systems_14" }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "utils_12": { + "inputs": { + "systems": "systems_15" + }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -1651,9 +1771,9 @@ "type": "github" } }, - "utils_12": { + "utils_13": { "inputs": { - "systems": "systems_15" + "systems": "systems_16" }, "locked": { "lastModified": 1689068808, @@ -1669,9 +1789,9 @@ "type": "github" } }, - "utils_13": { + "utils_14": { "inputs": { - "systems": "systems_16" + "systems": "systems_17" }, "locked": { "lastModified": 1710146030, @@ -1687,9 +1807,9 @@ "type": "github" } }, - "utils_14": { + "utils_15": { "inputs": { - "systems": "systems_17" + "systems": "systems_18" }, "locked": { "lastModified": 1694529238, @@ -1705,9 +1825,9 @@ "type": "github" } }, - "utils_15": { + "utils_16": { "inputs": { - "systems": "systems_18" + "systems": "systems_19" }, "locked": { "lastModified": 1710146030, @@ -1782,11 +1902,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -1800,11 +1920,11 @@ "systems": "systems_9" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1687171271, + "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", "type": "github" }, "original": { @@ -1818,11 +1938,11 @@ "systems": "systems_10" }, "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 034dd7b..f63e7c8 100644 --- a/flake.nix +++ b/flake.nix @@ -37,6 +37,7 @@ skynet_website_wiki.url = "git+https://forgejo.skynet.ie/Skynet/wiki"; skynet_website_games.url = "git+https://forgejo.skynet.ie/Skynet/website_games"; skynet_discord_bot.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot"; + skynet_discord_bot_t-800.url = "git+https://forgejo.skynet.ie/Skynet/discord-bot-t-800"; # for testing a local build # skynet_discord_bot.url = "git+file:/_college/CompSoc/Skynet/discord_bot?shallow=1"; diff --git a/machines/kitt.nix b/machines/kitt.nix index 93298ac..35600c8 100644 --- a/machines/kitt.nix +++ b/machines/kitt.nix @@ -29,6 +29,7 @@ in { ../applications/ldap/server.nix ../applications/ldap/backend.nix ../applications/discord.nix + ../applications/discord_t-800.nix ../applications/bitwarden/vaultwarden.nix ../applications/bitwarden/bitwarden_sync.nix ../applications/sso.nix @@ -53,6 +54,9 @@ in { # private member services discord_bot.enable = true; + # for logging on our own discord + discord_bot_t-800.enable = true; + # committee/admin services vaultwarden.enable = true; diff --git a/secrets/discord/t-800.age b/secrets/discord/t-800.age new file mode 100644 index 0000000000000000000000000000000000000000..496116149eda9783e6a21436482a21f0255f16fa GIT binary patch literal 1538 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w{*E76Zk zvk34?H#Lq-%g!;)^7HVEGB-|7^YchI4k``wGBXeGHHdU}i{#4ijBxVtO3XAWEl+eQ zj;N{(PjxcN2(>iMOe`sMGO!HK@D8X*FZ3ub$VRu#B%mrPKV88~-$}dD*uv5;CoIw+ zG~3s=BG)oG#XL9CGB7eszfixVu-w!qz}Y>^!-Ol})ga5zH!#xF!dc%d%+f2O&@I!r z#K<(jC^E+>)Y-y3HPI|8sJJN2+ZElm6i0)ypmc=-mkfVr%is`?6w81jL%$$5H}^a* z*Ie(yBuDr1GLK?oqX74CpWM=*N>?t6iolA%LlRvx(+cvkoD4k-vcjBGGLmz$&2kb$wX=$} zLwzgCoy{vsd`$DRjgq;-D)YRuEu38a@*~X6T@y=<%iaC;1N}U`UCc{7U0n>y-Q9Bx zTtXcS3i8oyE3`=UN>5iX3UCgp2+Z;hbj!&!_A?5}%y%lNbj*$Nj&e`(F^LE?bPX}{ zN%AvJHn8BTDl$&>$_w%|j_@xHj54&0GBF6uO)CjCaVn20O!m^YEb??qG7BrwFEBv2 z%{#2fqNrTKG{U_&-y+f5(%;y^FVWpN$~nq3CELp=$}7bnF(o&-)U=?|yU5McBO;J1 z-`vu#wA|Fv$;;5oGSb5%$D%5@szN)eIMge|**_`YBGNh7!Z9;^Q?08Ep$|f@^UjPFZ1-Q z^iDT)3U)3?EYI~1^foOhN~ww{_6V;s_4IPFG))S0aSG)sGOh}U406%VH4Ci>EzK=S zD-E*DHcCs&G&gcG^h-?1)=$bUbqV#()i37K)zwwV^a#{X$;)v|@-+1^FVFJJj0#IK zs4_JQ3NzNP$g8RhGP3k4_wg??Eez%Ak*M^H-r5uy(9mM>)$_dDdPbAbeXKikrq=)V z?zdps6L8vd(V}k?j5{(VwLfdG6>xh|rg+B6{K?zT3SV^ zYmd}Fjh)rIR9>g&xbWY-#MUF_u}$*L(SK*&GrbSvyZVJ;`}4cb|6jGohTr84lk+VX zv#vPvWscgtqd`2Hf}exymWO@b@pSWD4zHY3X0Jp`-szY(`p@6FQ^#^H?`dwU$yyOg zQF|tT;_XlCVmNny-QuglKR;=x9Xhh)cJ#VsKfSektBjsJG2{FrDSgXYb^GGTlqHR& z5&MhEyVmv}PiA$n{J-!8ho_iIP4}tWAI-COEHwX?cFbP!dK90Szs%{2e?Keuul~_- z@8Ge7!~{FOXU{StidG5D+ Date: Tue, 1 Jul 2025 16:21:18 +0000 Subject: [PATCH 520/563] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index f719ece..61cc024 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751383566, - "narHash": "sha256-MchpwkTBUlpa8Spj8UJbvPPW1TOaAtffsraQQSJ4a58=", + "lastModified": 1751386095, + "narHash": "sha256-LKo+rvR6/rXJwDQJXU+McooE+8PQF8F5ARAYplLG3oM=", "ref": "refs/heads/main", - "rev": "4fe416b9e7280d02e6ecc4b5e77c95b8d218f419", - "revCount": 23, + "rev": "9d26d8f159ca391380f672fba29f9c90151e1793", + "revCount": 25, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From 6ae308007f4a337803629d496f1017e66e10c8cf Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 1 Jul 2025 16:25:54 +0000 Subject: [PATCH 521/563] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 61cc024..3a63ce8 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751386095, - "narHash": "sha256-LKo+rvR6/rXJwDQJXU+McooE+8PQF8F5ARAYplLG3oM=", + "lastModified": 1751386942, + "narHash": "sha256-3byZajmYDFvOOHlp/QQwu8cCXdpJ9WEWAm92Nlnm+rM=", "ref": "refs/heads/main", - "rev": "9d26d8f159ca391380f672fba29f9c90151e1793", - "revCount": 25, + "rev": "6171e1d2e1b04a1b632c577f94df581780b1d574", + "revCount": 26, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From 3085a3a5a40a0290106fa669603fb0c47e004b2a Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Tue, 1 Jul 2025 19:16:49 +0000 Subject: [PATCH 522/563] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 3a63ce8..fe97196 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751386942, - "narHash": "sha256-3byZajmYDFvOOHlp/QQwu8cCXdpJ9WEWAm92Nlnm+rM=", + "lastModified": 1751397287, + "narHash": "sha256-9G1T1nJS6itGsUhZxr8e1KDIx1naTSO916QN0HyCwRw=", "ref": "refs/heads/main", - "rev": "6171e1d2e1b04a1b632c577f94df581780b1d574", - "revCount": 26, + "rev": "b26a7c23678fb7ad922e4b7f28330182d0e6844b", + "revCount": 27, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From 8a8a1a3c7f22b1559b948baa1b733393862273d9 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Jul 2025 14:35:37 +0100 Subject: [PATCH 523/563] feat: updated nixpkgs and lix --- flake.lock | 26 +++++++++++++------------- flake.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index fe97196..6ebf952 100644 --- a/flake.lock +++ b/flake.lock @@ -467,15 +467,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1746827285, - "narHash": "sha256-hsFe4Tsqqg4l+FfQWphDtjC79WzNCZbEFhHI8j2KJzw=", - "rev": "47aad376c87e2e65967f17099277428e4b3f8e5a", + "lastModified": 1751235704, + "narHash": "sha256-Jzm3KPZ2gL+0Nl3Mw/2E0B3vqDDi1Xt5+9VCXghUDZ8=", + "rev": "f3a7bbe5f8d1a8504ddb6362d50106904523e440", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/47aad376c87e2e65967f17099277428e4b3f8e5a.tar.gz?rev=47aad376c87e2e65967f17099277428e4b3f8e5a" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3a7bbe5f8d1a8504ddb6362d50106904523e440.tar.gz?rev=f3a7bbe5f8d1a8504ddb6362d50106904523e440" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.93.0.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" } }, "lix-module": { @@ -486,15 +486,15 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1746838955, - "narHash": "sha256-11R4K3iAx4tLXjUs+hQ5K90JwDABD/XHhsM9nkeS5N8=", - "rev": "cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc", + "lastModified": 1751240025, + "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", + "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc.tar.gz?rev=cd2a9c028df820a83ca2807dc6c6e7abc3dfa7fc" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" } }, "naersk": { @@ -1007,11 +1007,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", + "lastModified": 1751271578, + "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", + "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f63e7c8..3ff66a7 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs.url = "nixpkgs/nixos-unstable"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; # inputs.nixpkgs.follows = "nixpkgs"; }; From a2000ec6da816e3d889f22ead7c5d717d10b9447 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 3 Jul 2025 14:40:36 +0100 Subject: [PATCH 524/563] fix: force using our nameservers --- machines/_base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/machines/_base.nix b/machines/_base.nix index 84abb5c..dafb0fc 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -104,6 +104,8 @@ in { # every sever needs to be accessable over ssh for admin use at least firewall.allowedTCPPorts = [22]; + resolvconf.useLocalResolver = false; + resolvconf.extraConfig = "name_servers='193.1.99.120 193.1.99.109'"; # explisitly stating this is good defaultGateway = { address = "193.1.99.65"; From 183fc70d03699068fddaad74cc7acaf2ab7d2fe9 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 5 Jul 2025 14:37:35 +0000 Subject: [PATCH 525/563] 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 6ebf952..a177edb 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1750720601, - "narHash": "sha256-NDYXjqGEOXfge1kMd/4W5PdHz9HjZuAF2ssOsVYRmkM=", + "lastModified": 1751725913, + "narHash": "sha256-7/hUVgjLRZH2ZcFErIb4GuUGKGknKm4605hiOhJRRaI=", "ref": "refs/heads/main", - "rev": "d27befdac6927c686d4bf96e05e6f677f477c79a", - "revCount": 289, + "rev": "c4da3e91096741dc827f3a5ac3c184160b8f1e8c", + "revCount": 290, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 96a7af86cbfa16d5a418a2b6dff0fa373181ce6a Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 6 Jul 2025 21:45:09 +0100 Subject: [PATCH 526/563] feat: add esy to the admin list --- machines/_base.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/machines/_base.nix b/machines/_base.nix index dafb0fc..d824939 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -93,6 +93,8 @@ in { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEHNLroAjCVR9Tx382cqdxPZ5KY32r/yoQH1mgsYNqpm Silver_Laptop_WSL_Deb" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer" + + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxHpsApRyCvuP2ToGm46G308Og8lO7BYPuz+EqHVU5w esy root" ]; }; }; From 17d69245a54f4dc5853374ee64804a16039d6f9c Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Sun, 6 Jul 2025 21:52:29 +0100 Subject: [PATCH 527/563] [skip ci] test: added esy's root key to test if it works --- secrets/backup/restic.age | Bin 2870 -> 2980 bytes secrets/backup/restic_pw.age | 39 ++++++++++---------- secrets/base/root_pass.age | Bin 2849 -> 2959 bytes secrets/bitwarden/details.age | Bin 1155 -> 1265 bytes secrets/bitwarden/id.age | 38 ++++++++++---------- secrets/bitwarden/secret.age | Bin 1012 -> 1122 bytes secrets/discord/t-800.age | Bin 1538 -> 1648 bytes secrets/discord/token.age | Bin 1204 -> 1314 bytes secrets/dns_certs.secret.age | Bin 2924 -> 3034 bytes secrets/dns_dnskeys.conf.age | Bin 1204 -> 1314 bytes secrets/email/details.age | 53 +++++++++++++++------------- secrets/forgejo/runners/ssh.age | Bin 1491 -> 1601 bytes secrets/forgejo/runners/token1.age | 43 +++++++++++----------- secrets/forgejo/runners/token2.age | 42 +++++++++++----------- secrets/gitlab/db_pw.age | Bin 1111 -> 1221 bytes secrets/gitlab/ldap_pw.age | 40 +++++++++++---------- secrets/gitlab/pw.age | Bin 1111 -> 1221 bytes secrets/gitlab/runners/runner01.age | Bin 1175 -> 1285 bytes secrets/gitlab/runners/runner02.age | Bin 1175 -> 1285 bytes secrets/gitlab/secrets_db.age | Bin 1111 -> 1221 bytes secrets/gitlab/secrets_jws.age | Bin 2660 -> 2770 bytes secrets/gitlab/secrets_otp.age | Bin 1110 -> 1220 bytes secrets/gitlab/secrets_secret.age | Bin 1110 -> 1220 bytes secrets/grafana/pw.age | 38 ++++++++++---------- secrets/keycloak/pw.age | Bin 1024 -> 1134 bytes secrets/ldap/details.age | Bin 1637 -> 1747 bytes secrets/ldap/pw.age | 52 +++++++++++++-------------- secrets/nextcloud/pw.age | Bin 1024 -> 1134 bytes secrets/secrets.nix | 2 ++ secrets/stream_ulfm.age | Bin 3194 -> 3304 bytes secrets/wolves/details.age | Bin 2048 -> 2158 bytes 31 files changed, 181 insertions(+), 166 deletions(-) diff --git a/secrets/backup/restic.age b/secrets/backup/restic.age index 8f7c0425ea8ab0fe4651961ea1c328003fd1f320..00a5b352c4b76884b9e7cc035f3ca3b787e091e0 100644 GIT binary patch literal 2980 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5yYO4tMrV zwk-3>a4roEF19ptDsf42Np~wVH#K)HH7qqwHx4TmBg=v$5jCN;L9yHVx16aCIwlGY^ld3@<4uN>9u-E-UsjF^mi{PYnun zNlLFY3kl^i$g0fqO7@Nj@b{=H&G9X9DR<5_H%Up3NH6fy4~Pi#_R4eiEziyO2sS{s z%{#2fqNrTKBgE3ZQad9o+{oS4vC<{QxX{(v#Hlo_&@nPBFWAQ*#k1VVGbK2(GSrpJ zIMEj{*E!3yGz}vp(=rncQv((B z_5Hjflk+S*@{HUf4GfBl%uHP~z1_<*D^jx!f{b!4gG=JV zt1A7q^*xgdQ~b&kJ@X1oBHfHb)5|l$T*?jIf|5(pJ(4l}mTPVp<*1Mrp5kPd6Xs}9 zmQqrXmus2mn;ueR;g;`J;+z)hR#_6BTjXCH9^{?vp3bG678PRdAL46X;_e#Y>z`a^ zQ0SU&;$vZ8Qjuxq;^`Xcl3Q6EVwB^bSB!3(zI&2sdZ2=tYi?z5d0|GVmx)(qvZr5_ zxqf24shgvJdSpO$zEP30Uvg1sw!cq7ZX{P~rgMIxcTQoLxtEJiMp0T=L`hUwg;Tn( zVV1sWMUrD+Vpe6LX=Q#&1V(=IE6MTGcT@aCdQ@sjG`iXt;NTuS-&BGFL`=P)Js& zOPYCjpmvV8MY6Gbd2xEViHEjpT12LIvRQDrNqLcDx|vTdhTn`+i^4t16--0QJwp>M z1Eaz-N-~VH)3w9HUGvk614<$+jVuDpoReG%Lo3aEBC>N#xZEqfy$u7+vs3cRjngXw z3Jt0Xjl5jkLdwiNjE&7q5-Uud!jfHlv$ahy{8k!OF8lpo>yT}>S&ha z?p>AaYhIXGRZ(7H=4E7%k(cM166WKR>z|&?Wu)y|Z0Z{7VUcIyT^8!%n(Szi6`17b zX<1yASY(-HnOb3%~@HaBc%rh`B_K%44F!eRIG>bHKE6VXp z^bg4~LAT8#$sn^JP@%FiG|k<~B_ztHyuu^PIWNF0$Slb#F)^&f)!5Y2HN8A5B+J(& zs-iT)gsaTJHK4%D*E7k~B*@pSBq%SaAT2vTAUh>0Evl-_+|($m$X(kd$jHYh9o;tL zf*gJCas|(*lw8mBpiq~bQdb|(#Nsr=LgNVUvchtsU`z8%!%(BtV{5`Y_iqbuTi_4ueBN9uDLL%J*xeSfV%9H()f*h;D z0@E#1-HIa(-O^psiwwOA%QMT0%{=lg^Ml;{%Z=SJ>bFo=v$W(ug$Tb&)1Z9wkmQ0Y zlcFk1OTS8wpkg;){oKIBWNnLp3S+-uCv$iA{9wa$E{~83*RaG&qjF0pOA{Z{lEg?u zZ9m^iU&E-1q7qMk?X&<#AOC#Uil9u4c#CvPtZ+_ONJt%K%1UuJGPf+O@=Nn_F7vI@H#P9&iZXH3E)59t^T%7Rsc(?z?VVl`>|EjPQ{m!SY7|jy>FeTDV&IqP?P^%g zl^N+>R8mwD7?|kcSn2Cu>Fk_pR2AkP;Nj($otUF-tncq%;Z&TK8kJVgrK_u};OM1q zlI)Y^Zf25~=HZ>aV!d$<|X=@m> ze}|jDT^V~tr*_S@g17$)L)&LuWm*tCA-t$2rJG~I$@}NZQdIX_o_E}NWO9qTZmhkt z`1)TH-Dj_F^7FEhl9>H1o3VP2vW-_tAqQi5$|_f>=KP#j;e9P}+DlFTiS&JJvC!Rf zA%6v@zz+Vu4ihxwmQ`?g?Ni=2J1yhFB<*9u4vfAle6u)a#Icy4|8V`Ylkt%gC$!ai E05s#mr~m)} literal 2870 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sZk%&iDF z$~W;U$ty7m)J`dJ2@Wm`%uF%O^(u{w@Jw?u(+{#ND7Em-wcyH1^mlVCaw`Z3Dk%&I z2`Y2(baE~>_74p*_6_mPHS_j23^DUf_b$jX2}HNeB%mrPKV2a=u*54kqRLr2%)}|G zFvH0xFs-=6$vHFF%d8@^Fgwu0skq$TCCfK6$bc&>!pF6$EYmo*G~LL}C)M2~%(*l& z$+Iv#)!#KIworG6Tiq}lgPvzgJiC}zzC19s`4za!i)lQe@}CZbhnDMNV80{oDBUk zSO0YPWbexC0?$J2Vn=k_O#M`n>{Rj-rstC-^GxW1e$_`F5NOK9!FiA4@uqe}aaq$XuFXnPA@rkGm4GKs~ zF*i3b4KOuz56*JV%=HN^%&RahtS~Alx6pQt%ytg&^+orazI&2sdZ0p8j=!&?ds0SO ze!01OnqyQ*Rgp=gpP^r9vSW(3NobC-hq0?!L`a}Pjw@GiWpajPWSMc6c4>i8NTG>= zU#hubnwfTbhGAl&NkN{kvx}u?g+ZxT2u3RLE6MTGcU1654lUP?tTZt2&NVR4O$_ob zO4Ltx3$gTY53=wz%@4^mFbN7aip&cLw%|%GbutceO{+8tHS}`JkMb&Z35fJ7$}&kQ z2`S79GIq*M&NOuMs;CIbH9+@UnNg&HrK5tMf4+r#NqJ>PVYo+HnRb$ivtguTl%Zc~ zW>UI;Sa6n`U#VekQBZ}SfiIVHYJo*Xxv8a#L8zm*Z?SVkuxGGysB4i~VMVb|Wk!TS zy0f;Uxq)AbAx0{R2rhCoD_008^7gGV@-;Vi&NC~sFewOh_fGfoi}Lr5Fia};O*1GB zH+Cuu3CpZ773J^ld zkZ+Xb99dYNQ|9L%WLD~)p5zheZIKe0E~+hoQ-ZAfteu| z7JUIi}Z?uCWnRi4RSe#ySBsgYIQZV_PxB^Hi`nMHv) zCVmB3nV6}hAV=T3T%n{;+qA4C)iBl6IUvj+T-zrw(=^#EqtGm{I5^7HJ2lO;z|=F# zGAt_Bm#e_VQrjdY+&e4CN88B9A|o|XJ0#!0Fvp;%IM*dT*~KHnH88R)vm`MeBi@1w zU7T_q71BI1ssgJFy-X_H^Nq8@$~}GEObbg33bhl>^~=IstFpo~vqF75(zPo+xhxB_ zN}c?pOd^siN=%GBon4)>(zSzKv&(YBEh8Nb-6~8?9Na%$$leeSL42(EN~q!gAw$^mvPOORR8CS15E1^UL-y_V>>z z&o>QE_X^QZag8X?OAPZ4_w^{MG)ZzX_sh0)&#bH{=PE1?iwtuO@=FYM@-MG&3`%he z%lFDDOExpm_ckpr&I@n~%k_!0h|u=Kuq`#m*)=s?p(@m}xGdjW-?PXkqcklq#U;C< z)Ga;3*e}r6!zDZen=BB?O3$fz=zE63l^-`zXQU%w=!pwu8YNk1>u-y|ubD&5;K zAi%^evmn(o++1JZEx!<>oU|y5vUCnq@OLVA5A-pN$_omquyitaObyC5PBJWT4E9ee zau4+?D)1}tF?F)gcX7|=(vQ&h_sq>KPfe^UNzVu{EAme)^{vRw^K{NCi!`z*a?dqM zH*+$L@DIW$Cp`;%T>Q%wjEW12vfVB6^NLfvk_}V+L&IGHGAs;2-OGz23`0UI{f!+f zoV80TEOP?63M|SZlTtI&qavz|Or3))tCHP3N>j~?f-8*uQ%elY+)6{!GJT6nO-c;7 zbaizV!jkigQw>}kL;R9*^YqPfEHYhFll9Zx42^ON@?A^{gUr0VqH?nRGLtR1`t|lr zU1w*A z{dOoxny&J6`;*l ssh-ed25519 V1pwNA mN/1o9VKKc+kBc0s2DEmjHJn6AUbCQUoaCsvswNHzUM -SlqlUx/Ok6lrc71g7uJYG4/Y+DG9nnumw0GsHtFH9Ao --> ssh-ed25519 4PzZog Hm/dzRXkAtX8iopSdsrRw0rIAKtagbRtS9zGnFZdjAk -dIhBGvUOUd7SgqADywQnnv/lggussXa+AxOdxI/gp4E --> ssh-ed25519 dA0vRg mP3xepL4DnV1V0sYrS8n5a9XFaY3HlYn88IjukBW2C4 -KpUv1UGZdzx3kHH8LlkqCIgGK9DAOZSyN+bLfaPABcU --> ssh-ed25519 5Nd93w E8tGoDN/aQoe9gmMkIWxB7vsgQ5fJ8WzjO6+NefmcXM -HY65eZHHm3GovuZoVgOMh8kveA1aaxyYBvXDMuw5Ry4 --> ssh-ed25519 q8eJgg j86zF1fq/TSyxl0CTlvnJw0MJVVtG03oqGDumyovogI -gNZY0eSlLIstaHlbY/6n44/BKaQITXqD8qNOJGotplI --> ssh-ed25519 KVr8rw 7T8vLuXcc0jrtvQTu/FU3ZZC963YkAizU5Q79OQEvxg -R9YC1AZsrJa6PZ0Vzum9TKCwFPd5EWJ4McJqtNgQQ34 --> ssh-ed25519 fia1eQ bzqIMpD3LmkKUPRZ8HibiqJDZfR2lIcMCICputpX2w0 -2TMqO/yxAMPB4b13/r6jBytD5lhbhauxTrmCx95w/4s --> ssh-ed25519 3pl/Kw 9qEhAIqJFP6XrMsT5ju8XQeG5dNG/U0/wTUiPYT7xHU -gT+zRjaAhAK/BUOZXAWNUq90F1I9T/y6qZuGRnbHroQ ---- QGGO/WedFvcHW4JxdpMHP1PbfaB1ITP4KVb5vWF3Kzc -Y@Ò·›â/å­Ü» ÁKç‡ïhA@ð0K -.uÔÐÎq‘_9`Ï, ÓÕW%ØTnÞÇÎÈø`C€”ÌʯªÃ·‰1ŠÕnì3äï?ŹєǡV]­Ó \ No newline at end of file +-> ssh-ed25519 V1pwNA kWC0Tr0nlHEelEzS9xAzZ5UwI1vTgeaBS+zQJCxHe1A +dcVKgK28SA4abje/xfC2bqlDzrkThJh0hpsyCtfGPDM +-> ssh-ed25519 4PzZog H/hrMeDv4EmuSvR79vX7spZyF6t506ZKVHWHl4HN1wQ +E4+skv4K1fTqG1cIbRqRr89Ti6D78wxEzap3Sl0UZU8 +-> ssh-ed25519 dA0vRg SgmoRqftGwIG34Py02bfdEv2HlI6fPBiKmcBmz2VaiI +DKzlODXbQf9xzUzJHlwtIZbGw3qG2ApfssEF1/nZe+Q +-> ssh-ed25519 5Nd93w Q8fxVcYwxbeXJzpKCOWH4/D3t8bWSUm9E4spASzIKnQ +80fe2FiI+5OTojxu32OfFJwS3l/cMPr+5tErOr5wmcM +-> ssh-ed25519 q8eJgg zgw/JH1HOdTE38Cr/61gcGo6OruuFUCAUJ4wmNHSXWs +l7ta9JGOwCZCjnfui2Zo3PVF+Ge/UoPL0xm5lZ0GGF8 +-> ssh-ed25519 KVr8rw CcJymhaWM76X91C0ECPlZqaN2IARwxo1WMZRmlevnzA +syAw8YySWxtDonZ5txKVNynCdziInCzy4u5kv6mH8PU +-> ssh-ed25519 fia1eQ 0ocrOjhQ+CEJK8Li3rDegYkMXkBpjAAStjgvVHGQx3Q +YORVM3sEbE6PLVuwfMkxe9gYqTVVT7DGoG+kQcxaPiQ +-> ssh-ed25519 Km71ZA 9W2stpyr/9osFppfqBDjeDzZ6ltU+spmBoeWJ+I8sys +C6DGgwvbwW0r1E3L6o7LUOnPo/n8Sl8tGzm3NlsXGcw +-> ssh-ed25519 3pl/Kw pm1noozCEdPbd4f8rkSD/gicvfWTEN1kvYp7TLb68Uo +VH2XUbhIf4nYTmp6rkGt99RcI2xxa7F9QXmDp88r1CY +--- lNlQ5pwix455easITfJ8dztlPYg8Pi77sbAsOQF19dI +‹#@3öá|ÈKíÛ%ké±xL,ò5°x/QTbz ÆjÀ.”7ÿÏÇ-]‹2ñbùí_ >éNëJamÀ¬^ë„á CðŒÒ]VvhÔ|ý¡¢D›Ì€" \ No newline at end of file diff --git a/secrets/base/root_pass.age b/secrets/base/root_pass.age index 2313336437c6050b924be3bcd8aa192dcf6d1356..92697682e737cb17a5bbdda6411e86a548f82acd 100644 GIT binary patch literal 2959 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zJG^C*uj zuJ8{}O)E9fHgiu8b1cuSEDATxPER*BO)d-y4|8+M^|45)u;B8k40YEIcQiE4H7&>q z)-Nrx%yA9%N)7SNFSGCniF9@>D{?I|)DH;@4@9@kB%mrPKV2cU$UoQ5B`Va(vm(gd z(BG@HEU6@|%sV6^-?+@6Fv>*V)v2P$Dbvd{$dgOI#3MM*IU+JNF*!B7G&9S|-P6Q3 z+@i=WwJ^iaGu1r6&A&V}!qd_yHyhoy6i0)ypmc@MKm*GvH;eG{@bvKHurkkb|H$C% zGK=ES%!0xQgFGk8oD_e zEKI#B&63e=E3`=UN>5h^C`|Rqay2r_GjVk`w)83wE(`H@%l9ld334~eDKJeojS4Bx zG%zkn3(Dt;sL~HH4vNrr)-OtOElf2v2uksC&NXl~%1LzbcTe%iH>%XvPYI5+FfK;7 z%{#2fqNrRUP&=u-EKNJj*eu&JJ)^)q!=lP9CC|_~)zUD@t1>b%q9h>7JHRa2IVhhi zEz(!JB2qulxgfYKGC9d5*)1S1Ff|}M*rF_~D!3xDEXBPr)x$C()6)XowzSMd!_+{9 z^qlN0V~4YV@@jZN~xD$|O>GD}U%lZ%Tj)AEc$GJ{RH!o!V%j5Etj!cC)`D+)rq zy(=RELQPZ4eG2@tLX#t^l2e?#%>1$ zu1La2lM%s1j%MWwX4(N>Q2}o0{;8=>Cfbf+#TMqKWmUPwMLuao2DuicE;%77u70Mb zj;_Wua+qDG>n{W)YzU#@Z?6sZpj*rrsE7(l^7y zH_}nTAWT0nImOl3EZ3woAjP;Wys#|L(lE`_KRMagGbyV$CEwDbAjCK+J`FCJi?dw$Om||p-6{YX%Smu^*5fohE zRBY&KQey6#R+(E>QBoOTo)nVq5>bwBn{%Omh&QM2JygLOpQf`^+TV`mHn3wMu8sX_`oL?C37wG63Sx}Pd>2DMo=2@7T z;pCX_7KM=mJdzAD3j!5N!~If9%fl^7qkO9zlZ-N=0t$>P3_LtdJc2BXb3F6?aso13 z&C7jDjY7G?L(B>@y^5TR!jp_6JSxnS@D6AqhvC^o@Fufupvz#j+ z&)34c+~2Gq!qGR>EiApFEYdg4yD-o+(9|niJ5jqZx5&)fGQ7&M*bzP6f(u=oavc@C zwEYZIoeK<8D_kO+OG7NuGK#_@Ljt1G4KmY1lFUl;Gn4fbeacdE%9FXW1HG!elYN6d zD++TW0`+r>UBj|N%W@+!ohs6OOTB!`i_9wnE6c*XNN34D$-k%`~h?u1w7>H^_`K&NAV03d#x3)h}>y4fYN%@zU0= z$hRyk4oa*vFYpgc_VP3@$nexQ%J9<)!L zI3m?6B+4VqEHT8$)ilr~%hJuu%rVk9Kh%ON*C4$(r!3VwH8|V1Alxg=%r!kdT|Ya? zu_DROEik3PDAO-IH95*9(HO&TsX5NBsp$%dNr~D10S0-=&MB3KIUeo?j=@zHmi~F> zm1Tz6#yM%31!bn8DVA9|5f)tO2B8stVMRf{-o>stC0UMDflB| z7U@yNf!VpGUKqAnlto!O2P$|6o269+R-^`Im?wKD`*|BimPa~An1>|!2IZxcr(~uD zgqNC`>E{JiMRFAsXLxCQh9_sFlz0_+Mf$oq1tuCLW_tM;XNKvg1o=DXCsvr5I=O_K zV6?eB3w&Js%N4RK@{$~@60?K7U9vOXBf|_T^GqFmy!6Wq^pkS3a*cy?ode2}9epfA ze7XGcLVZh0%|eQd^Rf#vDkB5D5-al@Jq?@epPw0G5q&sY4{+>)Ge;;dov+1RJjEv1tZ*qgS$F2A^zG0k4`(y}vB%O@~IZPoat z$@f}Ee%YBxzwJ-7?B%{8t6sQ6V*kRuW~u+U#R|_JvQ3G1<&R(a``9DLPcKg}PHva~ l!^^Cw6h8Gp=1di)EoG-T;Gtzc>H@ literal 2849 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 diff --git a/secrets/bitwarden/details.age b/secrets/bitwarden/details.age index 4777128a8e12ba8668dd82eff7893033a22bc17a..173c7e3316722934efbf8f5cf25cae1839ecb2c6 100644 GIT binary patch literal 1265 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5y7*b@DVV zvkXcpbS-sv@iTQcDm5?9&@S=|DDudP3`i+XGpp1$_sPk~3*`#cH}ov7@OG~#E$}dQ z_cQf!F{yG5wXDdo2+XlecTUMnvGDbYFmo}ea74GwB%mrPKV6|H-ORnHvck|H%P(2q zBd5gJt31uc*f=ybup~d*D6up*#3(y5Br(Jy(16RR$h@S;$IT?y%%eQfB-}s1Jjoz8 z(k-PtKs(hb%&97{&^XyVP~XfgFB#po6i0)ypmYV#h^#=54705Cau<_|h-BwPBNy}V zqyV1~m%^~Tz(A8oGiQ_1imCv&3{Ni8Fy}}kOYMR{x3J2>Y>%LDi^2?pbf1V+?*QZS z496gIS8p@l@&X@Y??80hO#M z5|gzHgCpIee6k$P4PCh+tGoj}L(N0;U9v1H!~OG0&GPaJElmR~(~(dE3`=UN>5iX^+J{_b&=fEJ`EFr)yNawwzSMd!_+_p zcPB4nUqkm~7Z0yW{fta+?eNk-i;yy>L=O}9R8trCG?Vml7w3q)uuw;?tQ@y|lgiM< zTt_dr+z9_%kG#m-bZ5sR^T>iUvnc(fsC@0HK&SHJ;0OzJ+q`ql4Wk?tA}jpLjhy`r zi@f!n^-~HA%hJsZN|TGL+;Z}bea(%GEVH5tD@@JvOtbU30zAw7TrKiLt5Thc^uvve zvoaFR@=HoR%`=lSyqrw4E4=&SUu2i>otxm^=|8vy-NHKHAJtF*x}QEh}HM^RtcA? zd+S&>P5k`#gOfm;K<{Rwg39oK_1s^~*Et*)%aMG%dfi%%u*1)eRVXFczp_r)QDVz@ zf7ThtW1)|D`=way69n%*TpDN@*UI+&vB9hg|1!yaEs8M`wYNM^dK)Qjk6)};_Nwlr aU+bEe-17IBA4o99d|>^z@6P4R=NSQ(fU?~H delta 1069 zcmey!*~~dXr@q9rI5*F|!rRSJzudyLGBBw)xzNqX!_%aqAk8Q-(K0Q}zr?*X)U2{9 zkjp5k+|SR^yTr{jz}ZdTDLJsnJSwO#tu)-gu);Mtpd{PPB|XG1HLS|Km`m4Ap}06h zH#Nn`)YQ;Y!6cw6DnDHzDAh98Jv-Udq{=U~)Uwd9*e$9u)uh-hO+PEqFweQt*&;o) zASA;y$0MYi%f!Vg%b+;GJTJQ})HTXEHQ3!Zur$yjB27CtF+A7Qq{7GCJlN6QAh0lS z;z#lD^eorHyriHkUr$fZ#0odd;*dncV8cqof^4tc?6jc7z?`)3EY}=MOZP}F_k8D& zuz&(j%L45T6N|_kBk#O$zkqbl@@y|(^P==B*R0~qs5H+|KhONh@r>f(k%@^GS&^QZ zCh2LxLE4pt#YIl0+L_75MU{aCZYh3|=@G6`CD~cU{vr8XuE~Yv9;K!QQQ_u^x%zp9 zK^b|W1&&3Yk-3J+8GeZc{)r(~e)`(^KADk|&oYYFr}-r1yOdUDRh9>a`MY_W88}yj zmPZ7Ih9wpi`e+yWyBS1!ng^5yM|e1LSwv=pm4_8pWv2yM24NAQAzHp z^^T7D$$mK%nUP$krIx8qp83TtY5M5}r7nTN-e!>|21O(ej#3I##!M$ z*`Dauc~&|47CI`JcvYC0Bv<-n7JFoR`A3Erh9-x2dKurrB$YL>FVk# z7zT!vT3Ccs207(h7->7@C58AE7h9xry^hvx*m5G~ zbI-J*qUuf=R}-JRzvdRDa!<{jZEZ7ugWT2SPbXB=O#gCYTK)9gMwhvM(=27oXJ0uh zGRZ;nDi`a2_W0}5*YjSt|7P&;aJq-ad$l5_#+-9q&w@>_7rLxmzwhJK`~2%GFLK^1 z`5g1>(NsfUg?5);rvf+g3%WaN&fQpd;hpcIydPq#nR#!xJ&3q@!Txo7dGw9id2>&k z)rj@>N#r@bypJjPf$rAFDjE8-q-O~xJm$&TZ2B+9Xz>q&x7 diff --git a/secrets/bitwarden/id.age b/secrets/bitwarden/id.age index 4ea38d7..a2c3bc7 100644 --- a/secrets/bitwarden/id.age +++ b/secrets/bitwarden/id.age @@ -1,19 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA H7YH2bTxZIlSQR6h9LTj/rdgIH1FzrT3zGujEGWa/T0 -EB/hy708s62jz9yhqVMp/iouRC3Hf/GahvtZzgTK6Uk --> ssh-ed25519 4PzZog 0UlgzFAlGE4dOOHlGaI9DNBu2UaNTGOzjICpA218m1E -guZIR8Czh3zt4W4mKkHzp0VzhdK2nzM1hDB94t4AyFY --> ssh-ed25519 dA0vRg 7J2jo8Y7mlp91/N41e+cuv4Y46Ui+DKnNhfeXd2dsj8 -HqAFiScEAKMK4z4bfx+7PQQJQwm80GxjzjBghplVQtg --> ssh-ed25519 5Nd93w VIsfbZTy3Ima3RoXrVDmzm/bBlPRT7vgzwKLkQ+7WCE -ZTX0Gryg/XoQ7Pu0jmBb0MBKv0ee6GUFuOj27SThHIo --> ssh-ed25519 q8eJgg FOcmChMzV93MYDuFEraXcksxUi2YSxM0t1VXXmZOVXk -vBdFZBUquAmb1GQV+Gs8wLzzK0IS2yV/o9cnYiMGBPs --> ssh-ed25519 KVr8rw qC6uMcLvYz4gIK4Ajrfqzr1PBC4Iqgw6elBPRztTUzM -ww7UnTYn+ZwUwTg2xpNIp9cmPCxRztn+NWGzVfSgCMs --> ssh-ed25519 fia1eQ o3z/yAM9iwIYMJnmp/uJ/ul7nNp447VgumnKzSQyvig -dUXr5Za7VZzHJSmMwUw76TptIRHdtBRdHv4IRKfzZog --> ssh-ed25519 IzAMqA otPdEEaDoxx4CiZkn+Ho+Vp+l+BPC2a5vkSv1DCg4Bw -FCFjzX4tueayqW2vhzowZfntufX8uR5ViGFH78r82J4 ---- Tnv8fDlZG/DndtKdjbuxPnw6d36W0lZ0uetXa1VcaOs -5m PåÅñ_”\@%Ç–2Á€¡Æº¶ÌÊãòÉMCyäz¾Ó*=QMÐ>öXØ3Ý/1æÞÄú 4‘A5(c´ð²Š¬ƒ4îãgfô«µ,k \ No newline at end of file +-> ssh-ed25519 V1pwNA 79HhvqifubFk4bhlUPgKbgSplC41o8/uZV27eaeM0SA +mSJ2rkmOlgXyQAXj6pbFoajxCwPzKDBUWRPXqvHrW+8 +-> ssh-ed25519 4PzZog w+6c3JxUfEkgvDz7pq+451XSGC64TCNWau9zOGajpjQ +mEdXqG+GpaYVj6ICYPkCyA9ZRNmMtNsxWNeOpYOhkF0 +-> ssh-ed25519 dA0vRg Iy3bkGWSkMvk3wH05ETCFqZzUIc835XyJGHXlfmG2VI +ShexjmkSwsEgHR3uj+sftcB49zbp2z40Mi7NN7VYcII +-> ssh-ed25519 5Nd93w TM6CtcmxkTqQTP5UVD/1HPijQhMQsYdPrknDREwxtFw ++ld4GvbKQSKAUwMYzDSxtZqiN3OdnWlszYVzOrMbU0Q +-> ssh-ed25519 q8eJgg UgE7W6Lf/jdlSs2TpZNX2wRTY3iwQ1MzZE7zAN5Abz0 +oYf9iiAeoVg4RLYWEvw5xyGevxYQiiqELw/NLiBCZWI +-> ssh-ed25519 KVr8rw ZtAdKYXNsNCo7MzfBlQrax/sWItsFQtEo/tESJaviXs +Njql6s/+QtIbBmsbMYllDxodpIaBnRaMoojap4jUVwQ +-> ssh-ed25519 fia1eQ nIgFm64i5MPK/GvKl35nnXOO4hoD6+mFzJsFeB/6ICw +bJoDOMX3ek/5lVLeI1v99C24l4EwFcXIFAAlTMJb+Co +-> ssh-ed25519 Km71ZA sTHVMQlRs5/xewuUa6yFjuqCEqmWlekSwab0z4OWJRc +ExJw8np5XfBSSLo4cwwYoDoi/GxSGKkTn5rcKdMmI34 +-> ssh-ed25519 IzAMqA N6d6EYxr2LUzuHrH83h06JE5MGPcqdAMixJH3GZed0Q ++dE0EBX7jPvMv2qMI3mIuiM9TrhFYQwwC/+Ta+DiCNY +--- g8A4+bzRE56xnD8tVagvXopX6VlcS5iJcOcKTxC0ZGk +¦K!î¡'Ì_*ƒVŠEJɇÊ?Ë{å¨&’Ø\Aùur¹AX¦wgzãÆ ¢XÚ¨z·¿ôؤeðøŠì²N0&Ûɵ$à$&Ɉý:‰ \ No newline at end of file diff --git a/secrets/bitwarden/secret.age b/secrets/bitwarden/secret.age index f48af48ef1bda0cb2d10b69f4678b2d88de6df4c..2b24b470bd8a077ef66bfa24c92871f9628777ea 100644 GIT binary patch literal 1122 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5sZoch1cy zGW5+daSHR$Ht_W_s&aA;3iJ(&bo16ubuBP*%t(n02@ej+Ea!6dF?Y!cj;Kt{O^qt? zD%Um)_SY^8PBZdzPuDLFaIG>e(k?Le&nqc%%SX4(B%mrPKV8AYv#_c%C_AIrGu=PE z!pSen+t9-)#3|IXz$3sV$~D6?E#I;#H^Q~BDwNA8*V4n%IIGymti;R9qukddIaS-j z#lt+`C(XFZ)hRX5xH!bP%A>$PzyRI06i0)ypmYVpa6{uj)7%I%Lst)DLnmK-H`i?Q z97`jge0|gK(tKZ^d}GV<-14xja1*YgM8A}f;&iWM@0{|&TqjrUsxa5AG#|6DfXXV5 zjAY*ezoO(Evq&?S+(>lWO#M15njVd<}%t_IX z@C!CFjN~#iE%(X{&M8dEipn((C^m9QH*s+?@Tm&$NiR>13@r0X4=M}FPEE>jDo6L5 zcUX}{QMp2zk#ClxV_|M-xk+epdRbO>P8SW4Xbc0 zE-7>hF)u81%g_T3QWd#YeM)}fd%Y8>y7ynHe!MC#Z)&e`s-}Uh gPwqkKnc}~@tna<)(b7M?@?`m@3yTey!V0DV0A$H=;Q#;t delta 925 zcmaFF@r8YYPJOCVs9|PFrb%W+azMD5Yo%XhK}uk5d9F!LPPkz}xPfDEdPZKkzQ0>| zI#)@gS$0vOaZzDTazLeLPH>8aesE#2pP#3Xv$kd{;7#><<7oboiS%JcLnh)VM>4KyyX z^!N8kGY{8KN-FmD_AIGPwM;Y!cXQ0QUiT`Pj3T%Z6nuEeed+LD8Hn@iWD;w z$569^N`tBbPju_jG7}9`0~NB2Q?&hx(@KrPd?LL-|Hb{7lQj0`s|i{0;Se1AV=cGXjgXBeT52+`_!P%_?(zt4a-v${ZalLaItFN{b@0 zBGS>V^Q?08Ep${UaCddpx5x|2$xQPJatSjJ^NTEWbTe?t%{DYDk8%z(bf zFv(5#anJRN@C)$>EYx<(GY&O(it_SEGA?pAaEVMd@ee36$}lX+3XSyS%G`K&%f_>6 z{(k~iEstCHH_a@dD5SK|$1)-*E3@1z zE7?EL&(koJOS`hlB{4@o#h@&wDl@4fu-q)lB0It`(jv>G(y}T!J2Nn%tgyn!&$A+X z;z#jtFE5w$N{fn+f-J)*r();QLa$2a3VrRcfTBWu&+Pn^%7Cy$)2c9I!|Xt=KvRE1 zpWJNAlHdr#(CkQy>@;6*gMjq#tfc%5?Fz@L?7}jq(4s2e^emIf@r>f(mXS%BzKLG? z-Uc2?#V!&4B__dP1!iteMWN|MX@Le=VZp^lI(ZZt znkHuDd6*@a7rU7kX5}~s zri2@YIeTTKx_FqTC#E{0$AEWOkwsCtLa>{DQb?w+nUi^XWp+wfU`f48Sb0QlUT(RQ ziKkDVXR=#aW~f_uK#-@CCs%e#vVUGsv9^Dqr=?R;L~5v!ajPUnTdv}fePks{uNarkxph+*%3v)7N&tlX+@DM4@<_5<36-kz<&iVQg zWs&ICdFPrNMmZ`tnR#SnglAWjrF%O1n-)c-1vuq}W@NiNrWO`Eg}YRw;Q`S=Bem>7jd=DC#=IO`Xe2ZU6)I_oEU_5#VnUWtf#@kXB$BnHOPLkmeN@=oaSdKf^n?_6A3y ziyK~he&x<=npAS>+wRisqB=jO%0Ew1w^;ruabf4{7|#yjYfHW!@_rW0`dMGOetpGv zVaEO`^(#8O_>F9qt#aggZus9`#q+zueXZ?T2e+Afx_&C$(3kW?q2S~Kw%ZdEfA~JU zcx3;ot#_{&GBqkbuYB8g;_tR)C;2)yE8qXySg`zjUSH7H`x~RLFV89F6K_`YX$Yt; znDhKcZj9Tb&$*K9lO>8=lL9z(Jx(62Wo@o+`&88K{Po<&mt41g`{SOsNC=`NWUkcy#`s-;?)Mna*dJ zSZXioToH-6@OOPf?~S*)+jG6H2FZD|8jE&aF8H=sfg*!Mn1x;L}$ zdC3lsJ9hQD3#I#B#}`NZ(6Wf>30W?G#wcW+-|Z{RPo-_x7nR&)3wnF*@J rDe&~+X)mL{e9I9ipP=X<>i6O01&QR%(YI9?g|0j8DBK($ubKk@cY0-{ delta 1455 zcmeys)5J4Dr#>pJL_adkBET!%)HpINJI6H3&%-au+&DeW&m-M9s5H>a%sjx?Akx__ zk}JbA!pX-gG1I8DJkg~%qN*}H)yXI$)Y3RJv82$+z%o3;JD?)H(4)8@n@iVDp}06h zH#Nn`)YQ;Y!6cw6DnDJpOW#Sm(%8b%FDES0AT-<8*R3MgGC9ROH_|dNGEBcvzof9- z)F;5%J1%g{G4($vCP-z&`0E27XX)40UQG{7h_$0^j=!aOz6EGnqDD9zh- z;z#lD0+$SbXUpIaj}*&*B169*H#he@FV|e}!X!uc@-mNNW1|4~aG%`Lph{ORi;BRC zz~pqJsI;sKFVpN&&qBvgC!b8uL=%q`pR&>@x5`Shl1NKqH-o^*@r>f(nIVa;nP~-i zSx$x?23cXwDH+K**=9M3q1stR+M&J`<<906B|fJ4*+$7+VU>Aa*%nT&e)$pR=B|mQ z#^vt*`hk9)-Y(`Po~|wiqF1qJz&&oYYF8wEHARRm^v2fF2C8v7ZAWac{+ zR66EHc}KY?`Itlm8oGv<`6T%nCmUFBRTUYhdgTRq8b|n-21XfLMwu7{=BAZ|nmCn5 z6()OWTNZh`C7Fel=oc8E$AEWOkwsCtf@y?%alS>Ox23c2sewSBSHJQoco` zbFhVDW}c&2KDu>jnTdv}feL=%5iTZ97D;*DuCD1u=9TW=;n^n1{uY*I?nORE#jYiu z^`*(K!IqZ#t|nZ?=2-zAK7LLvX8x|(zD8B1iB5*85vGNyxj7-l9wDw(VNT^GKDo{X z`H|?>c~&|47CI_KdAXUDmw9?tdZ!yY1v?icmgo8hdYcv$rBp=}dxTe+dV0B7nkEIh zIE8W*8CL~F2D#L0=bD99gqG%(q?HC)W*eoYWttl~8TuurWa}s8mb!#`=js=8>FVk# zWO@YZr{v|hC3%|qn3reyWk!W18C01X1%(;wSL9Vy1{qm;mHYUYnHGj}^+;5DMsID3 z3}|Sv`09DyZ9St&=swn+IaBL@d-q$g>r7Z-TnK9@h>~#)to+`>X-02y!cY$ zTPr{R^Z83yQ+dx_G0$SV)A_9H-fPjIs*~HNgz4^;FnlT&`eoaz4BZWCo)g}cb*_z` zb$!2z7|%T6ch~=I+g2G{-=J}FzVV*Q)GgmSo>or$7IXRcEAHc`)P6^CPO;@)^u%6f z`L6e++z0B6Kh3P|B>m_LozeR)^w+AgOzCzZN|84nr;RUc>; zZ*w%~{(EOH|0S*)^;X`K`ad?DF7dv#N9v!(&gxw%uhVl}`0rj~>yh%6F`T=u=-uvvLeq4=8;KP1lKt%w!W<1~k diff --git a/secrets/discord/token.age b/secrets/discord/token.age index c6c06dd99891421e48fcc8dedfb1d6f069342086..71485f4f55b267a675f2b560b5502afdf12b55b2 100644 GIT binary patch literal 1314 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w}R4fM(g zE_TYy$_uEhv`n`sPA$ui^fa_6ODu2?PBAa@a?Li)G|LZkOXo5U$P6+!D9gyPO!9M0 zEKc$cwlqz3EY5K^bBhS6N;9o0GfpZiEilh<&qlY+B%mrPKV2ceJjcV|qf9%y+^yU+ z#n`gSso1pGGc?`LxwNb*%_qeqB_}vC*EOla!-UH*Jt)b)vLY)g(5ukj&BP+9G}6?= z-6zMyz&}ObH96lWJt(}=pgcS@7sIv`M}xAUbOk53L?Z*Qh~i2MN7MY^0+Z6PfC>{w z!_*S(AVaf2*U&J3qk>Xx3k#g}KBV`dtb8&>XNY+;a}m+O)19ua7sZV~3^=j7xTS!fz%;E8UV zcUX}{QMrOys$qqBiEpM$aA0tzhp&HOa;jNGNn(*_XoZu7re`v8^MzUFXT8Mi=N@S3)QL1B#S-EpYx+}VEX_<+Jseuaq zNyQl{P9C9^6{SXb{-If!&gD^6DIV#8+ED?a6@dkLC3%)*AucW@M)_Pp`Dp=ZIVIjv zN#!{v=9zwpRjFAfrjce&DZZ6P{>dH{zUdYE!QtkXRq5!qdFPrNMmZ{Ex`!s0dIcL5 zn1!2pxH_izR+LnRBs*1Qc^f(B8Jl^AnOTNaW>y#`hBU$^WT1!BaTXO*LGp`${Hk9mcWV^LLscVL=VXkwK| ziMf7CWkkMlu6d@uL6&K9W>L9ely{n6NFbMIKzLzpL{yn;pi_o{Yg%ZOdzzzBfp?;F zR#B9PVN{TNT12>IX^N{?sR5U+uC79`QL1NHctMJfw!4vIRbW!7g^{0;u}grZZ)&B9 zOPEtPd-kW-G9Tb z)Oh9wq0==78=wC1x|{OnO6|rz!mFIUV^q5O-n8e;#zvx5A zr**nX}OO$5 zM3}R)TYzIZS8z#sR%p6Wuu*PyM3_f$fLpO&dP$LwpL3>hjzMarUrAz0PFiGfPD!ET z#E;_P$wuy_Ro(%m;RPZ7mBxX7DPDnQc@{}NC1$Q!ZoXB%Ar*lJg&8G&X6gA{hK7d8 z631FEvQoIK1bB2BzY-P}#hld@CO zjIx6reO#RajmwivolU$ljLp5vEt2%zBk~+4pJf!UPc-%RGssDHEDm;cN((5>&~`U= zOZN)RNKDNzkM#6%iYhYpGs};1sme~~DhkOAF9`}Lh%8P{403l*%F;JVDh|kWO||s$ z_i&Byj7%y_jwrM&C`z$Fj{)znB8#GO1=A=G@1$Z=bC1G;DE|VFVxxMm+|;O${J<>t zh{BAVD(_H_91m}=%F-04Y%T-y46l%?jH)c}GGmvFkkV8qqu`RXs@!5{SHDs-7hk`M z@@yXum#V_Fbad;|G7}9`0~Lz$lJbfQd^`*E1Dq?$B7=)vEAm_uoh@7w3rjKr)6&c; z>+}5c{HomiB0{-}s*23Rf|JWriz8i%%Y1#awJklo14F|7qWpr20|L!UO@lox%rc!y za+1-l^Q?08Ep$|HamgDh_qZt_sz64K*t-b5HW9@QcXJs?c`N zaw+C=^!6|hP06cIs`9fe4)gR(F)+0V4KOaLsB{j?PxLo%^6*b`jY=tZHw-u6($&>f zNJ>of%!@E`bIdo*@hwd%4u~+!%Pa|SwlFm}$~E>%$uSH`_DqflC{AcK$_g~qyPX%X72Op1n z%(L-l(ydfJ%bf-J)l$c`Yj5Z43n=-xc$BUB#}W7_&%XTHohse1s^5L#M>1^MW>)FR z-JPU*@Z$-u#GpM6!rG3ZzxZ$HOkQKDcKb+Baii$;)z5D%%+}t{vU$rI+hkw6&nAn+`0%89)gmLW*@;t2w^**IQFG}C%Ve+Q(p(wddi#kYL-N-TU*+82uy0?Rd9{1i GuG0XjT$ir^ diff --git a/secrets/dns_certs.secret.age b/secrets/dns_certs.secret.age index 2f4966b5c71bb8a5e9d37cb94e88694436c538c5..507273eaa1055c019a0b63e7871a9455ba2ba794 100644 GIT binary patch literal 3034 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 Kpr5Or_X7X|eeA>l literal 2924 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 U3+6q#)VeW5NbCOOH48og0JYP|rT_o{ diff --git a/secrets/dns_dnskeys.conf.age b/secrets/dns_dnskeys.conf.age index 16c3f341e0a66d3669b3c0c23e3d0936125f2e6b..dc88913a3d85c524c2a2c9257f8e0fd6914a9b52 100644 GIT binary patch literal 1314 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w{-40p3M zGW1CGHgw4eFY^p?bWIE~_o}MMGs^X|FmN}^j_@n<_Vi2-E9bH_@~Fzra?}p7Nb=J+ z2o5!KPt5TTH3|zbHt-47Pd0OOiP8^uHOwik@HU{-BLf$%OcM)rP9~jC#~F6yTHTO*^w)|u&5xtG~Y5MDI-1CGRG)A*)cUF zJUH3HB0}5Dvdl6+z|Ykpr_d$YDIeXo6i0)ypmYVt60@lC@~{*$qsnrF0+-SVgP>%u zfM6$=Fwe4#0DW!qbQ5RK(h%q5oKP-PqX@&Qi2Q7A|Ln-1Tvtb9qYS?^{Ya0>NaL)^ zqHwRkveI;8$Iwds2n@fO`lVPJmn(!CWCa`eBsp976a*G}ho)JEhMPMYmlX$>8-|yZ zm>K7qWLvnU2YIB0I&xV$I~95d7Md7&Ia#$j%7V*FJ2|7m-6$Ed4BOH&6Ae=X6-v_5 z@(N0WEd#>}l2VM!J*qMaJOj&&3Nn2y{Y(-Q3*0=y+}#7s+$@89xw1U+a*Fefozp`L z12Zcg=*S%!Xcp`~*qSA>yvxksp%Nkm9yaB{Fql)rw6 zV^M*2l9_(6S%!I$S-P2NW{#g_PFeYvdk#bz|v76w6sJ!FTBJp(kL?}+$lXj*C*TDH7vxlEXv>2 z#68I0JIu$z)ziy6#4VjGATlYSDxlaqCm_SeC_6OSH@G6oAi~%(w=y`hEZN81FTKn% z%+lM#EysjQS65fT*w@d(I4~;DB*HAy+{@WD!@|6<($}>tv>@HNG9%5PBsVR{IWN21 zpwgGC;!dZ#yT$vs36ofT5~lr DcZ{=R literal 1204 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5ux5b8#y1 zNi_Ej4t7nCDl{uJGs(^NEq6~YN;In|$#Dz`(hs&war4v9@#Hco&C~Zvbjm9+@iWd# zFRI84De%rQF)%E43kvbF@UN%}4oEc23@&%BbVRq!B%mrPKV6|Xydu@zD>GT!Fgv@* zH_g(;&(ASX-?g$LA|s;GI55PZ#5_McFxV?Iu$-&J-_@xqKc!gT+{nZ$#5KgfvMM*y z#Kj}Yx41YlFw4ofDBH(7$KAryG9BHv6i0)ypmYTb^YR?aqQFX*P~R%!;Kan_WQ)iY zm(W6|VBhpWSNCF`*RupMdQ0h{Rw+U&l;iAIlI+zo6ov#H2uDKW&pF zgAk)aBX9H6D)+!NcN28mO#M5j)%uUKqFEb2@^6}NL45_RPt1$C)Gjq)kceYFo4T#JxPYW=} z&C1Pnc2DPWGtEf!3@XeF&rkKTjPlDiiYUsA^zaJF3@z~~G%zW$%r{6jEe$rx3ol2v z%{#2fqNrRUBH6>k!zirWJD@1ZJR;lJ-6XHVDJ`t3Fsd-nvm_)aA}7~4%h1%{uqu+v zzse-Y$h^?pH8spT-?`A#*|9X!vMR75r^wPZIMLDBG$Px(G|wnI*E<{CwzSMd!_+{9 z3TI27iV$}{lSH2^r}ET9!<-U*FT-5J)L<{SF#TY!62Bau+$A{YH6^GaWI+x$v${PZ0a60_Z0b3)CF zQ-UMILUR3zvNBC`9Q{kolEbP(JPL|Jq7uDAw9Ac*Jkle%3?ov_wVf@3Df@JS2Kk2LX24zLW5Fb(sFFmZLRuy8f9boBKO ztn%?R&B<`~HV90w)Xom&+WX76!jffy<&q{QAGa;)t|pV2cLd$uW)UUcGHv7XAk}Lj zlcu&Ny__9!=(g~ltELZo78%-pTxk1$jqt;E$=aO%Q=2S&n!Duo2wZ>tYZXUMQ{*n6 z31`EPoRmJAw##_QFYCL?`X)@zlcOHwZ(I<(?27c-hWfg7(b{2FMzQ?4Cwq5)Ja517 R$)T-&F46h3FV2Zw2>|)Wm^J_a diff --git a/secrets/email/details.age b/secrets/email/details.age index aee60aa..e38bd00 100644 --- a/secrets/email/details.age +++ b/secrets/email/details.age @@ -1,26 +1,29 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA P8uCL9OgS5BrRWrGEFOSqvO4KsGc3Y3q02OL4sFBQCg -XuuBTNDWEkcDzcO/aFgh7d3XhRmj/8maHx2U6l4KOgc --> ssh-ed25519 4PzZog 20A9EEcTrw/ZJjkvawiiUqHmMaNmwuP72VErLL8Z3B8 -w2Pl4/J0+MI07Blk3rRLAULbxMbFNLQpZkdJPhnoTK8 --> ssh-ed25519 dA0vRg jn2VA10+qrRAktjhSARaE+MAS5HsHsoIZfc1/ao/mV8 -3ahsWtZ8/Bb3tpQnLSyEPFHeW7dsX9uEaLZbJ200u7E --> ssh-ed25519 5Nd93w WKXWwcQBExcz6niKqBYT3JcL8EHfY2VeYfnTIEtEfGs -gzJOdp1j4QX3bWDzJgBig4/vDxlRRQl+jsGmcp95drE --> ssh-ed25519 q8eJgg I1J3jOc15TsBijQW8/DZbRETY+233V81vPLKfGI0ji0 -SLtoYZ+8T72c+FWAi8dz57VJ8wweJY737AKPF0PQEtE --> ssh-ed25519 KVr8rw CQZs4smVwaFAaFbLeyTFi/IaJyle199te4X8Zq0AfjA -/74zAyuwEmB1KcGBZK4QGgwShhqxOcEQ5wlpmtAT7Xw --> ssh-ed25519 fia1eQ CkkfDdt9iAaUxUZt+aD+VDMPUcMegomtFiR6CCux/UY -WQcE9ck0HuSXYCWqsy6NOXAHOlE4VIRUkgz/i+7AVQE --> ssh-ed25519 IzAMqA 2pbs+DJzOw4rgM80o0lUFzIgdMN/X0/7wrUh/OAxykA -291gUsUfOEEsf9o/qVoVI3s3gHmPK400NCEmpxNsefw --> ssh-ed25519 uZzB3g YP3htz8c1QJzFyAyGopjelQCKPyTx0SOOTVEL/uTK1I -iupAfrSbl5ybwi9Le655pU3Kw+KKndFZI9M+AlSrBWk --> ssh-ed25519 Hb0ipQ odISOFTymnTj8TnenWHMHeU0Qh4OSGYFy6vJUieehhE -G+Jje+2S+l9bSnKKrwGV5V2xLczDDPFXlZ8MsrL6jHs --> ssh-ed25519 IzAMqA HIG1qsEisRUws33TxC8yGSrITlwDxuL/RIL6lkdjwUk -IWMnSXxQzv8cAQKNmiY/+hRb86aAuFloQk9WFFcCSWY ---- UK7VzqqXFlN+IVB2hl81+7o1d1NjbFNY7tYRbTvnKmo -(¬ÎmyHC´©|B¶,ì# ûkWsI{KæöµHfŽÆâ¡’Å4µFâ,zXúá‡vÌ -W1Ú!þ*Ë{B‹ëÝ)R°°eGžK«‹¥=@Q>üBžšÇœeL6’œ°†÷D( °GNà $„²=òA—“_‡¹ÃñY!Û÷½0tGãqŒ¤ ssh-ed25519 V1pwNA sW9NG3ZnVZ7XN4iMceA+WNwEmGp5mB8fYRML4JMxTx4 +Ugwsmg4yXfq9YH99RoV2MymOyhHn+WEFbhSq3jOS+Jk +-> ssh-ed25519 4PzZog ncbPVDYkLeBV89U+YKVSGRyNDIdLDuN/YV9AiGcYfkY +rifseFii9IZI6t2cDfhi1GXQQRngI8IM+3H8znbMA/0 +-> ssh-ed25519 dA0vRg ZU44BDl8VU2ri+qNYEEj8GF4x4gGUQPnr6YlFA5itGk +zV29wfmrtyxEU1JFEm5P7pfkWwzmNpXflfLRsyZ3vCA +-> ssh-ed25519 5Nd93w BCqKxqNscTU2iEm4h/78KCzMjRWtHlO3rwZZjq2lJFQ +Y9yLQ33RvcO1g3a1q3w47Y0kgg1NZpdlYk34LrZ69mw +-> ssh-ed25519 q8eJgg lWbDTedbgvxvGpMPDWdrghAKO3duh85kaOR+7xsPd3E +MzwcVM+gzJ/IApGVZNNM+RuYp7EKZyxCDjRkipL3aYU +-> ssh-ed25519 KVr8rw 8vJTA9ABfwuZyFwhFZD4n187b6gmq7zCLALqp56mFyw +iQ4MtJ1YtYycFi8qCs4N0/nIXccaw2swi9yIvOLmVmA +-> ssh-ed25519 fia1eQ hZzB90WDGom3oaOlWlcBg8iAMAfbZGyosgFIa8AiTWI +HekDEc26Y121KRtKLavDD1xKcaClVgn2tGPrgQYWQBo +-> ssh-ed25519 Km71ZA uunwnxdg7A6ZGTbV51r5XL/2hJN/VFIUas0TVxid0Xc +zGx6iHfu+rZ9WbtIITtzDk0nzkFCeIRQpdRVoj7dj0E +-> ssh-ed25519 IzAMqA 17lTeNgkOhX6iOPix/YeKZyztDHYLu6OIjZOctANpmQ +fu8VIba1ZNy3QvnVk3bPmCA1n6/dcB02epAs0GLb6zE +-> ssh-ed25519 uZzB3g I0QOJAnUor5hnoKDlFeSuW82o94zcWcs6VvKTq37lVo +S6o+cem4L12E8V/DzbvL75azwrhLgZJXkxWXuCd4+Z4 +-> ssh-ed25519 Hb0ipQ cEsppH2jMi71R0513L/vq7MaFYYWiRrWZKricdhW/H8 +IvRQejJ2AOQAeWUumh4an0LUSBJYMMnOIr9PU8FjYiA +-> ssh-ed25519 IzAMqA cL7V3gfdSkpHtkcDhaH0ATTWUzBir09Xhe91wlaGJ14 +GU8IQvHlwyBBONJKufQRwEr7nZy6y36XszV+E97VA94 +--- Nq7IuDZY4GM8UBq0wdEnn/kZEJRdUlmqR75SlX75Q7w +oÖT·¹ëjˆo¬çÅ(Rð«Z¹lðmÑ’&f¶›7;a8¦÷B£€ò|±û‹ù«Ó”B/l ”ª +îÉÐg#˜L’›ò†‰"‹Ù/* ¶,aÜ…ã€.f.QÄ +Õ“¨oEÃM×V=å2ä¦q‘÷;IawkFØ\" Ÿç±Q¾7$.`MûR§XúÛ° \ No newline at end of file diff --git a/secrets/forgejo/runners/ssh.age b/secrets/forgejo/runners/ssh.age index 9a87cf315aad1c018c71b9e1f52cd48bb8a2be84..ec1e6ffb8c8855ba70c679581ec3f49cc0d3bbfc 100644 GIT binary patch literal 1601 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5wB8@-M9N za`P&6G`2_!3D1tq4ff2<%`r~$a52&^DoSw-^9}I|a5nYK@Z?H1_VJCVvhWQL*3ULf z&MXMY)ptqCP75k5%dkifbS%s<2`(!MHY;&4w?MbeB%mrPKV6~R%hWw2E7{j2$|u<} zq9Qdg$ke>lwYVfF-`U*KvAonWKRC>|(9$u{$(1Y0K;PTYBsnwG*I7Hv(mXFDxWLoG zIM>O?D<{g=-6K;!q$JNcG~6$!EF0an6i0)ypmYV_5RW|LFxT=lZ6~*4i=xP+sH6x( z!|?PZvxvgvJWuVUVh_heCrhu~P*<+1qO7P&%c`P`h!ivZ%A{hK;IeSv+|Zohz~m4! zv%s<-?FbXoi2Q=QEE9CwO#M@^ZDD5IrQ*G7}9`0~MSy z{Qb1kgTmd)jkC)$Tr)C4qY4aj@(Qveaw`n{sx0%|Od={u3JRUw0=bfkN=?$zJhM^? zOcFD+L(U|?jVN4l$iD7xRA3;jdf0~M-5iVV!MjI+uzje~;Aw9Qj3 z!%cnMeZ7JV5|fQ8A`%meBYX>jON=rDEx6oWibF~bvx3Zg0&@fP-7}1;jLHl01AMcq zLh=)%!U77TER0I3Dzd`MJ<)9|jjD1oPFKi}2=j?daV|+R40WqaHpnh95ArR_OfN`I zGs+7$OpeUYFAvK1tSYf|&*w79@GnU6^Yiu$Gxf;MGj%D?&CU++^ENjw@(XfI%d?Cq z3y(4g3vlww59HF-)l~@5_Hi=F53F*v@UP1B$_})s45@NX&++ti(+>+a^DcL`bn=ME zudK)mOXiw<>RG#Zwu|GUT^W@`=z9K3q5JmlAwwsMW7JKsqh z@-c7dG&fkEC%+|h;@l(hm-PQTPTctIYs;+1&K#=o!OS_!wBOV(ZZ*h>oygQwFww-D zyL#Ss7ww&YJZp4k*?iTB%rMz$A1Jpp?ce!a>2>dBdd^VP&EvMyt-iE8;;P!B?j0L8 z&i%3U-5TKqyf!wuhFcEghsiZGTsUL9^ghGibpi7f&K~pq>vv&&ke%uJ4xOuRD^|tL z(F)_cG)=+EXX49Gzc~KAvwpq6CNJowOB?rEqt!JsNBqvaO?l*E(c5IQ#x$~P-Ad8N z2bS&roY(9h7dc09R!i(g&uw3#q9e96r5UTwXZkaVwKSuRZ+@EKoPAdh*}mt?D=+qI zxw0a9{pT%atCEygfBi0yl|4eJt;vaibTh~?Nnzvt@x y$dh|{QSYVwQL1tV2YhPw=bQXmr8W1^$wda-Ext-;s{cp#cg~yU8r@^1_W%IvM^6U; delta 1405 zcmX@ebD4XBPQ6!Ju)ddmhL?qwK1n0atmc%@53vU6ZbfLl>SxV}kofq#K(sIjkpZe)R* zhi_VVvQMxHm%Cd^hP%I+v9U=+Nq&^RSBPgwl|huROHf&`S&Bh;rmMF_WKuw3foDMZ z#E;@(PX1=@W>GoWu7S=z?%|dG;qEzJCQeDF&ORP)nZbS@q53IRWhRFCzIlOMB>`?u zMK0xrA#Tnl-sxFp9ucJ>-Y!*M>4~m}ei=df75c@=`H@x5>AsWW7$w4Ty{o(;gCk9H z%1tA@-P}V9++4yVB8*MS^gTTy-Exx6JWTv^O3KW_gUh)Reaiwfii)yJeSAFJ-9wFC zvVEO{a~;i1+$~*;jg5TDQc{eaEQ=kTj3%F9l&IHE_bp3uuL|-^&Wy4s*AGa^EGZ5M z%umU)G!973)6cOi@bvRGG|6;JFXpl+DGU$Sj_@~%3dk?=2+nZ|bv2IgaLY=`2(e6d zbj-6b(=N}oNQv}u%SR7?@310^qH+blFvC(0V@D&4j1rS1PXm+EdK0g7eP`pyOhdEe zoB*c`7Zc0Uob<%1Lbq(L6u*E96Zag;l<-RJ64MaFV55j+(Vk44O0UZypjvGivqMO{e4RHLyIhe%~PGd4YMkf+6gO)4@xxqMtoA}Yel^Zmk$GgEvb4b8j_^88E7oJ>%wa6%`YUf+_fOPEUc*BJS(Rlq%f(d#JS8R(K|S|*fo$#S65fTBh(^4F}Nt) z%|Ei-I5NyEC%iB`Ik3FMIXgl-+rvDgpg7+!$;8CaH`s*Bp3U-~{emw!PWQ~$a-Qz4 zJ6%`&ICP0-c|skpz?5`Z#bZZgM8#FpKD?~v`1|u_q+i~1ZablzC>Lg>gY`>-Cz!5! zIITv;W4BP?*3%R29bnX$ZP9*ciTDw|R*AbEJLEe1HZ3|Yu;y>=Otp#+D$ie4CQ9tt z|Mlw5?}t974g<1uEK0akK3H7fTUb=X%SfgEdSy|0vVXO)!_-XvbC+hsJ>Rr&eh zoDZKm%fxh+Oez1jE_z8>m&mNT%4wUY%drV+HD~@R_IvF8bzZDTTSM~3F8j{RMWhr}n2O%wkiU9<}nr!-ZZ}J4&a;%51Hyk;}Nb dJ7I#+`zk*5PB*QD*Ic<3LAI7h7Q{U|4gijd4l)1$ diff --git a/secrets/forgejo/runners/token1.age b/secrets/forgejo/runners/token1.age index bf7d1d5..723b2c9 100644 --- a/secrets/forgejo/runners/token1.age +++ b/secrets/forgejo/runners/token1.age @@ -1,22 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA +pIQ+0uvquBBU5ZNQfiiUopQ/iodoDSPDsWNACANpkc -7ARm2csFT/lYYcck312gn+qFem6cSiHi1uzjd5uTSEM --> ssh-ed25519 4PzZog Ow4kjpBSlYqqOUnwyXfpuyVVG4V90AO+Ufg3urhbZTA -pqhJZHZjFCj9O2qKFJEesyw3QZ0KdtKM9aabt0qqyqY --> ssh-ed25519 dA0vRg LYcB23Z1a8veGkdyjVcrfLfpnRbeSYLLIwbqFkfkOwY -FgXSEffN3aa8p7mdbUg4ju05A6w7sgu9TEVZCuLg9H8 --> ssh-ed25519 5Nd93w +YYFQk5KWGpSB9Yd+RlfGBfuaJ4e4KoN+x6QOI8yLyU -4aDGQeg+qhWKbb8aIp/M931zbpFjvqUVDQr5luzKetI --> ssh-ed25519 q8eJgg OIX7xsmQUWnkTYeLMsLA041xszFNmSNu/dsdys5sLEg -kGh+aDF0EcCsrTd3eHIvHcp6Zz+n114Nve+iA9dJNFw --> ssh-ed25519 KVr8rw XlcnAJI30iJMH1Xi2DEMNUJWBaqaunFQUUqjKU8Goms -/zFGkNR5S+8cBcmnjlSVOP3sih4Xm4E5GtRpkG3fbWw --> ssh-ed25519 fia1eQ 1vb0ZzbLFiCWD/bEEQ+7ZqLOJpcNZA1v6fmBNMml9UA -/XFV734jcIrJCtwY63MgRcN3pyhGRmdE5WAhzCTrZlo --> ssh-ed25519 CqOTGQ oQFa2N/oo1mnS0d2Hn7sTr4XiKMm+AAANvTB3q+Cn1M -bBBOtb6zNevJiBU/PB3dE5TjaBzs5y6SAl1MOADwFqE --> ssh-ed25519 uZzB3g EtRrpCF2zNXG+Ap6orXxKCpgdp6OGBA20zT7iZMjfG4 -ZsxKfYW/2q6lnm+IuSANPHOuor3GxJNGtzD9lBT2Dlc ---- b+97Pc+Bh2lwkQ2OhlfGtpT05lzwBbmNxYy7TxkQvaA -«b0Üa§ˆ{ú|²-{ƒL -Û3 ssh-ed25519 V1pwNA ZZzPHXiieqnKeatxqOpOyJJdPCSrpU151rNY3PgewCc +usq82uQE6qxnwb5EYHlfXSl1A+oqV/DZcKlHmheNrLs +-> ssh-ed25519 4PzZog GPaAefwdrHHdkDJT4OHYFdmjUbXEQz3lLkGfu2M/c30 +hoWO80LE9PEMkqlQLD4WXIDc9rgX0uMbNzHkiXcVWRM +-> ssh-ed25519 dA0vRg 1WCuZ91cuKBZi7gFFVArvvAvMh6aU0AufX2vDHiXvTI +yUUbM5kXyyiNlvV7UWXNNhBe3JZ+ZxdoXf1FRwQiHt4 +-> ssh-ed25519 5Nd93w 8HkcjdSrVbg3TQFn/ldlqYEU3aPHFBIcXnzovwMv2Vc ++2kX+X1uYoUnyUyLYLLWeRw99OC3St30ky6Xsf7ls+Y +-> ssh-ed25519 q8eJgg moUF6G0Qsz6+vJTMFoKIusiCfapHvaRBdOoB9r2uP00 +limKEFL+4G28+jc5pOiNt1OkpQRzSXKq+3If8/Dfe+E +-> ssh-ed25519 KVr8rw /G4TpEFysiCx/eF25IA9gjmX4w1yGM6m2Lx1mTmf0mU +nXIuYPbV3S+0+3Ce45iPeAzZlIr1i0RnGWSLg3KBH5I +-> ssh-ed25519 fia1eQ tXV4gH4gIjFYWNxLV0AQVOvahTtvFWK5W6tNZTjA9ig +pxpIIZ4+/ItpG6nolOS7lxGwSkhwq1XvdxePxWsJYCE +-> ssh-ed25519 Km71ZA QRM3tBeZJGVMwZ51ZBlxGIzwGOyMB9ppGNq4pUyRsHo ++0QO4JlKaOUH5MY+w02Rq0DDNk76eSD2EVIAvQeiZ9Y +-> ssh-ed25519 CqOTGQ Ystm+4YnAlTTYPiHBXVa8lM/MGEfZ3OcmxiT8QcdKSY +F2b5grk6m2sVnhhWF68WxUemgtZHYSIJZ9e7eBKtIjA +-> ssh-ed25519 uZzB3g PepFlWAg+221m5eOVoNl1TIRVrS6lpkrQ9Dgce+Grwc +6/8sTiO+P/HgNbB8YyRVylAPPp3lwF4D6FbWWaPSxtE +--- 0PQ3rJZdbEfye9mLMrQJ0jGvJSiZ+9dh9Bv6bpGEBNs +^;­Yh=p«3>FÂ:2b6û+¥C²À“ÅEÉ6Ÿ3óýT´EÚ.è[,[Ú'¼È3„¢¯P 6_|ê *AÇùÓQ*ôj¬cƒ \ No newline at end of file diff --git a/secrets/forgejo/runners/token2.age b/secrets/forgejo/runners/token2.age index aec16c6..5360a17 100644 --- a/secrets/forgejo/runners/token2.age +++ b/secrets/forgejo/runners/token2.age @@ -1,21 +1,23 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA ccCI3dQxsa2ZCh0ZvVuZyVlGhbmDGZhpP/1ZOo4h0n4 -sZVa+SmOKofbQqLoccCVCucubBDZ+M6JjP7mYD1sPdo --> ssh-ed25519 4PzZog vUYse3RgWUEHV5WpaTooXTGRlZrPN9Rv5kgpDQF5bzI -4CXVFUyCBNNfNFtpNX85QbvypvGhqmqv8cZFxse8qY8 --> ssh-ed25519 dA0vRg fjBLqSO3lOAkFjIUf3cw9KcS6GiI3XHygzLqHZ8HWCI -r51K0Qn5CQ6bWjPMsbbx7GcZBFkfznlwUeAT7k48bTY --> ssh-ed25519 5Nd93w lm/dILoCnula6pjMSU36exugjaDUQdMyXu9J8o9aAGU -XKNybvPiP8p8ekJOYoYyQe0weZNvCKxHyRierqtOA/0 --> ssh-ed25519 q8eJgg kzY4FBRimHWOxBC40TOLbAXHjgeXoRrJNaVHzCIihCs -hL2sddOfuVpW0aR0IXUwlBnhUixpwtm2nN8ZLFwnKxY --> ssh-ed25519 KVr8rw nvbIH2FLP+1apZMSQbUmGvG9A7+8eRgH8aILlWtePBg -SJY3KmiPUHLjiPB92jW20RxzlHgie0cNyAmWbxn86Ck --> ssh-ed25519 fia1eQ gSgrywCP2+DAokxgLSRjh7g8kxqYMLyxXCpO1JyNOyk -vDFj0SVUJZ2+aTWrinJQNq7VCmZME0fc9A7SgPgttjQ --> ssh-ed25519 CqOTGQ Vh2iFaSEnJMD1Lg4PpNCnU5zF26t2yq6CjM1Fw1Xej0 -qFA7MEM82zAdKcdVBxmixpWXqQRbYYtUgYgvv+5Qr64 --> ssh-ed25519 uZzB3g OHlq5XFNupblTEbMi3jaf/LqvFCkD8Ni0ya5j5b2m3I -wamah1nxgBUQUkIEFXHuG9O5DvB9HnyaFqxsREM+T4w ---- FPKedvAzPcmXhVexIy1UpwSfwKCsdyfTxcl/AFagFt8 -"êò[ôV!hòŒÈ|˜*¡aÙ®ä{4ðêÜtŠãG|ûŽ}=Ž/Æiä‹b>?à¼ÛL"ùÛLjj£e×-±ã’¤·˜:;Û øþö± \ No newline at end of file +-> ssh-ed25519 V1pwNA Lw89KnIDDurZQ0UaqDS1utTrKCGXR+Uxs3od/5n09io +1JECYcXRBNWwzoagvEKeoWoW2d8da15eWPfTD8nKqX0 +-> ssh-ed25519 4PzZog LB5CnkEPX2RH8vWdD15KMs/qgNbw3e7G8qCV1CMf8kE +pO77W91WR/8MRPLIuJrLk5ib9CPp7xHuUmTS8fmQ3KM +-> ssh-ed25519 dA0vRg QhtuGTY1MEpEjRahnU3WtON6Xda7y3HvGXpB3HcDfBk +6sCAQhU4K2nQ5pMbGYY75TKUXxZ4BKHCb6sOHMAuNEA +-> ssh-ed25519 5Nd93w 2QcbhnmxOkTrRUMrHR4X3spMUnsLXN9DDnh49qFAYx0 +SD47vo7tOPWmvXR2wTj+BSsxJUqnlXOu8HlTEOExeC4 +-> ssh-ed25519 q8eJgg 9TqmbSDG4KOl14FNZmZKFZ5Q/60K657phquz+qpIgyU +odOvsccHqgXoC7WgKcFjJDm5it9ZGm5ifjU2pt5hQZ4 +-> ssh-ed25519 KVr8rw w0fZq3VUrN8wi4UrhMUfrviUiaWl4Ol+tbTXN/urISs +TY+dO2Z6TmN9DBPuo1vyxgeXbDcqZlRoP+Q1IN6O/ks +-> ssh-ed25519 fia1eQ 5Aqk1jkUQkomeBioV7LAPMzurJ1dHdYHbzLHXH7mrRQ +j+7aPUOeJAI10FL4DjXKlYEkC25gM7TNy/X5vFk68+8 +-> ssh-ed25519 Km71ZA S9le6/bZxnkPVuCLqiYc8VMk8LXlk0BVJUtJYc/CmB4 +DTjvS3wBo+RHy0klprrgKS1wYAMAkfzPkpw/ip7KwpE +-> ssh-ed25519 CqOTGQ xba3GuenbljaFEcgaX5UknPWjJSyQOMBaJSGk4VHZg4 +uzGnhgquJHT4+0zop9wNg6Fm8ka/9Ri1yPjw65VnGtA +-> ssh-ed25519 uZzB3g WaU+50ui82IQHobA1QB62WX7bnjgxSVy9LAGjYifuHI +H0O4GIRchLil79zqim5v46RT8Xbu5zi0dKSRPiT6kHc +--- vg0SOy4LbcYEcxJMe6lbREFPPcxrRI/dJM7Lx3VC1rQ +b–x‰â¯mVâ^hŽ0•Þúl@ƒ^Áôô–›ŸRy€ñS\rÈéÐÕµ;œ@™±t~U«YM)‚œÃAø?ƲW˹m,1I“ \ No newline at end of file diff --git a/secrets/gitlab/db_pw.age b/secrets/gitlab/db_pw.age index 0e130b3d50070bb8b63b7e1376260407b999bdc7..2c4ae22a1ff1b0aab7b4f2e6f43c0aa3125842c3 100644 GIT binary patch literal 1221 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uxm$_;Vx zwFq}h3HJ{RF!D(?j5N`9j`B|pPB%|AsYtGn+chFT&nrL3*eIpc*+0Um62rC>M}xAUbOlqV)X4Clq|#(3kMt0u%#^aMq_VWM zq~Z!~bCZgsu%K)M(=?;NbOYxc6E0J;Jg@X@=K>S6e1nK2C+G6yA~(~5N>`7(oTRcS zWAl=<$RzKutcno-Ky<&E`lVPJmn)?ESO(@-n49=pROb8YCmI?WI(rBDBu2SJWT%y9 z6lIlU7zR`&x)g5)h6;x*CZWdG)Q5fXo zl2YPP&Q+G{mE`PS7VhtBZ0Hu892l4$6%p*@=Ng$|?r&fbWitab> zup*11a)o?XlML;sL|1M7Fc%-k(lRHPV&B||U=J5x3(KOoP1qu*@P4&oHy%WOUooG7}9`0~OLs zJq(@P+&!~{D-*r50!#x#{Czwl(@Ro(Q;Ix7oHL?Q%8W`QT+9m7Be{Y-a>|0uB2ub~ zb5iv69sM$cT|AQ9eT$q5O!7mkN`eZ5yeh*IL(8@E^3iSc&NVlTa#W}YFmN;Ubqme* zk20+EOL0o_$THL}bkuh>tME08^vX(hN=^>T4l^#wN#}Aj@p3DS2s1LzGN{ZdHO(yY zO*77Matd@cPV>w%5BKo4OsXoYh|2J)zzE6Gs46GpbOp!E?2Ix~|C|)p3fB;~pn{70 z)Q}2OzkHA4C@;rcqY%fcyi`kXry`4TUoIo3U>E)GT-8|aF3wuY`1`-d@fyGU4`_>{1W%zoZu>xDE+9SDyQ%Qmz)68fHG~TB8zZu zzoMkfB$whc$85vWd@gII>+Ji!-tj(?uhikp^}46{xqtCoF>Y5iHLoM?r@C{M?1YZ~ zDQXbUyu8dWhcB>L=7Zjzq&Hdo+!o#}?@S!tWvr3<0iX5zGr*fjF1fL8RCD|Ro~gFXOlV+0Czl~4*&oF delta 1023 zcmX@gd7Wc|PQ7cntGQD}aD|DFPeiV7QF(ZBj<2D=M}=dKbCpR^g=&c?&W16=B_4_;~B-njEvH%j7pM= zEK4$c99`U;D+-GX^xcECLyN+Eiy|^}{X#ADOI$r8!?PW^vb}Q(Ov_v=Lju!FLi0@w zw2eZYolRU#GtFFlvmGmf@}l&;Elet_ob@N4VU(!XcS>|kDK$4Yt4h-MO$!gq%relf z46igub}KE*%MZzQ&q^xt2(C)>@<`@Nij1g;$~DW%D=jd}FE?{43@A1TkMQ*~%`!`k z^vNqSsq}SE33WFq4tGV50PnCOi=uLc;^0ExFv|ib9}^RoV2|MRy!uSD+{rvQXpfz=E*ilJZIm zk3x@%B$Kj8bnDVG6Ae=X6+(l{jT5udL(^T%0-aopG6IY|f{fi9%RNgoN+QZVEWEPn zgUj7LyaGzfO}I==0v)4VoGX0tianf4$}Cfjiz57-6SLgQ%FR;E!o#w|e2on=%qt?@ z^Uo5_s#ck%C_*% z2;{2pG%j#5O|7>yE6ok`&h_^6PS*}i@i(prbW9J8$||>rNGU2T_pPj~tcc{&)zww- zuPg}ncB~A@(a%dvkF<=+_4F ssh-ed25519 V1pwNA HYKtH5eSIXo8kMrS2Y15Dk5h1rACkzbFp2Au/2JExHc -ei3/hAN9Uars2aH62Ri6ue9N+tX29yxV0cTdxDThXMI --> ssh-ed25519 4PzZog HtprLR1voqpk5ESBcCBNUfh34Q6EsU/3K2X/8Vbth2o -vbYCsZvSXCSB20fLNGwWbUgLkPrx7aRqwMFAnWdy38E --> ssh-ed25519 dA0vRg ix/hHlYzo63deUYDx9UnW5DkJlb6bY9InUZ3uaICtmk -qjDwnXymOM0k9pgvfw/XNOVq1UoqZVdCx+vvPiPUDng --> ssh-ed25519 5Nd93w O77U44+F1MkFUQeHufrlXFagp4saKodduMmbBG6J8Ck -zriyFrdnZ61OuMBUtUIvye4vUZ4AFaySsNwTiJmeq2k --> ssh-ed25519 q8eJgg bzoTPXyLF5wiScYUKyob6E9BE5/cA22DJJhSL+jLgEE -0oXd/EqGnpxpAaKgWPHw3Keks4UEldfpbc9zMc0nrVM --> ssh-ed25519 KVr8rw g+ht9Go3cMVPAzUkxhsM1zj5CrADjKqbWNVgPTIJ2Hk -ryMzelkyfOY/IZDiE0gURovSm6fzuBsJfwr4row3J0o --> ssh-ed25519 fia1eQ K7HJ1EJQmjVeYLu6zYpTjWbUDOTZe3m1GwSIbnWa8Ck -WSFnQ6RMQMU6YXNFwEPRRymlFMTSPCW0B7wE67k8JTg --> ssh-ed25519 uZzB3g 0/9ETo7Do0PxXog0PM+/rylYK/lf3dgcv1AvVS871A4 -/PUIHJx8tsX7vb+ID7W8t/WPVoFj/6iiVRFdhs8sEfo ---- j0TLY296m7nfn9xagQQqMMYGTcLt1bn0Uu33CqNKPCg -b‘]“P3xM{Jmu –Î RŘ÷ýŸ]§B¡óéò(;g­O÷é rðšñ¤6Õ Ü—Z÷ÿ0nT€R8]¸|T¾&«)W̵ - õ ›M"‘z¢Q(½Ã{T²$\Nàì\T=d‰Ï¯wé):Ú¹1[*öÃNÚ1ÆÁÞðNnLœ'ôKÆ9~MiJ5[ú‘H!W \ No newline at end of file +-> ssh-ed25519 V1pwNA dHoon26BhGIqe6TjYS7Q93OC2vhr64B7ofHzX8FiJxk +EcH7j44+zOHBcJOw0AwpziXtUPxOH//MGacSa7rDNT0 +-> ssh-ed25519 4PzZog CrrMq81Ep/Gm9qYcZjRJ1IpXtFGp/1XDfBCB6OSGbiY +gJ+PFL0Sx7izMk54jJr3LPvfZ9DMQP5/FjAXkRw/mkc +-> ssh-ed25519 dA0vRg r5S3Fqlmqeeeu75r9COpp4mS07YWY0HP11zby9AjCyY +DGkeIp0M6dIA4WM4KYVZiwalHjou6qzLOFUnksIPU2Q +-> ssh-ed25519 5Nd93w bm2DM8tuydnEqbcM7/aMgHtU/cnnfENGHgMgXPft414 +7bFV4Mx/gSaEM7+rJbqjjuod0U7tl8ODbK1+qY7gtmE +-> ssh-ed25519 q8eJgg 35Ce/4wweXHadDG1ryl1d53G7IxEOwOFQATYgC6WzBY +5va0fHjZXbH/2ZAFioTcmyeFCid8vrgTFXK6wR/ranA +-> ssh-ed25519 KVr8rw dyfXPAGfWlbmjpiol87idweWsU/c1v4gwq18Y/4oZBo +MiuhfBeQeMlHsi7hz0OgOiLIbFjeSaUoJ+xlIHkAmpY +-> ssh-ed25519 fia1eQ +GTfP3+0hcdmM9qtZvUw2bZ+32guClfXwRTfvOg5Tzc +8gSAdoh1DRoiD6KTpm5F/hFvT02/3bf4ayD/dICjpTs +-> ssh-ed25519 Km71ZA g3doqjZJ0GP9PgkZ5l/ePPxI3gyvILvrQAx4En6r2kA +O2lJGGq/LLsjtzwnfyUSD8Avw+5KbuNGd5XA8FwWJOw +-> ssh-ed25519 uZzB3g 79FGgQhIwzLPTKUBhv6RdT3RqBe+JRb3DYLPt5mAPDg +gp9dUDfNPnhAX75SJhFxBmyNdaH8umAQcYzjBHkPEoo +--- XZ+0tCvAK9SgY5daynCjTqE5M0N3ip+wVIg8o/18AEs +`ÁT6,NH]ÝÄåÒ‘ÿ*q»zíC«'‰€T +#\ÔL‡b0zðB•«Æ F̽H@ À†·ùs! "zêÁÖ«ë8Çj} Õí%ÐFEiÌ ä…ŽB¬–fü@†A˜­›JµÚq¨}cÀUC=Ä%s¢&lbpË€\<Ühx1K&ñXÌ¥3Li˜¦¬|—Çý(_°Ô2©ËX’g \ No newline at end of file diff --git a/secrets/gitlab/pw.age b/secrets/gitlab/pw.age index 9002d809236e5e59015ed2570fcaecaf173d3f18..e6291159201c0ba1c0ace8001a9100998a912ad4 100644 GIT binary patch literal 1221 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zK1NzHT7 z);7;D^U04$tuXK`%yg_ed_su*#I6sEPnrCr2+6?;!W8lDtZ%luG~5JhvRj zK(9cj$WZMxue7YJ)O2*)O#MK&{^9r;JLqn1i6O9YY zosG54ay=|6wS!C3Lz1}y&5VqT%Y7{LEsOF}gNyYY6SK-ZvfT5l0<*#m(zT0%T{7Lg z3p27q4YJW~E3`=UN>5iXGR+N5Pc1bvFRn~62{sQ*adynsF80ZYN=!G%&khVs_AvGj zDa7PM161b?-JwS;8NcV%Shi4*ZlOrtn9oJ-zbytijZtBvsC?JPvb;W zSA#IWe8Y%{%yNr@jGU_Al)$`z9D@QQ-y-AU^1v#yloE`P^v*RmjB->6sxr+m&$A5k zDToX;F4T7q3Q4at_4PH)bTRcTGVpfFFerA+&vz;dDo^Li%y2Go^>q%7iYf{U4azFX zPxDC2&^HN9^J>H!XwuH=By~BzHW!p#G`)zkzY)%pAsRQzmMEF6r-o zt0(S%g;lEY?CdjVSMZ1_9D8^#e2ZG!nG7r>a~V>sEHYF99sAECBuYr6T|U delta 1024 zcmX@gd7Wc|PQ8hROR;IVlZSCgMo^M_WO#&YR&t=ZTZVySa$r$ju6B~AOHoipXtASv zF_&*@Vr7_Ra+IT4im_|HX<2HPQ(8n-W};(=QMqqPlzU=kWQLKxnQLZHB$uw8LUD11 zZfc5=si~o*f=NJCRDQaGb9Sy@q;Gj)xqfkpfn#>LzFW9+QBX)&gm;pmqi154yPtP@ zglBe6VPR!9S8kGNv2n6-nPE;rR;G4Qgj2AmYgk}PW_o3SiBW!0N z3jBO5($kYt{gQnm3IiNV)4~c&BP@f%&HVExpJf!U&k2gmEO$09Pc$ql*Y)6;PRjA*%F9Yh4-a+r%Pt8mNe^}`&Z#VOsSGfW2=?*P z5BEs6F!3tZ4l*zBbIUJBj{)znB8#GOg|O_@Qe)@J^wdNr{|No0(&T!7*F=}ns0_pW z+@hrN(0q3%OUu9tmjDx2UoNxEq|{Om%OaEDTwm>o(tNLCZEpkDs6sP+AKwTUQ~gR8 z|1h^mrwUU~Pju_jG7}9`0~K=9{L`G=Q;GsBe9FCwi}HfJvV9AyEOK03{L1{(11emS z>QnNPv~#`uB7C{3QmXumjEX&dt3tB06Z0*NlH3Emj0@eoN(=%F%(R^oUHwd*LQS0f zvmDW_D~+mhGEP@;4)D(__AE{gsB-cP_b4~aH*yY2cFZ*?i7+zq(XK4dcXY`z^$kc$ zEl=k%D2((@jqt0l3NAB_GR+9djx6$v^fxv1H1y<)($&>f zh;Ru{&Nt03H1_f-j<6_madb<}F*Pp;%*?j13=K|BOU!XiGc}5|EHO*w3S}(5(BsM) zY4Y{3B%kiS2an2?lGr1wb5B2*crEk>vt@MNx!u1uF6J|hD`zTXxt@A7!uofaC_{LH z(1Tw)c59?sEm-pSo}ZCV&P3-B1>G$<=h<|xFg@>Qn0J+JH=9-Y`S{~P*+a;l1Q(bhLI%IAvoNi@{gk4P-6h;X#b zO!LUg^ze4HFvu$i%PA;J3ovkX@y_)!NDlWhHbA${B%mrPKV8AsK-<(H!>A-JC8f&H zC(_G5w9GrA!Zg%0C_K0*$}ri>HQmF&FUvRFwV2D$&?m^Z*upz4Fr?5o-OD^gJEmQoD+{e_rB*-^2DnH*p-MzreG7{Zy z-eE-+Mdb>{MkZw?rrt&d>A6W+MW$hid9E3rF8(D(MVUcCK3?G^0R_3H6~0-OIj&sh ziP;5F85V_^Mj1xhMWJ5dImX$ACY9cWW}Zea<|%dL=0}33y{L?~= zEd3+1f&+6rs**$fL)^oh@-u@>3(|8P^SS&(b27p$^|c-S^4y~Q@-uxbvI@gJiVDLb zlU$6wtAfo+yiDE9gVIw2J<)9|jjD1oPFE;2ipn)k4GGXUH3}_=a5b-VG0--5F{`vp z4KsCdiS)HJ4~a;LGIq(T%;(Cr^wv*t4f8Y!cK7lR&NM0w$<0qrH1tcYC@yv`$SMy? z%MU5ZEQ$y>P3O|p)l~?#bTX)P4li(WH7yOPG)VFa4-9q7EO##q3Cu1EHcUw|HMFRz zEOt$C^W>VnbIp?TC)Z|QvC;W|Ls_D@$0+=vX0O{n{+%1;4VOKzPG+j!e!t2xKID)4 z;;j>Nv;I%5vAurwKl=v<-)G$Y3pHJYO%ANheYEt8(Vb_UYNF37FEUsBsmT;_oZo%J ctZmJE=AtcGHM3nx`c8kH(vvrV;qIoN0LN;qg#Z8m literal 1175 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5tnHcFIgn zOZNA4weZOfax70ZbIJ5~k4Q}q^0Leb4J>mhOY%+jOm!@9apWp8@JaIV*7pnZ^-1&% z%+2x1HTNA8 z%Ox-^*dW5hx6CP|Ks(v8Af?JAB*iBrInUkIz?CaG*xBF3E2-4W!zjO`)UYC`q98ZS zH^;v)CC{iVvM|gwv9dU;ydvDcFdf~t6i0)ypmc@I)Ih)TtnB3Es7%kCfIN54z%-W- z3y)ND|LpXTVo!H(&yXO0qZAVtqjau9)8ar^w|s5$h>CI_{Yr~WGc(gdv&@PpLv8(} zNXvkzO5}^a^9w42s>0mTq9WY_qsq+E$_k>&LOn_{%sj#z zgTtNN%zV*pE3`=UN>5jCb@nuO4%W`d4omgacS&~3Hp>pM@F)(=&ML~P3<@;%_4hII z$;(Xi3@zp=_6!a&@J=uCadA%xa?y|QbIUXd^UButb571JGd6Isj0#Wm%k_JTIm$FL*;L=8$jcx-tR&N-Aj37JJS3E> zO1~n+tlTrbEL=amQrp5&+a(~oGO;i%FG)YG)Gxij(ZoEYGPyJ}x6A`lYO8p=w{oG_O3lFE9kce~- z|Hz1x5@%l@r;x-fr{K^i$GiZuDu452lid82#K;^AGfxb^IT!kexCbg^==8C;0>xx+a?j7dr+81_q-0tu(62$v9mhAUi81S358?%_zhmBc~+G z(b6ro(85XIz$-nm*dV7QTszg(qAI{YC@`HX)Xz87%_}X?(JZPYGPkgx&@wE`)Fje7 zD97E*z{o2#v)nf`)3V&HG~bm=S65dd#XmCNNk7A|D#XJmC?~z3EX~QsHM7LsH77Bu ztSYSB-=!ch$+gVI$UmDax6o5))#k5_pA275TPL_mRN?4XSG|+7m}lk$Pq$EKke=W$ z^VzJ8v)p^mwC$HT6<@IVSi94Pc}<7^9PV7&QQJOm%JB^gs>13YtJZElobr-k#q(WD m3^TVjRCS8nXk?0!D1UgJnJYTKY;xoI$zf?tE2p+?-VOlz2#cct diff --git a/secrets/gitlab/runners/runner02.age b/secrets/gitlab/runners/runner02.age index 50405a419dadb2f1b9f589bb16c1a2bdefaeeb0a..d1517c4f7606a1c55fa7fd39364efbe79a7d2753 100644 GIT binary patch literal 1285 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5ziF4E4`3 zbv5<(_sBGKv-I^!Hw-DaNY)Sbsc_ZzDlKt$%uT8Y@JzGxu;8+EN%64A_BHTu4t6yw z%rMLj@z-|s&P`7W@OQ5;3of=Sh;j+_F}JLAw?MbeB%mrPKV6};!aE`5iPNi!`m%=C13%J*}w^!811@l7(;&PlFv&NfT8$jq)Zt;lx| z^UBT)ck$%%3~+a@Fm&^E3&~GPbM$p7EedhfHZ6#BG>AwF_RLM!Hjc80^2iSg2rEXn z%{#2fqNrRU)H2M{-7wK3Ezls@E4U;-+bgfwtgz5M)g&-2zskuoyV$fO*v}&~G{TXq zz}r2vFw7t=$Gs%oAlJ`0*f-VNq$Ib5(Z>MYwzSMd!_+{9 zkV^NQ5(~G;!aNi2#0=vS*ND^Bsz+?-Hs(erF0@JVz65XBk^C~cGb1w7`aSv2T$}uxHF%J#Mca91!NeRyO zC@c;NF3WKD_w-K+_lh)g3vx8hsPYfWGO*xEDaa`)2=wxf%t%biHTHH3aW(ZY392+R zEDUpXbq_Skb%}5dcZqP$EXPPCrBPK*#_0-KhTfLBeul2$E{;AHp8DQNk*=w(Df(re z7JkkFm1$wwo;gvDDXwAK?&(~4xo(A-X{CPdQN|?!t`Su^*`*f6W`4%`C1J^x?&W6T zp%zBkuHmj}DHdG1y1EMC&i)l876pL@mfj}$mTmzkKM}AGjwskcG~WKpOmJmRW6%djFTj9_=mt=^8(lY>mf7cG;eb`&D6eh z{m`*nUF+AF7j8{@Ipflc+Cz^8zD@~9|5$OqEB^D;~&PKP*B%mrPKV6|Lx6(YkqRh z(4;W0Ksz$i$o(g?OZoA&m?cp#AE~Qz#OM! z*RT**gW$wSuMo@JNS_RSx1vgROS6(plgc7eobtI+g0x*yOdTt|Gs2QxlB4vq^*!?(!z{uxEHaWU!+cUh)5|Lg zavdGZD_zlTE3`=UN>5iP^h!>1t&GaC%#SQLF-kTL42m%E3@QkBEh_O(^2~EBjdUuh z3JHxgG>YWPDD$(-&MO)IW+%F%WXii-5|$|{a>^)E-a z%{#2fqNrRUKO?dCfU&x&NOf<&*tKtIpi zL^nULY=7gjyqqvI%K{U>%)+32XGaqQUyqcmjI7i!&rnZv+nfviL)-%uj7s#&!z)tU zT_asA_5Fh@(hZEu3r&)9@?A~RN=nU>jSCDCJ;M!h(!=A@vt-w%kuFu4RSLra&dPLGA@WLFAU1(($5TcO3p3uHqJLP2zIIRHV(}fFe*0miVR8j@(FNvE6(>XayJQxaXf?y$nB^M9wccxM+d>@ATr1b1|ph-2Sbx zqUa8LQPm&rhl^%%h45Uv79sp$w@Ao?hO>Odyvf|p|Ez5?y63jTZe;+M@u3xBOAfy{ m{!(k9YvCNsFHV diff --git a/secrets/gitlab/secrets_db.age b/secrets/gitlab/secrets_db.age index f5f2ba7ad2cfecdeb88885744f964097e584f15e..12efa5dbdef3496b013a11051ac21c5436b03e98 100644 GIT binary patch literal 1221 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!v2^o?{% zGA%4mcMH@G3iplDHVgI1jZAe9xAZqi^a=?oFiZC>4=~QpFyS&Ua!*b3F>opJ_qEI| zF)EMD^0Lr(FV`;*^$AWdi%3k5iU=_G4$wDDN=CQMB%mrPKV2ce$j8sqJR`K&&(|o# zJH^qx!Xm0PI3nFKyRgD1)lJ_o+u6dxILO)E(S$48B{I27Hs6i0)ypmYV(bR%C==cEibqf+;z9Bq@-tV9d* zFyAmkladVAbf@rA3pZo)aHmAauyn2{gL03=@}L0EqLe^y(_oLVBKN#Nzpx^=Vwb=G zN3$v)?d;UZeCM)|ykd0QO#Mag%oKlLyTuiHiLL;3@v%F0c zLsES!vM~HsXp!obp01GT6Ic}BpBU(F>S|$gj$_T2m$c{?13@#5z4T~rVu1E}Z%5sfJE;PvZ3B>SQuDM~9qk?6DL2*u+QFdaA zeuX-;N|ktu%Z z+U9}9DVEv(-r=4Vfn04dPww1!e2zUj{m15iK^m(o3|u-i?dAXPnsb?tX|?5}=-?x( zR>>#1m~ub;vDnOI)0ZRbz8n*-+jiyb^py24mN(qu4Q%1{I@28UeCm_EYg{Bu*^m7e zzJ5i|=&z6CjTv#v8{RV*7sYOq&PrK>?zK)734iDyb~V!3u=R)M)&ey&ACezK`+UR1bK zF;}KbSxJa-Xn9s?K$?YbP49`1!DRaM2QW}#ulo}SM7W|ie!Iffxo zzQN^rRc5JXe|(RqjTXF22rgmY#WmrYYWr9+nZM0gjH7;~B-nUDE?nvx+Mn zL!ErG(gVr^bAvt1yu-56{fgWi%_EIMGrdb4L$k693o3lMaziT%@&mjAy(&yB{agYq zQ;Soo95W5PlhVqQvjQXBBNEL$1Dq^F^n)EIpJf!Uca2KV4-L*Rcg`v{(GN>?FSqbB zPjPimbW1LDG;>Qz@lHz#$t=nVOmp((D)%vU3UhKd$qDl+&C)k6&vvRbkJJzFjc^II z3@-By_RGyM_YNyJEb_=kj{)znB8#GO1y{=yGwnj>R40pIlc;e2s-*geG{2zqqR2Gw zN~6NG$Skv{5X)rWG&jfaY%cc_zfxag7pKTd(~wHHDC5L(OLM2JpiIxAV5jUT{dCg; z(azl;F=WOVD&G7}9`0~MkS14{}E%gTaX-NTZ+yn-u2wJm%ztIET3TuSmYL-fPU z>didzE6R<1v(mXzyq%m~O2V}R(%ig*vdbJjGR*S*{0a<F%Fb<`^8Bl#=XZ>f{pQ9OPHzXI@$u>Thad>SkG0 zQOp&dQEcJo7FO?;9~xy|9%<_4?VVzrU67M(krd`xno?E~8d@1;;8>L!k?PB(tE;OJ zY?h13Bm>ZQ?>To)-ql`!a}@lm&S$L2X@Qm_(>}K+hTgy;r+F~ zDS6kf9{A1vByj1YzS|94^Ij|np6%m*&gWNY{!QM^hitySTqNp|lFzzoV#D^9E85cx MH8YpmJxV?W0DuE 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 diff --git a/secrets/gitlab/secrets_otp.age b/secrets/gitlab/secrets_otp.age index 013859e12c46a550ed2dd6f6b1c32341c7a353ca..e2f666b1f6d59a7fae19074bfcfad3ae745c1ea9 100644 GIT binary patch literal 1220 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5!s$%nDER z4oUI|_st7Scg@d<4E9S7u5!yQN)Gf7Osw>BDG18;@G|!e59IQ9OHU0pGtG%GFf}O; z^9%~CGR<-~a4&IAHp>X`^z=3hjf(UL%Crcp@|igOV{8IBg z<1{nFtO#?%!r;tur$BVuO#M5iX^3%@=^tLdI3e`7qEpkdqEzM5x@y|^TH#RlRE6dWh4AJ+_ z5BG5{2#n-%%5~Qdt}-;PsxmPPNKOmajxZ@NDXGjhjta{ub4~RM^))nbPR=bf%QQi^ z%{#2fqNrTKGBY*Dz`(UUC(1a=BGoB0$}!Qr*wWJ?ts>jVw>&l2)U&d}BrG`9up*Qz zKhGf8$k;qL-_zM3C!`=R!^AAr(4wrY%G5I?FjL>atkAVM&s{$>+Ylq((lQebQv(%3 z41@J^{M}N^lk@W|OiNuH^*s%eip{f(4ZKP#-Mv%&%iUee3(Q@Ea$ULd++Cbav(0iX z(t=X83v%>*j8hUTjr?-W^mAQFDKC?#ZQ{=A9C0R8iuZRhjGKTvBA7 zW~?6^>6Yu~nd??*Ug%StVo_z`=$_{3Y=LfDX;hVyak_$jT3}UVS*DA3Ua7HVWmRxQ zie;%!rdMQWrC*qKVL)J7hJjzGx4XGnxi6PXR8nA$c~nWVc50MiQdCHYYhGY^S&+H6 zacQBaVUD(6aHOlVkH5BGNjaCUuC9V#MSf9=Nvc~|iM~N*plNz;rE7L-T6t)mbBei1 zVo*s^fn|P#v3F@iWgypOHNn{tVXN3Cz1&l2tlB8??$Ga}f$PpAG&1AMTwv% zESv?eR>)3f%X{it$I5#oYeh7_k(kepJuSbtWj8oYPgp7QHkYoQLUD11 zZfc5=si~o*f=NJCRDQaGv$j#Hm%pQM*bd{bRQtCBJ@N<%HPLW+XjgVS9if{h}%B2to!^veq(a}u3>ef>+4 z^F5P_(!-OqOTAq6Q*zzXd@TGT&9jpN%!)iGpJf!U56pK8%y)7MudoPCH#RWx_R1{C z%rFd!@^#L24s$UJ%Z-Zg@T&@sDs~U$@-hi3EDAHt%JeS|&PXcE2=j@E3QjEb@yhk9 zC^XG6@%A<{4=_x0OwI^Ij{)znB8#GOg=|Y>FBARrAXDSq0<(a;sF3>5uz&#n>|+0{ z@UT>iKyT-wFrR?*)I>*vVyJ=HwZmQYE%E|9 z>O<2DJj=DU4MVvc&61Ns3XAjHsw$%ND_qTror<(`lZ~THGE0&TJ%XG|jNQvUL#i@D z4NTCjD~+mhGEP^Bh{%odkJ2_O3ikI&b14qi_bB!a@+vR0%<`!!FHA}<&d$p=%P?|v zb+X_x%5t*MuF9@2Pfu~n3(G0Ub;)(A3^zB@*AMp%DoZNJGRrhJOpVH|G_f$?($&>f z2=UIUuqdl?^sfkxC^5B2&doIm%ryxyOA0dZ40rSP@htMsDX)wSHgR#}I#sZs?@i?a z<%Kgvca$(ZZ{EXZBM_e+Uvc@zyjQM2FCTh;rC0X&_qjXvT9)mY|H16TwYaBJbMH81 z^J=T@3(0q$E08#I?gP~#Z9!E(xi^om{gZBQOnUt)(}&&jz~-3^S6qC;zx%t(zWUW` zT`yHKQ=0wGnoW01XRJTan)mF4#ows~ia*1uBxZh=tax@KaLUCH{qA2=FR9EfZ7-k2 L%HD9;c3vO=LdI&Y diff --git a/secrets/gitlab/secrets_secret.age b/secrets/gitlab/secrets_secret.age index 621e1b82cae3a34d69fcfcd630e39b316b792288..54feb45bed9f268c90024e37cbfccb58ab3eb96a 100644 GIT binary patch literal 1220 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5w{5(KdJX z(GN3pa`nheuE_Oqvq%a~%MNo%^U(H4iSP+Dbt$c&8ivj{TC4GhW3G7KyVaYeVyB%mrPKV8AGFge>R+1cDXJk%#Y z*(f=$JS4-=%`H65KO{dOGcwcC#4#5kt4e+h9)Xyp`F-)%t4)BjE&5QJk%q%hT%=I*kh_rMqHH%C% z$@B~kjY#K8%1tv5PcHC@OiML1uL}1!cMHujEH5k9H+D+&%`!+yNy-h2a7^|}^EN@Z z%{#2fqNrTKB`w)UKe8gn#M7WK(xR#|*d!^^CBV<8%sC{-IKtT_J3J>R+^;awJIs?S zrL3STBqB|}z#?3`JUBSTFswYdG|bz;v9vHE(kmq=*g4B3BQZ5a-!&QCwzSMd!_+{9 zlAQ7i$H<_tH0>f2_b_LFleEx+@;rZ!h}^QOD2uABG=IPHkjijB^T2d2A8o^`#E7C2 zHy`IDZ78qC80DxC6i`y?oKafj zXc4I&VdfF(7-UkJmE~_>;i+F9nV#nFQSM_|?4uu<=5D~1=#*ueSfE|xQ&y^PZsDD0 z;%RE(lAfF8mf>ZXkyIF%R%IBHW{?!<8sv-ax6-I8C*yR5WFv#}lu$$Wh(tr}(mac> ztQ;fv;Lz}-!ZNcQ$H;8$(vZ|b_e9f3gB$~{WCJ%pw;YcQb7%MbV6%*raL3YuvaD2J zZ|~5O#MG+5!u%?yqB8e9U&mrDU0q#;JPRZJfGlrcM^nSdknE~T?=1Z=$DBlO7k7i4 ztW14>H#hAtGshHPqbf(P`3%l(XBnAfj>JE3`xeoV;~RY}KrZ&fVUc#VV>(I9pYA*? zUUmKDtH@8Sjdh6^_CC7rYWaNs+W494we)y4l^dqYaI}^e?cfrf$J{r0)%O{(zLRse z^w~SgZCECh`s>z->xC=$ip7oOrfnOWm`p_OrAK$u@%rtZ#bsZT1OaLcl<=-H|} hHGAud`^`&sZktoMU;^u6`QwEyeedHwyCrRl2LOf4p49*V delta 1023 zcmX@Yd5vR&PJK$Te~FVU`g_oI8s#A85TbQF!m~oY*YiVvopru<_ zF;_@_YCxK4Qc;nao3>-ViHlo+cSVSEq+xbcxoJqSXF*bFSx8x7L8-Y#B$uw8LUD11 zZfc5=si~o*f=NJCRDQaGaZq-#MTuj$L4aj=qJO4|i(7h1QbDdoXhD{7Qecitc2bn1 zm${3%V_s+|mxoVAuxpNGxQnY>rjNI4Rb^g*vwn7Ev2%)lMo?ZvV6MJPMPg;Tce$Uz z#E;_PmFfOY9>q?sIoYOpUIxz2VV>G95sq#l8HFZk&PgREp&tHGrfGSpdD+=qrX^lg zDgH&~Wfp~biC%tX+Lqx_8DYU5{%OJ5m5%-u>6XFi#)csg=6Q~j;~B-nvn-q=Gs8Sg z-J-N319B}*Ej-M%!(2i=J;O^9gNmd4i=7?I%F_eFLV`WHsv?ZiqXP6pjP>;meIi|b z4g5_)5>ujF41yzlEmC|-(u^ZL4RXs$%Y)M=pJf!UH_H#t_w~qfbW2W24b^w_$#?hG zPD(Mr2zJWmiuBLaHYv+A_xJY9EJ1p*e|O`=Digy% zeb353Z)b~Sm*g_jJcE#&Y_80le1Dfx)6lF+!@R8QVCSl=%Akr&AJY)uQtyn?bc4_W zKW$gTq8$CQP;~3kG7}9`0~LaTymA8#@=c1(9E;0KGqb&_ES$W3L-Q=nQ&UVc($Y)P z>dkWU9JAbwog=v_(oC|8qnt7=lOoG4BMgc{4Gnxs3_S9EDsoCH%Sf z$o4BUObv3*3Mfwu@w3Pba0$t%3=J$VDk?EEN-WQJPxXn^jw(!aOo~kA>bd-?H2#O< zr0vV%o?q(ZnRoW)wsU)%Qe?sfOYIbAux~$Te&o`gO{Gc850p);(NTT)a;f}D=A+u_ zkM+;L&iwJSC_QrP;sw+8JyaIoZxni=h0`Ou<9yzi-|DU*$0OfpxLB>zaTetWjbC4R zJm_2UrV0LkwALz2p2~Jor1C2(*WQ|Rp9WUWZs%2ek8T+pJNWOVf)Q_D>&q|tn#EID LZEhB}Zx00k447xw diff --git a/secrets/grafana/pw.age b/secrets/grafana/pw.age index 44dbbc7..f9285e2 100644 --- a/secrets/grafana/pw.age +++ b/secrets/grafana/pw.age @@ -1,19 +1,21 @@ age-encryption.org/v1 --> ssh-ed25519 V1pwNA wg5YKE7/sMO2/uHVH21A5Ezp5jTGyWICQE0hjgdOPFI -0BdMLvNfdkdawh6+binpY5cP3+SUih9GqXqGRjIMuPU --> ssh-ed25519 4PzZog ig5HQ0wsF9mdSplrAA+k47YEnLKXxsq0mbLSBcuhLz8 -j7lejLu7Nm7rscsILqxJ7c2CTV52a8auuzRfuyT8tyc --> ssh-ed25519 dA0vRg A3FTxSbl06XeRXwqtSEdp8zrbNRrYEhIzxggBa87yFw -MDLSG1m3Ss7mRB1D18VL1XzEPJqUJTay2BCgRrR2MTk --> ssh-ed25519 5Nd93w 7FA1lC5wmw07jEoTAJteqj25VU9LgpS4aS+UDhfJ3Us -ss6DD0KevDM1MWr9ZtUi/ZwvRi6KxAHUvQoQlhDvhso --> ssh-ed25519 q8eJgg tynydC/TKwdRGYYFhkOUeBSQhbReny5WqFiksVBfhik -uuvgLJZGfeCIudTGb/E91YUWtMuX4Q4+dP/ixM5ppr0 --> ssh-ed25519 KVr8rw 0PrEzDMMr5NRKLPwh5FUdsK+IgmmOaR+vsjkRlaPaW0 -12tS3tR3BAEBTVQunX//RAXefZ+b422Q2uaDViMPcmw --> ssh-ed25519 fia1eQ Phy3mMJqUjc+np7zDI0UVeHEMF9aDJGBKQGeNDWWcC8 -/B5W/0j5Ziq/ToQKswSHyLaVw7cl5DyQ0PhhQK8MnkI --> ssh-ed25519 IpLDOw g8f5bCJc2CSqqNi5ZbzykknpsWFEffdEjT+ZxHkUZ3g -sSfMc85BkNYiDO7JKm3yzK+dA94qry15c/GyZx4sTLE ---- iE3MElTwsLIYXZDjxLu2iz9LU/NieS1hbcuFfMn1erk -?×øQµ°ø1é˜uL×L*›ç;ï)°ƒ!EðªÑk³.qLÚ† Š¢hF±Õ<ìÖ<íöHÌòfuQIÁŒÙ2EǘÀ4 \ No newline at end of file +-> ssh-ed25519 V1pwNA sIoha/7vcAIuauOaV8gQA1spz0NZWfcc4rr2zgUP2k8 ++XELN1EFpMnDsVYgPnSaRm4qduSY+80RCfEFnBPCj/0 +-> ssh-ed25519 4PzZog ffub2ZpZEkysUNemtue5UroJj+/Oxi+nIstX7/txi2w +MsvvInOvekc27UTViomCZbeikTKm1vqTKsanOpeSQ8c +-> ssh-ed25519 dA0vRg ymDF91ZONYNjDV5Gktf0at2kUkfYbPSja9iWOqcBxVk +gw7IgyRSVKfxeebADqYH7z+TZJcWIMS3g14U3FrDS7c +-> ssh-ed25519 5Nd93w n17TARvCsIOmSp0WjZQEczLCFsAVYf9lDlJDdZeqzFU +gRRE87qCSiKevHShj1k0bw+kwOVblwhMGh94WRYdqIM +-> ssh-ed25519 q8eJgg 7ZJM3hSRIaQSpMnE594tD3qsufP0IwI5ngmitx/SW34 +Yibvj3cTOT6TOHSFBgeBwpXbGNFjeYs+oNjbfP3GRgc +-> ssh-ed25519 KVr8rw O8njcmXqC4uurmzk0MLECH/pVlVqA0dqM9uL00vKlls +h1dhNulCkCc3O8GmNSt67dxK2XhibTJHxx2loo2Y26s +-> ssh-ed25519 fia1eQ NE6qJvq6AK7bIlbq7QSJqQwpGv6cgQFv/L/6MXOQUzI +uk1G8a1cECFkjbt7bjcXOYQDHcTBCQwhyqcTg3pIC0o +-> ssh-ed25519 Km71ZA wQh+XFb10AF8fdeDGM3mMJG6N43ej48QML69Xa+xFHQ +eDuMG3MT8EuzS+QCAHLUi1NhRWp67jJamSL5iUQKi9c +-> ssh-ed25519 IpLDOw wTE9a1YrhG1NqYTOBoihrNH3xt2fKOmGHvx5liEfeHM +Rv9+kBZamBTDS8XGRaTsuUW/t6p5kYnbfNyyZY5n590 +--- 2HVyulzZ1Z3kQSSDH6HN/mu8uT+u8yohmt0bpe/VNQw +ŒM\$0ëÁgÄiºS¹mŠ¦‡lgÁJJ_yJª»ÓÀì<²¾.l<¹“ ‡cÁ~84•v¼ûG²´¹Pû$ª ˉN°{ý5c \ No newline at end of file diff --git a/secrets/keycloak/pw.age b/secrets/keycloak/pw.age index cb13415ecd01af9be1f42c1299432120737e7654..61651308d3d9ff38b1a6f4eb9f82a68998737640 100644 GIT binary patch literal 1134 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5zI)Gj??H z@(wA@ON{i^E;cu_Fm(3waw;n@@bcC7&j=3A%MLUua5K$u&*lot&vwhz&NVJBaWnSF zN=>Tpcgpq53=at`%ymi(4$=|??OZK5^qcWA}8%IzmUj4{lxr` zD%a$+s#IUEkZeEgM1B7%1MPIn>|(AEzakG;<21KKM_1pXA}>QDGn1kW&>BXdntO|m?-Qw+=egUdplqk_ELJq!J! z^uu#g0*cXXE3`=UN>5iPb@B@JN(?eDCLBYn-qH_1(;-2q!vVaxMp)1RA#&6xEPh@ zS|nPgho&YPdPNkurv;b=76*iByM%iN6sEbDCMT6SJ7dI~cdof%l%qn9qgSDEaJFAX zXn0g|ZnPPXvysVH^H^7b_;G0%0j;0jDl%}h#iDl855&kD=TO)n{~@(l>7s7fym z3-v3_G)ygZGRe-%t}6F2;L_FARq(d-(M~fl4hs$OEDaC$b+?Ertt!_xGOzLsNHxpR z&o3$oHp$eE$Vl->=3-QlEKaSAQ&CzuQ~TGR%T2$&_*(DXH)+w@trf4<*e4o2`D^@7 spEG-hx?jZEOu4Y7TX=UUJ^A#tK}RfX!wjxFOx%19TX!Y6zrLsn08^TGd;kCd delta 937 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 delta 1480 zcmcc2`;=#bPJMV-wuMDVT9J8hM6pYVpRsA8Uu2GtewBNgXJlS!ZdE~Xj#Ft)W`S{q zE0cq>ky~!IuW`9yMu1^KT2xkUm9JrWZk1WNf2d1}wqcZixk0F-FPE;JLUD11 zZfc5=si~o*f=NJCRDQZbph=~Pw@XE)m$`{oRb@_zk6V~oP-S?QpSO8gN^x;%K&H1z zW=>{#ns=@zS8`UAvsqYSWnQL}ajt=9sQKq@MW~u3ADZybWRVfwjRV5K#nH8RqAtothelFQb1wJ0W+8NngdEOOa zf!@WH>Bg4Ed9Gew9$BTvX%((UMmfgG<<9PzVO0f1S>7flMZVdS;~B-n-Ge=|OCq$3 zeWOgAOA;e|!V9wu(w!#^m8&CoeYbsJab*SLPAWFQ}Rlx5{o@T+_Eh) z%AL#nGTkE+Ju^K5%JM8+tEx!EeQ_fG7K#8F|mj=(JpZ+HqLhPj&Kck^h-~U2=y@u zGzj;o$SkY!NDm3lNDeeXj{)znB8#GOg)pzeP!kJ3FMa1?ZC_^t6Qg>U+|0sI7gyJU z4DGB`W6yNUvWU>)^ipGYU#_4avj`7Uzr3odJbmrR2yfG3OLs4Aw@5S340l6U^FSkW z^CF`%^Stt$Ky>TUG7}9`0~P!t^wX*e3Ul*AElk5rl1zN7{1emCO7fgtqbd{K5=&jR zO-=lQ5={df4MMrRODoe0!wd_HO^pM5Q-WMfEdopO{q+q>-GahQbG=<$EK%sIt`jRHMkqFqd)zSEoR(C?9wI5|8kp zGHvgyDuVz67ypvPN;mTyKYzCn?JVEisARJu?aGR*@W}khi7evb*^%D9E}3DzhAv5| zRXLzY3Np$~aq>;8DD*8buP8_|PIC|RDbz1EGT{pJh)65e5AgMH^vch%s0`N64{$39 z2{F&n&r43TD2}x7jLh~ZORg&MF9!uvcz#x}sY#}(OGa*(L3VzITZy(yN>P|$T1iq) zx@kplSdekCWoU@8pTDsymq&WGMY&gUxocFCXOU;Nk6Bh(Qe{@9V^&bEPr0*ppl^0y znrT6~pHqGy$n5$gAGZt>_mI-`KvTo4Jg*?5z`Uv)?UE>$kWh3vKuGWIuiH@UjpmixmBU&`38oeU~Cf<3#NO*HF{!&2OY?fKH0SIBuar`mL< z>%F!ewk+&kvB320_XMv$0!jzMcg0;|*C<-POsp@->Cx030>^f3c%y6o_34ur+Z;qR zuYCUf??&~ ssh-ed25519 V1pwNA U0WP4K92oRNJ1Dz7siaR+8IcCuKO+diy9VhnuyMQ3w8 -Ral58VncypJzKyBweTNDn0uyFfmqbVBsZAgsxd16I8s --> ssh-ed25519 4PzZog ADJzfpJ3mw+42CriE25RkMq49zMrkaQM+mYO450fDBo -lkz7JlpkgOOg/clVAOJ3BBnSmo84u+hxHAqxgj4VfgQ --> ssh-ed25519 dA0vRg TbBXDcY0qSdQ8X+CsumrUV8DATgyjybFmMSr7vKcvEQ -VA0TrtKta0ObYcXio/usanpsD/cAtS/FSd6IcOLYzaQ --> ssh-ed25519 5Nd93w dFpBpeouKn6S84QDP3mvQmecCnGO1DbEFRf4IgnsHjc -9xoxDilLBwS1QxXnXk2CUaoyQs8udAZJqbgwMpj5ivI --> ssh-ed25519 q8eJgg 7bSXg/HPIYoAMK/aLs+IrN9Y9BEPUyTsIo3PLEmH4yk -l0Pe13zucVpLKDE9LnBtQMkdQQuAbR/hCYhjmji6xHo --> ssh-ed25519 KVr8rw cDXOR2vdFmc8V0cDFzJd+7024ez99Th7v+i/7aK6Zwg -av5jiCaB5Q4Pa6Jbmeyx7RFwrj/qkmIN+BC7d8IMP+g --> ssh-ed25519 fia1eQ 1VFDFHIJ58+ybs3uUVIXHMpOCweDRBH1h/9b/qfUc1Y -W74hrPdMJ8sriTxN7FMoGkY22Ba3uq8DB+H1Rb4AGII --> ssh-ed25519 IzAMqA pIdk0fdfM7FZB/TTA9EN38qzBxVO1IMgDSi03tpJR3s -f4UURtxj2/YnmepYeoiFeSVwsWo4u/YYZzPZr+vybVY --> ssh-ed25519 uZzB3g JhwS814323gjfUA4JxkPFuBfNppmI5N4sN2bLxOXTVY -Up6477aZtVmbVV0s+dAafQZm1Fk4L3zA5nGG/JOMnX8 --> ssh-ed25519 Hb0ipQ 7eBD6LAaLzBep1Ihw5ElMkeT8lYTeaQJGoYlsN6AVm8 -9QLQ1Uja0PfiQdpnB4ykW8GAXdzDZUfertdRB1V/+/Q --> ssh-ed25519 IzAMqA TPkc8WaH/jYOcTvFD43lwQR6fgnJ9bLdMJI5ns49hX0 -FoUbMUqIfkiFxk8YqwHmeVb5/k7H+0EJcFDzNZoPs8s ---- Rfu7lKgz3e8yBtCwf1rlh2lH5pMTtBeCAR2HtL8Lehw -X_¶ÇÈ™æb­p®9eŠ ™+ÖKÛ¬£‚‰OåÛp™ -… 8ºputJâ†[WÉÑÃã±â:Q¥ç§þ -™¯\SW½zuœ3ÈcÙç&`­JþT˜öõÈX®Ý’òR†ýÓKÃ8ͳu8[º¶SK`¡[3?hç§T7atLç1|õH—‘`nÛ¡á;ü¸i­2 \ No newline at end of file +-> ssh-ed25519 V1pwNA qDFD8i1k1rzDBYBtXj6sYiQdmfGhDfXS5vMcYRF32Gs +7zO8QwPzrrqH6JPBRuasWwUw2/O1siBySFvHSp5j0n0 +-> ssh-ed25519 4PzZog u2Eg6RB/AmN5GtU/d/WfaJPew8reKZnC8C8AZWVnYRY +5tGVoNyuPKbCQSHnEy61rfuG59t1aEY1XQRJNmuj21E +-> ssh-ed25519 dA0vRg wkxiozefM16DTQAF7Ts74MP6R7jZ0FormDqg4SJkjzs +ee9kJkSDUwm3feZhBcsUeWvG90Cy6X+qwuL/PpLSKHI +-> ssh-ed25519 5Nd93w LwnaKhjUgCrVDxj0G5WTwHuzjN+nWLApK8LBgXeJAxI +WNicDBw71xFfnSn1R9f0XeAnGPHAfc0QCj9yjHk2Ra0 +-> ssh-ed25519 q8eJgg fgH9K/UiFJaCiV/NPDu1RbkMMH6tumir0qhO0gfKGTs +bycdxFG/VHcSbd1g9Ou36sZeTdUarIG5Hyn+Nji6MHk +-> ssh-ed25519 KVr8rw 1we04j3ymB7zbOJnarg67KzI/yMiQHr1ytBS8PxVywM +Jjq2uJtOAn62PeTJX021zHgCd6yPkxRnSt4IFc/T6Xc +-> ssh-ed25519 fia1eQ 3ywHsF86PLUY5Vr4hE4DI62bsGgA3iU4QFEk9SvHWHU +TvkQ/+gQJ3DXnvpD6U+jKS4EG6kIJa+nX08nUJFs1Wg +-> ssh-ed25519 Km71ZA IG4kxxGPSU/CvwDfTjlp1hUgmnzRqK+YCYTfd1qLgxA +B3cTR3mZkipgVe9tdU4re/GYuSlSDdI6Bok7yHPhhOQ +-> ssh-ed25519 IzAMqA /eXLqE1/nW5vpiaCC+NH3ytm1XrjQPgKo2rR7igOyBE +EUsEQWWTaS3uhOu/ayZNlwYw3vY7Rb2IeYl6QOelmY8 +-> ssh-ed25519 uZzB3g 5SrR6ZP2zqFHCLeykkmpeR+Km4/4ml2AcPnOAxgpq1k +BD5IXtf2/S+ME5mPHPu/yQVqQ02+aivLLV84fBSeq+Y +-> ssh-ed25519 Hb0ipQ 5z6PimjHhHU2bXtloaoYqcJk0/S/mrmXqs4u8TJjPnE +2I+d+g8Xivns+fT9W9Ws6rYCcMXJamuZ+uBnXcukcFY +-> ssh-ed25519 IzAMqA ZwdALhB/2dqaFC4bSqgXNYPbN0hgUKdEmyNyDpDg3F8 +ukgzLa7A0bVryf4GEXtqbAU6uMlEiZC6ZYnNgIdbPAg +--- XF4TF6aDYrTOXdaLTJgns3ZMeVVCO4OO+LSIczz8vag +nƒò¦ïXå~' #žW¯Y!&œñXŠœ¬sRúBµÈ»‡g¹iƒGë–Ùʶ7}[myzuöägÀ]È_úÅ~°à™:9uÍæ§Ò’(y.ÿv?r4eÓ:0?¤»ˆ7,‰Ï»„ŒK5†dÁµÎPš?4¡úÆ0S§3aÉ ¬G¢]Iâ)»ŠR³†…ŠNƒ©Ÿðû! \ No newline at end of file diff --git a/secrets/nextcloud/pw.age b/secrets/nextcloud/pw.age index 1e381170f4ea55290d3993a2b167a7b92b09066d..047db6e3abdcd742bebb451dfae43c1126a57f22 100644 GIT binary patch literal 1134 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+Gb||gb5uyptMW*S ztPF5*NiVbv&&l-3OEt@NbE*jSO7?WmG0O2baP`km(k{-;GvLxLu&63daw|wR^~;Vj z%c(TZt;#KTtMUm5F$)WD_OEabb@ojPs7jAY^+mVMB%mrPKV2cCG_9zrJUA=NBhxg^ z)1oZHEv2xk)XP6FF)2ALJHWsqC?h{PFuBsm&4Q~aJKRuTKgqk?Jix`(u{gBQBginw zJJ-n~+$%IU$;>3Az&xTLD7`e*s~Fw36i0)ypmc>&?GV?LY_}xC?Bt|;w;&gzoZ{3l z&-C(&pa4gsP!Df!*V0IXP{%AwcMGmu(;&Apx8R~8i*m03ePg%MP}fM4(!3xK=agjk zRKF5kFaW6=(2&y!#%1ulTFUyE>^YRUFEONK3C<;vsH!28sbIG#I zw9GcMaCGD<%TG*B4i3sR_X;X2&hZUQGPE!W({^{y@Nv&eN%J=FtqiL)4Nr-13Bw3U z@310^qH+c8WS2tsh$Ma2@I>QM0}~$~^Wd_G&rUoiF zhPh`uRizsk8wOOS8U(sj$?~wr6oECgm^iJxSN!fq(y}qxI}UpC#G9Er<+&h zRQM$Oxf>MwS%w9sxdr+adE|xp7r9oMBvwW`7F1OldzPcy=ACP980Dy7W{{d^6lLjC z7Le)con+=5o)l>jrXS&NYV7C~;q9N|tY4m%ZI&3E>EX#`>8c%2V(Mv-7gXhF9ugE$ zUgDbQ5oG36>=a;VT9F)Rky~V$onmGdP~?biTclfJg>$-skCBU+nPX9ecWHi9Xi8*I zk!f~ia&Az1v6-v8VTNIpepMJ3lqhpwP=B zE8on|qAVhrt2`s8L_4x7)H%5%KitJ7-PFa$c%#Y)S~ntZ?*U(5V?cxBJ zWZyhf(fi9`0RZiuV zsd*`7`bAzr$vKwV7GcHCk!~5mY1%%3uL zmN``+C7wp5PUbsMP636 zQLs^!r%z>Gs)u=yTcCMXGFPF0nyFb@sCikaPikdgQf`oCzOj+NS&^$zL7r2gd2v#9 zva?fmSd>qh0lIZ*nTdv}feMbP<(Zxy{%(%t?#8A1f$ov+K2BA^X-V!b8O7#-kx50B z^+h?6h870SVHRA*sm@itl|exUM)?-Od6AW29)4~fNqMD_+UZ3(Y0f#WRhDK2nZ>3q zZlUPbMY<(cIHxO^CT4jB<^`o17U=uvrFVk# zB)Yl>rUs|@Cb^lXnUt7U1v^G~`sfFQ8y1C^`y{%i8JD^FnPe0e`{-M6g`bv|U8BuW z-^g(8%X!P~Rgd&_Th@o3{wjdB6}eA%1on^rrn7ukAErv0CtW)1ONa4 diff --git a/secrets/secrets.nix b/secrets/secrets.nix index a69d2c4..08d748a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,6 +6,7 @@ let thenobrainer = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKjaKI97NY7bki07kxAvo95196NXCaMvI1Dx7dMW05Q1 thenobrainer"; eliza = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIJaVEGPDxG/0gbYJovPB+tiODgBDUABlgc1OokmF3WA eliza-skynet"; esy = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINS2UR/o+nK8lNHHTj5I84ZAAp6P+ZhXqhedMfx0KHE4 "; + esy_root = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDxHpsApRyCvuP2ToGm46G308Og8lO7BYPuz+EqHVU5w esy root"; users = [ admin @@ -15,6 +16,7 @@ let thenobrainer eliza esy + esy_root ]; agentjones = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDHOxA3uYcqS5gTrG1hS8XXwehzQYAI2I4iULtU8cXft root@agentjones"; diff --git a/secrets/stream_ulfm.age b/secrets/stream_ulfm.age index 118eeb28fd4b2934879ef2ce17d157fdb51bb08e..b014d5f7da16c63976a6fbe4fdd1a0071e1ca2d1 100644 GIT binary patch delta 3235 zcmew*@j`NfPJK>tdQe7Tj!S8Nd6sucxUsfrflsKuYek-=OJZ4Ip1zB=e`dB%fq8(7 zCs#;LU~oZ(X-cA5U~#T~L1~n~t9MCoNpVSvx3)`ENs4JzN?59qM{seKBbTn7LUD11 zZfc5=si~o*f=NJCRDQaGWnMsmdv0DtkztB~Q<6c5hg)8ru~~MMuXeIyrHi(3Pn+Atk2CRZ%Gc!C6rOK~9bZkztXZrmn^2c`5l(-jya?Nq%X0 zAqGa;rmkU5iI!zSNiO=nrTQVRiD~6kMy>{-?o|dw$-&vh`4JYA;~B-nvrJ3Fv!kj4 zgHm#GD?F;olX6lFymHF@LW`;lOik0AJgO42jDm|Tw6i?9{9UrmbB$9fJ(Bd3Gm;&R z%#%!Aa}0_t-AaA3i@owZ^ebGF3KBCa(?bm=pJf!UcMdKHD0C~cNOH~3GLG`8$ngvI z$O_J=^!7E$^v^8MPs*~$b2QDwj{)znB8#GO1>cY)r`&?7lysvsCqo0{u*&-Kq^gpD)cmlt zDE<5r10Um(61SxEaPz1T11_ham6N!3d{=qJuJ9#%AL}ZjKkeifCTDE?+b4oyQW~reo*M=n?=clqfE85DvXPw22 zUsWo9C+WorWqnd`G#7Bv^5%k=riJ{m|W6{j4xjd$Y_+2aQYh%uD9o zK5^=B@@8Y-s7hPzn(KM*I40arNQt`gsI2JU9qErAq0-+H&vvr!m*t7`5UXQncJfm# zEIY4Nwn1Ib+{{Rj$Axpx-h&J*x97Jp@4OcAqvb5ufA$x0K^0pUg-9p=+Z1uFsW@G5 zLA1=AmY8EH4q1MI+EchUSZ)w~_P5xOtNyV^R?fM1nH@q~3bq!Vw4D3!i|Y#O%W0=W zXGQIrpRDw5XL;7a#~Zijo$T8n$!7ml*6aNZ?duA>atd3OuVqe6SXy(HUM;t+xoI(#eX6t5S-Hj^mjo4N?3b*lGRV|uxz=EQ#aOrP#BG@c(U)7-b0=Jz zS9feeeIe5-j&|vJcS`J!F|3*N=UmR74I(E(x3>PCuXVe?|IXY~nw(SaPFrZp7-b!D z_%r|O8;fR4RZ&uM_+D`K&vW+G1@jsLJHJ-%yYZv9{buOZIiG!hTUzB>#x$*YTo%>g z^y5R_roA_wzPIQ0l6+&rY8rN=AdKb1C0~sbukKx1)Z;5sFVHj1HR#DUWvw#PHz(Gu z@PE2e^sJuc{kQK!SbXZt4)1*y#%0&E@W(3tpw{)N$>+^42AN)!+Pii2wsUdU!%yeG zlWT1ZvF^SRk&&POchjHw>IPH(+)Jsp4bo853+wOS9+y}qI!jSCLeT}C*UhO8 z5A59DRvg`Odyo8Ej)eNuC6BLL{3`2fYx(l=ZF~EW@tx|=5|%x*>gos^pYCN6w z{7~_`);^V^W(yK7cAdG$WbJ*!Wv}N<2Fq%3{fI}p_@Sn|^kx3V zCb>cnZ#l+0uqhoEe!NqB@4{cZ<}pUp?_D?B+1Z_K$?NY1dqvJm?E0;0`)BH=&-VU1 z98XBhE>bw#_MFkDKX6*^wzrP_&1U;qC9T%Vdr7`oZDWx9uFvM`MaFc!FHaB7KI(iy zqi|AceDF=jIn{z$5bykdN>X)>3z z6>>KIzslJ3>Oy@$q<-YS9h;q(X`lP0(cKzkCY8+KQqK{-tVWM3yT&!lPHpD%s6{0j zxA#f^TRF|IR9Haf*|i8yJ7eQ77i&*kdu_~Obhdhiz4EE%?WM2G*&L?_mfd4(_oTX9zxtSk(3EhU$^z z)8U4PqK!-?|E;foyYT2)x1Qy%UN3Jtd~1cpFVFH^zqaa;*!sT*r$6O3*!-}4 z<=t-yxqrD|H+F7mT`{@8VQjr`HzZb4GarT*f*=+M&!}!$n84*0)_EMe>o(bZ=({6;G_E&py zqa@;$LkQ1>A7@uy%`D6+o__tRE_|GmGhIrS44;Mwck{(trp0?ACb&YpJlEsHAo22yc=PV}E{QCdy{TmRn zE#jy|t5t_{-9onJ423zKiPL`;o#|ro*uRQZyGqRH?V0TyZ2#_h`5H(bHhyo>Xu5er zP5!?X`)0q&K4JV?;Pv{_Kno>>-~^*>JB#ysEF|;lT_$Fl#UHv=cs6b6?iG%@doG{; z{c{_8N_qB^ACGtfzIYc+3GJJl%G=82Uq97lrr6uH&mUPD9kY-5)v-NLr%a*l)A?6x zkDn;ru{H66Wny_@?8y&HW#29+X7#;V!D6&de^vI3^@Yl&>1pc<9lhqPE1Z(i+I{#+ z*g=P5KX*-@!@yk6t>*pkS`9mUyXvW*()l5GAKx{f^k8lO>b>G^GsSW$R>*O0xLwK} z9WqfdU}I!TR>}5@P7j=>yRoiR{`7Rtk@Hqr0SrsxlvtyMO{XOktkztq<90GErDPem zir5GFt-HT+&A9Ku!}fWGT_^jwcRt+W>5{t-3z)9nZgFi6TiMA28|xEp<#ltE%~rm$ z!uFNcV&QnMeL78(SZ>W%;dJJ5n(p^^_8l*|fCVpNW@Ic`$RWMq9ruxyPkkP3dMN4i zL48)!>CoQ#gM|t_(`OxK+_vHAo5O*1EpC~sPp{nC!n4xhr$dkQLd!*m{JWQkUq7`; z`&-em%Kk+GO&W6!M;XVP$7S3~st*c!b94U$Taza*-x_XB+4S@Ki(R^Rb6<4{eSLE9 zMu6x(tv!vEXEw$Ch>5NLP*-Qha{r!}c|wH0Zocof#(=XsTQ>!~%;A@s{XW$DbLL7J zQ<;q8(oZ;V@Sa|IT-~#^*yO~WBdwi^p1j+Ix;Y+v>S|c5C_LqEi)YsEo=hJL+rWuZ gdJ{qe&m1g2!1ON4;^B&F6}>ro;;zdIDx0nX0C94cLjV8( delta 3124 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 delta 1913 zcmaDS&>%2Dr#>Phz{ADGyTY_MCrdji)uPJP%fiptH$9}(sWQ~H&{e;}(jcX>#GouR zk}EqgEz>PC%*WT;Bg`YRz{$WhG`KL!Ij1lv$S2ZJKRwH_FgQY6yClEdmrK`9p}06h zH#Nn`)YQ;Y!6cw6DnDJJpv)vYH!-_BH!VHG-!dXA+|4B1B_l1_$gr#`E5M}0tkA76 zA|=1lQa{&|%h0H>)X_g6-9IBN*E`iY+`OzP(cRO?ud>)HBP%u6*f-3=sKPrh-6Al1 z;z#lDY=bPFUJh+0`tIPf1|R{v?v$HjEX=mZ_6S# z|1b-uk_vzGQj@$QPou0tQ|}CC@4}?SbR&f(zUfgZhWcfx zsm2v1=7FWTIZjUQCQ%VC#${z?=J}3g#h%H5UX>YvWmU;shQ(Fkt|q>Pfv%MUWO^@CdE0H#R18a&oYYFnC1(U?7?fFt6{i%tTl!~3 z28Wqe1X(y`7KHg4YNsa}rdt|0nP(((WqCxnSR|VyXISQh+xmLLrmbw;u zmgi^(ghv>rSO%M#7ke3?$AEWOkwsCtLT*`LW^$l`f0=)AR)mF@e_4G}gpWl8O zc}{?3ut}-0vv+R3qqnDHI#+mZQl7hER+4#=Nk~q(tD}BssB4J1g}HgEftg!*xMfOc zL}8?JftP`gE4p=QnTdv}feH~WW|d}zKFP^J$w`43UKYgxW(Fq40YyPsRmti3Wm#nf zrsXcVrS4fi&dFScL1`J`z9y+TF5zkB>3M0PIT`Nm6-HjAmbpHG0p>orL3xqMY5Bex z>7kR)vxwKHIa|6WhvpVnnC4XarkZ5y=R}1V7v>sTnq_z;dm5KH8iu$hB^l*dW_xmF zC6zi=czNW96&B?rW|dS0h9z63nOBx(2bPEXri8hgBv~32__;dfW(J~rr8KI_$v9oX zLchdWyTG_2-&Nbu-96VN+sz=^Cp*G9In1Tf*|4mrFeq7sVXF~EYUeEGSwiW%0J3?aw3a(cyXkAN~x)TfvJ~s zK%!&1Wm-&;8k z%Kc3|eYqA-oBrmjWaFtUiV5=QJf7(xE zO}VLe;aJt4yxHFu>{=LdRo-~r(`m7JeQT_C%dy)CIo;ZN?U9vJ#A&zlTi)zC6R^hl zMbI}>=VzKOy;i60W^(<1ow9d^fWkAixo&zZp49Iu6N+P~$}iXufAq^b;lCHP_|#t& zWywGN%(8rUeZb55k3W{^#rOYye)A}^rlM!GYT(ArVV`%OHL{;=u<5M--zAkUJ+^+A z=H6*5Nn}!Y(3X<7?&$Wp{~~$T<_5jVYiDRt}T-dw4<&yP6hjY)*cAD|+zSTb0_*=Q|wdF@$S01{fQ+M!recsobwhY^kH9Rz| zW4T!@yC%S}r0jO0>ke)v<^8OCJH>b9JoVMln0R5vW|6ZD-{xG`uQ^`7=i$7|>?;hm z7F%_F{lo1t+3G*<`=eI+Cik4YGxzxBcqaV)m^|0-O4rPdns5GGh<$bU_( zoE!fMo>jb`FE_15`DN**rrJC8{fYAxnG(I8e33gj&Ff@1_rx9UPiL)mn%ro6=JdDH zE55<|=A6CWc9ePIl<7-t^_H$*xTm-OYus&%#nx+Cw*D5asLpEaw$R@aXS$$&MNj8$ z&h&Rve!Cf!UHEuLY(w)jxksr5<|$Waupdp8pO_Z4?03}Zz*k3#<2TDltAE(1&bYT; zab>is;Lq$R9>F+fd*RiUckCv-_FNa85hK!6{q0W5QO)Q-k?s!)WhbpW@Y&dC^YlL7 zIP>KPmX@x*DO9cTr1w!bM?=wc;do2FIJU?sa$B)vX8hZocc>d*GVFm!CVGCaX From 13aa5b37a7361a78686bf95dd9a9571a96205247 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 6 Jul 2025 23:33:47 +0000 Subject: [PATCH 528/563] 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 a177edb..3c8228f 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751725913, - "narHash": "sha256-7/hUVgjLRZH2ZcFErIb4GuUGKGknKm4605hiOhJRRaI=", + "lastModified": 1751844531, + "narHash": "sha256-vxOybwQM2pQU0hhoO6DvsZrfB8nqLu2k5UKOBZIbOaU=", "ref": "refs/heads/main", - "rev": "c4da3e91096741dc827f3a5ac3c184160b8f1e8c", - "revCount": 290, + "rev": "764e8cd620d61ed6ca6d168cd06489e94d40b615", + "revCount": 292, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From c57f5b5f6f0ae4048ec575378e475c0978490c84 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 7 Jul 2025 20:35:05 +0000 Subject: [PATCH 529/563] 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 3c8228f..e6dca48 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751844531, - "narHash": "sha256-vxOybwQM2pQU0hhoO6DvsZrfB8nqLu2k5UKOBZIbOaU=", + "lastModified": 1751920177, + "narHash": "sha256-m9XL0STa3cP8BmAj8xvZQfIbmhst1E+1X3OKzYIUW3s=", "ref": "refs/heads/main", - "rev": "764e8cd620d61ed6ca6d168cd06489e94d40b615", - "revCount": 292, + "rev": "b8ffd421844414b44cc66d7ef671c206072027da", + "revCount": 293, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 6ca361d42b692356a045fa0993ed3e9c890635a3 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 7 Jul 2025 21:26:12 +0000 Subject: [PATCH 530/563] 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 e6dca48..e2f7264 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751920177, - "narHash": "sha256-m9XL0STa3cP8BmAj8xvZQfIbmhst1E+1X3OKzYIUW3s=", + "lastModified": 1751923345, + "narHash": "sha256-KfAb51GCg5Syjpc5RXC0vkOML/Q+eVzKR90dkjUdUa4=", "ref": "refs/heads/main", - "rev": "b8ffd421844414b44cc66d7ef671c206072027da", - "revCount": 293, + "rev": "e901f3ed74120cb533b6eff7a873a8cd07776efd", + "revCount": 295, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From abddb133ecccc49a23844954a7e4a63306e55e1f Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Fri, 11 Jul 2025 11:26:33 +0000 Subject: [PATCH 531/563] Updated flake for skynet_discord_bot_t-800 --- flake.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index e2f7264..cce90b3 100644 --- a/flake.lock +++ b/flake.lock @@ -1148,11 +1148,11 @@ "utils": "utils_4" }, "locked": { - "lastModified": 1751397287, - "narHash": "sha256-9G1T1nJS6itGsUhZxr8e1KDIx1naTSO916QN0HyCwRw=", + "lastModified": 1752232947, + "narHash": "sha256-WW6gL8JSoJu6p+3Xnea9J8+epWtSOs3O9Sk/+Uz+ZnM=", "ref": "refs/heads/main", - "rev": "b26a7c23678fb7ad922e4b7f28330182d0e6844b", - "revCount": 27, + "rev": "379cc1d431ec8395c368dae773d7c4120bee57d7", + "revCount": 28, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot-t-800" }, From eed6c54c1ab0448f0ef9631c862c94992a2263b2 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 13 Jul 2025 18:13:07 +0000 Subject: [PATCH 532/563] 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 cce90b3..4a4a4bd 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1745466454, - "narHash": "sha256-st63Yf+KzhrontRBVdlQ/TR6TXAqpoOHvP0VqEYTDY4=", + "lastModified": 1752358668, + "narHash": "sha256-B0SzdQrrOLxhafWrY+8wZLwAQndRGCiH/Crwz5ZqR90=", "ref": "refs/heads/main", - "rev": "e135e90a8ee46e57f35e6d74799a8e4ccaea70a9", - "revCount": 151, + "rev": "be0baabd7eaf3f44b723cb121c6f9f170355d713", + "revCount": 152, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From 180c3bdbcbd61110f7cbcef9bc26cf40000bbf48 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 13 Jul 2025 18:59:49 +0000 Subject: [PATCH 533/563] 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 4a4a4bd..36b6290 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1752358668, - "narHash": "sha256-B0SzdQrrOLxhafWrY+8wZLwAQndRGCiH/Crwz5ZqR90=", + "lastModified": 1752433143, + "narHash": "sha256-oMfwxl4i+VcYNizv2k8M5PtiGPBc9RB0Px5iCdvzypA=", "ref": "refs/heads/main", - "rev": "be0baabd7eaf3f44b723cb121c6f9f170355d713", - "revCount": 152, + "rev": "0abad978f3fd8c191d2f57edd94da405e3f816a8", + "revCount": 160, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From b45accbd9e5ab60e5b9070fc86e07b0798e0d101 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sat, 19 Jul 2025 11:39:35 +0000 Subject: [PATCH 534/563] 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 36b6290..1d8488c 100644 --- a/flake.lock +++ b/flake.lock @@ -1385,11 +1385,11 @@ "utils": "utils_16" }, "locked": { - "lastModified": 1752433143, - "narHash": "sha256-oMfwxl4i+VcYNizv2k8M5PtiGPBc9RB0Px5iCdvzypA=", + "lastModified": 1752925027, + "narHash": "sha256-APuWWdod4L3mgSBXJTukfbB8s37NvzUkju+lELUD7PI=", "ref": "refs/heads/main", - "rev": "0abad978f3fd8c191d2f57edd94da405e3f816a8", - "revCount": 160, + "rev": "917c316e7606995362b436f5c6248f058c762176", + "revCount": 166, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/wiki" }, From f3aaa522b29512ad6051c6522b909319d2b0114a Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 21 Jul 2025 01:08:00 +0000 Subject: [PATCH 535/563] 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 1d8488c..c4e9355 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1751923345, - "narHash": "sha256-KfAb51GCg5Syjpc5RXC0vkOML/Q+eVzKR90dkjUdUa4=", + "lastModified": 1753059987, + "narHash": "sha256-e7swS3m94iVuUN6tVlrcePCnCm8E351WvxmTokOUxjA=", "ref": "refs/heads/main", - "rev": "e901f3ed74120cb533b6eff7a873a8cd07776efd", - "revCount": 295, + "rev": "18fd45d39b3a47642467dd8d64bd56847dfc45ea", + "revCount": 315, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From e3d5a6faf447571965df138797726cfacab9a148 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 21 Jul 2025 01:57:40 +0000 Subject: [PATCH 536/563] 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 c4e9355..ddeb07d 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1753059987, - "narHash": "sha256-e7swS3m94iVuUN6tVlrcePCnCm8E351WvxmTokOUxjA=", + "lastModified": 1753062779, + "narHash": "sha256-hTDomWgg3cp9fw7HyzxYWUxBAwSyHq+ocZQ2rgVeTUg=", "ref": "refs/heads/main", - "rev": "18fd45d39b3a47642467dd8d64bd56847dfc45ea", - "revCount": 315, + "rev": "095ff6f2cea5b3d35880d4a55b60930b60e3efcb", + "revCount": 316, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 9fcc01278f5ec43621f7b4b10ac527c2218f4630 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Mon, 21 Jul 2025 03:47:45 +0000 Subject: [PATCH 537/563] 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 ddeb07d..b5b7584 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1753062779, - "narHash": "sha256-hTDomWgg3cp9fw7HyzxYWUxBAwSyHq+ocZQ2rgVeTUg=", + "lastModified": 1753068543, + "narHash": "sha256-7nzgRSIXrtKFY3y9z184enq8VMnizVy91I42wsM1J58=", "ref": "refs/heads/main", - "rev": "095ff6f2cea5b3d35880d4a55b60930b60e3efcb", - "revCount": 316, + "rev": "a225c14b4fdaafe390dc8840065946d8c2a2e4b8", + "revCount": 317, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From b9903cdc7ce0f2c1d78e6b7cbafe4d8e7e8ae323 Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Sun, 31 Aug 2025 11:58:37 +0000 Subject: [PATCH 538/563] 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 b5b7584..79f9311 100644 --- a/flake.lock +++ b/flake.lock @@ -1127,11 +1127,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1753068543, - "narHash": "sha256-7nzgRSIXrtKFY3y9z184enq8VMnizVy91I42wsM1J58=", + "lastModified": 1756641335, + "narHash": "sha256-jnBhbxGjNzOKkNJHWB+yHIfMDQPrguFF2lhW1RQgqxA=", "ref": "refs/heads/main", - "rev": "a225c14b4fdaafe390dc8840065946d8c2a2e4b8", - "revCount": 317, + "rev": "3149a5f99fc927397fec18840ceb9cbe54d65ce0", + "revCount": 319, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, From 7b99b640055b17336f0b50a676bb39e0ca4967b1 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 4 Sep 2025 13:26:32 +0100 Subject: [PATCH 539/563] testing: WAL for teh DB seems to be working in small scale tests, lets see if it works long term --- applications/git/forgejo.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/git/forgejo.nix b/applications/git/forgejo.nix index 51f2869..cfe0a60 100644 --- a/applications/git/forgejo.nix +++ b/applications/git/forgejo.nix @@ -111,6 +111,10 @@ in { REPO_INDEXER_ENABLED = true; }; + database = { + SQLITE_JOURNAL_MODE = "WAL"; + }; + # Allow for signing off merge requests # "repository.signing" = { # SIGNING_KEY = "5B2DED0FE9F8627A"; From b0fd7d3b7fe33c7cb6124d18f22c6d0ec57fb479 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 4 Sep 2025 16:21:53 +0100 Subject: [PATCH 540/563] fix: got www.outinul.ie working --- applications/skynet_users.nix | 96 +++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 44 deletions(-) diff --git a/applications/skynet_users.nix b/applications/skynet_users.nix index 2812bcc..88347a2 100644 --- a/applications/skynet_users.nix +++ b/applications/skynet_users.nix @@ -9,6 +9,23 @@ with lib; let name = "website_users"; cfg = config.services.skynet."${name}"; php_pool = name; + + custom = domain: user: { + "${domain}" = { + forceSSL = true; + enableACME = true; + locations = { + "/" = { + alias = "/home/${user}/public_html/"; + index = "index.html"; + extraConfig = '' + autoindex on; + ''; + tryFiles = "$uri$args $uri$args/ /index.html"; + }; + }; + }; + }; in { imports = [ ]; @@ -84,55 +101,46 @@ in { phpEnv."PATH" = lib.makeBinPath [pkgs.php]; }; - services.nginx.virtualHosts = { - "outinul.ie" = { - forceSSL = true; - enableACME = true; - locations = { - "/" = { - alias = "/home/outinul/public_html/"; - index = "index.html"; - extraConfig = '' - autoindex on; - ''; - tryFiles = "$uri$args $uri$args/ /index.html"; - }; - }; - }; + services.nginx.virtualHosts = lib.mkMerge [ # main site - "*.users.skynet.ie" = { - forceSSL = true; - useACMEHost = "skynet"; - serverName = "~^(?.+)\.users\.skynet\.ie"; + { + "*.users.skynet.ie" = { + forceSSL = true; + useACMEHost = "skynet"; + serverName = "~^(?.+)\.users\.skynet\.ie"; - # username.users.skynet.ie/ - # user goes: - # chmod 711 ~ - # chmod -R 755 ~/public_html + # username.users.skynet.ie/ + # user goes: + # chmod 711 ~ + # chmod -R 755 ~/public_html - locations = { - "/" = { - alias = "/home/$user/public_html/"; - index = "index.html"; - extraConfig = '' - autoindex on; - ''; - tryFiles = "$uri$args $uri$args/ /index.html"; - }; + locations = { + "/" = { + alias = "/home/$user/public_html/"; + index = "index.html"; + extraConfig = '' + autoindex on; + ''; + tryFiles = "$uri$args $uri$args/ /index.html"; + }; - "~ ^(.+\\.php)(.*)$" = { - root = "/home/$user/public_html/"; - index = "index.php"; - extraConfig = '' - autoindex on; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; - include ${pkgs.nginx}/conf/fastcgi.conf; - ''; - tryFiles = "$uri$args $uri$args/ /index.php"; + "~ ^(.+\\.php)(.*)$" = { + root = "/home/$user/public_html/"; + index = "index.php"; + extraConfig = '' + autoindex on; + fastcgi_split_path_info ^(.+\.php)(/.+)$; + fastcgi_pass unix:${config.services.phpfpm.pools.${php_pool}.socket}; + include ${pkgs.nginx}/conf/fastcgi.conf; + ''; + tryFiles = "$uri$args $uri$args/ /index.php"; + }; }; }; - }; - }; + } + + (custom "outinul.ie" "outinul") + (custom "www.outinul.ie" "outinul") + ]; }; } From ddf27a279480b6e3c20dd46f4a245163be1d179f Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Fri, 29 Aug 2025 10:02:05 +0100 Subject: [PATCH 541/563] tool: would be useful to have inetutils on every machiene --- machines/_base.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/machines/_base.nix b/machines/_base.nix index d824939..632ee50 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -147,6 +147,7 @@ in { traceroute openldap screen + inetutils ]; }; } From 0c90d041e0b110ce88cc779d0fbafd1129dd21d5 Mon Sep 17 00:00:00 2001 From: Brendan Golden Date: Thu, 4 Sep 2025 22:40:19 +0100 Subject: [PATCH 542/563] feat: move to teh lix overlay instead of compilling it each time --- applications/_base.nix | 3 + flake.lock | 250 +++++++++++++---------------------------- flake.nix | 18 ++- machines/_base.nix | 3 - 4 files changed, 91 insertions(+), 183 deletions(-) diff --git a/applications/_base.nix b/applications/_base.nix index c9f7f61..79a83df 100644 --- a/applications/_base.nix +++ b/applications/_base.nix @@ -70,6 +70,9 @@ in { } ]; + # use lix instead of nix + nix.package = pkgs.lixPackageSets.stable.lix; + # set networking = { hostName = cfg.host.name; diff --git a/flake.lock b/flake.lock index 79f9311..325fe34 100644 --- a/flake.lock +++ b/flake.lock @@ -47,7 +47,7 @@ "inputs": { "fenix": "fenix_2", "flakeCompat": "flakeCompat_2", - "nixpkgs": "nixpkgs_25" + "nixpkgs": "nixpkgs_24" }, "locked": { "lastModified": 1719514321, @@ -314,24 +314,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "flakeCompat": { "flake": false, "locked": { @@ -364,21 +346,6 @@ "type": "github" } }, - "flakey-profile": { - "locked": { - "lastModified": 1712898590, - "narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=", - "owner": "lf-", - "repo": "flakey-profile", - "rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d", - "type": "github" - }, - "original": { - "owner": "lf-", - "repo": "flakey-profile", - "type": "github" - } - }, "git-hooks": { "inputs": { "flake-compat": [ @@ -464,39 +431,6 @@ "type": "github" } }, - "lix": { - "flake": false, - "locked": { - "lastModified": 1751235704, - "narHash": "sha256-Jzm3KPZ2gL+0Nl3Mw/2E0B3vqDDi1Xt5+9VCXghUDZ8=", - "rev": "f3a7bbe5f8d1a8504ddb6362d50106904523e440", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/f3a7bbe5f8d1a8504ddb6362d50106904523e440.tar.gz?rev=f3a7bbe5f8d1a8504ddb6362d50106904523e440" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" - } - }, - "lix-module": { - "inputs": { - "flake-utils": "flake-utils_3", - "flakey-profile": "flakey-profile", - "lix": "lix", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1751240025, - "narHash": "sha256-SXUAlxpjPRkArRMHy5+Hdi+PiC+ND9yzzIjiaHmTvQU=", - "rev": "8b1094356f4723d6e89d3f8a95b333ee16d9ab02", - "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/8b1094356f4723d6e89d3f8a95b333ee16d9ab02.tar.gz?rev=8b1094356f4723d6e89d3f8a95b333ee16d9ab02" - }, - "original": { - "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz" - } - }, "naersk": { "inputs": { "nixpkgs": "nixpkgs_4" @@ -517,7 +451,7 @@ }, "naersk_2": { "inputs": { - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1721727458, @@ -535,7 +469,7 @@ }, "naersk_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_10" }, "locked": { "lastModified": 1745925850, @@ -553,7 +487,7 @@ }, "naersk_4": { "inputs": { - "nixpkgs": "nixpkgs_13" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1739824009, @@ -671,21 +605,6 @@ } }, "nixpkgs_10": { - "locked": { - "lastModified": 1722995383, - "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "ref": "nixos-unstable", - "type": "indirect" - } - }, - "nixpkgs_11": { "locked": { "lastModified": 1750731501, "narHash": "sha256-Ah4qq+SbwMaGkuXCibyg+Fwn00el4KmI3XFX6htfDuk=", @@ -701,7 +620,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_11": { "locked": { "lastModified": 1750506804, "narHash": "sha256-VLFNc4egNjovYVxDGyBYTrvVCgDYgENp5bVi9fPTDYc=", @@ -716,7 +635,7 @@ "type": "indirect" } }, - "nixpkgs_13": { + "nixpkgs_12": { "locked": { "lastModified": 1741462378, "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=", @@ -730,7 +649,7 @@ "type": "indirect" } }, - "nixpkgs_14": { + "nixpkgs_13": { "locked": { "lastModified": 1741513245, "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", @@ -745,7 +664,7 @@ "type": "indirect" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1687274257, "narHash": "sha256-TutzPriQcZ8FghDhEolnHcYU2oHIG5XWF+/SUBNnAOE=", @@ -759,7 +678,7 @@ "type": "indirect" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -773,6 +692,20 @@ "type": "indirect" } }, + "nixpkgs_16": { + "locked": { + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nixpkgs_17": { "locked": { "lastModified": 1741037377, @@ -803,11 +736,11 @@ }, "nixpkgs_19": { "locked": { - "lastModified": 1741037377, - "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", + "lastModified": 1690026219, + "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "02032da4af073d0f6110540c8677f16d4be0117f", + "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", "type": "github" }, "original": { @@ -832,20 +765,6 @@ } }, "nixpkgs_20": { - "locked": { - "lastModified": 1690026219, - "narHash": "sha256-oOduRk/kzQxOBknZXTLSEYd7tk+GoKvr8wV6Ab+t4AU=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f465da166263bc0d4b39dfd4ca28b777c92d4b73", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_21": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -859,7 +778,7 @@ "type": "indirect" } }, - "nixpkgs_22": { + "nixpkgs_21": { "locked": { "lastModified": 1689935543, "narHash": "sha256-6GQ9ib4dA/r1leC5VUpsBo0BmDvNxLjKrX1iyL+h8mc=", @@ -873,7 +792,7 @@ "type": "indirect" } }, - "nixpkgs_23": { + "nixpkgs_22": { "locked": { "lastModified": 1724114134, "narHash": "sha256-V/w5MIQy4jTG/L7/V/AL2BF5gSEWCfxHVDQdzLBCV18=", @@ -887,7 +806,7 @@ "type": "indirect" } }, - "nixpkgs_24": { + "nixpkgs_23": { "locked": { "lastModified": 1695978539, "narHash": "sha256-lta5HToBZMWZ2hl5CautNSUgIZViR41QxN7JKbMAjgQ=", @@ -901,7 +820,7 @@ "type": "indirect" } }, - "nixpkgs_25": { + "nixpkgs_24": { "locked": { "lastModified": 1668226844, "narHash": "sha256-G/S4FBWDAqHeBS/hfXwUCJbnaKnrQFoeeKwzvZEOgxM=", @@ -917,7 +836,7 @@ "type": "github" } }, - "nixpkgs_26": { + "nixpkgs_25": { "locked": { "lastModified": 1724395761, "narHash": "sha256-zRkDV/nbrnp3Y8oCADf5ETl1sDrdmAW6/bBVJ8EbIdQ=", @@ -990,22 +909,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1749794982, - "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1751271578, "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=", @@ -1020,7 +923,7 @@ "type": "indirect" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1723151389, "narHash": "sha256-9AVY0ReCmSGXHrlx78+1RrqcDgVSRhHUKDVV1LLBy28=", @@ -1034,6 +937,21 @@ "type": "indirect" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1722995383, + "narHash": "sha256-UzuXo7ZM8ZK0SkWFhHocKkLSGQPHS4JxaE1jvVR4fUo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "957d95fc8b9bf1eb60d43f8d2eba352b71bbf2be", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "agenix": "agenix", @@ -1042,8 +960,7 @@ "colmena": "colmena", "compsoc_public": "compsoc_public", "flake-utils": "flake-utils_2", - "lix-module": "lix-module", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "simple-nixos-mailserver": "simple-nixos-mailserver", "skynet_discord_bot": "skynet_discord_bot", "skynet_discord_bot_t-800": "skynet_discord_bot_t-800", @@ -1122,7 +1039,7 @@ "skynet_discord_bot": { "inputs": { "naersk": "naersk_2", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_9", "nixpkgs-mozilla": "nixpkgs-mozilla", "utils": "utils_3" }, @@ -1143,7 +1060,7 @@ "skynet_discord_bot_t-800": { "inputs": { "naersk": "naersk_3", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_11", "nixpkgs-mozilla": "nixpkgs-mozilla_2", "utils": "utils_4" }, @@ -1164,7 +1081,7 @@ "skynet_ldap_backend": { "inputs": { "naersk": "naersk_4", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "nixpkgs-mozilla": "nixpkgs-mozilla_3", "utils": "utils_5" }, @@ -1184,7 +1101,7 @@ }, "skynet_ldap_frontend": { "inputs": { - "nixpkgs": "nixpkgs_15", + "nixpkgs": "nixpkgs_14", "utils": "utils_6" }, "locked": { @@ -1203,7 +1120,7 @@ }, "skynet_website": { "inputs": { - "nixpkgs": "nixpkgs_16", + "nixpkgs": "nixpkgs_15", "utils": "utils_7" }, "locked": { @@ -1222,7 +1139,7 @@ }, "skynet_website_1996": { "inputs": { - "nixpkgs": "nixpkgs_17", + "nixpkgs": "nixpkgs_16", "utils": "utils_8" }, "locked": { @@ -1241,7 +1158,7 @@ }, "skynet_website_2003": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "utils": "utils_9" }, "locked": { @@ -1260,7 +1177,7 @@ }, "skynet_website_2006": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "utils": "utils_10" }, "locked": { @@ -1279,7 +1196,7 @@ }, "skynet_website_2016": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_19", "utils": "utils_11" }, "locked": { @@ -1298,7 +1215,7 @@ }, "skynet_website_2022": { "inputs": { - "nixpkgs": "nixpkgs_21", + "nixpkgs": "nixpkgs_20", "utils": "utils_12" }, "locked": { @@ -1319,7 +1236,7 @@ }, "skynet_website_2023": { "inputs": { - "nixpkgs": "nixpkgs_22", + "nixpkgs": "nixpkgs_21", "utils": "utils_13" }, "locked": { @@ -1340,7 +1257,7 @@ }, "skynet_website_2024": { "inputs": { - "nixpkgs": "nixpkgs_23", + "nixpkgs": "nixpkgs_22", "utils": "utils_14" }, "locked": { @@ -1361,7 +1278,7 @@ }, "skynet_website_games": { "inputs": { - "nixpkgs": "nixpkgs_24", + "nixpkgs": "nixpkgs_23", "utils": "utils_15" }, "locked": { @@ -1381,7 +1298,7 @@ "skynet_website_wiki": { "inputs": { "alejandra": "alejandra_2", - "nixpkgs": "nixpkgs_26", + "nixpkgs": "nixpkgs_25", "utils": "utils_16" }, "locked": { @@ -1564,21 +1481,6 @@ "type": "github" } }, - "systems_19": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1719,7 +1621,7 @@ }, "utils_10": { "inputs": { - "systems": "systems_13" + "systems": "systems_12" }, "locked": { "lastModified": 1731533236, @@ -1737,7 +1639,7 @@ }, "utils_11": { "inputs": { - "systems": "systems_14" + "systems": "systems_13" }, "locked": { "lastModified": 1689068808, @@ -1755,7 +1657,7 @@ }, "utils_12": { "inputs": { - "systems": "systems_15" + "systems": "systems_14" }, "locked": { "lastModified": 1710146030, @@ -1773,7 +1675,7 @@ }, "utils_13": { "inputs": { - "systems": "systems_16" + "systems": "systems_15" }, "locked": { "lastModified": 1689068808, @@ -1791,7 +1693,7 @@ }, "utils_14": { "inputs": { - "systems": "systems_17" + "systems": "systems_16" }, "locked": { "lastModified": 1710146030, @@ -1809,7 +1711,7 @@ }, "utils_15": { "inputs": { - "systems": "systems_18" + "systems": "systems_17" }, "locked": { "lastModified": 1694529238, @@ -1827,7 +1729,7 @@ }, "utils_16": { "inputs": { - "systems": "systems_19" + "systems": "systems_18" }, "locked": { "lastModified": 1710146030, @@ -1863,7 +1765,7 @@ }, "utils_3": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1710146030, @@ -1881,7 +1783,7 @@ }, "utils_4": { "inputs": { - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1731533236, @@ -1899,7 +1801,7 @@ }, "utils_5": { "inputs": { - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1731533236, @@ -1917,7 +1819,7 @@ }, "utils_6": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1687171271, @@ -1935,7 +1837,7 @@ }, "utils_7": { "inputs": { - "systems": "systems_10" + "systems": "systems_9" }, "locked": { "lastModified": 1710146030, @@ -1953,7 +1855,7 @@ }, "utils_8": { "inputs": { - "systems": "systems_11" + "systems": "systems_10" }, "locked": { "lastModified": 1731533236, @@ -1971,7 +1873,7 @@ }, "utils_9": { "inputs": { - "systems": "systems_12" + "systems": "systems_11" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index 3ff66a7..3053145 100644 --- a/flake.nix +++ b/flake.nix @@ -7,11 +7,6 @@ # Return to using unstable once the current master is merged in # nixpkgs.url = "nixpkgs/nixos-unstable"; - lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.2-1.tar.gz"; - # inputs.nixpkgs.follows = "nixpkgs"; - }; - # utility stuff flake-utils.url = "github:numtide/flake-utils"; agenix.url = "github:ryantm/agenix"; @@ -97,7 +92,18 @@ meta = { nixpkgs = import nixpkgs { system = "x86_64-linux"; - overlays = []; + overlays = [ + (final: prev: { + inherit + (final.lixPackageSets.stable) + nixpkgs-review + nix-direnv + nix-eval-jobs + nix-fast-build + colmena + ; + }) + ]; }; specialArgs = { inherit inputs self; diff --git a/machines/_base.nix b/machines/_base.nix index 632ee50..a8f53ff 100644 --- a/machines/_base.nix +++ b/machines/_base.nix @@ -19,9 +19,6 @@ in { # base application config for all servers ../applications/_base.nix - - # - inputs.lix-module.nixosModules.default ]; options.skynet = { From 6ef89cac05dba1bbd9933ec51f90783dfb20267e Mon Sep 17 00:00:00 2001 From: sysadm <+sysadm@users.noreply.github.com> Date: Thu, 4 Sep 2025 22:14:49 +0000 Subject: [PATCH 543/563] 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 325fe34..81c5faa 100644 --- a/flake.lock +++ b/flake.lock @@ -1044,11 +1044,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1756641335, - "narHash": "sha256-jnBhbxGjNzOKkNJHWB+yHIfMDQPrguFF2lhW1RQgqxA=", + "lastModified": 1757023884, + "narHash": "sha256-E+lp2PyQo9vakrwAjcB+krIGPi095CaAbZ/49tWvCtw=", "ref": "refs/heads/main", - "rev": "3149a5f99fc927397fec18840ceb9cbe54d65ce0", - "revCount": 319, + "rev": "7526a82bb7c384c16a09992458868b2f669ed279", + "revCount": 320, "type": "git", "url": "https://forgejo.skynet.ie/Skynet/discord-bot" }, 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 544/563] 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 545/563] 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 546/563] 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 547/563] 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 548/563] 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 549/563] 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 550/563] 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 551/563] 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 552/563] 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 553/563] 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 554/563] 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 555/563] 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 556/563] 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 557/563] 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 558/563] 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 559/563] 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 560/563] 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 561/563] 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 562/563] 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 563/563] 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" },