In xvm-devconfig and xvm-prodconfig:

   * Make adminacl a global setting.
   * Use a common value for the various contact fields.

svn path=/trunk/packages/xvm-devconfig/; revision=2216

diff --git a/debian/changelog b/debian/changelog
index 151f25d..3c99c97 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xvm-devconfig (0.30) unstable; urgency=low
+
+  * Make adminacl a global setting.
+  * Use a common value for the various contact fields.
+
+ -- Evan Broder <broder@mit.edu>  Fri, 27 Feb 2009 15:45:34 -0500
+

 xvm-devconfig (0.29) unstable; urgency=low
 
   * Act authoritative for {1,2}.181.18.in-addr.arpa
 xvm-devconfig (0.29) unstable; urgency=low
 
   * Act authoritative for {1,2}.181.18.in-addr.arpa

diff --git a/master.yaml b/master.yaml
index ebc31b1..55cfc62 100644 (file)
--- a/master.yaml
+++ b/master.yaml
@@ -1,3 +1,6 @@
+contact: &contact xvm@mit.edu
+adminacl: system:xvm
+

 kerberos:
  realm: ATHENA.MIT.EDU
 
 kerberos:
  realm: ATHENA.MIT.EDU
 

@@ -32,7 +35,7 @@ remote:
  ip: 18.181.0.231
 
 dns:
  ip: 18.181.0.231
 
 dns:

- contact: xvm@mit.edu
+ contact: *contact

  domains:  # first one is advertised
   - dev.xvm.mit.edu
   - 2.181.18.in-addr.arpa
  domains:  # first one is advertised
   - dev.xvm.mit.edu
   - 2.181.18.in-addr.arpa

@@ -59,8 +62,7 @@ xen:
 web:
  baseuri: https://xvm-dev.mit.edu/
  hostname: xvm-dev.mit.edu
 web:
  baseuri: https://xvm-dev.mit.edu/
  hostname: xvm-dev.mit.edu

- errormail: xvm@mit.edu
- adminacl: system:xvm
+ errormail: *contact

  errormail_exclude:
   - price
   - ecprice
  errormail_exclude:
   - price
   - ecprice