diff --git a/nixos-modules/cloud/default.nix b/nixos-modules/cloud/default.nix index aaba0ef..ee503bb 100644 --- a/nixos-modules/cloud/default.nix +++ b/nixos-modules/cloud/default.nix @@ -3,7 +3,6 @@ config, lib, pkgs, - options, ... }: @@ -31,10 +30,6 @@ with lib; "nextcloud30" ]; }; - - adminpassFile = options.services.nextcloud.config.adminpassFile // { - default = config.sops.secrets."nextcloud/admin".path; - }; }; config = mkIf cfg.enable { @@ -64,7 +59,7 @@ with lib; database.createLocally = true; config = { - inherit (cfg) adminpassFile; + adminpassFile = config.sops.secrets."nextcloud/admin".path; adminuser = "root"; dbtype = "pgsql"; }; diff --git a/nixos-modules/cloud/test.nix b/nixos-modules/cloud/test.nix deleted file mode 100644 index 5dbfa78..0000000 --- a/nixos-modules/cloud/test.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - ... -}: -{ - # Note: This extends the default configuration from ${self}/checks/nixos-modules - nodes.webserver = - { pkgs, lib, ... }: - let - inherit (pkgs) curl gnugrep; - inherit (lib) mkForce genAttrs const; - in - { - qois.cloud = { - enable = true; - domain = "cloud.example.com"; - package = pkgs.nextcloud31; - adminpassFile = (pkgs.writeText "nextcloud-test-adminpass-file" "super secret password").outPath; - }; - - qois.postgresql.package = pkgs.postgresql; - sops.secrets = mkForce { }; - - # Disable TLS services - services.nginx.virtualHosts = genAttrs [ "cloud.example.com" ] (const { - forceSSL = mkForce false; - enableACME = mkForce false; - }); - - # Test environment - environment.systemPackages = [ - curl - gnugrep - ]; - }; -} diff --git a/nixos-modules/cloud/test.py b/nixos-modules/cloud/test.py deleted file mode 100644 index b7d5cf9..0000000 --- a/nixos-modules/cloud/test.py +++ /dev/null @@ -1,32 +0,0 @@ -def test(subtest, webserver): - webserver.wait_for_unit("nginx") - webserver.wait_for_open_port(80) - - # Helpers - def curl_variable_test(node, variable, expected, url): - value = node.succeed( - f"curl -s --no-location -o /dev/null -w '%{{{variable}}}' '{url}'" - ) - assert value == expected, ( - f"expected {variable} to be '{expected}' but got '{value}'" - ) - - def expect_http_code(node, code, url): - curl_variable_test(node, "http_code", code, url) - - def expect_http_content_contains(node, expectedContentSnippet, url): - content = node.succeed(f"curl --no-location --silent '{url}'") - assert expectedContentSnippet in content, f""" - expected in content: - {expectedContentSnippet} - at {url} but got following content: - {content} - """ - - # Tests - with subtest("website is successfully served on cloud.example.com"): - webserver.succeed("grep cloud.example.com /etc/hosts") - expect_http_code(webserver, "200", "http://cloud.example.com") - expect_http_content_contains( - webserver, "Log in to cloud.qoo.is", "http://docs.example.com" - )