Reconfigure prod as the production cluster!

svn path=/trunk/packages/xvm-prodconfig/; revision=1643

diff --git a/debian/changelog b/debian/changelog
index 145b5cd..09962c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-prodconfig (1.0.0) unstable; urgency=low
+
+  * Prod launch!
+
+ -- Evan Broder <broder@mit.edu>  Fri, 14 Nov 2008 14:34:50 -0500
+

 xvm-prodconfig (0.21) unstable; urgency=low
 
   * Add the two remaining hosts - we can comment them out on
 xvm-prodconfig (0.21) unstable; urgency=low
 
   * Add the two remaining hosts - we can comment them out on

diff --git a/master.yaml b/master.yaml
index 2114b4e..c45f2c3 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -20,24 +20,24 @@ apt:
  keyid: 35AE3C4F
 
 db:
  keyid: 35AE3C4F
 
 db:

- uri: postgres://invirt@xvm-dev.mit.edu/invirt
- host: xvm-dev.mit.edu
- ip: 18.181.0.80
+ uri: postgres://invirt@xvm.mit.edu/invirt
+ host: xvm.mit.edu
+ ip: 18.181.0.62

  port: 5432
  user: invirt
  dbname: invirt
 
 remote:
  port: 5432
  user: invirt
  dbname: invirt
 
 remote:

- hostname: xvm-remote-dev.mit.edu
- ip: 18.181.0.231
+ hostname: xvm-remote.mit.edu
+ ip: 18.181.0.188

 
 dns:
  contact: xvm@mit.edu
  domains: # first one is advertised
 
 dns:
  contact: xvm@mit.edu
  domains: # first one is advertised

-  - prod.xvm.mit.edu
+  - xvm.mit.edu

  nameservers:
  nameservers:

-  - hostname: xvm-dev.mit.edu
-    ip: 18.181.0.80
+  - hostname: xvm.mit.edu
+    ip: 18.181.0.62

  zone_files:
   - /etc/invirt/zone
 
  zone_files:
   - /etc/invirt/zone
 

@@ -51,27 +51,29 @@ dhcp:
  search_domain: mit.edu
 
 web:
  search_domain: mit.edu
 
 web:

- baseuri: https://xvm-dev.mit.edu/
- hostname: xvm-dev.mit.edu
+ baseuri: https://xvm.mit.edu/
+ hostname: xvm.mit.edu

  errormail: xvm@mit.edu
  adminacl: system:xvm-webacl
  errormail_exclude:
  errormail: xvm@mit.edu
  adminacl: system:xvm-webacl
  errormail_exclude:

-  - '*'
+  - broder

   - price
   - ecprice
   - andersk
   - price
   - ecprice
   - andersk

+  - quentin
+  - hartmans

 
 console:
 
 console:

- hostname: xvm-console-dev.mit.edu
- ip: 18.181.0.230
+ hostname: xvm-console.mit.edu
+ ip: 18.181.0.134

 
 svn:
  repopath: /afs/sipb.mit.edu/project/xvm/svn
 
 svn:
  repopath: /afs/sipb.mit.edu/project/xvm/svn

- uri: https://xvm-dev.mit.edu:1111
+ uri: https://xvm.mit.edu:1111

 
 trac:
  uri: https://xvm.mit.edu/trac/wiki
 
 vnc:
  base_port: 10003
 
 trac:
  uri: https://xvm.mit.edu/trac/wiki
 
 vnc:
  base_port: 10003

- proxy_ip: 18.181.0.80
+ proxy_ip: 18.181.0.62

diff --git a/zone b/zone
index ecdd69c..9c4aa20 100644 (file)
--- a/zone
+++ b/zone
@@ -1,4 +1,4 @@
-@       900     IN      SOA     xvm-dev.mit.edu. xvm.mit.edu. (
+@       900     IN      SOA     xvm.mit.edu. xvm.mit.edu. (

         2
         1d
         1d
         2
         1d
         1d

@@ -7,10 +7,11 @@
         )
 
 ; Our services
         )
 
 ; Our services

+ns1             IN      A       18.181.0.62

 remote          IN      TXT     "reserved to prevent confusion with an XVM server"
 console         IN      TXT     "reserved to prevent confusion with an XVM server"
 remote          IN      TXT     "reserved to prevent confusion with an XVM server"
 console         IN      TXT     "reserved to prevent confusion with an XVM server"

-dev             IN      TXT     "reserved for the XVM development cluster"

 prod            IN      TXT     "reserved for the XVM production cluster"
 prod            IN      TXT     "reserved for the XVM production cluster"

+dev             IN      NS      xvm-dev.mit.edu.

 
 localhost       IN      TXT     "reserved to prevent confusion with your own computer"
 localdomain     IN      TXT     "reserved to prevent confusion with your own computer"
 
 localhost       IN      TXT     "reserved to prevent confusion with your own computer"
 localdomain     IN      TXT     "reserved to prevent confusion with your own computer"