v/infrastructure
1
0
Fork 0
Code Issues 13 Pull requests 1 Projects Releases Packages Activity Actions

inject queer.af IP addr

Browse source
This commit is contained in:
Vivian 2024-02-14 15:27:32 +01:00
parent 140fe8df72
commit a82965d754
8 changed files with 484 additions and 469 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/hosts/hades/dns/configuration.nix
View file

@ -34,6 +34,7 @@
"fedi.xirion.net typetransparent"
"grist.tud.0x76.dev typetransparent"
"dex.tud.0x76.dev typetransparent"
"queer.af typetransparent"
];
local-data = [
@ -51,6 +52,7 @@
''"fedi.xirion.net A 192.168.0.122"''
''"grist.tud.0x76.dev A 192.168.0.122"''
''"dex.tud.0x76.dev A 192.168.0.122"''
''"queer.af A 65.108.48.233"''
];
};
}

1
nixos/hosts/hades/storage/configuration.nix
View file

@ -32,6 +32,7 @@
d5 = "/mnt/disk5";
d6 = "/mnt/disk6";
d7 = "/mnt/disk7";
# d8 = "/mnt/disk8";
};
contentFiles = [
"/var/lib/snapraid/snapraid.content"

5
nixos/hosts/hades/storage/fs.nix
View file

@ -41,6 +41,11 @@
device = "/dev/disk/by-uuid/6c568887-9d2e-45ce-ab85-4c48cca2226a";
};
# "/mnt/disk8" = {
# fsType = "ext4";
# device = "/dev/disk/by-partuuid/73d8eea4-c648-4c91-99dc-19940832ffe7";
# };
"/mnt/parity1" = {
fsType = "ext4";
device = "/dev/disk/by-partuuid/7c9b88ed-b8f8-40c9-bbc3-b75d30e04e01";

1
nixos/hosts/thalassa/default.nix
View file

@ -2,5 +2,6 @@
"aoife" = {
type = "local";
mac = "04:7b:cb:b6:2d:88";
nix = false;
};
}

17
nixos/pkgs/glitch-soc/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, nodejs-slim, bundlerEnv, nixosTests
, yarn, callPackage, imagemagick, ffmpeg, file, ruby, writeShellScript
, yarn, callPackage, ruby, writeShellScript
, fetchYarnDeps, prefetch-yarn-deps
, brotli
@ -22,18 +22,6 @@ stdenv.mkDerivation rec {
name = "${pname}-gems-${version}";
inherit version gemset ruby;
gemdir = src;
# This fix (copied from https://github.com/NixOS/nixpkgs/pull/76765) replaces the gem
# symlinks with directories, resolving this error when running rake:
# /nix/store/451rhxkggw53h7253izpbq55nrhs7iv0-mastodon-gems-3.0.1/lib/ruby/gems/2.6.0/gems/bundler-1.17.3/lib/bundler/settings.rb:6:in `<module:Bundler>': uninitialized constant Bundler::Settings (NameError)
postBuild = ''
for gem in "$out"/lib/ruby/gems/*/gems/*; do
cp -a "$gem/" "$gem.new"
rm "$gem"
# needed on macOS, otherwise the mv yields permission denied
chmod +w "$gem.new"
mv "$gem.new" "$gem"
done
'';
};
mastodonModules = stdenv.mkDerivation {
@ -96,7 +84,8 @@ stdenv.mkDerivation rec {
'';
};
propagatedBuildInputs = [ imagemagick ffmpeg file mastodonGems.wrappedRuby ];
propagatedBuildInputs = [ mastodonGems.wrappedRuby ];
nativeBuildInputs = [ brotli ];
buildInputs = [ mastodonGems nodejs-slim ];
buildPhase = ''

550
nixos/pkgs/glitch-soc/gemset.nix
View file

File diff suppressed because it is too large Load diff

8
nixos/pkgs/glitch-soc/source.nix
View file

@ -1,7 +1,7 @@
# This file was generated by pkgs.mastodon.updateScript.
{ fetchFromGitHub, applyPatches, patches ? [] }:
let
version = "0e562916cce3241d98bd10f04a6aa7419700605";
version = "bc39b3196db8c79719c5a6c920c780284b8266a";
in
(
applyPatches {
@ -9,10 +9,10 @@ in
owner = "glitch-soc";
repo = "mastodon";
rev = "v${version}";
hash = "sha256-fZH3zPEU5jnYFhLx8OKDNrvsSVT46Peu92L84Fg5YpQ=";
hash = "sha256-6ipYkF0PP3D15PD7vyN1cGqnxoBRrXEaRsrto7ZXej0=";
};
inherit patches;
patches = patches ++ [];
}) // {
inherit version;
yarnHash = "sha256-P7KswzsCusyiS4MxUFnC1HYMTQ6fLpIwd97AglCukIk=";
yarnHash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
}