make sure all servers share basic config
This commit is contained in:
parent
31d6e00786
commit
e0238fc413
6 changed files with 12 additions and 10 deletions
|
@ -8,8 +8,11 @@
|
||||||
mkServer = pkgs: system: hostname:
|
mkServer = pkgs: system: hostname:
|
||||||
pkgs.lib.nixosSystem {
|
pkgs.lib.nixosSystem {
|
||||||
inherit system;
|
inherit system;
|
||||||
modules =
|
modules = [
|
||||||
[ (./. + "/nixos/boxes/${hostname}") sops.nixosModules.sops ];
|
(./. + "/nixos/boxes/${hostname}")
|
||||||
|
(import ./nixos/server-common.nix)
|
||||||
|
sops.nixosModules.sops
|
||||||
|
];
|
||||||
specialArgs = { inherit inputs; };
|
specialArgs = { inherit inputs; };
|
||||||
};
|
};
|
||||||
mkRaspi = pkgs: hostname:
|
mkRaspi = pkgs: hostname:
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
./bolty-boot.nix
|
./bolty-boot.nix
|
||||||
./real-hardware.nix
|
./real-hardware.nix
|
||||||
../../server-security.nix
|
|
||||||
../cli.nix
|
../cli.nix
|
||||||
./matrix-server.nix
|
./matrix-server.nix
|
||||||
./nextcloud.nix
|
./nextcloud.nix
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
imports = [
|
imports = [
|
||||||
./vpsfree1-vpsadminos.nix
|
./vpsfree1-vpsadminos.nix
|
||||||
../cli.nix
|
../cli.nix
|
||||||
../../server-security.nix
|
|
||||||
../../server-common.nix
|
|
||||||
./foundryvtt.nix
|
./foundryvtt.nix
|
||||||
./cryptpad.nix
|
./cryptpad.nix
|
||||||
./syncthing-relay.nix
|
./syncthing-relay.nix
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
./search.nix
|
./search.nix
|
||||||
./snowflake.nix
|
./snowflake.nix
|
||||||
../cli.nix
|
../cli.nix
|
||||||
../../server-security.nix
|
|
||||||
../../server-common.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
systemd.extraConfig = ''
|
systemd.extraConfig = ''
|
||||||
|
|
|
@ -1 +1,4 @@
|
||||||
{ config, pkgs, ... }: { system.stateVersion = "22.05"; }
|
{ config, pkgs, ... }: {
|
||||||
|
imports = [ ./server-security.nix ./tailscale ];
|
||||||
|
system.stateVersion = "22.05";
|
||||||
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
tailscale-key-foureighty: ENC[AES256_GCM,data:9Yc2Bwf+WvFbz0L1UxEvFszXsfzsubDbiRbELMHUkRS8x4FJqZeGTw==,iv:sT5gbrlM3Id/XMD9S5v4tsohoRJpY3gyFVzKNQSYOYg=,tag:26+nM805hVZxYRnCtWisFg==,type:str]
|
tailscale-key-foureighty: ENC[AES256_GCM,data:9Yc2Bwf+WvFbz0L1UxEvFszXsfzsubDbiRbELMHUkRS8x4FJqZeGTw==,iv:sT5gbrlM3Id/XMD9S5v4tsohoRJpY3gyFVzKNQSYOYg=,tag:26+nM805hVZxYRnCtWisFg==,type:str]
|
||||||
|
tailscale-key-bolty: ENC[AES256_GCM,data:PgFzvVHQjvEkjOyWR30dC4MwVbIyMg4I/8KHj2bwWWBTmzZYYPV/b2Q=,iv:YXSqpgPaMUOe/D7i0jHJWbzRp+L8lk8kQQXdkL1/wYw=,tag:Mj8A6mP1oQweyjTikoZD6A==,type:str]
|
||||||
sops:
|
sops:
|
||||||
kms: []
|
kms: []
|
||||||
gcp_kms: []
|
gcp_kms: []
|
||||||
|
@ -50,8 +51,8 @@ sops:
|
||||||
eFBLY0MybzVvVFB1L0F5eE9CUXBMWXMK5Eqhb43xV4Itt+FIQeGn0iJP/a43Fk+9
|
eFBLY0MybzVvVFB1L0F5eE9CUXBMWXMK5Eqhb43xV4Itt+FIQeGn0iJP/a43Fk+9
|
||||||
d8r9mvv7ZKRCWPjJCkJnX+5r1nBKzcLqa/tCPNqT+pXDfAy6gJVtcQ==
|
d8r9mvv7ZKRCWPjJCkJnX+5r1nBKzcLqa/tCPNqT+pXDfAy6gJVtcQ==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
lastmodified: "2022-08-19T17:37:35Z"
|
lastmodified: "2022-08-19T19:26:30Z"
|
||||||
mac: ENC[AES256_GCM,data:qnyVQpFRiLoAwFt9Ph0PHvUqWhPmqoysHXwWIZXVYUoOX3fgVEQJBk5hdenqZh7hYV7++uW3wl7c5w5XaBvM3fzFhwocy+qP4NpcVv9yP9XMNPbPAehJTSJ6SgYU0pkCl5m675cuCt4Ify+iITN2b4s4Luyn/IwnMNXQTF7FUZs=,iv:w+fr5j4l0T+hKbTTM8KR9HbhuIk3xvfv15O/xrabiAE=,tag:2MFDkmOOkt1h5K/yOXxxAg==,type:str]
|
mac: ENC[AES256_GCM,data:qqPKhHxzolSP9sj0RSiyVU0OoGUV705Xc28c5VO351g1jEHomqkFwf+NObHBUtUl0/gr9CYOu6l8Df3TuFou+T+zn9sPetBTtbwfQfK6v9EFEU3u6q7ckc70Odhiyt1eTv3Wa5qYZtjUoC86IRBd+asbkekg5LqgI0mluhTtqPE=,iv:cadJu5M60pYu0Et/CZIo/luKvpJhpinx0wA5Z+a2h/s=,tag:Xitr1QLo2CdavdnXxmu7MA==,type:str]
|
||||||
pgp: []
|
pgp: []
|
||||||
unencrypted_suffix: _unencrypted
|
unencrypted_suffix: _unencrypted
|
||||||
version: 3.7.3
|
version: 3.7.3
|
||||||
|
|
Loading…
Reference in a new issue