pub-solar/infra
6
1
Fork 3
Code Issues 25 Pull requests 11 Actions Packages Projects 1 Releases Wiki Activity

feat: pull in forgejo + mastodon updates early #64

Merged
teutat3s merged 3 commits from feat/early-forgejo-mastodon-updates into main 2023-11-18 22:13:06 +00:00
Conversation 0 Commits 3 Files changed 5 +11 -6
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 37176a52ce - Show all commits

7
hosts/nachtigall/apps/mastodon.nix
View file

@ -40,10 +40,9 @@
# Different from WEB_DOMAIN in our case # Different from WEB_DOMAIN in our case
localDomain = "pub.solar"; localDomain = "pub.solar";
enableUnixSocket = true; enableUnixSocket = true;
# Processes used by the mastodon-streaming service. Defaults to the number # Number of processes used by the mastodon-streaming service
# of CPU cores minus one # Recommended is the amount of your CPU cores minus one
# This is without affect until this comment is addressed # On our current 8-Core system, let's start with 5 for now
# https://github.com/NixOS/nixpkgs/pull/251950#issuecomment-1732568492
streamingProcesses = 5; streamingProcesses = 5;
# Processes used by the mastodon-web service # Processes used by the mastodon-web service
webProcesses = 2; webProcesses = 2;

8
hosts/nachtigall/default.nix
View file

@ -1,4 +1,4 @@
{ ... }: { flake, ... }:
{ {
imports = imports =
@ -28,5 +28,11 @@
./apps/matrix/mautrix-telegram.nix ./apps/matrix/mautrix-telegram.nix
./apps/matrix/synapse.nix ./apps/matrix/synapse.nix
./apps/nginx-matrix.nix ./apps/nginx-matrix.nix
"${flake.inputs.unstable}/nixos/modules/services/web-apps/mastodon.nix"
];
disabledModules = [
"services/web-apps/mastodon.nix"
]; ];
} }

2
overlays/default.nix
View file

@ -8,7 +8,7 @@
overlays = ({ ... }: { overlays = ({ ... }: {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
mastodon = inputs.mastodon-fork.legacyPackages.${prev.system}.mastodon; mastodon = inputs.unstable.legacyPackages.${prev.system}.mastodon;
forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo; forgejo = inputs.unstable.legacyPackages.${prev.system}.forgejo;
forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner; forgejo-actions-runner = inputs.unstable.legacyPackages.${prev.system}.forgejo-actions-runner;