updating flake and pinning to 22.05

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

View file

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

View file

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

View file

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

View file

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