hotfix: add websites to hainich

because gitlab broke websites AGAIN, they are now running on hainich
directly
While this is only a temporary solution, I think it will be as permanent
as they come
This commit is contained in:
schweby 2021-06-25 11:38:47 +02:00
parent 776c4d2f0f
commit 6a408db9c1
No known key found for this signature in database
GPG key ID: B880491D046E2F87
3 changed files with 56 additions and 0 deletions

View file

@ -12,6 +12,7 @@
../../common ../../common
# ./wireguard.nix # ./wireguard.nix
./services/nginx.nix ./services/nginx.nix
./services/websites.nix
# ./k8s.nix # ./k8s.nix
./services/ghost_waszumfff.nix ./services/ghost_waszumfff.nix
./services/gitlab-runner.nix ./services/gitlab-runner.nix

View file

@ -0,0 +1,43 @@
{ 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;
};
}

View file

@ -37,6 +37,18 @@
"url_template": "https://releases.mattermost.com/<version>/mattermost-<version>-linux-amd64.tar.gz", "url_template": "https://releases.mattermost.com/<version>/mattermost-<version>-linux-amd64.tar.gz",
"version": "5.34.3" "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": { "mumble-website": {
"branch": "master", "branch": "master",
"repo": "https://gitlab.infra4future.de/hacc/infra4future/mumble.infra4future.de.git", "repo": "https://gitlab.infra4future.de/hacc/infra4future/mumble.infra4future.de.git",