aynish/sincerity.network
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

changes to hopefully make things work

Browse source
This commit is contained in:
Infra 2022-10-03 04:45:56 +00:00
parent 107e15f728
commit 577f1a83de
5 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -60,7 +60,7 @@
modules = (builtins.attrValues nixosModules) ++ [ modules = (builtins.attrValues nixosModules) ++ [
# > Our main nixos configuration file < # > Our main nixos configuration file <
./nixos/configuration.nix ./nixos/configuration.nix
# bonfire.nixosModules.bonfire bonfire.nixosModules.bonfire
]; ];
}; };
test = nixpkgs.lib.nixosSystem { test = nixpkgs.lib.nixosSystem {

7
nixos/book-stack.nix
View file

@ -3,8 +3,9 @@
{ {
services.bookstack = { services.bookstack = {
enable = true; enable = true;
hostname = "wiki.mutualaid.work"; hostname = "wiki.sincerity.network";
# appKeyFile = "/run/secrets/bookstack-app-key"; # appKeyFile = "/run/secrets/bookstack-app-key";
appKeyFile = "/home/infra/app-key-file"; # TODO use agenix
nginx = { nginx = {
serverName = "wiki.mutualaid.work"; serverName = "wiki.mutualaid.work";
listenAddresses = [ "0.0.0.0" ]; listenAddresses = [ "0.0.0.0" ];
@ -15,9 +16,9 @@
# Probably will need more configuration and testing # Probably will need more configuration and testing
# mail = { # mail = {
# host = "migadu.com"; # host = "migadu.com";
# user = "infra@mutualaid.work"; # user = "infra@sincerity.network";
# port = ???; # port = ???;
# from = "bookstack@mutualaid.work"; # from = "bookstack@sincerity.network";
# driver = "smtp"; # driver = "smtp";
# }; # };
}; };

11
nixos/configuration.nix
View file

@ -8,7 +8,8 @@
./hardware-configuration.nix ./hardware-configuration.nix
./vault-warden.nix ./vault-warden.nix
./book-stack.nix ./book-stack.nix
# ./bonfire.nix ./bonfire.nix
./mumble.nix
]; ];
nix = { nix = {
@ -19,9 +20,7 @@
# This will additionally add your inputs to the system's legacy channels # This will additionally add your inputs to the system's legacy channels
# Making legacy nix commands consistent as well, awesome! # Making legacy nix commands consistent as well, awesome!
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
};
nix = {
settings = { settings = {
# Enable flakes and new 'nix' command # Enable flakes and new 'nix' command
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";
@ -30,6 +29,11 @@
}; };
}; };
environment.systemPackages = [
git
vim
];
# Remove if you wish to disable unfree packages for your system # Remove if you wish to disable unfree packages for your system
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@ -44,6 +48,7 @@
extraGroups = [ "wheel" ]; extraGroups = [ "wheel" ];
}; };
}; };
security.sudo.wheelNeedsPassword = false;
# This setups a SSH server. Very important if you're setting up a headless system. # This setups a SSH server. Very important if you're setting up a headless system.
# Feel free to remove if you don't need it. # Feel free to remove if you don't need it.

18
nixos/mumble.nix Normal file
View file

@ -0,0 +1,18 @@
{pkgs, ... }:
{
services.murmur = {
enable = true;
hostname = "talk.sincerity.network";
registerHostname = "talk.sincerity.network";
registerUrl = "talk.sincerity.network";
registerName = "Sincerity Network Mumble";
};
services.nginx = {
enable = true;
useACME = true;
forceSSL = true;
virtualHosts."talk.sincerity.network".proxyPass = "http://localhost:64738/";
};
}

2
nixos/vault-warden.nix
View file

@ -4,7 +4,7 @@
services.vaultwarden = { services.vaultwarden = {
enable = true; enable = true;
config = { config = {
domain = "https://vault.mutualaid.work:8443"; domain = "https://vault.sincerity.network:8443";
signupsAllowed = false; signupsAllowed = false;
rocketPort = 8222; rocketPort = 8222;
rocketLog = "critical"; rocketLog = "critical";