diff options
| author | lassulus <lass@aidsballs.de> | 2016-02-01 15:19:04 +0100 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-02-01 15:19:04 +0100 |
| commit | b7e2a64c3205a36b850dd1990146e0aeab5dbf5e (patch) | |
| tree | 1434c93427bee20fb515168c6a2705eb04aa2970 /makefu/2configs | |
| parent | 72dc2dd7fa54c77e08052efed21f68758fa533a2 (diff) | |
| parent | b38a821c31de84af6567073bd65ac76c5fc02b5d (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'makefu/2configs')
| -rw-r--r-- | makefu/2configs/git/cgit-retiolum.nix | 3 | ||||
| -rw-r--r-- | makefu/2configs/tinc-basic-retiolum.nix | 1 | ||||
| -rw-r--r-- | makefu/2configs/urlwatch.nix | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/makefu/2configs/git/cgit-retiolum.nix b/makefu/2configs/git/cgit-retiolum.nix index 35bb169cf..7d85eb8d1 100644 --- a/makefu/2configs/git/cgit-retiolum.nix +++ b/makefu/2configs/git/cgit-retiolum.nix @@ -16,6 +16,9 @@ let desc = "Tinc Advanced Graph Generation"; }; cac = { }; + init-stockholm = { + desc = "Init stuff for stockholm"; + }; }; priv-repos = mapAttrs make-priv-repo { diff --git a/makefu/2configs/tinc-basic-retiolum.nix b/makefu/2configs/tinc-basic-retiolum.nix index 2abf4f188..f49c596fc 100644 --- a/makefu/2configs/tinc-basic-retiolum.nix +++ b/makefu/2configs/tinc-basic-retiolum.nix @@ -4,7 +4,6 @@ with lib; { krebs.retiolum = { enable = true; - hosts = ../../krebs/Zhosts; connectTo = [ "gum" "pigstarter" diff --git a/makefu/2configs/urlwatch.nix b/makefu/2configs/urlwatch.nix index a83279ba2..f869f5a78 100644 --- a/makefu/2configs/urlwatch.nix +++ b/makefu/2configs/urlwatch.nix @@ -29,6 +29,7 @@ https://pypi.python.org/simple/bepasty/ https://pypi.python.org/simple/xstatic/ http://guest:derpi@cvs2svn.tigris.org/svn/cvs2svn/tags/ + http://ftp.debian.org/debian/pool/main/a/apt-cacher-ng/ ]; }; } |