derped/nixos
1
0
Fork 0
Code Releases Activity

Replaced 'builtins.readFile' with 'lib.fileContents'.

Browse source
This commit is contained in:
Kevin Baensch 2019-04-14 18:35:37 +02:00
parent a3929a8ec5
commit 097981466e
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/nix.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, lib, pkgs, ... }:
{ {
nix = { nix = {
@ -9,7 +9,7 @@
extraOptions = '' extraOptions = ''
build-timeout = 86400 # 24 hours build-timeout = 86400 # 24 hours
''; '';
binaryCachePublicKeys = [ (builtins.readFile /secret/hydra_cache.pub) ]; binaryCachePublicKeys = [ (lib.fileContents /secret/hydra_cache.pub) ];
trustedBinaryCaches = [ trustedBinaryCaches = [
"https://cache.nixos.org" "https://cache.nixos.org"
"https://cache.ophanim.de" "https://cache.ophanim.de"

3
configuration.nix
View file

@ -2,9 +2,8 @@
with lib; with lib;
# hint: use 'echo -n' so there is no newline char in the hostName file
let let
machinePath = (builtins.toPath ("/etc/nixos/machines/" + (builtins.readFile /secret/hostName))); machinePath = (builtins.toPath ("/etc/nixos/machines/" + (fileContents /secret/hostName)));
machineConf = machinePath + "/configuration.nix"; machineConf = machinePath + "/configuration.nix";
machineOpts = machinePath + "/options.nix"; machineOpts = machinePath + "/options.nix";
in { in {

2
services/mailserver.nix
View file

@ -9,7 +9,7 @@ mkIf (elem "mailserver" config.machine.services) {
domains = [ config.machine.domain ]; domains = [ config.machine.domain ];
loginAccounts = { loginAccounts = {
"derped@${config.machine.domain}" = { "derped@${config.machine.domain}" = {
hashedPassword = (builtins.readFile /secret/derped.mail); hashedPassword = (fileContents /secret/derped.mail);
}; };
}; };
# Use Let's Encrypt certificates. Note that this needs to set up a stripped # Use Let's Encrypt certificates. Note that this needs to set up a stripped

2
services/mariaDB.nix
View file

@ -3,7 +3,7 @@
with lib; with lib;
let let
giteapwd = if config.services.gitea.enable then (builtins.readFile /secret/gitea) else ""; giteapwd = if config.services.gitea.enable then (fileContents /secret/gitea) else "";
in mkIf (elem "mariaDB" config.machine.services) { in mkIf (elem "mariaDB" config.machine.services) {
services.mysql = { services.mysql = {
enable = true; enable = true;