cst1/infrastructure
1
0
Fork 0
forked from DGNum/infrastructure
Code Pull requests Activity

fix(nixfmt): Reformat

Browse source
This commit is contained in:
sinavir 2025-01-12 18:26:51 +01:00
parent 75f00f4b9c
commit ea9f513459
No known key found for this signature in database
24 changed files with 190 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hive.nix
View file

@ -8,8 +8,9 @@ let
sources' = import ./npins; sources' = import ./npins;
# Patch sources directly # Patch sources directly
sources = builtins.mapAttrs (patch.base { pkgs = import sources'.nixos-unstable { }; }) sources =
.applyPatches' sources'; builtins.mapAttrs (patch.base { pkgs = import sources'.nixos-unstable { }; }).applyPatches'
sources';
nix-lib = import ./lib/nix-lib; nix-lib = import ./lib/nix-lib;
inherit (nix-lib) mapSingleFuse; inherit (nix-lib) mapSingleFuse;

6
lib/netconf-junos/protocols.nix
View file

@ -28,9 +28,9 @@ in
config.netconf.xmls.protocols = '' config.netconf.xmls.protocols = ''
<protocols> <protocols>
<rstp operation="replace"> <rstp operation="replace">
${ ${concatMapStringsSep "" (
concatMapStringsSep "" (intf: "<interface><name>${intf}</name></interface>") config.protocols.rstp intf: "<interface><name>${intf}</name></interface>"
} ) config.protocols.rstp}
</rstp> </rstp>
</protocols> </protocols>
''; '';

4
lib/nix-lib/nixpkgs.nix
View file

@ -79,7 +79,9 @@ rec {
f here values f here values
); );
in in
f [ ] [ f
[ ]
[
rhs rhs
lhs lhs
]; ];

6
machines/nixos/bridge01/secrets/secrets.nix
View file

@ -2,6 +2,8 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "bridge01" ] [ (import ../../../../keys).mkSecrets
[ "bridge01" ]
[
# List of secrets for bridge01 # List of secrets for bridge01
] ]

6
machines/nixos/compute01/kanidm/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../../keys).mkSecrets [ "compute01" ] [ (import ../../../../../keys).mkSecrets
[ "compute01" ]
[
"kanidm-password_admin" "kanidm-password_admin"
"kanidm-password_idm_admin" "kanidm-password_idm_admin"
] ]

3
machines/nixos/compute01/librenms/module.nix
View file

@ -401,7 +401,8 @@ in
"distributed_billing" = cfg.distributedPoller.distributedBilling; "distributed_billing" = cfg.distributedPoller.distributedBilling;
"distributed_poller_memcached_host" = cfg.distributedPoller.memcachedHost; "distributed_poller_memcached_host" = cfg.distributedPoller.memcachedHost;
"distributed_poller_memcached_port" = cfg.distributedPoller.memcachedPort; "distributed_poller_memcached_port" = cfg.distributedPoller.memcachedPort;
"rrdcached" = "${cfg.distributedPoller.rrdcachedHost}:${toString cfg.distributedPoller.rrdcachedPort}"; "rrdcached" =
"${cfg.distributedPoller.rrdcachedHost}:${toString cfg.distributedPoller.rrdcachedPort}";
}) })
// (lib.optionalAttrs cfg.useDistributedPollers { // (lib.optionalAttrs cfg.useDistributedPollers {
"distributed_poller" = true; "distributed_poller" = true;

3
machines/nixos/compute01/outline.nix
View file

@ -45,7 +45,8 @@ in
dgn-web.simpleProxies.outline = { dgn-web.simpleProxies.outline = {
inherit host port; inherit host port;
vhostConfig.locations."/robots.txt".return = ''200 "User-agent: *\nDisallow: /s/demarches-normaliennes/\n"''; vhostConfig.locations."/robots.txt".return =
''200 "User-agent: *\nDisallow: /s/demarches-normaliennes/\n"'';
}; };
age-secrets.autoMatch = [ "outline" ]; age-secrets.autoMatch = [ "outline" ];

6
machines/nixos/compute01/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "compute01" ] [ (import ../../../../keys).mkSecrets
[ "compute01" ]
[
# List of secrets for compute01 # List of secrets for compute01
"arkheon-env_file" "arkheon-env_file"
"bupstash-put_key" "bupstash-put_key"
@ -33,4 +35,4 @@
"telegraf-environment_file" "telegraf-environment_file"
"vaultwarden-environment_file" "vaultwarden-environment_file"
"zammad-secret_key_base_file" "zammad-secret_key_base_file"
] ]

6
machines/nixos/geo01/secrets/secrets.nix
View file

@ -2,6 +2,8 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "geo01" ] [ (import ../../../../keys).mkSecrets
[ "geo01" ]
[
# List of secrets for geo01 # List of secrets for geo01
] ]

6
machines/nixos/geo02/secrets/secrets.nix
View file

@ -2,6 +2,8 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "geo02" ] [ (import ../../../../keys).mkSecrets
[ "geo02" ]
[
# List of secrets for geo02 # List of secrets for geo02
] ]

6
machines/nixos/hypervisor01/secrets/secrets.nix
View file

@ -2,6 +2,8 @@
# #
# SPDX-License-Identifer: EUPL-1.2 # SPDX-License-Identifer: EUPL-1.2
(import ../../../../keys).mkSecrets [ "hypervisor01" ] [ (import ../../../../keys).mkSecrets
[ "hypervisor01" ]
[
] ]

6
machines/nixos/hypervisor02/secrets/secrets.nix
View file

@ -2,6 +2,8 @@
# #
# SPDX-License-Identifer: EUPL-1.2 # SPDX-License-Identifer: EUPL-1.2
(import ../../../../keys).mkSecrets [ "hypervisor02" ] [ (import ../../../../keys).mkSecrets
[ "hypervisor02" ]
[
] ]

6
machines/nixos/hypervisor03/secrets/secrets.nix
View file

@ -2,6 +2,8 @@
# #
# SPDX-License-Identifer: EUPL-1.2 # SPDX-License-Identifer: EUPL-1.2
(import ../../../../keys).mkSecrets [ "hypervisor03" ] [ (import ../../../../keys).mkSecrets
[ "hypervisor03" ]
[
] ]

6
machines/nixos/rescue01/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "rescue01" ] [ (import ../../../../keys).mkSecrets
[ "rescue01" ]
[
# List of secrets for rescue01 # List of secrets for rescue01
"stateless-uptime-kuma-password" "stateless-uptime-kuma-password"
] ]

6
machines/nixos/storage01/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "storage01" ] [ (import ../../../../keys).mkSecrets
[ "storage01" ]
[
# List of secrets for storage01 # List of secrets for storage01
"bupstash-put_key" "bupstash-put_key"
"forgejo-mailer_password_file" "forgejo-mailer_password_file"
@ -23,4 +25,4 @@
"prometheus-uptime-kuma-apikey" "prometheus-uptime-kuma-apikey"
"prometheus-web_config_file" "prometheus-web_config_file"
"tvix-store-infra-signing-key" "tvix-store-infra-signing-key"
] ]

3
machines/nixos/tower01/secrets/secrets.nix
View file

@ -2,6 +2,7 @@
# #
# SPDX-License-Identifer: EUPL-1.2 # SPDX-License-Identifer: EUPL-1.2
(import ../../../../keys).mkSecrets [ "tower01" ] (import ../../../../keys).mkSecrets
[ "tower01" ]
[ [
] ]

6
machines/nixos/vault01/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "vault01" ] [ (import ../../../../keys).mkSecrets
[ "vault01" ]
[
# List of secrets for vault01 # List of secrets for vault01
"radius-auth_token_file" "radius-auth_token_file"
"radius-ca_pem_file" "radius-ca_pem_file"
@ -13,4 +15,4 @@
"eatonmon-password_file" "eatonmon-password_file"
"radius-ap-radius-secret_file" "radius-ap-radius-secret_file"
"wg-key" "wg-key"
] ]

3
machines/nixos/web01/redirections.nix
View file

@ -35,8 +35,7 @@ in
"www.interq.ens.fr" = "interq.ens.fr"; "www.interq.ens.fr" = "interq.ens.fr";
}; };
temporary = temporary = {
{
}; };
retired = mkSubs { retired = mkSubs {

6
machines/nixos/web01/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "web01" ] [ (import ../../../../keys).mkSecrets
[ "web01" ]
[
# List of secrets for web01 # List of secrets for web01
"acme-certs_secret" "acme-certs_secret"
"bupstash-put_key" "bupstash-put_key"
@ -12,4 +14,4 @@
"ntfy_sh-environment_file" "ntfy_sh-environment_file"
"castopod-environment_file" "castopod-environment_file"
"kahulm-session_secret" "kahulm-session_secret"
] ]

3
machines/nixos/web01/wordpress/default.nix
View file

@ -66,5 +66,6 @@ in
dgn-backups.jobs.containers.settings.paths = [ "/var/lib/nixos-containers" ]; dgn-backups.jobs.containers.settings.paths = [ "/var/lib/nixos-containers" ];
services.nginx.virtualHosts."bds.ens.fr".locations."/gestion2".return = "301 https://gestion.bds.ens.fr"; services.nginx.virtualHosts."bds.ens.fr".locations."/gestion2".return =
"301 https://gestion.bds.ens.fr";
} }

6
machines/nixos/web02/secrets/secrets.nix
View file

@ -2,9 +2,11 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "web02" ] [ (import ../../../../keys).mkSecrets
[ "web02" ]
[
# List of secrets for web02 # List of secrets for web02
"cas_eleves-secret_key_file" "cas_eleves-secret_key_file"
"kadenios-secret_key_file" "kadenios-secret_key_file"
"kadenios-email_password_file" "kadenios-email_password_file"
] ]

6
machines/nixos/web03/secrets/secrets.nix
View file

@ -2,7 +2,9 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ "web03" ] [ (import ../../../../keys).mkSecrets
[ "web03" ]
[
# List of secrets for web03 # List of secrets for web03
"bupstash-put_key" "bupstash-put_key"
"dj_annuaire-secret_key_file" "dj_annuaire-secret_key_file"
@ -20,4 +22,4 @@
"webhook-gestiojeux_token" "webhook-gestiojeux_token"
"webhook-interludes_token" "webhook-interludes_token"
"webhook-wikiens_token" "webhook-wikiens_token"
] ]

7
meta/nodes/nixos.nix
View file

@ -212,6 +212,13 @@
system = "nixos"; system = "nixos";
}; };
deployment = {
sshOptions = [
"-J"
"root@vault01.hyp01.infra.dgnum.eu"
];
};
admins = [ "ecoppens" ]; admins = [ "ecoppens" ];
}; };

6
modules/nixos/dgn-backups/keys/secrets.nix
View file

@ -2,9 +2,11 @@
# #
# SPDX-License-Identifier: EUPL-1.2 # SPDX-License-Identifier: EUPL-1.2
(import ../../../../keys).mkSecrets [ ] [ (import ../../../../keys).mkSecrets
[ ]
[
"compute01.key" "compute01.key"
"storage01.key" "storage01.key"
"web01.key" "web01.key"
"web03.key" "web03.key"
] ]