From efdcc8583654b0303bc80ede8d58938d0271d961 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Mon, 30 Aug 2021 20:37:28 +0200 Subject: [PATCH] add space-left server --- terranix/space-left/config.nix | 5 ++++- .../configs/nixserver-host/configuration.nix | 8 ++++---- .../plops/configs/nixserver-host/netdata.nix | 11 ----------- .../plops/configs/nixserver-host/ssh.nix | 2 +- terranix/space-left/shell.nix | 11 ++++++----- terranix/space-left/terraform.tfstate | Bin 0 -> 4753 bytes 6 files changed, 15 insertions(+), 22 deletions(-) create mode 100644 terranix/space-left/terraform.tfstate 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 0000000000000000000000000000000000000000..5cc489a1b152159a58beab926fcc4891f0708d70 GIT binary patch literal 4753 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 f*pU^rtB?&OIW#vb3`DvAo@p^*