Compare commits
3 Commits
e9414209f5
...
efe47bacb1
Author | SHA1 | Date | |
---|---|---|---|
efe47bacb1 | |||
89163d4cf3 | |||
d39e2b94d8 |
32
deploy.sh
32
deploy.sh
@ -1,32 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
DEPLOY_HOST=$1
|
||||
DEPLOY_ADDRESS=$2
|
||||
DEPLOY_PORT=$3
|
||||
|
||||
if [ -z $DEPLOY_HOST ]; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cmd=" \
|
||||
nixos-rebuild switch \
|
||||
-I "nixos-config=hosts/${DEPLOY_HOST}/configuration.nix" --show-trace\
|
||||
"
|
||||
|
||||
if [ -z $DEPLOY_ADDRESS ] || [ $DEPLOY_ADDRESS = "-" ]; then
|
||||
DEPLOY_ADDRESS="clerie@${DEPLOY_HOST}.net.clerie.de"
|
||||
fi
|
||||
|
||||
if [ $DEPLOY_ADDRESS != "localhost" ]; then
|
||||
cmd="${cmd} \
|
||||
--target-host ${DEPLOY_ADDRESS} \
|
||||
--build-host localhost \
|
||||
--use-remote-sudo \
|
||||
"
|
||||
fi
|
||||
|
||||
if [ -n "$DEPLOY_PORT" ]; then
|
||||
cmd="NIX_SSHOPTS=\"-p $DEPLOY_PORT\" ${cmd}"
|
||||
fi
|
||||
|
||||
eval ${cmd}
|
27
flake.lock
Normal file
27
flake.lock
Normal file
@ -0,0 +1,27 @@
|
||||
{
|
||||
"nodes": {
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1664538465,
|
||||
"narHash": "sha256-EnlC7dDKX7X1wlnXkB1gmn9rBZQ0J9+biVTZHw//8us=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "10ecda252ce1b3b1d6403caeadbcc8f30d5ab796",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
"version": 7
|
||||
}
|
58
flake.nix
Normal file
58
flake.nix
Normal file
@ -0,0 +1,58 @@
|
||||
{
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
};
|
||||
outputs = { nixpkgs, ... }: {
|
||||
colmena = {
|
||||
meta = {
|
||||
nixpkgs = import nixpkgs {};
|
||||
};
|
||||
|
||||
defaults = { name, ... }: {
|
||||
imports = [
|
||||
(./. + "/hosts/${name}/configuration.nix")
|
||||
];
|
||||
deployment = {
|
||||
targetHost = "${name}.net.clerie.de";
|
||||
targetUser = null;
|
||||
};
|
||||
};
|
||||
|
||||
# Hosts
|
||||
|
||||
backup-4 = { ... }: {};
|
||||
|
||||
carbon = { ... }: {};
|
||||
|
||||
clerie-backup = { ... }: {};
|
||||
|
||||
dn42-il-gw1 = { ... }: {};
|
||||
|
||||
dn42-il-gw5 = { ... }: {};
|
||||
|
||||
dn42-il-gw6 = { ... }: {};
|
||||
|
||||
dn42-ildix-clerie = { ... }: {};
|
||||
|
||||
gatekeeper = { ... }: {};
|
||||
|
||||
hydra-1 = { ... }: {};
|
||||
|
||||
minecraft-2 = { ... }: {};
|
||||
|
||||
monitoring-3 = { ... }: {};
|
||||
|
||||
nonat = { ... }: {};
|
||||
|
||||
osmium = { ... }: {};
|
||||
|
||||
palladium = { ... }: {};
|
||||
|
||||
porter = { ... }: {};
|
||||
|
||||
storage-2 = { ... }: {};
|
||||
|
||||
web-2 = { ... }: {};
|
||||
};
|
||||
};
|
||||
}
|
25
hosts/hydra-1/configuration.nix
Normal file
25
hosts/hydra-1/configuration.nix
Normal file
@ -0,0 +1,25 @@
|
||||
{ config, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
./hardware-configuration.nix
|
||||
../../configuration/common
|
||||
../../configuration/proxmox-vm
|
||||
];
|
||||
|
||||
boot.loader.grub.enable = true;
|
||||
boot.loader.grub.version = 2;
|
||||
boot.loader.grub.device = "/dev/vda";
|
||||
|
||||
networking.hostName = "hydra-1";
|
||||
|
||||
networking.useDHCP = false;
|
||||
networking.interfaces.ens18.ipv6.addresses = [ { address = "2001:638:904:ffcb::a"; prefixLength = 64; } ];
|
||||
networking.interfaces.ens19.ipv4.addresses = [ { address = "192.168.10.36"; prefixLength = 24; } ];
|
||||
networking.defaultGateway6 = { address = "2001:638:904:ffcb::1"; interface = "ens18"; };
|
||||
networking.defaultGateway = { address = "192.168.10.1"; interface = "ens19"; };
|
||||
networking.nameservers = [ "2001:638:904:ffcc::3" "2001:638:904:ffcc::4" "141.24.40.3" "141.24.40.4" ];
|
||||
|
||||
system.stateVersion = "22.11";
|
||||
}
|
33
hosts/hydra-1/hardware-configuration.nix
Normal file
33
hosts/hydra-1/hardware-configuration.nix
Normal file
@ -0,0 +1,33 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[ (modulesPath + "/profiles/qemu-guest.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/05ec1a84-7889-4551-bbb9-388b90039839";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.ens18.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.ens19.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
@ -6,6 +6,6 @@ self: super: {
|
||||
pyexcel-webio = self.python3.pkgs.callPackage ./pyexcel-webio {};
|
||||
uptimestatus = self.python3.pkgs.callPackage ./uptimestatus {};
|
||||
wetter = self.python3.pkgs.callPackage ./wetter {
|
||||
inherit (self) pkgconfig libsass;
|
||||
inherit (self) pkg-config libsass;
|
||||
};
|
||||
}
|
||||
|
@ -6,7 +6,7 @@
|
||||
libsass,
|
||||
yarn2nix-moretea,
|
||||
nodejs,
|
||||
pkgconfig,
|
||||
pkg-config,
|
||||
pkgs,
|
||||
psycopg2,
|
||||
python3,
|
||||
@ -34,7 +34,7 @@ let
|
||||
|
||||
/* build native node-sass extensions */
|
||||
pkgConfig.node-sass = {
|
||||
buildInputs = [ python3 libsass pkgconfig ];
|
||||
buildInputs = [ python3 libsass pkg-config ];
|
||||
postInstall = ''
|
||||
export npm_config_nodedir=${nodejs}
|
||||
LIBSASS_EXT=auto yarn --offline run build
|
||||
|
Loading…
Reference in New Issue
Block a user