diff --git a/hosts/hainich/configuration.nix b/hosts/hainich/configuration.nix index 634e219..b36b0ab 100644 --- a/hosts/hainich/configuration.nix +++ b/hosts/hainich/configuration.nix @@ -12,7 +12,6 @@ ../../common # ./wireguard.nix ./services/nginx.nix - ./services/websites.nix # ./k8s.nix ./services/ghost_waszumfff.nix ./services/gitlab-runner.nix diff --git a/hosts/hainich/services/websites.nix b/hosts/hainich/services/websites.nix deleted file mode 100644 index a2b0f1c..0000000 --- a/hosts/hainich/services/websites.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ config, lib, pkgs, ... }: - -let - sources = import ../../../nix/sources.nix; -in - -let - haccearth = pkgs.stdenv.mkDerivation { - name = "hacc.earth-website"; - src = sources.haccearth-website.outPath.outPath; - buildPhase = '' - ${pkgs.jekyll.outPath}/bin/jekyll build - ''; - installPhase = '' - mkdir -p $out - cp -r _site/* $out - ''; - }; - infra4futurede = pkgs.stdenv.mkDerivation { - name = "infra4future.de-website"; - src = sources.infra4future-website.outPath.outPath; - buildPhase = '' - ${pkgs.jekyll.outPath}/bin/jekyll build - ''; - installPhase = '' - mkdir -p $out - cp -r _site/* $out - ''; - }; -in -{ - services.nginx.virtualHosts."hacc.earth" = { - forceSSL = true; - enableACME = true; - root = haccearth.outPath; - }; - - services.nginx.virtualHosts."infra4future.de" = { - forceSSL = true; - enableACME = true; - root = infra4futurede.outPath; - }; -} diff --git a/nix/sources.json b/nix/sources.json index ab567f8..5377437 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -37,18 +37,6 @@ "url_template": "https://releases.mattermost.com//mattermost--linux-amd64.tar.gz", "version": "5.34.3" }, - "haccearth-website": { - "branch": "master", - "repo": "https://gitlab.infra4future.de/hacc/infra4future/hacc.earth.git", - "rev": "1a79b7468f156a3bb2da1c4c810d7db9e86fdb9f", - "type": "git" - }, - "infra4future-website": { - "branch": "master", - "repo": "https://gitlab.infra4future.de/hacc/infra4future/infra4future.de.git", - "rev": "7520f0c343f33dbdb385df15cd3fbcde79d734c4", - "type": "git" - }, "mumble-website": { "branch": "master", "repo": "https://gitlab.infra4future.de/hacc/infra4future/mumble.infra4future.de.git",