Merge branch 'kenobi' into 'newinfra'
Pads and PrivateBin on new infra See merge request nounous/ansible!96certbot_on_virtu
						commit
						1e4a77891c
					
				| 
						 | 
				
			
			@ -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}
 | 
			
		||||
    #
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue