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-prodconfig/; revision=2216

diff --git a/debian/changelog b/debian/changelog
index 3a9aadb..75577f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xvm-prodconfig (1.1.12) 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:46 -0500
+

 xvm-prodconfig (1.1.11) unstable; urgency=low
 
   * Add 2.181.18.in-addr.arpa to the list of domains we are authoritative for
 xvm-prodconfig (1.1.11) unstable; urgency=low
 
   * Add 2.181.18.in-addr.arpa to the list of domains we are authoritative for

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

 apt:
  keyid: 35AE3C4F
 
 apt:
  keyid: 35AE3C4F
 

@@ -31,7 +34,7 @@ dhcp:
  search_domain: mit.edu
 
 dns:
  search_domain: mit.edu
 
 dns:

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

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

@@ -76,8 +79,7 @@ vnc:
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu
 web:
  baseuri: https://xvm.mit.edu/
  hostname: xvm.mit.edu

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

  errormail_exclude:
   - broder
   - price
  errormail_exclude:
   - broder
   - price