Index: trunk/packages/hvirt-config/common/etc/apt/sources.list.d/backports.list =================================================================== --- trunk/packages/hvirt-config/common/etc/apt/sources.list.d/backports.list (revision 2888) +++ trunk/packages/hvirt-config/common/etc/apt/sources.list.d/backports.list (revision 2888) @@ -0,0 +1,2 @@ +deb http://archive.ubuntu.com/ubuntu hardy-backports main universe multiverse restricted +deb-src http://archive.ubuntu.com/ubuntu hardy-backports main universe multiverse restricted Index: trunk/packages/hvirt-config/common/etc/apt/sources.list.d/hvirt.list =================================================================== --- trunk/packages/hvirt-config/common/etc/apt/sources.list.d/hvirt.list (revision 2888) +++ trunk/packages/hvirt-config/common/etc/apt/sources.list.d/hvirt.list (revision 2888) @@ -0,0 +1,3 @@ +## Should be in sources.list.d dir +deb http://hvirt-dev.hcs.harvard.edu/apt hardy hvirt +deb-src http://hvirt-dev.hcs.harvard.edu/apt hardy hvirt Index: trunk/packages/hvirt-config/debian/changelog =================================================================== --- trunk/packages/hvirt-config/debian/changelog (revision 2887) +++ trunk/packages/hvirt-config/debian/changelog (revision 2888) @@ -1,2 +1,8 @@ +hvirt-config (0.10) unstable; urgency=low + + * Renamed package to hvirt-config + + -- Greg Brockman Sat, 16 Jan 2010 01:58:48 -0500 + hvirt-devconfig (0.9) unstable; urgency=low Index: trunk/packages/hvirt-config/debian/control =================================================================== --- trunk/packages/hvirt-config/debian/control (revision 2887) +++ trunk/packages/hvirt-config/debian/control (revision 2888) @@ -1,3 +1,3 @@ -Source: hvirt-devconfig +Source: hvirt-config Section: servers Priority: important @@ -9,6 +9,14 @@ Architecture: all Provides: invirt-config -Conflicts: invirt-config +Conflicts: invirt-config, hvirt-prodconfig Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base (>= 0.0.19) Description: Hvirt dev-cluster config This is the master configuration package for the Hvirt development cluster. + +Package: hvirt-prodconfig +Architecture: all +Provides: invirt-config +Conflicts: invirt-config, hvirt-devconfig +Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base (>= 0.0.19) +Description: Hvirt prod-cluster config + This is the master configuration package for the Hvirt production cluster. Index: trunk/packages/hvirt-config/debian/copyright =================================================================== --- trunk/packages/hvirt-config/debian/copyright (revision 2887) +++ trunk/packages/hvirt-config/debian/copyright (revision 2888) @@ -1,4 +1,6 @@ This software was written for the XVM project -of the MIT Student Information Processing Board. +of the MIT Student Information Processing Board and adapted +for the Hvirt project of the Harvard +Computer Society. Copyright : Index: trunk/packages/hvirt-config/debian/hvirt-config.lintian-overrides =================================================================== --- trunk/packages/hvirt-config/debian/hvirt-config.lintian-overrides (revision 2888) +++ trunk/packages/hvirt-config/debian/hvirt-config.lintian-overrides (revision 2888) @@ -0,0 +1,2 @@ +hvirt-devconfig binary: file-in-unusual-dir root/.k5login +hvirt-prodconfig binary: file-in-unusual-dir root/.k5login Index: trunk/packages/hvirt-config/debian/hvirt-devconfig.install =================================================================== --- trunk/packages/hvirt-config/debian/hvirt-devconfig.install (revision 2887) +++ trunk/packages/hvirt-config/debian/hvirt-devconfig.install (revision 2888) @@ -1,1 +1,2 @@ -master.yaml etc/invirt +dev/master.yaml etc/invirt +common/* . Index: trunk/packages/hvirt-config/debian/hvirt-devconfig.lintian-overrides =================================================================== --- trunk/packages/hvirt-config/debian/hvirt-devconfig.lintian-overrides (revision 2887) +++ (revision ) @@ -1,1 +1,0 @@ -hvirt-devconfig binary: file-in-unusual-dir root/.k5login Index: trunk/packages/hvirt-config/debian/hvirt-devconfig.postinst =================================================================== --- trunk/packages/hvirt-config/debian/hvirt-devconfig.postinst (revision 2887) +++ (revision ) @@ -1,51 +1,0 @@ -#!/bin/sh -# postinst script for hvirt-devconfig -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - # Regen invirt config - if hash invoke-rc.d; then - invoke-rc.d invirt-base reload - else - /etc/init.d/invirt-base reload - fi - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - triggered) - invirt-reload - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - - Index: trunk/packages/hvirt-config/debian/hvirt-prodconfig.install =================================================================== --- trunk/packages/hvirt-config/debian/hvirt-prodconfig.install (revision 2888) +++ trunk/packages/hvirt-config/debian/hvirt-prodconfig.install (revision 2888) @@ -0,0 +1,1 @@ +common/* . Index: trunk/packages/hvirt-config/debian/hvirt-prodconfig.triggers =================================================================== --- trunk/packages/hvirt-config/debian/hvirt-prodconfig.triggers (revision 2888) +++ trunk/packages/hvirt-config/debian/hvirt-prodconfig.triggers (revision 2888) @@ -0,0 +1,1 @@ +activate invirt-reload Index: trunk/packages/hvirt-config/debian/rules =================================================================== --- trunk/packages/hvirt-config/debian/rules (revision 2887) +++ trunk/packages/hvirt-config/debian/rules (revision 2888) @@ -3,6 +3,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk -binary-install/xvm-devconfig:: +binary-install/hvirt-devconfig:: # Versions of CDBS newer than ours do this for us - dh_lintian -pxvm-devconfig - install -m 0644 -D k5login $(DEB_DESTDIR)/root/.k5login + dh_lintian -phvirt-devconfig + install -m 0644 -D dev/k5login $(DEB_DESTDIR)/root/.k5login + +binary-install/hvirt-prodconfig:: + # Versions of CDBS newer than ours do this for us + dh_lintian -phvirt-prodconfig + install -m 0644 -D prod/k5login $(DEB_DESTDIR)/root/.k5login Index: trunk/packages/hvirt-config/dev/k5login =================================================================== --- trunk/packages/hvirt-config/dev/k5login (revision 2888) +++ trunk/packages/hvirt-config/dev/k5login (revision 2888) @@ -0,0 +1,2 @@ +gdb@HCS.HARVARD.EDU +gdb/root@HCS.HARVARD.EDU Index: trunk/packages/hvirt-config/dev/master.yaml =================================================================== --- trunk/packages/hvirt-config/dev/master.yaml (revision 2888) +++ trunk/packages/hvirt-config/dev/master.yaml (revision 2888) @@ -0,0 +1,33 @@ +db: + uri: postgres://invirt@hvirt-dev.hcs.harvard.edu/invirt + host: hvirt-dev.hcs.harvard.edu + ip: 140.247.89.172 + port: 5432 + user: invirt + dbname: invirt + +svn: + uri: https://xvm.mit.edu:1111 + +hosts: +- hostname: hersilia.hcs.harvard.edu + ip: 140.247.89.251 + internal_ip: 10.245.65.37 + +remote: + hostname: hvirt-remote-dev.hcs.harvard.edu + ip: 140.247.89.173 + +console: + hostname: hvirt-remote-dev.hcs.harvard.edu + ip: 140.247.89.173 + +kerberos: + realm: HCS.HARVARD.EDU + +xen: + network: + netmask: 255.255.255.128 + gateway: 140.247.89.129 + lvm: + vg: root Index: trunk/packages/hvirt-config/dev/sysvms/s_console =================================================================== --- trunk/packages/hvirt-config/dev/sysvms/s_console (revision 2888) +++ trunk/packages/hvirt-config/dev/sysvms/s_console (revision 2888) @@ -0,0 +1,19 @@ +import os + +release = os.uname()[2] +kernel = '/boot/vmlinuz-%s' % release +ramdisk = '/boot/initrd.img-%s' % release +memory = '256' + +disk = ['phy:root/s_console_hda,hda,w'] + +name = 's_console' + +vif = [ 'ip=140.247.89.173,mac=00:16:3e:2a:7e:0a' ] + +on_poweroff = 'destroy' +on_reboot = 'restart' +on_crash = 'restart' + +root = "/dev/hda1 ro" +extra = '2 console=xvc0' Index: trunk/packages/hvirt-config/dev/sysvms/s_master =================================================================== --- trunk/packages/hvirt-config/dev/sysvms/s_master (revision 2888) +++ trunk/packages/hvirt-config/dev/sysvms/s_master (revision 2888) @@ -0,0 +1,19 @@ +import os + +release = os.uname()[2] +kernel = '/boot/vmlinuz-%s' % release +ramdisk = '/boot/initrd.img-%s' % release +memory = '256' + +disk = ['phy:root/s_master_hda,hda,w'] + +name = 's_master' + +vif = [ 'ip=140.247.89.172,mac=00:16:3e:04:d1:56' ] + +on_poweroff = 'destroy' +on_reboot = 'restart' +on_crash = 'restart' + +root = "/dev/hda1 ro" +extra = '2 console=xvc0' Index: trunk/packages/hvirt-config/dev/sysvms/s_remote =================================================================== --- trunk/packages/hvirt-config/dev/sysvms/s_remote (revision 2888) +++ trunk/packages/hvirt-config/dev/sysvms/s_remote (revision 2888) @@ -0,0 +1,19 @@ +import os + +release = os.uname()[2] +kernel = '/boot/vmlinuz-%s' % release +ramdisk = '/boot/initrd.img-%s' % release +memory = '256' + +disk = ['phy:root/s_remote_hda,hda,w'] + +name = 's_remote' + +vif = [ 'ip=140.247.89.174,mac=00:16:3e:9e:72:a5' ] + +on_poweroff = 'destroy' +on_reboot = 'restart' +on_crash = 'restart' + +root = "/dev/hda1 ro" +extra = '2 console=xvc0' Index: trunk/packages/hvirt-config/k5login =================================================================== --- trunk/packages/hvirt-config/k5login (revision 2887) +++ (revision ) @@ -1,2 +1,0 @@ -gdb@HCS.HARVARD.EDU -gdb/root@HCS.HARVARD.EDU Index: trunk/packages/hvirt-config/master.yaml =================================================================== --- trunk/packages/hvirt-config/master.yaml (revision 2887) +++ (revision ) @@ -1,33 +1,0 @@ -db: - uri: postgres://invirt@hvirt-dev.hcs.harvard.edu/invirt - host: hvirt-dev.hcs.harvard.edu - ip: 140.247.89.172 - port: 5432 - user: invirt - dbname: invirt - -svn: - uri: https://xvm.mit.edu:1111 - -hosts: -- hostname: hersilia.hcs.harvard.edu - ip: 140.247.89.251 - internal_ip: 10.245.65.37 - -remote: - hostname: hvirt-remote-dev.hcs.harvard.edu - ip: 140.247.89.173 - -console: - hostname: hvirt-remote-dev.hcs.harvard.edu - ip: 140.247.89.173 - -kerberos: - realm: HCS.HARVARD.EDU - -xen: - network: - netmask: 255.255.255.128 - gateway: 140.247.89.129 - lvm: - vg: root Index: trunk/packages/hvirt-config/prod/k5login =================================================================== --- trunk/packages/hvirt-config/prod/k5login (revision 2888) +++ trunk/packages/hvirt-config/prod/k5login (revision 2888) @@ -0,0 +1,1 @@ +gdb/root@HCS.HARVARD.EDU