move variables to generic subfolder

nginx-add-modsecurity
Izorkin 2021-12-14 18:57:18 +02:00
parent ac9860453b
commit b2659618aa
4 changed files with 8 additions and 8 deletions

View File

@ -6,12 +6,11 @@ in
{
imports = [
./hardware-configuration.nix
./variables-module.nix
./variables.nix
./files.nix
./users.nix
./generic/api/api.nix
./generic/modules/api.nix
./generic/modules/userdata.nix
./generic/services/backup/restic.nix
./generic/services/cloud/nextcloud.nix
./generic/services/git/gitea.nix
@ -26,6 +25,7 @@ in
./generic/services/webserver/memcached.nix
./generic/services/webserver/nginx.nix
./generic/system/limits.nix
./generic/system/userdata.nix
];
nixpkgs.overlays = [ (nix-overlay) ];

View File

@ -0,0 +1,6 @@
{ pkgs, ... }:
{
services = {
userdata = builtins.fromJSON (builtins.readFile ./../../userdata/userdata.json);
};
}

View File

@ -1,6 +0,0 @@
{ pkgs, ... }:
{
services = {
userdata = builtins.fromJSON (builtins.readFile ./userdata/userdata.json);
};
}