projects
/
invirt/packages/xvm-prodconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Split the tagger name and e-mail out into separate fields.
[invirt/packages/xvm-prodconfig.git]
/
master.yaml
diff --git
a/master.yaml
b/master.yaml
index
0d8c298
..
cc564a7
100644
(file)
--- a/
master.yaml
+++ b/
master.yaml
@@
-1,13
+1,17
@@
+contact: &contact xvm@mit.edu
+adminacl: &adminacl system:xvm-root
+priv_contact: &priv_contact xvm-root@mit.edu
+
apt:
keyid: 35AE3C4F
apt:
keyid: 35AE3C4F
-authn:
- - type: kerberos
- realm: ATHENA.MIT.EDU
-
authz:
- type: afs
cell: athena.mit.edu
authz:
- type: afs
cell: athena.mit.edu
+ auth: yes
+ - type: afs
+ cell: sipb.mit.edu
+ auth: yes
console:
hostname: xvm-console.mit.edu
console:
hostname: xvm-console.mit.edu
@@
-31,15
+35,28
@@
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
domains: # first one is advertised
- xvm.mit.edu
+ - 2.181.18.in-addr.arpa
nameservers:
- hostname: xvm.mit.edu
ip: 18.181.0.62
zone_files:
- /etc/invirt/zone
nameservers:
- hostname: xvm.mit.edu
ip: 18.181.0.62
zone_files:
- /etc/invirt/zone
+git:
+ branches:
+ prod:
+ acl: *adminacl
+ component: stable
+ dev:
+ acl: system:xvm-dev
+ component: unstable
+ tagger:
+ name: Invirt Build Server
+ email: invirt@mit.edu
+
hosts: # hosts on which VMs run
- hostname: citadel-station.mit.edu
ip: 18.181.0.221
hosts: # hosts on which VMs run
- hostname: citadel-station.mit.edu
ip: 18.181.0.221
@@
-50,6
+67,12
@@
hosts: # hosts on which VMs run
- hostname: arklay-mansion.mit.edu
ip: 18.181.0.224
- hostname: arklay-mansion.mit.edu
ip: 18.181.0.224
+kerberos:
+ realm: ATHENA.MIT.EDU
+
+mail:
+ forward: *priv_contact
+
monitoring:
- hostname: syn.mit.edu
ip: 18.181.0.65
monitoring:
- hostname: syn.mit.edu
ip: 18.181.0.65
@@
-72,8
+95,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
@@
-81,3
+103,7
@@
web:
- andersk
- quentin
- hartmans
- andersk
- quentin
- hartmans
+
+xen:
+ network:
+ iface: eth2