aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.envrc1
-rw-r--r--modules/private/websites/tools/peertube/default.nix12
-rw-r--r--nix/sources.json12
m---------nixops/secrets0
-rw-r--r--shell.nix18
5 files changed, 29 insertions, 14 deletions
diff --git a/.envrc b/.envrc
index 9741a31..b4859fd 100644
--- a/.envrc
+++ b/.envrc
@@ -1,6 +1,7 @@
1# vim: filetype=bash 1# vim: filetype=bash
2export PASSWORD_STORE_DIR=$(expand_path nixops/secrets) 2export PASSWORD_STORE_DIR=$(expand_path nixops/secrets)
3export NIX_PATH=nixpkgs=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nixops".url') 3export NIX_PATH=nixpkgs=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nixops".url')
4NIX_PATH=$NIX_PATH:nixpkgs-nix=$(cat $(expand_path nix/sources.json) | jq -r '."nixpkgs-nix".url')
4 5
5export NIXOPS_ENV_LOADED=1 6export NIXOPS_ENV_LOADED=1
6 7
diff --git a/modules/private/websites/tools/peertube/default.nix b/modules/private/websites/tools/peertube/default.nix
index 9c5ef5a..d2cbe40 100644
--- a/modules/private/websites/tools/peertube/default.nix
+++ b/modules/private/websites/tools/peertube/default.nix
@@ -43,18 +43,6 @@ in {
43 socket: '${env.redis.socket}' 43 socket: '${env.redis.socket}'
44 auth: null 44 auth: null
45 db: ${env.redis.db} 45 db: ${env.redis.db}
46 auth:
47 local:
48 enabled: true
49 ldap:
50 enabled: true
51 ldap_only: false
52 url: ldaps://${env.ldap.host}/${env.ldap.base}
53 bind_dn: ${env.ldap.dn}
54 bind_password: ${env.ldap.password}
55 base: ${env.ldap.base}
56 mail_entry: "mail"
57 user_filter: "${env.ldap.filter}"
58 smtp: 46 smtp:
59 transport: sendmail 47 transport: sendmail
60 sendmail: '/run/wrappers/bin/sendmail' 48 sendmail: '/run/wrappers/bin/sendmail'
diff --git a/nix/sources.json b/nix/sources.json
index 854d6c8..3a8f016 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -105,6 +105,18 @@
105 "url": "https://github.com/NixOS/nixpkgs-channels/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz", 105 "url": "https://github.com/NixOS/nixpkgs-channels/archive/c59ea8b8a0e7f927e7291c14ea6cd1bd3a16ff38.tar.gz",
106 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" 106 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
107 }, 107 },
108 "nixpkgs-nix": {
109 "branch": "nixos-unstable",
110 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
111 "homepage": "https://github.com/NixOS/nixpkgs",
112 "owner": "NixOS",
113 "repo": "nixpkgs",
114 "rev": "891f607d5301d6730cb1f9dcf3618bcb1ab7f10e",
115 "sha256": "1cr39f0sbr0h5d83dv1q34mcpwnkwwbdk5fqlyqp2mnxghzwssng",
116 "type": "tarball",
117 "url": "https://github.com/NixOS/nixpkgs/archive/891f607d5301d6730cb1f9dcf3618bcb1ab7f10e.tar.gz",
118 "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
119 },
108 "nixpkgs-nixops": { 120 "nixpkgs-nixops": {
109 "branch": "nixos-unstable", 121 "branch": "nixos-unstable",
110 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to", 122 "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
diff --git a/nixops/secrets b/nixops/secrets
Subproject 00f59f49098d79f0839541fd379e8933e3ddf9d Subproject c16489e0bcb8785afa2b4c19d2c44e164ef4b7e
diff --git a/shell.nix b/shell.nix
index 93caa0b..3aa03a7 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,4 +1,18 @@
1{ pkgs ? import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); } }: 1{ pkgs ? import <nixpkgs> { overlays = builtins.attrValues (import ./overlays); },
2 pkgs-nix ? import <nixpkgs-nix> { overlays = builtins.attrValues (import ./overlays); }
3}:
4let
5 patchedNix = pkgs-nix.nixUnstable.overrideAttrs(old: {
6 patches = old.patches ++ [
7 # Fix the ETag bug. PR merged. Remove when updating to >= 20210125
8 # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750
9 (pkgs-nix.fetchpatch {
10 url = "https://patch-diff.githubusercontent.com/raw/NixOS/nix/pull/4470.diff";
11 sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4=";
12 })
13 ];
14 });
15in
2pkgs.mkShell { 16pkgs.mkShell {
3 buildInputs = [ pkgs.nixUnstable pkgs.morph pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ]; 17 buildInputs = [ patchedNix pkgs.morph pkgs.niv pkgs.pass pkgs.curl pkgs.shellcheck pkgs.jq pkgs.gnumake ];
4} 18}