summary refs log tree commit diff
diff options
context:
space:
mode:
authorRory& <root@rory.gay>2024-02-19 11:18:45 +0100
committerRory& <root@rory.gay>2024-06-05 17:25:16 +0200
commit7720ba2a8c17e31ea303e5b5c72bf8239d65c6c0 (patch)
tree3b7c1094a10b7dd8b3562debd8c9c72cf0d8cfd8
parentSwitch dev/nix instance to master (diff)
downloadSpacebar-Open-Infrastructure-7720ba2a8c17e31ea303e5b5c72bf8239d65c6c0.tar.xz
Fix container folder name
-rwxr-xr-xhost/Spacebar-nginx/containers/spacebar-server/container.nix (renamed from host/Spacebar-nginx/containers/spacebar-server-dev-nix/container.nix)5
-rw-r--r--host/Spacebar-nginx/containers/spacebar-server/import.nix (renamed from host/Spacebar-nginx/containers/spacebar-server-dev-nix/import.nix)0
-rwxr-xr-xhost/Spacebar-nginx/containers/spacebar-server/root.nix (renamed from host/Spacebar-nginx/containers/spacebar-server-dev-nix/root.nix)0
-rwxr-xr-xhost/Spacebar-nginx/containers/spacebar-server/services/nginx.nix (renamed from host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/nginx.nix)2
-rw-r--r--host/Spacebar-nginx/containers/spacebar-server/services/postgres.nix (renamed from host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/postgres.nix)0
-rwxr-xr-xhost/Spacebar-nginx/containers/spacebar-server/services/spacebar-server.nix (renamed from host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/spacebar-server.nix)0
6 files changed, 4 insertions, 3 deletions
diff --git a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/container.nix b/host/Spacebar-nginx/containers/spacebar-server/container.nix

index 12dd2cc..7882f72 100755 --- a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/container.nix +++ b/host/Spacebar-nginx/containers/spacebar-server/container.nix
@@ -1,13 +1,14 @@ -{ pkgs, lib, spacebar-server, ... }: +{ pkgs, lib, spacebar-server, rootDomain, ... }: { privateNetwork = true; autoStart = true; specialArgs = { inherit spacebar-server; + inherit rootDomain; }; config = { lib, pkgs, spacebar-server, rootDomain, ... }: { - imports = [ (import ./root.nix { inherit lib pkgs spacebar-server rootDomain; }) ]; + imports = [ ./root.nix ]; environment.etc."resolv.conf".text = '' nameserver 8.8.8.8 nameserver 8.4.4.8 diff --git a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/import.nix b/host/Spacebar-nginx/containers/spacebar-server/import.nix
index 7be8e2d..7be8e2d 100644 --- a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/import.nix +++ b/host/Spacebar-nginx/containers/spacebar-server/import.nix
diff --git a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/root.nix b/host/Spacebar-nginx/containers/spacebar-server/root.nix
index d543ef2..d543ef2 100755 --- a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/root.nix +++ b/host/Spacebar-nginx/containers/spacebar-server/root.nix
diff --git a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/nginx.nix b/host/Spacebar-nginx/containers/spacebar-server/services/nginx.nix
index 675e861..ea312a3 100755 --- a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/nginx.nix +++ b/host/Spacebar-nginx/containers/spacebar-server/services/nginx.nix
@@ -1,4 +1,4 @@ -{ config, pkgs, lib, spacebar-server, rootDomain ... }: +{ config, pkgs, lib, spacebar-server, rootDomain, ... }: { services = { diff --git a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/postgres.nix b/host/Spacebar-nginx/containers/spacebar-server/services/postgres.nix
index b3c8cad..b3c8cad 100644 --- a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/postgres.nix +++ b/host/Spacebar-nginx/containers/spacebar-server/services/postgres.nix
diff --git a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/spacebar-server.nix b/host/Spacebar-nginx/containers/spacebar-server/services/spacebar-server.nix
index aaa1396..aaa1396 100755 --- a/host/Spacebar-nginx/containers/spacebar-server-dev-nix/services/spacebar-server.nix +++ b/host/Spacebar-nginx/containers/spacebar-server/services/spacebar-server.nix