fi/nix-infra
1
2
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: fi:df36846fb2e5c8e1ea9cfaf7daa4079bb8449f76
Branches Tags
fi:main
fi:ikiwiki
fi:mas
..
compare: fi:ae2a4c91fd360457015727083bb12b493d958a4f
Branches Tags
fi:main
fi:ikiwiki
fi:mas

No commits in common. "df36846fb2e5c8e1ea9cfaf7daa4079bb8449f76" and "ae2a4c91fd360457015727083bb12b493d958a4f" have entirely different histories.
df36846fb2 ... ae2a4c91fd

4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
config/hosts/mastodon/mastodon.nix
View file

@ -16,14 +16,14 @@ let
}; };
mastodonNekoverseOverlay = final: prev: { mastodonNekoverseOverlay = final: prev: {
mastodon = (prev.mastodon.override rec { mastodon = (prev.mastodon.override rec {
version = "4.5.9"; version = "4.5.8";
srcOverride = final.applyPatches { srcOverride = final.applyPatches {
src = pkgs.stdenv.mkDerivation { src = pkgs.stdenv.mkDerivation {
name = "mastodonWithThemes"; name = "mastodonWithThemes";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://github.com/mastodon/mastodon.git"; url = "https://github.com/mastodon/mastodon.git";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-EXMJWdcuvQWe2cXONlcN/oB4b0nXwDqRT+miIB7P7js="; sha256 = "sha256-03PdAB9KOvMgQJPx+7ik13QE18fjdLIab7zEXaPc4nk=";
}; };
# mastodon ships with broken symlinks, disable the check for that for now # mastodon ships with broken symlinks, disable the check for that for now
dontCheckForBrokenSymlinks = true; dontCheckForBrokenSymlinks = true;

6
config/hosts/web-public-2/virtualHosts/element-admin.nekover.se.nix
View file

@ -1,14 +1,14 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
let let
elementAdminVersion = "0.1.11"; elementAdminVersion = "0.1.10";
elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: { elementAdmin = pkgs.stdenv.mkDerivation (finalAttrs: {
pname = "element-admin"; pname = "element-admin";
version = elementAdminVersion; version = elementAdminVersion;
src = pkgs.fetchzip { src = pkgs.fetchzip {
url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip"; url = "https://github.com/element-hq/element-admin/archive/refs/tags/v${elementAdminVersion}.zip";
sha256 = "sha256-tSUTDPspQJjvP1KN4nUr4LYyjNQFj4pKMMA8JmavIxo="; sha256 = "sha256-dh7tmzAaTfKB9FuOVhLHpOIsTZK1qMvNq16HeObHOqI=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -19,7 +19,7 @@ let
pnpmDeps = pkgs.pnpm.fetchDeps { pnpmDeps = pkgs.pnpm.fetchDeps {
inherit (finalAttrs) pname version src; inherit (finalAttrs) pname version src;
fetcherVersion = 2; fetcherVersion = 2;
hash = "sha256-Hf4PWey5bczSNbc3QQ9z9X3OVUZ7VHXw7BHGQqJWPac="; hash = "sha256-S/MdfUv6q+PaAKWYHxVY80BcpL81dOfpPVhNxEPQVE4=";
}; };
buildPhase = '' buildPhase = ''

4
config/hosts/web-public-2/virtualHosts/element.nekover.se.nix
View file

@ -1,9 +1,9 @@
{ pkgs, ... }: { pkgs, ... }:
let let
elementWebVersion = "1.12.17"; elementWebVersion = "1.12.10";
element-web = pkgs.fetchzip { element-web = pkgs.fetchzip {
url = "https://github.com/vector-im/element-web/releases/download/v${elementWebVersion}/element-v${elementWebVersion}.tar.gz"; url = "https://github.com/vector-im/element-web/releases/download/v${elementWebVersion}/element-v${elementWebVersion}.tar.gz";
sha256 = "sha256-ZlL4lQar/nEqA/1Js/aQvlnscWfb41oPbK69jSL9584="; sha256 = "sha256-YpxfV4BCXh2fffQvVsZGOfK82TpGzg6uOx7iUPqiXVE=";
}; };
elementWebSecurityHeaders = '' elementWebSecurityHeaders = ''
# Configuration best practices # Configuration best practices

7
config/hosts/web-public-2/virtualHosts/nekover.se.nix
View file

@ -22,13 +22,6 @@
add_header Access-Control-Allow-Origin *; add_header Access-Control-Allow-Origin *;
''; '';
}; };
locations."/.well-known/matrix/support" = {
return = "200 '{\"contacts\": [{\"email_address\": \"admin@nekover.se\", \"role\": \"m.role.admin\"}]}'";
extraConfig = ''
default_type application/json;
add_header Access-Control-Allow-Origin *;
'';
};
extraConfig = '' extraConfig = ''
set_real_ip_from 10.202.41.100; # IPv4 from web-public-2 set_real_ip_from 10.202.41.100; # IPv4 from web-public-2
set_real_ip_from 10.203.10.3; # IPv6 from valkyrie set_real_ip_from 10.203.10.3; # IPv6 from valkyrie