diff --git a/REUSE.toml b/REUSE.toml index bd72fbd..8e2a0d6 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -20,7 +20,7 @@ precedence = "closest" [[annotations]] SPDX-FileCopyrightText = "2024 Tom Hubrecht " SPDX-License-Identifier = "EUPL-1.2" -path = ["machines/nixos/compute01/ds-fr/01-smtp-tls.patch", "machines/nixos/compute01/librenms/kanidm.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch", "machines/nixos/vault01/k-radius/packages/03-set-log-level.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/lix/02-fetchGit-locked.patch", "patches/nixpkgs/01-pretalx-environment-file.patch", "patches/nixpkgs/03-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch", "patches/cas-eleves/01-ldap-settings.patch"] +path = ["machines/nixos/compute01/ds-fr/01-smtp-tls.patch", "machines/nixos/compute01/stirling-pdf/*.patch", "machines/nixos/vault01/k-radius/packages/01-python_path.patch", "machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch", "machines/nixos/vault01/k-radius/packages/03-set-log-level.patch", "machines/nixos/web01/crabfit/*.patch", "machines/nixos/web02/cas-eleves/01-pytest-cas.patch", "patches/lix/01-disable-installChecks.patch", "patches/lix/02-fetchGit-locked.patch", "patches/nixpkgs/01-pretalx-environment-file.patch", "patches/nixpkgs/03-crabfit-karla.patch", "patches/nixpkgs/05-netbird-relay.patch", "patches/cas-eleves/01-ldap-settings.patch"] precedence = "closest" [[annotations]] diff --git a/default.nix b/default.nix index 9ffad4c..6dc15c2 100644 --- a/default.nix +++ b/default.nix @@ -113,7 +113,6 @@ let { path = [ "machines/nixos/compute01/ds-fr/01-smtp-tls.patch" - "machines/nixos/compute01/librenms/kanidm.patch" "machines/nixos/compute01/stirling-pdf/*.patch" "machines/nixos/vault01/k-radius/packages/01-python_path.patch" "machines/nixos/vault01/k-radius/packages/02-remove-noisy-logs.patch" diff --git a/machines/nixos/compute01/_configuration.nix b/machines/nixos/compute01/_configuration.nix index 65f402a..59dd27a 100644 --- a/machines/nixos/compute01/_configuration.nix +++ b/machines/nixos/compute01/_configuration.nix @@ -24,7 +24,6 @@ lib.extra.mkConfig { "grafana" "hedgedoc" "kanidm" - "librenms" "mastodon" # "netbox" "nextcloud" diff --git a/machines/nixos/compute01/kanidm/default.nix b/machines/nixos/compute01/kanidm/default.nix index eb6057b..fec245e 100644 --- a/machines/nixos/compute01/kanidm/default.nix +++ b/machines/nixos/compute01/kanidm/default.nix @@ -108,21 +108,6 @@ in ]; }; - dgn_librenms = { - allowInsecureClientDisablePkce = true; - displayName = "LibreNMS [Network]"; - enableLegacyCrypto = true; - originLanding = "https://nms.dgnum.eu"; - originUrl = "https://nms.dgnum.eu/auth/kanidm/callback"; - preferShortUsername = true; - - scopeMaps.grp_active = [ - "openid" - "profile" - "email" - ]; - }; - dgn_netbird = { displayName = "Netbird [VPN]"; enableLocalhostRedirects = true; diff --git a/machines/nixos/compute01/librenms/default.nix b/machines/nixos/compute01/librenms/default.nix deleted file mode 100644 index 36c4cc4..0000000 --- a/machines/nixos/compute01/librenms/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Tom Hubrecht -# -# SPDX-License-Identifier: EUPL-1.2 - -{ config, pkgs, ... }: - -let - host = "nms.dgnum.eu"; -in - -{ - imports = [ ./module.nix ]; - - services.librenms = { - enable = true; - - package = - (pkgs.librenms.override { inherit (config.services.librenms) dataDir logDir; }).overrideAttrs - (old: { - patches = (old.patches or [ ]) ++ [ ./kanidm.patch ]; - vendorHash = "sha256-J/whSL1keEZKkfOtHpkJ2vSrN/s+DpUGb6RBXpQZQXg="; - }); - - hostname = host; - - settings = { - auth.socialite = { - configs.kanidm = { - listener = "\\SocialiteProviders\\Kanidm\\KanidmExtendSocialite"; - client_id = "$KANIDM_CLIENT_ID"; - client_secret = "$KANIDM_CLIENT_SECRET"; - redirect = "$KANIDM_REDIRECT_URI"; - base_url = "$KANIDM_BASE_URL"; - }; - default_role = "normal"; - register = true; - }; - }; - - database = { - createLocally = true; - passwordFile = config.age.secrets."librenms-database_password_file".path; - }; - - environmentFile = config.age.secrets."librenms-environment_file".path; - - nginx = { - serverName = host; - enableACME = true; - forceSSL = true; - }; - }; - - age-secrets.autoMatch = [ "librenms" ]; -} diff --git a/machines/nixos/compute01/librenms/kanidm.patch b/machines/nixos/compute01/librenms/kanidm.patch deleted file mode 100644 index d5a4d28..0000000 --- a/machines/nixos/compute01/librenms/kanidm.patch +++ /dev/null @@ -1,90 +0,0 @@ -diff --git a/composer.json b/composer.json -index af8168f4c..1775f150e 100644 ---- a/composer.json -+++ b/composer.json -@@ -54,6 +54,7 @@ - "phpmailer/phpmailer": "~6.0", - "predis/predis": "^2.0", - "silber/bouncer": "^1.0", -+ "socialiteproviders/kanidm": "^5.0", - "socialiteproviders/manager": "^4.3", - "spatie/laravel-ignition": "^2.0", - "symfony/yaml": "^6.2", -diff --git a/composer.lock b/composer.lock -index 3d89a1530..a00c5f307 100644 ---- a/composer.lock -+++ b/composer.lock -@@ -4,7 +4,7 @@ - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", - "This file is @generated automatically" - ], -- "content-hash": "fee5d24447dced4397e26066f8c9ee59", -+ "content-hash": "b9316a47587c8e6f6b0adbe3d54777f3", - "packages": [ - { - "name": "amenadiel/jpgraph", -@@ -5906,6 +5906,56 @@ - }, - "time": "2023-02-10T16:47:25+00:00" - }, -+ { -+ "name": "socialiteproviders/kanidm", -+ "version": "5.0.0", -+ "source": { -+ "type": "git", -+ "url": "https://github.com/SocialiteProviders/Kanidm.git", -+ "reference": "111ad45941e7150e3219ddfdeb8159f758bde2fd" -+ }, -+ "dist": { -+ "type": "zip", -+ "url": "https://api.github.com/repos/SocialiteProviders/Kanidm/zipball/111ad45941e7150e3219ddfdeb8159f758bde2fd", -+ "reference": "111ad45941e7150e3219ddfdeb8159f758bde2fd", -+ "shasum": "" -+ }, -+ "require": { -+ "ext-json": "*", -+ "php": "^8.0", -+ "socialiteproviders/manager": "^4.4" -+ }, -+ "type": "library", -+ "autoload": { -+ "psr-4": { -+ "SocialiteProviders\\Kanidm\\": "" -+ } -+ }, -+ "notification-url": "https://packagist.org/downloads/", -+ "license": [ -+ "MIT" -+ ], -+ "authors": [ -+ { -+ "name": "Tom Hubrecht", -+ "email": "tom@hubrecht.ovh" -+ } -+ ], -+ "description": "Kanidm OAuth2 Provider for Laravel Socialite", -+ "keywords": [ -+ "kanidm", -+ "laravel", -+ "oauth", -+ "provider", -+ "socialite" -+ ], -+ "support": { -+ "docs": "https://socialiteproviders.com/kanidm", -+ "issues": "https://github.com/socialiteproviders/providers/issues", -+ "source": "https://github.com/socialiteproviders/providers" -+ }, -+ "time": "2024-02-19T19:49:21+00:00" -+ }, - { - "name": "socialiteproviders/manager", - "version": "v4.6.0", -index 3d89a1530..a00c5f307 100644 ---- a/app/Providers/EventServiceProvider.php -+++ b/app/Providers/EventServiceProvider.php -@@ -33,3 +33,4 @@ - \SocialiteProviders\Manager\SocialiteWasCalled::class => [ -+ \SocialiteProviders\Kanidm\KanidmExtendSocialite::class.'@handle', - \App\Listeners\SocialiteWasCalledListener::class, - ], diff --git a/machines/nixos/compute01/librenms/module.nix b/machines/nixos/compute01/librenms/module.nix deleted file mode 100644 index a8727e0..0000000 --- a/machines/nixos/compute01/librenms/module.nix +++ /dev/null @@ -1,687 +0,0 @@ -# SPDX-FileCopyrightText: 2024 Tom Hubrecht -# -# SPDX-License-Identifier: EUPL-1.2 - -{ - config, - lib, - pkgs, - modulesPath, - ... -}: - -let - inherit (lib) - literalExpression - mkEnableOption - mkOption - recursiveUpdate - types - ; - - cfg = config.services.librenms; - settingsFormat = pkgs.formats.json { }; - configJson = settingsFormat.generate "librenms-config.json" cfg.settings; - - inherit (cfg) package; - - phpOptions = '' - log_errors = on - post_max_size = 100M - upload_max_filesize = 100M - date.timezone = "${config.time.timeZone}" - ''; - - phpIni = - pkgs.runCommand "php.ini" - { - inherit (package) phpPackage; - inherit phpOptions; - preferLocalBuild = true; - passAsFile = [ "phpOptions" ]; - } - '' - cat $phpPackage/etc/php.ini $phpOptionsPath > $out - ''; - - artisanWrapper = pkgs.writeShellScriptBin "librenms-artisan" '' - cd ${package} - sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user}' - fi - $sudo ${package}/artisan $* - ''; - - lnmsWrapper = pkgs.writeShellScriptBin "lnms" '' - cd ${package} - exec ${package}/lnms $* - ''; - - configFile = pkgs.writeText "config.php" '' - cfg.database.host == "localhost"; - message = ''The database host must be "localhost" if services.librenms.database.createLocally is set to true.''; - } - { - assertion = !(cfg.useDistributedPollers && cfg.distributedPoller.enable); - message = "The LibreNMS instance can't be a distributed poller and a full instance at the same time."; - } - ]; - - users.users.${cfg.user} = { - group = "${cfg.group}"; - isSystemUser = true; - }; - - users.groups.${cfg.group} = { }; - - services = { - librenms.settings = - { - # basic configs - "user" = cfg.user; - "own_hostname" = cfg.hostname; - "base_url" = lib.mkDefault "/"; - "auth_mechanism" = lib.mkDefault "mysql"; - - # disable auto update function (won't work with NixOS) - "update" = false; - - # enable fast ping by default - "ping_rrd_step" = 60; - - # one minute polling - "rrd.step" = if cfg.enableOneMinutePolling then 60 else 300; - "rrd.heartbeat" = if cfg.enableOneMinutePolling then 120 else 600; - } - // (lib.optionalAttrs cfg.distributedPoller.enable { - "distributed_poller" = true; - "distributed_poller_name" = lib.mkIf ( - cfg.distributedPoller.name != null - ) cfg.distributedPoller.name; - "distributed_poller_group" = cfg.distributedPoller.group; - "distributed_billing" = cfg.distributedPoller.distributedBilling; - "distributed_poller_memcached_host" = cfg.distributedPoller.memcachedHost; - "distributed_poller_memcached_port" = cfg.distributedPoller.memcachedPort; - "rrdcached" = - "${cfg.distributedPoller.rrdcachedHost}:${toString cfg.distributedPoller.rrdcachedPort}"; - }) - // (lib.optionalAttrs cfg.useDistributedPollers { - "distributed_poller" = true; - # still enable a local poller with distributed polling - "distributed_poller_group" = lib.mkDefault "0"; - "distributed_billing" = lib.mkDefault true; - "distributed_poller_memcached_host" = "localhost"; - "distributed_poller_memcached_port" = 11211; - "rrdcached" = "localhost:42217"; - }); - - memcached = lib.mkIf cfg.useDistributedPollers { - enable = true; - listen = "0.0.0.0"; - }; - - mysql = lib.mkIf cfg.database.createLocally { - enable = true; - package = lib.mkDefault pkgs.mariadb; - settings.mysqld = { - innodb_file_per_table = 1; - lower_case_table_names = 0; - } // (lib.optionalAttrs cfg.useDistributedPollers { bind-address = "0.0.0.0"; }); - ensureDatabases = [ cfg.database.database ]; - ensureUsers = [ - { - name = cfg.database.username; - ensurePermissions = { - "${cfg.database.database}.*" = "ALL PRIVILEGES"; - }; - } - ]; - initialScript = lib.mkIf cfg.useDistributedPollers ( - pkgs.writeText "mysql-librenms-init" '' - CREATE USER IF NOT EXISTS '${cfg.database.username}'@'%'; - GRANT ALL PRIVILEGES ON ${cfg.database.database}.* TO '${cfg.database.username}'@'%'; - '' - ); - }; - - nginx = lib.mkIf (!cfg.distributedPoller.enable) { - enable = true; - virtualHosts."${cfg.hostname}" = lib.mkMerge [ - cfg.nginx - { - root = lib.mkForce "${package}/html"; - locations."/" = { - index = "index.php"; - tryFiles = "$uri $uri/ /index.php?$query_string"; - }; - locations."~ .php$".extraConfig = '' - fastcgi_pass unix:${config.services.phpfpm.pools."librenms".socket}; - fastcgi_split_path_info ^(.+\.php)(/.+)$; - ''; - } - ]; - }; - - phpfpm.pools.librenms = lib.mkIf (!cfg.distributedPoller.enable) { - inherit (cfg) group user; - inherit (package) phpPackage; - inherit phpOptions; - settings = { - "listen.mode" = "0660"; - "listen.owner" = config.services.nginx.user; - "listen.group" = config.services.nginx.group; - } // cfg.poolConfig; - }; - - logrotate = { - enable = true; - settings."${cfg.logDir}/librenms.log" = { - su = "${cfg.user} ${cfg.group}"; - create = "0640 ${cfg.user} ${cfg.group}"; - rotate = 6; - frequency = "weekly"; - compress = true; - delaycompress = true; - missingok = true; - notifempty = true; - }; - }; - - cron = { - enable = true; - systemCronJobs = - let - env = "PHPRC=${phpIni}"; - in - [ - # based on crontab provided by LibreNMS - "33 */6 * * * ${cfg.user} ${env} ${package}/cronic ${package}/discovery-wrapper.py 1" - "*/5 * * * * ${cfg.user} ${env} ${package}/discovery.php -h new >> /dev/null 2>&1" - - "${ - if cfg.enableOneMinutePolling then "*" else "*/5" - } * * * * ${cfg.user} ${env} ${package}/cronic ${package}/poller-wrapper.py ${toString cfg.pollerThreads}" - "* * * * * ${cfg.user} ${env} ${package}/alerts.php >> /dev/null 2>&1" - - "*/5 * * * * ${cfg.user} ${env} ${package}/poll-billing.php >> /dev/null 2>&1" - "01 * * * * ${cfg.user} ${env} ${package}/billing-calculate.php >> /dev/null 2>&1" - "*/5 * * * * ${cfg.user} ${env} ${package}/check-services.php >> /dev/null 2>&1" - - # extra: fast ping - "* * * * * ${cfg.user} ${env} ${package}/ping.php >> /dev/null 2>&1" - - # daily.sh tasks are split to exclude update - "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh cleanup >> /dev/null 2>&1" - "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh notifications >> /dev/null 2>&1" - "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh peeringdb >> /dev/null 2>&1" - "19 0 * * * ${cfg.user} ${env} ${package}/daily.sh mac_oui >> /dev/null 2>&1" - ]; - }; - }; - - systemd = { - services = { - rrdcached = lib.mkIf cfg.useDistributedPollers { - description = "rrdcached"; - after = [ "librenms-setup.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - Type = "forking"; - User = cfg.user; - Group = cfg.group; - LimitNOFILE = 16384; - RuntimeDirectory = "rrdcached"; - PidFile = "/run/rrdcached/rrdcached.pid"; - # rrdcached params from https://docs.librenms.org/Extensions/Distributed-Poller/#config-sample - ExecStart = "${pkgs.rrdtool}/bin/rrdcached -l 0:42217 -R -j ${cfg.dataDir}/rrdcached-journal/ -F -b ${cfg.dataDir}/rrd -B -w 1800 -z 900 -p /run/rrdcached/rrdcached.pid"; - }; - }; - - librenms-scheduler = { - description = "LibreNMS Scheduler"; - path = [ pkgs.unixtools.whereis ]; - serviceConfig = { - Type = "oneshot"; - WorkingDirectory = package; - User = cfg.user; - Group = cfg.group; - ExecStart = "${artisanWrapper}/bin/librenms-artisan schedule:run"; - }; - }; - - librenms-setup = { - description = "Preparation tasks for LibreNMS"; - before = [ "phpfpm-librenms.service" ]; - after = [ - "systemd-tmpfiles-setup.service" - ] ++ (lib.optional (cfg.database.host == "localhost") "mysql.service"); - wantedBy = [ "multi-user.target" ]; - restartTriggers = [ - package - configFile - ]; - path = [ - pkgs.mariadb - pkgs.unixtools.whereis - pkgs.gnused - ]; - serviceConfig = { - Type = "oneshot"; - RemainAfterExit = true; - EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; - User = cfg.user; - Group = cfg.group; - ExecStartPre = lib.mkIf cfg.database.createLocally [ - "!${pkgs.writeShellScript "librenms-db-init" '' - DB_PASSWORD=$(cat ${cfg.database.passwordFile} | tr -d '\n') - echo "ALTER USER '${cfg.database.username}'@'localhost' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql - ${lib.optionalString cfg.useDistributedPollers '' - echo "ALTER USER '${cfg.database.username}'@'%' IDENTIFIED BY '$DB_PASSWORD';" | ${pkgs.mariadb}/bin/mysql - ''} - ''}" - ]; - }; - script = '' - set -euo pipefail - - # config setup - ln -sf ${configFile} ${cfg.dataDir}/config.php - ${pkgs.envsubst}/bin/envsubst -i ${configJson} -o ${cfg.dataDir}/config.json - export PHPRC=${phpIni} - - if [[ ! -s ${cfg.dataDir}/.env ]]; then - # init .env file - echo "APP_KEY=" > ${cfg.dataDir}/.env - ${artisanWrapper}/bin/librenms-artisan key:generate --ansi - ${artisanWrapper}/bin/librenms-artisan webpush:vapid - echo "" >> ${cfg.dataDir}/.env - echo -n "NODE_ID=" >> ${cfg.dataDir}/.env - ${package.phpPackage}/bin/php -r "echo uniqid();" >> ${cfg.dataDir}/.env - echo "" >> ${cfg.dataDir}/.env - else - # .env file already exists --> only update database and cache config - ${pkgs.gnused}/bin/sed -i /^DB_/d ${cfg.dataDir}/.env - ${pkgs.gnused}/bin/sed -i /^CACHE_DRIVER/d ${cfg.dataDir}/.env - fi - ${lib.optionalString (cfg.useDistributedPollers || cfg.distributedPoller.enable) '' - echo "CACHE_DRIVER=memcached" >> ${cfg.dataDir}/.env - ''} - echo "DB_HOST=${cfg.database.host}" >> ${cfg.dataDir}/.env - echo "DB_PORT=${toString cfg.database.port}" >> ${cfg.dataDir}/.env - echo "DB_DATABASE=${cfg.database.database}" >> ${cfg.dataDir}/.env - echo "DB_USERNAME=${cfg.database.username}" >> ${cfg.dataDir}/.env - echo -n "DB_PASSWORD=" >> ${cfg.dataDir}/.env - cat ${cfg.database.passwordFile} >> ${cfg.dataDir}/.env - - # clear cache after update - OLD_VERSION=$(cat ${cfg.dataDir}/version) - if [[ $OLD_VERSION != "${package.version}" ]]; then - rm -r ${cfg.dataDir}/cache/* - echo "${package.version}" > ${cfg.dataDir}/version - fi - - # convert rrd files when the oneMinutePolling option is changed - OLD_ENABLED=$(cat ${cfg.dataDir}/one_minute_enabled) - if [[ $OLD_ENABLED != "${lib.boolToString cfg.enableOneMinutePolling}" ]]; then - ${package}/scripts/rrdstep.php -h all - echo "${lib.boolToString cfg.enableOneMinutePolling}" > ${cfg.dataDir}/one_minute_enabled - fi - - # migrate db - ${artisanWrapper}/bin/librenms-artisan migrate --force --no-interaction - ''; - }; - }; - - timers.librenms-scheduler = { - description = "LibreNMS Scheduler"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "minutely"; - AccuracySec = "1second"; - }; - }; - - tmpfiles.rules = - [ - "d ${cfg.logDir} 0750 ${cfg.user} ${cfg.group} - -" - "f ${cfg.logDir}/librenms.log 0640 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir} 0750 ${cfg.user} ${cfg.group} - -" - "f ${cfg.dataDir}/.env 0600 ${cfg.user} ${cfg.group} - -" - "f ${cfg.dataDir}/version 0600 ${cfg.user} ${cfg.group} - -" - "f ${cfg.dataDir}/one_minute_enabled 0600 ${cfg.user} ${cfg.group} - -" - "f ${cfg.dataDir}/config.json 0600 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/app 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/debugbar 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/framework 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/framework/cache 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/framework/sessions 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/framework/views 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/storage/logs 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/rrd 0700 ${cfg.user} ${cfg.group} - -" - "d ${cfg.dataDir}/cache 0700 ${cfg.user} ${cfg.group} - -" - ] - ++ lib.optionals cfg.useDistributedPollers [ - "d ${cfg.dataDir}/rrdcached-journal 0700 ${cfg.user} ${cfg.group} - -" - ]; - }; - - programs.mtr.enable = true; - - security.wrappers = { - fping = { - setuid = true; - owner = "root"; - group = "root"; - source = "${pkgs.fping}/bin/fping"; - }; - }; - - environment.systemPackages = [ - artisanWrapper - lnmsWrapper - ]; - }; - - meta.maintainers = lib.teams.wdz.members; -} diff --git a/machines/nixos/compute01/secrets/librenms-database_password_file b/machines/nixos/compute01/secrets/librenms-database_password_file deleted file mode 100644 index 4da18c2..0000000 --- a/machines/nixos/compute01/secrets/librenms-database_password_file +++ /dev/null @@ -1,29 +0,0 @@ -age-encryption.org/v1 --> ssh-ed25519 jIXfPA UxfxSZSNMeVYMYCahDmlrf3mdMpyFzcj+81nBBCECgk -lYiIx4BvqqB1CfM/Y+Y1LRZBDzGkRKdfa0HLfPCzQUE --> ssh-ed25519 QlRB9Q I13TmGvHd/x40ML386PyWmdd/ub3Q69MqPi1GzEwgVI -8ym5O+kh3JBJ91vizO8jODFN9M2OAUIOijmI5QKzguQ --> ssh-ed25519 r+nK/Q RPDuBopRVTVPKRqZgEh2XfchP9XCPjzhuW+hu2LCbBk -BYZJvcH3BQGh9CSkvREz1JzyksVN8TSuilW2ww2kXho --> ssh-rsa krWCLQ -jFEaahbYnGF9WTvaW5FmBIrhNwt/ZiaQv04VZHQnOhJRCmJViExZl2+yCqHlK4nF -X5qbe51FwJX1VyF4x74tVdTb3PR1hx1JdncEXUdr2/8DSsddAGTowQl2RA8GBpd4 -K2YiRjMPTvShmfXZUncqR8UOB97FIOMMMjXZmDN+T2D4xZ522g7mvPLq/a9T9iB6 -cvcwu4PVvTTO+oM7hWj3KYM1aMtRlNscgPaJSvZ5f3MOAEo4qdDlERC473jc/0ez -yRNz1B4AjO4YWWXmLgPrh2n+kCkv4ZI5nUHgO8kCNuHLD8bX5eeQCn1fx6F2bWuE -f5c9CI4X69z0HQDZWVSwcw --> ssh-ed25519 /vwQcQ 9iCDJiFcwJ/2GZ1fP0BiUUDfSb8ByldRGMUMNxp1gTE -khKANSZ8UIF9jCm32Y2Pn0e04Qr42eKPfTOPTQdnKEs --> ssh-ed25519 0R97PA qacag6Tw7RwyACjvRUQU25252nDQxDxepGuUg4e82QY -UAYVIwprsmpC7GYPZNlLAKjLQkbZ1DmXy5fdGyL3az4 --> ssh-ed25519 JGx7Ng Q6GFfKxfoI4rD1smg3NwD9Q8IqP9dFCmhBIcompCW2c -B+S+wCC7oe8CXH1/7n45U2XssrzB1xHYuJX0BPQa4tY --> ssh-ed25519 bUjjig ZIXCFGNK5HSrVCzXw+d89RtmVYkricFsN4ITXhZYnAI -AryndaatuETXTDqFO+PgjU6X9N56DgfhTtZA660I9zI --> ssh-ed25519 tDqJRg YyWweqs0fGEtC/t/lW2Mf8uSby7lg/p00tz51qchz2o -8bVaNX8O4+GOTvj+DVINnbQdLo0Os5nVwYygobJqLbI --> .-grease -+TO+CNhkq/HSoBucxW7tIR6mZW6vKF/Zb1zhIBB8juSR0Tu8yw0JArAmWR5dJIRH -fDlE8JfUaY67j/KXN3ZhNvtVxzzmpK1HBG8Oii8brlVCSR6dDSLxqCHXQJo ---- 0CxvM54IJkhoH/NGTqvbcnwBi7k9txCFSFyoEk15eeM -D/l,_(4 {,^Y'BUM^2yn{ܣ \ No newline at end of file diff --git a/machines/nixos/compute01/secrets/librenms-environment_file b/machines/nixos/compute01/secrets/librenms-environment_file deleted file mode 100644 index cce9382..0000000 Binary files a/machines/nixos/compute01/secrets/librenms-environment_file and /dev/null differ diff --git a/machines/nixos/compute01/secrets/secrets.nix b/machines/nixos/compute01/secrets/secrets.nix index 1ada18e..feae5a0 100644 --- a/machines/nixos/compute01/secrets/secrets.nix +++ b/machines/nixos/compute01/secrets/secrets.nix @@ -18,8 +18,6 @@ "grafana-oauth_client_secret_file" "grafana-smtp_password_file" "hedgedoc-environment_file" - "librenms-database_password_file" - "librenms-environment_file" "mastodon-extra_env_file" "mastodon-smtp-password" "netbox-environment_file" diff --git a/meta/dns.nix b/meta/dns.nix index fa3fd56..4946f1f 100644 --- a/meta/dns.nix +++ b/meta/dns.nix @@ -82,7 +82,6 @@ let "gist" # Opengist "grafana" # Grafana "netbox-v2" # Netbox - "nms" # LibreNMS "pads" # Hedgedoc "pass" # Vaultwarden "pdf" # Stirling PDF