diff options
| author | jeschli <jeschli@gmail.com> | 2018-07-31 16:33:33 +0200 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-07-31 16:33:33 +0200 |
| commit | 676f5668de1f15b9297dd5ca36385cbfc0f33d87 (patch) | |
| tree | 132a46ddc2a1863ebe58ab3bdf56c9a06cefab91 /lass/2configs/dcso-dev.nix | |
| parent | d34cfa4cc8953ee227f99a36d56ec9335cba532e (diff) | |
| parent | 46e725b6ee1259ad8a0d33f9ffbda6fd1dc2228d (diff) | |
Merge remote-tracking branch 'origin/staging/jeschli'
Diffstat (limited to 'lass/2configs/dcso-dev.nix')
| -rw-r--r-- | lass/2configs/dcso-dev.nix | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lass/2configs/dcso-dev.nix b/lass/2configs/dcso-dev.nix index 0996d21c1..4d8d308fb 100644 --- a/lass/2configs/dcso-dev.nix +++ b/lass/2configs/dcso-dev.nix @@ -17,6 +17,7 @@ in { openssh.authorizedKeys.keys = [ config.krebs.users.lass.pubkey config.krebs.users.lass-android.pubkey + config.krebs.users.lass-mors.pubkey config.krebs.users.jeschli-bln.pubkey config.krebs.users.jeschli-brauerei.pubkey "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1T5+2epslFARSnETdr4wdolA6ocJaD4H9tmz6BZFQKXlwIq+OMp+sSEdwYwW3Lu9+mNbBHPxVVJDWg/We9DXB0ezXPM5Bs1+FcehmkoGwkmgKaFCDt0sL+CfSnog/3wEkN21O/rQxVFqMmiJ7WUDGci6IKCFZ5ZjOsmmfHg5p3LYxU9xv33fNr2v+XauhrGbFtQ7eDz4kSywxN/aw73LN4d8em0V0UV8VPI3Qkw7MamDFwefA+K1TfK8pBzMeruU6N7HLuNkpkAp7kS+K4Zzd72aQtR37a5qMiFUbOxQ9B7iFypuPx0iu6ZwY1s/sM8t3kLmcDJ9O4FOTzlbpneet3as6iJ+Ckr/TlfKor2Tl5pWcXh2FXHoG8VUu5bYmIViJBrKihAlAQfQN0mJ9fdFTnCXVTtbYTy11s4eEVHgUlb7oSpgBnx5bnBONgApbsOX9zyoo8wz8KkZBcf1SQpkV5br8uUAHCcZtHuY6I3kKlv+8lJmgUipiYzMdTi7+dHa49gVEcEKL4ZnJ0msQkl4XT7JjKETLvumC4/TIqVuRu48wuYalkCR9OzxCsTXQ/msBJBztPdYLrEOXVb2HfzuCT+43UuMQ5rP/EoPy0TWQO9BaqfEXqvbOvWjVxj/GMvglQ2ChZTwHxwwTKB8qRVvJLnbZQwizQiSrkzjb6hRJfQ== u0_a165@localhost" @@ -63,4 +64,12 @@ in { networking.interfaces.et0.ipv4.addresses = [ { address = "10.99.23.1"; prefixLength = 24; } ]; + virtualisation.docker.enable = true; + environment.etc."docker/daemon.json".source = pkgs.writeText "daemon.json" '' + { + "bip": "172.25.0.1/16" + } + ''; + services.rabbitmq.enable = true; + services.postgresql.enable = true; } |