diff --git a/Base/dom0.xml b/Base/dom0.xml deleted file mode 100644 index 22735a7..0000000 --- a/Base/dom0.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/Bundler/xen-utils.xml b/Bundler/xen-utils.xml deleted file mode 100644 index 96006c0..0000000 --- a/Bundler/xen-utils.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/Cfg/etc/xen/baldrick/baldrick b/Cfg/etc/xen/baldrick/baldrick deleted file mode 100644 index aead4e2..0000000 --- a/Cfg/etc/xen/baldrick/baldrick +++ /dev/null @@ -1,13 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -execfile("/etc/xen/common_wheezy.py") - -name = "baldrick" - -memory = 512 - -disk = [ vol(name, "slash", "xvda"), - vol(name, "swap", "xvdb"), - vol(name, "data", "xvdc") ] - -vif = [ pub('02:62:61:6c:64:01') ] diff --git a/Cfg/etc/xen/cas/cas b/Cfg/etc/xen/cas/cas deleted file mode 100644 index 876a8c1..0000000 --- a/Cfg/etc/xen/cas/cas +++ /dev/null @@ -1,14 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -execfile("/etc/xen/common_wheezy.py") - -name = "cas" - -memory = 512 - -disk = [ vol(name, "slash", "xvda"), - vol(name, "swap", "xvdb") ] - -vif = [ pub('02:00:63:61:73:01'), - adm('02:00:63:61:73:02'), - ] diff --git a/Cfg/etc/xen/common.py/common.py b/Cfg/etc/xen/common.py/common.py deleted file mode 100644 index 8eea4c1..0000000 --- a/Cfg/etc/xen/common.py/common.py +++ /dev/null @@ -1,46 +0,0 @@ -# -*- coding: utf-8 -*- -# Fichier géré par Bcfg2 --- NE PAS ÉDITER -# Éditez /var/lib/bcfg2/Cfg/etc/xen/common.py/common.py - -u'''Définition communes pour tout les dom-U''' - -# Le noyau et l'initrd, c'est le même pour tout le monde -kernel = "/boot/vmlinuz-2.6.26-2-xen-amd64" -ramdisk = "/boot/initrd.img-2.6.26-2-xen-amd64" - -# Mémoire conseillée, augmenter si nécessaire -memory = 256 - -# L'argument root= à passer au noyau -root = "/dev/hda ro" - -def pub(mac): - u"Définit une interface sur le vlan public" - return 'mac=%s, bridge=xenbr1' % mac - -def adm(mac): - u"Définit une interface sur le vlan d'administration" - return 'mac=%s, bridge=xenbr2' % mac - -def freebox(mac): - u"Définit une interface sur le vlan de la freebox" - return 'mac=%s, bridge=xenbr8' % mac - -def install_party(mac): - u"Définit une interface sur le vlan install-party" - return 'mac=%s, bridge=xenbr10' % mac - -def appt_ens(mac): - u"Definit une interface sur le vlan 21" - return 'mac=%s, bridge=xenbr21' % mac - -def vol(name, vol_name, guest_disk): - u"Definit un disque dur" - return 'phy:/dev/iscsi_%s_%s,%s,w' % (name, vol_name, guest_disk) - -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' - -# Sans ça il n'y a pas de console dans les domU -extra = "xencons=tty" diff --git a/Cfg/etc/xen/common_squeeze.py/common_squeeze.py b/Cfg/etc/xen/common_squeeze.py/common_squeeze.py deleted file mode 100644 index 4a396f8..0000000 --- a/Cfg/etc/xen/common_squeeze.py/common_squeeze.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -# Fichier gere par Bcfg2 --- NE PAS EDITER -# Editez /var/lib/bcfg2/Cfg/etc/xen/common_squeeze.py/common_squeeze.py - -u'''Definition communes pour tout les dom-U sous squeeze''' - -# Le noyau et l'initrd, c'est le meme pour tout le monde -kernel = "/boot/vmlinuz-2.6.32-5-xen-amd64" -ramdisk = "/boot/initrd.img-2.6.32-5-xen-amd64" - -# Memoire conseillee, augmenter si necessaire -memory = 256 - -# L'argument root= a passer au noyau -root = "/dev/xvda ro" - -def pub(mac): - u"Definit une interface sur le vlan public" - return 'mac=%s, bridge=xenbr1' % mac - -def adm(mac): - u"Definit une interface sur le vlan d'administration" - return 'mac=%s, bridge=xenbr2' % mac - -def freebox(mac): - u"Definit une interface sur le vlan de la freebox" - return 'mac=%s, bridge=xenbr8' % mac - -def install_party(mac): - u"Definit une interface sur le vlan install-party" - return 'mac=%s, bridge=xenbr10' % mac - -def appt_ens(mac): - u"Definit une interface sur le vlan 21" - return 'mac=%s, bridge=xenbr21' % mac - -def gratuit(mac): - u"Definit une interface sur le vlan 6" - return 'mac=%s, bridge=xenbr6' % mac - -def accueil(mac): - u"Definit une interface sur le vlan 7" - return 'mac=%s, bridge=xenbr7' % mac - -def isolement(mac): - u"Definit une interface sur le vlan 9" - return 'mac=%s, bridge=xenbr9' % mac - -def wifi(mac): - u"Definit une interface sur le vlan 3" - return 'mac=%s, bridge=xenbr3' % mac - -def vol(name, vol_name, guest_disk): - u"Definit un disque dur" - return 'phy:/dev/iscsi_%s_%s,%s,w' % (name, vol_name, guest_disk) - -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' - -# Sans ca il n'y a pas de console dans les domU -extra = "xencons=tty" diff --git a/Cfg/etc/xen/common_wheezy.py/common_wheezy.py b/Cfg/etc/xen/common_wheezy.py/common_wheezy.py deleted file mode 100644 index 9c16273..0000000 --- a/Cfg/etc/xen/common_wheezy.py/common_wheezy.py +++ /dev/null @@ -1,62 +0,0 @@ -# -*- coding: utf-8 -*- -# Fichier gere par Bcfg2 --- NE PAS EDITER -# Editez /var/lib/bcfg2/Cfg/etc/xen/common_squeeze.py/common_squeeze.py - -u'''Definition communes pour tout les dom-U sous squeeze''' - -# Le noyau et l'initrd, c'est le meme pour tout le monde -kernel = "/boot/vmlinuz-3.2.0-4-amd64" -ramdisk = "/boot/initrd.img-3.2.0-4-amd64" - -# Memoire conseillee, augmenter si necessaire -memory = 256 - -# L'argument root= a passer au noyau -root = "/dev/xvda ro" - -def pub(mac): - u"Definit une interface sur le vlan public" - return 'mac=%s, bridge=xenbr1' % mac - -def adm(mac): - u"Definit une interface sur le vlan d'administration" - return 'mac=%s, bridge=xenbr2' % mac - -def freebox(mac): - u"Definit une interface sur le vlan de la freebox" - return 'mac=%s, bridge=xenbr8' % mac - -def install_party(mac): - u"Definit une interface sur le vlan install-party" - return 'mac=%s, bridge=xenbr10' % mac - -def appt_ens(mac): - u"Definit une interface sur le vlan 21" - return 'mac=%s, bridge=xenbr21' % mac - -def gratuit(mac): - u"Definit une interface sur le vlan 6" - return 'mac=%s, bridge=xenbr6' % mac - -def accueil(mac): - u"Definit une interface sur le vlan 7" - return 'mac=%s, bridge=xenbr7' % mac - -def isolement(mac): - u"Definit une interface sur le vlan 9" - return 'mac=%s, bridge=xenbr9' % mac - -def wifi(mac): - u"Definit une interface sur le vlan 3" - return 'mac=%s, bridge=xenbr3' % mac - -def vol(name, vol_name, guest_disk): - u"Definit un disque dur" - return 'phy:/dev/iscsi_%s_%s,%s,w' % (name, vol_name, guest_disk) - -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' - -# Sans ca il n'y a pas de console dans les domU -extra = "xencons=tty" diff --git a/Cfg/etc/xen/puppet/puppet b/Cfg/etc/xen/puppet/puppet deleted file mode 100644 index ff3d1d4..0000000 --- a/Cfg/etc/xen/puppet/puppet +++ /dev/null @@ -1,15 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -execfile("/etc/xen/common_squeeze.py") - -name = "puppet" - -memory = 512 - -disk = [ vol(name, "slash", "xvda"), - vol(name, "var", "xvdb"), - vol(name, "swap", "xvdc") ] - - -vif = [ pub('02:8c:42:42:67:4b'), - adm('02:8c:42:42:67:4c') ] diff --git a/Cfg/etc/xen/routeur/routeur b/Cfg/etc/xen/routeur/routeur deleted file mode 100644 index 1f80c1f..0000000 --- a/Cfg/etc/xen/routeur/routeur +++ /dev/null @@ -1,17 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -execfile("/etc/xen/common_wheezy.py") - -name = "routeur" - -memory = 512 - -disk = [ vol(name, "slash", "xvda"), - vol(name, "swap", "xvdb") ] - -vif = [ pub('02:72:6f:75:74:01'), - adm('02:72:6f:75:74:02'), - accueil('02:72:6f:75:74:07'), - isolement('02:72:6f:75:74:09'), - appt_ens('02:72:6f:75:74:21') - ] diff --git a/Cfg/etc/xen/sogo/sogo b/Cfg/etc/xen/sogo/sogo deleted file mode 100644 index a9b54f0..0000000 --- a/Cfg/etc/xen/sogo/sogo +++ /dev/null @@ -1,12 +0,0 @@ -# -*- coding: utf-8; mode: python -*- - -execfile("/etc/xen/common_wheezy.py") - -name = "sogo" - -disk = [ vol(name, "slash", "xvda"), - vol(name, "var", "xvdb"), - vol(name, "swap", "xvdc") ] - -vif = [ pub('02:62:75:42:24:00'), - adm('02:62:75:42:24:01') ] diff --git a/Cfg/etc/xen/xend-config.sxp/xend-config.sxp b/Cfg/etc/xen/xend-config.sxp/xend-config.sxp deleted file mode 100644 index b97734f..0000000 --- a/Cfg/etc/xen/xend-config.sxp/xend-config.sxp +++ /dev/null @@ -1,228 +0,0 @@ -# -*- sh -*- - -# -# Xend configuration file. -# - -# This example configuration is appropriate for an installation that -# utilizes a bridged network configuration. Access to xend via http -# is disabled. - -# Commented out entries show the default for that entry, unless otherwise -# specified. - -#(logfile /var/log/xen/xend.log) -#(loglevel DEBUG) - - -# The Xen-API server configuration. (Please note that this server is -# available as an UNSUPPORTED PREVIEW in Xen 3.0.4, and should not be relied -# upon). -# -# This value configures the ports, interfaces, and access controls for the -# Xen-API server. Each entry in the list starts with either unix, a port -# number, or an address:port pair. If this is "unix", then a UDP socket is -# opened, and this entry applies to that. If it is a port, then Xend will -# listen on all interfaces on that TCP port, and if it is an address:port -# pair, then Xend will listen on the specified port, using the interface with -# the specified address. -# -# The subsequent string configures the user-based access control for the -# listener in question. This can be one of "none" or "pam", indicating either -# that users should be allowed access unconditionally, or that the local -# Pluggable Authentication Modules configuration should be used. If this -# string is missing or empty, then "pam" is used. -# -# The final string gives the host-based access control for that listener. If -# this is missing or empty, then all connections are accepted. Otherwise, -# this should be a space-separated sequence of regular expressions; any host -# with a fully-qualified domain name or an IP address that matches one of -# these regular expressions will be accepted. -# -# Example: listen on TCP port 9363 on all interfaces, accepting connections -# only from machines in example.com or localhost, and allow access through -# the unix domain socket unconditionally: -# -# (xen-api-server ((9363 pam '^localhost$ example\\.com$') -# (unix none))) -# -# Optionally, the TCP Xen-API server can use SSL by specifying the private -# key and certificate location: -# -# (9367 pam '' /etc/xen/xen-api.key /etc/xen/xen-api.crt) -# -# Default: -# (xen-api-server ((unix))) - - -#(xend-http-server no) -#(xend-unix-server no) -#(xend-tcp-xmlrpc-server no) -#(xend-unix-xmlrpc-server yes) -(xend-relocation-server yes) - -#(xend-unix-path /var/lib/xend/xend-socket) - - -# Address and port xend should use for the legacy TCP XMLRPC interface, -# if xen-tcp-xmlrpc-server is set. -#(xen-tcp-xmlrpc-server-address 'localhost') -#(xen-tcp-xmlrpc-server-port 8006) - -# SSL key and certificate to use for the legacy TCP XMLRPC interface. -# Setting these will mean that this port serves only SSL connections as -# opposed to plaintext ones. -#(xend-tcp-xmlrpc-server-ssl-key-file /etc/xen/xmlrpc.key) -#(xend-tcp-xmlrpc-server-ssl-cert-file /etc/xen/xmlrpc.crt) - - -# Port xend should use for the HTTP interface, if xend-http-server is set. -#(xend-port 8000) - -# Port xend should use for the relocation interface, if xend-relocation-server -# is set. -#(xend-relocation-port 8002) - -# Address xend should listen on for HTTP connections, if xend-http-server is -# set. -# Specifying 'localhost' prevents remote connections. -# Specifying the empty string '' (the default) allows all connections. -#(xend-address '') -#(xend-address localhost) - -# Address xend should listen on for relocation-socket connections, if -# xend-relocation-server is set. -# Meaning and default as for xend-address above. -#(xend-relocation-address '') - -# The hosts allowed to talk to the relocation port. If this is empty (the -# default), then all connections are allowed (assuming that the connection -# arrives on a port and interface on which we are listening; see -# xend-relocation-port and xend-relocation-address above). Otherwise, this -# should be a space-separated sequence of regular expressions. Any host with -# a fully-qualified domain name or an IP address that matches one of these -# regular expressions will be accepted. -# -# For example: -# (xend-relocation-hosts-allow '^localhost$ ^.*\\.example\\.org$') -# -#(xend-relocation-hosts-allow '') - -# The limit (in kilobytes) on the size of the console buffer -#(console-limit 1024) - -## -# To bridge network traffic, like this: -# -# dom0: ----------------- bridge -> real eth0 -> the network -# | -# domU: fake eth0 -> vifN.0 -+ -# -# use -# -# (network-script network-bridge) -# -# Your default ethernet device is used as the outgoing interface, by default. -# To use a different one (e.g. eth1) use -# -# (network-script 'network-bridge netdev=eth1') -# -# The bridge is named xenbr0, by default. To rename the bridge, use -# -# (network-script 'network-bridge bridge=') -# -# It is possible to use the network-bridge script in more complicated -# scenarios, such as having two outgoing interfaces, with two bridges, and -# two fake interfaces per guest domain. To do things like this, write -# yourself a wrapper script, and call network-bridge from it, as appropriate. -# -(network-script network-dummy) - -# The script used to control virtual interfaces. This can be overridden on a -# per-vif basis when creating a domain or a configuring a new vif. The -# vif-bridge script is designed for use with the network-bridge script, or -# similar configurations. -# -# If you have overridden the bridge name using -# (network-script 'network-bridge bridge=') then you may wish to do the -# same here. The bridge name can also be set when creating a domain or -# configuring a new vif, but a value specified here would act as a default. -# -# If you are using only one bridge, the vif-bridge script will discover that, -# so there is no need to specify it explicitly. -# -(vif-script vif-bridge) - - -## Use the following if network traffic is routed, as an alternative to the -# settings for bridged networking given above. -#(network-script network-route) -#(vif-script vif-route) - - -## Use the following if network traffic is routed with NAT, as an alternative -# to the settings for bridged networking given above. -#(network-script network-nat) -#(vif-script vif-nat) - - -# Dom0 will balloon out when needed to free memory for domU. -# dom0-min-mem is the lowest memory level (in MB) dom0 will get down to. -# If dom0-min-mem=0, dom0 will never balloon out. -(dom0-min-mem 0) - -# In SMP system, dom0 will use dom0-cpus # of CPUS -# If dom0-cpus = 0, dom0 will take all cpus available -(dom0-cpus 1) - -# Whether to enable core-dumps when domains crash. -#(enable-dump no) - -# The tool used for initiating virtual TPM migration -#(external-migration-tool '') - -# The interface for VNC servers to listen on. Defaults -# to 127.0.0.1 To restore old 'listen everywhere' behaviour -# set this to 0.0.0.0 -#(vnc-listen '127.0.0.1') - -# The default password for VNC console on HVM domain. -# Empty string is no authentication. -(vncpasswd '') - -# The VNC server can be told to negotiate a TLS session -# to encryption all traffic, and provide x509 cert to -# clients enalbing them to verify server identity. The -# GTK-VNC widget, virt-viewer, virt-manager and VeNCrypt -# all support the VNC extension for TLS used in QEMU. The -# TightVNC/RealVNC/UltraVNC clients do not. -# -# To enable this create x509 certificates / keys in the -# directory /etc/xen/vnc -# -# ca-cert.pem - The CA certificate -# server-cert.pem - The Server certificate signed by the CA -# server-key.pem - The server private key -# -# and then uncomment this next line -# (vnc-tls 1) - -# The certificate dir can be pointed elsewhere.. -# -# (vnc-x509-cert-dir /etc/xen/vnc) - -# The server can be told to request & validate an x509 -# certificate from the client. Only clients with a cert -# signed by the trusted CA will be able to connect. This -# is more secure the password auth alone. Passwd auth can -# used at the same time if desired. To enable client cert -# checking uncomment this: -# -# (vnc-x509-verify 1) - -# The default keymap to use for the VM's virtual keyboard -# when not specififed in VM's configuration -#(keymap 'en-us') - -# Script to run when the label of a resource has changed. -#(resource-label-change-script '') diff --git a/Metadata/groups.xml b/Metadata/groups.xml index 31cd8c2..f3cb9fd 100644 --- a/Metadata/groups.xml +++ b/Metadata/groups.xml @@ -1461,11 +1461,6 @@ - - - -