Merge branch 'master' of github.com:gcrofils/asimov-remote

gcrofils · Nov 22, 2011 · 8bd777e · 8bd777e
2 parents 3413915 + 8773582
commit 8bd777e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/etc/named/conf/common/2bu.ro.dns b/etc/named/conf/common/2bu.ro.dns
@@ -18,7 +18,7 @@ $include "common/cname_base.dns";
 ;# Reminder : Http Proxy needs to be changed
 ;# in common/a_proxy.dns
 
-cloudy-storm-2        	IN      A     	175.41.255.24		; EC2 AP-NorthEast
+
 cloudy-storm-3        	IN      A     	175.41.255.24		; EC2 AP-NorthEast
 
 ;# others
@@ -28,7 +28,7 @@ heavy-waterfall-3	      IN	A	122.248.253.86		; EC2 AP-SouthEast
 ;crispy-nuts-1         	IN  A 175.41.255.66 		; EC2 AP-NorthEast STOPPED 18/10/2011
 dirty-caffeine-4      	IN  A 79.125.123.65		; EC2 Europe
 clumsy-burst-1		      IN	A	46.137.85.114		; EC2 Europe
-geeky-cloud-2		        IN	A	50.18.63.110		; EC2 US-West
+geeky-cloud-3		        IN	A	50.18.63.110		; EC2 US-West
 heroic-mosquito-2	      IN	A	50.18.176.201		; EC2 US-West
 
 ;######################
@@ -41,7 +41,8 @@ heroic-mosquito-2	      IN	A	50.18.176.201		; EC2 US-West
 
 ap-northeast        	IN     CNAME       cloudy-storm-3
 ;#ap-southeast        	IN     CNAME       funky-pizza-2 ; STOPPED 18/10/2011
-us-west             	IN     CNAME       heroic-mosquito-2
+;#us-west             	IN     CNAME       heroic-mosquito-2 ; STOPPED 18/11/2011
+
 
 ;# Services
 

diff --git a/etc/named/conf/common/mx_hostnames_caffeine.dns b/etc/named/conf/common/mx_hostnames_caffeine.dns
@@ -1,11 +1,10 @@
-cloudy-storm-1        	IN	MX	1	caffeine.2bu.ro.
-cloudy-storm-2        	IN	MX	1	caffeine.2bu.ro.
-;funky-pizza-2		        IN	MX	1	caffeine.2bu.ro.
-heavy-waterfall-1	      IN	MX	1	caffeine.2bu.ro.
-heavy-waterfall-2	      IN	MX	1	caffeine.2bu.ro.
+;funky-pizza-2		      IN	MX	1	caffeine.2bu.ro.
+cloudy-storm-3         	IN	MX	1	caffeine.2bu.ro.
 ;crispy-nuts-1         	IN	MX	1	caffeine.2bu.ro.
-dirty-caffeine-3      	IN	MX	1	caffeine.2bu.ro.
+dirty-caffeine-4      	IN	MX	1	caffeine.2bu.ro.
+geeky-cloud-3	          IN	MX	1	caffeine.2bu.ro.
+heavy-waterfall-3	      IN	MX	1	caffeine.2bu.ro.
+heroic-mosquito-2       IN	MX	1	caffeine.2bu.ro.
 clumsy-burst-1		      IN	MX	1	caffeine.2bu.ro.
-geeky-cloud-1		        IN	MX	1	caffeine.2bu.ro.
-heroic-mosquito-1	      IN	MX	1	caffeine.2bu.ro.
+
 
diff --git a/etc/named/conf/common/soa.dns b/etc/named/conf/common/soa.dns
@@ -1,6 +1,6 @@
 $TTL 21600
 @     IN     SOA    dns.2bu.ro.     hostmaster (
-                    2011112001 ; serial
+                    2011112201 ; serial
                     21600      ; refresh after 6 hours
                     3600       ; retry after 1 hour
                     604800     ; expire after 1 week