From 244b67ebc618e1713dc3b998d0ed68c94fd496dc Mon Sep 17 00:00:00 2001 From: Anish L Date: Sat, 2 Jul 2022 01:05:45 +1000 Subject: [PATCH] back to working deploys commented out impure parts of helix --- flake.nix | 2 +- hosts/helix/hardware-configuration.nix | 2 +- profiles/matrix/default.nix | 16 ++++++++-------- profiles/metrics/default.nix | 22 +++++++++++----------- profiles/rss-bridge/default.nix | 4 ++-- profiles/sealight-website/default.nix | 26 +++++++++++++------------- 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/flake.nix b/flake.nix index d5d6c70a..d4a92af5 100644 --- a/flake.nix +++ b/flake.nix @@ -122,7 +122,7 @@ }; suites = with profiles; rec { base = [ core users.root users.anish ]; - sealight = [ base server rss-bridge gitea wireguard-server metrics sealight-website ]; # matrix backup + sealight = [ base server wireguard-server metrics ]; # rss-bridge gitea sealight-website matrix backup mossnet = [ base server taskd shaarli wallabag dns monitoring nfs rss-bridge gonic headphones radicale seafile syncthing ]; # hpi sync.music cube = [ base site server ]; graphical = [ base bluetooth music sync.kitaab sync.website sync.cal wifi desktop ]; diff --git a/hosts/helix/hardware-configuration.nix b/hosts/helix/hardware-configuration.nix index 403ff39d..593ca674 100644 --- a/hosts/helix/hardware-configuration.nix +++ b/hosts/helix/hardware-configuration.nix @@ -6,7 +6,7 @@ { imports = [ - + # ]; boot.initrd.availableKernelModules = [ "ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk" ]; diff --git a/profiles/matrix/default.nix b/profiles/matrix/default.nix index f3959d84..ae29709a 100644 --- a/profiles/matrix/default.nix +++ b/profiles/matrix/default.nix @@ -239,8 +239,8 @@ enable = true; virtualHosts = { "sealight.xyz" = { - forceSSL = true; - enableACME = true; + #forceSSL = true; + #enableACME = true; locations."/" = { root = "/var/www/sealight.xyz"; }; @@ -253,8 +253,8 @@ }; ## virtual host for Synapse "chat.sealight.xyz" = { - forceSSL = true; - enableACME = true; + #forceSSL = true; + #enableACME = true; #useACMEHost = "sealight.xyz"; locations."/" = { proxyPass = "http://localhost:8448"; @@ -262,8 +262,8 @@ }; ## virtual host for Riot/Web "element.sealight.xyz" = { - forceSSL = true; - enableACME = true; + #forceSSL = true; + #enableACME = true; #useACMEHost = "sealight.xyz"; ## root points to the riot-web package content, also configured via Nix locations."/" = { @@ -271,8 +271,8 @@ }; }; ${config.services.jitsi-meet.hostName} = { - enableACME = true; - forceSSL = true; + #enableACME = true; + #forceSSL = true; }; }; ## other nginx specific best practices diff --git a/profiles/metrics/default.nix b/profiles/metrics/default.nix index 957f6afc..d94655b9 100644 --- a/profiles/metrics/default.nix +++ b/profiles/metrics/default.nix @@ -142,18 +142,18 @@ }; services.loki = { - enable = true; - configFile = /var/loki-config.yaml; + enable = false; # TODO + #configFile = /var/loki-config.yaml; }; - systemd.services.promtail = { - description = "Promtail service for Loki"; - wantedBy = [ "multi-user.target" ]; + # systemd.services.promtail = { + # description = "Promtail service for Loki"; + # wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = '' - ${pkgs.grafana-loki}/bin/promtail --config.file ${/var/promtail.yaml} - ''; - }; - }; + # serviceConfig = { + # ExecStart = '' + # ${pkgs.grafana-loki}/bin/promtail --config.file ${/var/promtail.yaml} + # ''; + # }; + # }; } diff --git a/profiles/rss-bridge/default.nix b/profiles/rss-bridge/default.nix index f84dbe23..94e7f7ef 100644 --- a/profiles/rss-bridge/default.nix +++ b/profiles/rss-bridge/default.nix @@ -6,6 +6,6 @@ whitelist = [ "Facebook" "Bandcamp" "Twitter" "Telegram" "Instagram" "Reddit" ]; }; - services.nginx.virtualHosts."bridge.sealight.xyz".forceSSL = true; - services.nginx.virtualHosts."bridge.sealight.xyz".enableACME = true; + #services.nginx.virtualHosts."bridge.sealight.xyz".forceSSL = true; + #services.nginx.virtualHosts."bridge.sealight.xyz".enableACME = true; } diff --git a/profiles/sealight-website/default.nix b/profiles/sealight-website/default.nix index a079ee61..e81bbf2b 100644 --- a/profiles/sealight-website/default.nix +++ b/profiles/sealight-website/default.nix @@ -1,14 +1,14 @@ { - services.nginx = { - enable = true; - vhost = { - "sealight.xyz" = { - forceSSL = true; - enableACME = true; - locations."/" = { - root = "/var/www/sealight.xyz" - }; - }; - }; - }; - } + # services.nginx = { + # enable = true; + # virtualHosts = { + # "sealight.xyz" = { + # forceSSL = true; + # enableACME = true; + # locations."/" = { + # root = "/var/www/sealight.xyz"; + # }; + # }; + # }; + # }; +}