Commit 1e4a7789 authored by Maxime Bombar's avatar Maxime Bombar

Merge branch 'kenobi' into 'newinfra'

Pads and PrivateBin on new infra

See merge request !96
parents 78833313 1034d316
......@@ -52,6 +52,8 @@ nginx:
- {from: phabricator.crans.org, to: 172.16.10.116}
- {from: trackerusercontent.crans.org, to: 172.16.10.116}
- {from: wiki.crans.org, to: 172.16.10.161}
- {from: pad.crans.org, to: "172.16.10.130:9001"}
- {from: zero.crans.org, to: 172.16.10.130}
- {from: ethercalc.crans.org, to: "172.16.10.133:8000"}
# - {from: mailman.crans.org, to: 10.231.136.180}
#
......
......@@ -99,6 +99,7 @@ kiwi.adm.crans.org
tracker.adm.crans.org
jitsi.adm.crans.org
ethercalc-srv.adm.crans.org
kenobi.adm.crans.org
[ovh_physical]
sputnik.adm.crans.org
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment