diff --git a/terranix/space-left/config.nix b/terranix/space-left/config.nix index 32349b0..ab53daf 100644 --- a/terranix/space-left/config.nix +++ b/terranix/space-left/config.nix @@ -18,7 +18,7 @@ in { hcloud.nixserver = { host = { enable = true; - serverType = "cx51"; # 35€/month + serverType = "cx31"; configurationFile = pkgs.writeText "configuration.nix" '' { pkgs, lib, config, ... }: { @@ -28,6 +28,9 @@ in { }; }; + # todo : put this in the hcloud module + resource.hcloud_server.nixserver-host.location = "hel1"; + hcloud.export.nix = toString ./plops/generated/nixos-machines.nix; resource.local_file.sshConfig = { diff --git a/terranix/space-left/plops/configs/nixserver-host/configuration.nix b/terranix/space-left/plops/configs/nixserver-host/configuration.nix index c710230..49ec152 100644 --- a/terranix/space-left/plops/configs/nixserver-host/configuration.nix +++ b/terranix/space-left/plops/configs/nixserver-host/configuration.nix @@ -1,12 +1,12 @@ { config, pkgs, lib, ... }: { imports = [ # - ./codimd.nix + #./codimd.nix ./hardware-configuration.nix - ./jitsi.nix - ./netdata.nix + #/jitsi.nix + #./netdata.nix ./ssh.nix - ./workadventure.nix + #./workadventure.nix ]; environment.systemPackages = [ pkgs.git pkgs.ag pkgs.htop ]; diff --git a/terranix/space-left/plops/configs/nixserver-host/netdata.nix b/terranix/space-left/plops/configs/nixserver-host/netdata.nix index 7bfdfc6..a879b7f 100644 --- a/terranix/space-left/plops/configs/nixserver-host/netdata.nix +++ b/terranix/space-left/plops/configs/nixserver-host/netdata.nix @@ -12,15 +12,4 @@ }; }; }; - - services.nginx.enable = true; - services.nginx.virtualHosts."netdata.party.ingolf-wagner.de" = { - enableACME = true; - forceSSL = true; - basicAuth.admin = "NYsXfBKRwkkS60WIeZONtFTv3nz4tPy52uqLkzJzuc"; - locations."/" = { - proxyPass = "http://localhost:19999"; - proxyWebsockets = true; - }; - }; } diff --git a/terranix/space-left/plops/configs/nixserver-host/ssh.nix b/terranix/space-left/plops/configs/nixserver-host/ssh.nix index c794884..93bfd18 100644 --- a/terranix/space-left/plops/configs/nixserver-host/ssh.nix +++ b/terranix/space-left/plops/configs/nixserver-host/ssh.nix @@ -4,7 +4,7 @@ services.sshd.enable = true; services.openssh.passwordAuthentication = false; services.openssh.banner = '' - [ JITSI Server ] + [ Space Left Server ] ''; # the public ssh key used at deployment diff --git a/terranix/space-left/shell.nix b/terranix/space-left/shell.nix index 1b9722a..78e5f83 100644 --- a/terranix/space-left/shell.nix +++ b/terranix/space-left/shell.nix @@ -1,11 +1,12 @@ { pkgs ? import { } }: let - terranix = pkgs.callPackage (pkgs.fetchgit { - url = "https://github.com/mrVanDalo/terranix.git"; - rev = "2.3.0"; - sha256 = "030067h3gjc02llaa7rx5iml0ikvw6szadm0nrss2sqzshsfimm4"; - }) { }; + #terranix = pkgs.callPackage (pkgs.fetchgit { + # url = "https://github.com/mrVanDalo/terranix.git"; + # rev = "2.3.0"; + # sha256 = "030067h3gjc02llaa7rx5iml0ikvw6szadm0nrss2sqzshsfimm4"; + #}) { }; + terranix = pkgs.terranix; terraform = pkgs.writers.writeBashBin "terraform" '' export TF_VAR_hcloud_api_token=`${pkgs.pass}/bin/pass development/hetzner.com/api-token` diff --git a/terranix/space-left/terraform.tfstate b/terranix/space-left/terraform.tfstate new file mode 100644 index 0000000..5cc489a Binary files /dev/null and b/terranix/space-left/terraform.tfstate differ