diff options
Diffstat (limited to 'krebs/3modules')
| -rw-r--r-- | krebs/3modules/repo-sync.nix | 40 | ||||
| -rw-r--r-- | krebs/3modules/rtorrent.nix | 1 |
2 files changed, 34 insertions, 7 deletions
diff --git a/krebs/3modules/repo-sync.nix b/krebs/3modules/repo-sync.nix index 0317d1eca..bcd9da5ea 100644 --- a/krebs/3modules/repo-sync.nix +++ b/krebs/3modules/repo-sync.nix @@ -17,29 +17,57 @@ let # see `repo-sync --help` # `ref` provides sane defaults and can be omitted + # you can have multiple repo-sync groups and therefore multiple @latest + # configuration entries. # attrset will be converted to json and be used as config - { repo = { + # each attrset defines a group of repos for syncing + + { nxpkgs = { makefu = { origin = { - url = http://github.com/makefu/repo ; + url = http://github.com/makefu/nixpkgs; ref = "heads/dev" ; }; mirror = { - url = "git@internal:mirror" ; + url = "git@internal:nixpkgs-mirror" ; ref = "heads/github-mirror-dev" ; }; }; lass = { origin = { - url = http://github.com/lass/repo ; + url = http://github.com/lass/nixpkgs; + }; + mirror = { + url = "git@internal:nixpkgs-mirror" ; + }; + }; + "@latest" = { + mirror = { + url = "git@internal:nixpkgs-mirror"; + ref = "heads/master"; + }; + }; + }; + stockholm = { + lass = { + origin = { + url = http://cgit.prism.r/stockholm; + }; + mirror = { + url = "git@internal:stockholm-mirror" ; + }; + }; + makefu = { + origin = { + url = http://gum.krebsco.de/stockholm; }; mirror = { - url = "git@internal:mirror" ; + url = "git@internal:stockholm-mirror" ; }; }; "@latest" = { mirror = { - url = "git@internal:mirror"; + url = "git@internal:stockholm-mirror"; ref = "heads/master"; }; }; diff --git a/krebs/3modules/rtorrent.nix b/krebs/3modules/rtorrent.nix index 57a579bc0..d53482339 100644 --- a/krebs/3modules/rtorrent.nix +++ b/krebs/3modules/rtorrent.nix @@ -336,7 +336,6 @@ let pm.min_spare_servers = 1 pm.max_spare_servers = 3 chdir = / - # errors to journal php_admin_value[error_log] = 'stderr' php_admin_flag[log_errors] = on catch_workers_output = yes |