wurzel/fruitbasket
9
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

updating flake and pinning to 22.05

Browse source
This commit is contained in:
revol-xut 2022-11-18 17:51:09 +01:00
parent ba27089255
commit 231d82029d
No known key found for this signature in database
GPG key ID: 4F56FF7759627D07
5 changed files with 114 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -1,5 +1,6 @@
{ {
inputs = { inputs = {
nixpkgs.url = github:nixpkgs/nixos/nixos-22.05;
sops-nix.url = github:Mic92/sops-nix; sops-nix.url = github:Mic92/sops-nix;
sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs.follows = "nixpkgs";
fsr-infoscreen.url = github:fsr/infoscreen; fsr-infoscreen.url = github:fsr/infoscreen;

4
modules/nextcloud.nix
View file

@ -61,7 +61,7 @@ in
# ensure that postgres is running *before* running the setup # ensure that postgres is running *before* running the setup
systemd.services."nextcloud-setup" = { systemd.services."nextcloud-setup" = {
requires = ["postgresql.service"]; requires = [ "postgresql.service" ];
after = ["postgresql.service"]; after = [ "postgresql.service" ];
}; };
} }

11
modules/stream.nix
View file

@ -1,20 +1,23 @@
{pkgs, lib, config, ...}: { pkgs, lib, config, ... }:
let let
website = pkgs.fetchgit { website = pkgs.fetchgit {
url = "ssh+git://git@github.com:fsr/fruitbasket.git"; url = "ssh+git://git@github.com:fsr/fruitbasket.git";
rev = "1b380f3bfd48aae2a17aefbbdd0538f09b7d3bcf"; rev = "1b380f3bfd48aae2a17aefbbdd0538f09b7d3bcf";
sha256 = ""; sha256 = "";
}; };
in { in
{
services = { services = {
nginx = { nginx = {
virtualHosts = { virtualHosts = {
"stream.ifsr.de" = { "stream.ifsr.de" = {
enableACME = true; enableACME = true;
forceSSL = true; forceSSL = true;
locations."/" = let locations."/" =
let
cfg = config.services.owncast; cfg = config.services.owncast;
in { in
{
proxyPass = "http://${toString cfg.listen}:${toString cfg.port}"; proxyPass = "http://${toString cfg.listen}:${toString cfg.port}";
proxyWebsockets = true; proxyWebsockets = true;
}; };

16
modules/wiki.nix
View file

@ -6,7 +6,7 @@
"mediawiki/ldapprovider".owner = config.users.users.mediawiki.name; "mediawiki/ldapprovider".owner = config.users.users.mediawiki.name;
}; };
# users.users.mediawiki.extraGroups = [ "postgres" ]; # users.users.mediawiki.extraGroups = [ "postgres" ];
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
final.config.systemd.services.mediawiki-init.script = '' final.config.systemd.services.mediawiki-init.script = ''
@ -21,7 +21,7 @@
passwordFile = config.sops.secrets."mediawiki/initial_admin".path; passwordFile = config.sops.secrets."mediawiki/initial_admin".path;
database = { database = {
type = "postgres"; type = "postgres";
# socket = "/run/postgresql"; # socket = "/run/postgresql";
user = "mediawiki"; user = "mediawiki";
name = "mediawiki"; name = "mediawiki";
host = "localhost"; host = "localhost";
@ -29,12 +29,12 @@
passwordFile = config.sops.secrets."mediawiki/postgres".path; passwordFile = config.sops.secrets."mediawiki/postgres".path;
}; };
# virtualHost = { # virtualHost = {
# hostName = "wiki.quitte.tassilo-tanneberger.de"; # hostName = "wiki.quitte.tassilo-tanneberger.de";
# adminAddr = "root@ifsr.de"; # adminAddr = "root@ifsr.de";
# forceSSL = true; # forceSSL = true;
# enableACME = true; # enableACME = true;
# }; # };
virtualHost = { virtualHost = {
hostName = "wiki.quitte.tassilo-tanneberger.de"; hostName = "wiki.quitte.tassilo-tanneberger.de";