From 2453a45c740a8d5bdcc090495429c17ed4701cac Mon Sep 17 00:00:00 2001 From: Alex Auvolat Date: Wed, 27 Jul 2022 10:39:09 +0200 Subject: Disable spoutnik --- cluster/staging/node/spoutnik.nix | 58 --------------------------- cluster/staging/node/spoutnik.nix.unavailable | 58 +++++++++++++++++++++++++++ sshtool | 2 +- 3 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 cluster/staging/node/spoutnik.nix create mode 100644 cluster/staging/node/spoutnik.nix.unavailable diff --git a/cluster/staging/node/spoutnik.nix b/cluster/staging/node/spoutnik.nix deleted file mode 100644 index 060d77d..0000000 --- a/cluster/staging/node/spoutnik.nix +++ /dev/null @@ -1,58 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - -{ - boot.loader.grub.enable = true; - boot.loader.grub.version = 2; - boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only - - networking.hostName = "spoutnik"; - services.openssh.ports = [ 220 ]; - - deuxfleurs.network_interface = "enp0s25"; - deuxfleurs.lan_ip = "192.168.0.40"; - deuxfleurs.ipv6 = "::"; #TODO - - deuxfleurs.cluster_ip = "10.14.0.0"; - deuxfleurs.is_raft_server = false; #TODO - - # Nginx configuration: - - services.nginx = { - enable = true; - - # Use recommended settings - recommendedGzipSettings = true; - recommendedOptimisation = true; - recommendedProxySettings = true; - recommendedTlsSettings = true; - - # Add any further config to match your needs, e.g.: - virtualHosts = let - base = locations: { - inherit locations; - - forceSSL = true; - enableACME = true; - }; - proxy = addr: port: base { - "/".proxyPass = "http://" + addr + ":" + toString(port); - }; - in { - "axl.deuxfleurs.fr" = proxy "192.168.0.60" 80; - "warez.luxeylab.net" = proxy "192.168.0.50" 80; - }; - }; - - - # ACME: - - security.acme = { - acceptTerms = true; - email = "adrien@luxeylab.net"; - }; -} - diff --git a/cluster/staging/node/spoutnik.nix.unavailable b/cluster/staging/node/spoutnik.nix.unavailable new file mode 100644 index 0000000..060d77d --- /dev/null +++ b/cluster/staging/node/spoutnik.nix.unavailable @@ -0,0 +1,58 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running ‘nixos-help’). + +{ config, pkgs, ... }: + +{ + boot.loader.grub.enable = true; + boot.loader.grub.version = 2; + boot.loader.grub.device = "/dev/sda"; # or "nodev" for efi only + + networking.hostName = "spoutnik"; + services.openssh.ports = [ 220 ]; + + deuxfleurs.network_interface = "enp0s25"; + deuxfleurs.lan_ip = "192.168.0.40"; + deuxfleurs.ipv6 = "::"; #TODO + + deuxfleurs.cluster_ip = "10.14.0.0"; + deuxfleurs.is_raft_server = false; #TODO + + # Nginx configuration: + + services.nginx = { + enable = true; + + # Use recommended settings + recommendedGzipSettings = true; + recommendedOptimisation = true; + recommendedProxySettings = true; + recommendedTlsSettings = true; + + # Add any further config to match your needs, e.g.: + virtualHosts = let + base = locations: { + inherit locations; + + forceSSL = true; + enableACME = true; + }; + proxy = addr: port: base { + "/".proxyPass = "http://" + addr + ":" + toString(port); + }; + in { + "axl.deuxfleurs.fr" = proxy "192.168.0.60" 80; + "warez.luxeylab.net" = proxy "192.168.0.50" 80; + }; + }; + + + # ACME: + + security.acme = { + acceptTerms = true; + email = "adrien@luxeylab.net"; + }; +} + diff --git a/sshtool b/sshtool index 58b00ef..f6f8521 100755 --- a/sshtool +++ b/sshtool @@ -14,7 +14,7 @@ fi shift 1 if [ -z "$1" ]; then - NIXHOSTLIST=$(ls cluster/$CLUSTER/node | grep -v '\.site\.') + NIXHOSTLIST=$(ls cluster/$CLUSTER/node | grep '\.nix$' | grep -v '\.site\.') else NIXHOSTLIST="$@" fi -- cgit v1.2.3