Mic92/stockholm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'gum/master'

Browse Source
This commit is contained in:
lassulus 2017-06-18 14:09:14 +02:00
commit 3c09becf47
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
krebs/3modules/tinc_graphs.nix
View File

@ -48,7 +48,7 @@ let
external domainname to be used for anonymous graphs
it will be used if you want to enable ACME
'';
default = "graphs.krebsco.de";
default = "graph.krebsco.de";
};
complete = mkOption {

10
shared/1systems/wolf.nix
View File

@ -15,6 +15,7 @@ in
../2configs/repo-sync.nix
../2configs/shared-buildbot.nix
../2configs/shack/worlddomination.nix
../2configs/shack/drivedroid.nix
# ../2configs/shack/nix-cacher.nix
../2configs/shack/mqtt_sub.nix
@ -90,6 +91,15 @@ in
swapDevices = [
{ device = "/dev/disk/by-label/swap"; }
];
# fallout of ipv6calypse
networking.extraHosts = ''
hass.shack 10.42.2.191
heidi.shack 10.42.2.135
'';
users.extraUsers.root.openssh.authorizedKeys.keys = [
config.krebs.users.ulrich.pubkey
];
time.timeZone = "Europe/Berlin";
sound.enable = false;

6
shared/2configs/shack/worlddomination.nix
View File

@ -26,11 +26,11 @@ let
};
};
pkg = pkgs.stdenv.mkDerivation {
name = "worlddomination-2017-06-08";
name = "worlddomination-2017-06-10";
src = pkgs.fetchgit {
url = "https://github.com/shackspace/worlddomination/";
rev = "39344a4";
sha256 = "07alvdgz1vyww6nlay4qx4l7hnfqw0sqcdd9syhsjhqv3ciigwcp";
rev = "72fc9b5";
sha256 = "05h500rswzypcxy4i22qc1vkc8izbzfqa9m86xg289hjxh133xyf";
};
buildInputs = [
(pkgs.python3.withPackages (pythonPackages: with pythonPackages; [