fix deployments
This commit is contained in:
parent
528ecd8bea
commit
02dd2402aa
5 changed files with 31 additions and 22 deletions
|
@ -54,16 +54,16 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1635844945,
|
"lastModified": 1636623366,
|
||||||
"narHash": "sha256-tZcL307dj28jgEU1Wdn+zwG9neyW0H2+ZjdVhvJxh9g=",
|
"narHash": "sha256-jOQMlv9qFSj0U66HB+ujZoapty0UbewmSNbX8+3ujUQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b67e752c29f18a0ca5534a07661366d6a2c2e649",
|
"rev": "c5ed8beb478a8ca035f033f659b60c89500a3034",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "master",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
description = "Delft Deployment";
|
description = "Delft Deployment";
|
||||||
|
|
||||||
inputs.deploy-rs.url = "github:serokell/deploy-rs";
|
inputs.deploy-rs.url = "github:serokell/deploy-rs";
|
||||||
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
inputs.nixpkgs.url = "github:NixOS/nixpkgs/master";
|
||||||
|
|
||||||
outputs = { self, nixpkgs, deploy-rs }: {
|
outputs = { self, nixpkgs, deploy-rs }: {
|
||||||
nixosConfigurations.bastion = nixpkgs.lib.nixosSystem {
|
nixosConfigurations.bastion = nixpkgs.lib.nixosSystem {
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
../../common
|
../../common
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "vault";
|
networking.hostName = "consul";
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
@ -24,18 +24,5 @@
|
||||||
# Additional packages
|
# Additional packages
|
||||||
environment.systemPackages = with pkgs; [ ];
|
environment.systemPackages = with pkgs; [ ];
|
||||||
|
|
||||||
# Vault
|
networking.firewall.allowedTCPPorts = [ ];
|
||||||
networking.firewall.allowedTCPPorts = [ 8200 ];
|
|
||||||
|
|
||||||
services.vault = {
|
|
||||||
enable = true;
|
|
||||||
# bin version includes the UI
|
|
||||||
package = pkgs.vault-bin;
|
|
||||||
address = "0.0.0.0:8200";
|
|
||||||
storageBackend = "file";
|
|
||||||
storagePath = "/var/lib/vault";
|
|
||||||
extraConfig = ''
|
|
||||||
ui = true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,15 @@ in {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
virtualHosts."zookeeper-dev.0x76.dev" = {
|
||||||
|
enableACME = true;
|
||||||
|
forceSSL = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://10.42.43.28:8085/";
|
||||||
|
proxyWebsockets = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
# Kubernetes endpoints
|
# Kubernetes endpoints
|
||||||
virtualHosts."0x76.dev" = k8s_proxy;
|
virtualHosts."0x76.dev" = k8s_proxy;
|
||||||
virtualHosts."zookeeper.0x76.dev" = k8s_proxy;
|
virtualHosts."zookeeper.0x76.dev" = k8s_proxy;
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
../../common
|
../../common
|
||||||
];
|
];
|
||||||
|
|
||||||
networking.hostName = "consul";
|
networking.hostName = "vault";
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
|
@ -24,5 +24,18 @@
|
||||||
# Additional packages
|
# Additional packages
|
||||||
environment.systemPackages = with pkgs; [ ];
|
environment.systemPackages = with pkgs; [ ];
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ ];
|
# Vault
|
||||||
|
networking.firewall.allowedTCPPorts = [ 8200 ];
|
||||||
|
|
||||||
|
services.vault = {
|
||||||
|
enable = true;
|
||||||
|
# bin version includes the UI
|
||||||
|
package = pkgs.vault-bin;
|
||||||
|
address = "0.0.0.0:8200";
|
||||||
|
storageBackend = "file";
|
||||||
|
storagePath = "/var/lib/vault";
|
||||||
|
extraConfig = ''
|
||||||
|
ui = true
|
||||||
|
'';
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue