From b2d23ea7a524ad3822fc4f466bdba2747af6941c Mon Sep 17 00:00:00 2001 From: opensides Date: Tue, 7 Apr 2009 16:58:36 +0000 Subject: [PATCH] git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5-plugins@13585 594d385d-05f5-0310-b6e9-bd551577e9d8 --- sudo-ldap/addons/sudo/class_sudoldap.inc | 183 ----------------- .../addons/sudo/class_sudoldapEditRole.inc | 108 ---------- sudo-ldap/addons/sudo/main.inc | 111 ---------- sudo-ldap/addons/sudo/sudoldap.tpl | 17 -- sudo-ldap/addons/sudo/sudoldapeditrole.tpl | 42 ---- sudo-ldap/doc/README.sudo | 8 - sudo-ldap/gen_locale.sh | 169 ---------------- sudo-ldap/locale/messages.po | 81 -------- sudo-ldap/plugin.dsc | 5 - sudo-ldap/schema/sudo.schema | 43 ---- xen/doc/french-explanation | 40 ---- xen/doc/machintest.cfg | 40 ---- xen/doc/xen-tools.conf | 191 ------------------ xen/schema/xen.schema | 143 ------------- 14 files changed, 1181 deletions(-) delete mode 100644 sudo-ldap/addons/sudo/class_sudoldap.inc delete mode 100644 sudo-ldap/addons/sudo/class_sudoldapEditRole.inc delete mode 100644 sudo-ldap/addons/sudo/main.inc delete mode 100644 sudo-ldap/addons/sudo/sudoldap.tpl delete mode 100644 sudo-ldap/addons/sudo/sudoldapeditrole.tpl delete mode 100644 sudo-ldap/doc/README.sudo delete mode 100755 sudo-ldap/gen_locale.sh delete mode 100644 sudo-ldap/locale/messages.po delete mode 100644 sudo-ldap/plugin.dsc delete mode 100644 sudo-ldap/schema/sudo.schema delete mode 100644 xen/doc/french-explanation delete mode 100644 xen/doc/machintest.cfg delete mode 100644 xen/doc/xen-tools.conf delete mode 100644 xen/schema/xen.schema diff --git a/sudo-ldap/addons/sudo/class_sudoldap.inc b/sudo-ldap/addons/sudo/class_sudoldap.inc deleted file mode 100644 index 7090d93a8..000000000 --- a/sudo-ldap/addons/sudo/class_sudoldap.inc +++ /dev/null @@ -1,183 +0,0 @@ - - \version 1.00 - \date 22.03.2008 - - This class provides the functionality to read and write all attributes - relevant for sudo-ldap from/to the LDAP. - */ - -class sudoldap extends plugin -{ - /* Definitions */ - var $plHeadline = "sudo-ldap"; - var $plDescription = "This does something"; - - /* Plugin specific values */ - var $attributes = array( "cn", - "description", - "sudoUser", - "sudoHost", - "sudoCommand", - "sudoRunAs", - "sudoOption"); - - var $objectclasses = array("sudoRole"); - var $Roles = array(); - var $dialog = NULL; - - /* constructor, if 'dn' is set, the node loads the given - 'dn' from LDAP */ - function sudoldap ($config, $dn= NULL, $parent= NULL){ - /* Configuration is fine, allways */ - $this->config= $config; - /* Load bases attributes */ - plugin::plugin($config, $dn, $parent); - $ldap= $this->config->get_ldap_link(); - } // function - - /* execute generates the html output for this node */ - function execute($isCopyPaste = false){ - /* Call parent execute */ - plugin::execute(); - $display= ""; - $smarty= get_smarty(); - $this->Roles = $this->getRoles(); - - /* Edited or Added zone - */ - if((isset($_POST['SaveRoleChanges'])) && is_object($this->dialog)){ - $this->dialog->save_object(); - - /* Check for errors - */ - if(count($this->dialog->check())){ - foreach($this->dialog->check() as $msgs){ - print_red($msgs); - } - }else{ - /* add new/edited zone - */ - $ret = $this->dialog->save(); - //if(!$this->dialog->isNew){ - // unset($this->Roles[$this->dialog->OldRoleName]); - //} - $this->Roles[$ret['cn']] = $ret; - $this->dialog = NULL; - } - } - - /* Cancel zone edit / new - */ - if(isset($_POST['CancelRoleChanges'])){ - $this->dialog = NULL; - } - - /* Add empty new zone - */ - //if(isset($_POST['AddRole']) && chkacl($this->acl,"sudoldap") == ""){ - if(isset($_POST['AddRole'])){ - $this->dialog = new sudoldapEditRole($this->config); - } - - /* Check for edit role request - */ - $once = false; - foreach( $_POST as $name => $value){ - - /* check all post for edit request - */ - - //if(preg_match("/^editRole_/",$name)&&!$once - // && chkacl($this->acl,"sudoldap") == ""){ - if(preg_match("/^editRole_/",$name)&&!$once){ - $once =true; - $tmp = preg_replace("/^editRole_/","",$name); - $tmp = base64_decode(preg_replace("/_.*$/","",$tmp)); - $this->dialog= new sudoldapeditRole($this->config, - $this->dn, - $this->Roles[$tmp]); - } // if () - - /* check posts for delete zone - */ - - //if(preg_match("/^delRole_/",$name)&&!$once - // && chkacl($this->acl,"sudoldap") == ""){ - if(preg_match("/^delRole_/",$name)&&!$once){ - $once =true; - $tmp = preg_replace("/^delRole_/","",$name); - $tmp = base64_decode(preg_replace("/_.*$/","",$tmp)); - - /* Initiate deletion - */ - - $this->RemoveRole($tmp); - } // if () - - } // foreach() - - /* Show dialog - */ - if($this->dialog!= NULL){ - $this->dialog->save_object(); - $this->dialog->parent = $this; - return($this->dialog->execute()); - } - - $RoleList = new divSelectBox("sudoRoles"); - $RoleList->SetHeight(300); - $editImg = " - "; - - foreach($this->Roles as $role => $values ){ - $link = "%s"; - $RoleList->AddEntry( - array( - array("string" => sprintf($link,base64_encode($role),$role)), - array("string" => str_replace("%s",base64_encode($role),$editImg)) - ) - ); - } // foreach() - - $smarty->assign("sudoldapACL",chkacl($this->acl,"sudoldap")); - $smarty->assign("RoleList",$RoleList->DrawList()); - - $display.= $smarty->fetch(get_template_path('sudoldap.tpl', TRUE)); - - return($display); - } // function - - function getRoles(){ - $ret = array(); - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $ldap->search("(objectClass=sudoRole)",$this->attributes); - while ($attrs= $ldap->fetch()){ - $cn= $attrs['cn'][0]; - foreach($this->attributes as $value){ - if(isset($attrs[$value])){ - $ret[$cn][$value] = $attrs[$value][0]; - } // if() - } // foreach() - } // while() - return($ret); - } - - function RemoveRole($cn){ - if($cn!=""){ - $ldap= $this->config->get_ldap_link(); - $dn = "cn=".$cn.",ou=SUDOers,".$this->config->current['BASE']; - $ldap->cd($dn); - $ldap->rmdir_recursive($dn); - show_ldap_error($ldap->get_error(), _("Removing DNS entries failed")); - unset($this->Roles[$cn]); - } // if() - } // function - -} - -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -?> diff --git a/sudo-ldap/addons/sudo/class_sudoldapEditRole.inc b/sudo-ldap/addons/sudo/class_sudoldapEditRole.inc deleted file mode 100644 index 64f0761a8..000000000 --- a/sudo-ldap/addons/sudo/class_sudoldapEditRole.inc +++ /dev/null @@ -1,108 +0,0 @@ -isNew = true; - }else{ - $this->isNew = false; - foreach($this->attributes as $value){ - if(isset($attrs[$value])){ - $this->$value = $attrs[$value]; - } - } - } - } - - function execute() - { - /* Call parent execute */ - plugin::execute(); - - - /* Fill templating stuff */ - $smarty= get_smarty(); - $display= ""; - - $smarty->assign("cn", $this->cn); - $smarty->assign("description", $this->description); - $smarty->assign("sudoUser", $this->sudoUser); - $smarty->assign("sudoHost", $this->sudoHost); - $smarty->assign("sudoCommand", $this->sudoCommand); - $smarty->assign("sudoRunAs", $this->sudoRunAs); - $smarty->assign("sudoOption", $this->sudoOption); - - /* Display template */ - $display.= $smarty->fetch( - get_template_path('sudoldapeditrole.tpl', TRUE)); - return($display); - } - - /* Save data to object */ - function save_object() - { - //plugin::save_object(); - foreach($this->attributes as $attr){ - if(isset($_POST[$attr])){ - $this->$attr = $_POST[$attr]; - } - } - } - - - /* Check supplied data */ - function check() - { - } - - - /* Save to LDAP */ - function save() - { - plugin::save(); - $ldap= $this->config->get_ldap_link(); - - $this->dn = "cn=".$this->cn.",ou=SUDOers,".$this->config->current['BASE']; - $this->attrs['objectClass'] = array("sudoRole"); - - $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn)); - $ldap->cd($this->dn); - $ldap->add($this->attrs); - - /* Display errors - */ - if($ldap->get_error() != "Success"){ - show_ldap_error("Record:".$ldap->get_error(), _("Saving failed!")); - } - } - - -} - -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -?> diff --git a/sudo-ldap/addons/sudo/main.inc b/sudo-ldap/addons/sudo/main.inc deleted file mode 100644 index 1d57e66ed..000000000 --- a/sudo-ldap/addons/sudo/main.inc +++ /dev/null @@ -1,111 +0,0 @@ - - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* Clear display */ -$display= ""; - -if (!$remove_lock){ - - /* Reset requested? */ - if (isset($_POST['edit_cancel']) || - (isset($_GET['reset']) && $_GET['reset'] == 1)){ - - del_lock ($ui->dn); - sess_del ('edit'); - sess_del ('sudoldap'); - } - - /* Create sudoldap object on demand */ - if (!isset($_SESSION['sudoldap']) || (isset($_GET['reset']) && $_GET['reset'] == 1)){ - $_SESSION['sudoldap']= new sudoldap ($config, $ui->dn); - } - $sudoldap= $_SESSION['sudoldap']; - - /* save changes back to object */ - if (isset ($_SESSION['edit'])){ - $sudoldap->save_object (); - } - - /* Enter edit mode? */ - if ((isset($_POST['edit'])) && (!isset( $_SESSION['edit']))){ - - /* Check locking */ - if (($username= get_lock($ui->dn)) != ""){ - $_SESSION['back_plugin']= $plug; - gen_locked_message ($username, $ui->dn); - exit (); - } - - /* Lock the current entry */ - add_lock ($ui->dn, $ui->dn); - $_SESSION['dn']= $ui->dn; - $_SESSION['edit']= TRUE; - } - - /* Adjust acl's to mode */ - if (isset($_SESSION['edit'])){ - $acl= get_permissions ($ui->dn, $ui->subtreeACL); - $sudoldap->acl= get_module_permission($acl, "sudoldap", $ui->dn); - } else { - $acl= get_permissions ($ui->dn, $ui->subtreeACL); - $editacl= get_module_permission($acl, "sudoldap", $ui->dn); - $sudoldap->acl= "#none#"; - } - - /* save changes to LDAP and disable edit mode */ - $info= ""; - if (isset($_POST['edit_finish'])){ - - /* Perform checks */ - $message= $sudoldap->check (); - - /* No errors, save object */ - if (count ($message) == 0){ - $sudoldap->save (); - gosa_log ("SUDO/ldap object'".$ui->dn."' has been saved"); - $sudoldap->acl= "#none#"; - $editacl= get_module_permission($acl, "sudoldap", $ui->dn); - del_lock ($ui->dn); - sess_del ('edit'); - - /* Remove from session */ - sess_del ('sudoldap'); - } else { - /* Errors found, show message */ - show_errors ($message); - } - } - - /* Execute formular */ - $display.= $sudoldap->execute (); - - /* Store changes in session */ - if (isset ($_SESSION['edit'])){ - $_SESSION['sudoldap']= $sudoldap; - } - - /* Page header*/ - $display= print_header(get_template_path('images/posix.png'), - _("sudo-ldap"), $info).$display; - -} - -// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: -?> diff --git a/sudo-ldap/addons/sudo/sudoldap.tpl b/sudo-ldap/addons/sudo/sudoldap.tpl deleted file mode 100644 index 0f609735a..000000000 --- a/sudo-ldap/addons/sudo/sudoldap.tpl +++ /dev/null @@ -1,17 +0,0 @@ - - - - -
-

{t}Sudo Roles{/t}

- {$RoleList} - - -
- diff --git a/sudo-ldap/addons/sudo/sudoldapeditrole.tpl b/sudo-ldap/addons/sudo/sudoldapeditrole.tpl deleted file mode 100644 index d4f42c61a..000000000 --- a/sudo-ldap/addons/sudo/sudoldapeditrole.tpl +++ /dev/null @@ -1,42 +0,0 @@ -

{t}sudo-ldap role{/t}

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{t}cn{/t}{$must}
{t}description{/t}{$must}
{t}sudoUser{/t}{$must}
{t}sudoHost{/t}{$must}
{t}sudoCommand{/t}{$must}
{t}sudoRunAs{/t}{$must}
{t}sudoOption{/t}{$must}
-
-

- - -

-
- diff --git a/sudo-ldap/doc/README.sudo b/sudo-ldap/doc/README.sudo deleted file mode 100644 index 0c0864b09..000000000 --- a/sudo-ldap/doc/README.sudo +++ /dev/null @@ -1,8 +0,0 @@ -To use the sudo extension - -1) Add the sudo.schema to your schema directory - -Benoit Mortier -OpenSides October 2007 - - diff --git a/sudo-ldap/gen_locale.sh b/sudo-ldap/gen_locale.sh deleted file mode 100755 index 4960be833..000000000 --- a/sudo-ldap/gen_locale.sh +++ /dev/null @@ -1,169 +0,0 @@ -#!/bin/sh - -generate_po() { - ORIG=`pwd` - TEMPDIR="/tmp/gosa-locale" - TRUE=`which true` - - echo - echo "Creating temporary directory..." - [ -d $TEMPDIR ] && rm -rf $TEMPDIR - mkdir $TEMPDIR - - echo "Creating copy of GOsa..." - tar c . | tar x -C $TEMPDIR - - echo "Converting .tpl files..." - pushd . &> /dev/null - cd $TEMPDIR - - for template in $(find . -name '*.tpl'); do - echo "* converting .tpl files: $(basename $template)" - sed -e 's/{t}/!g' $template > $template.new - mv $template.new $template - done - - for class in $(find . -name 'class_*.inc'); do - echo "* converting class_*.inc files: $(basename $class)" - sed -e 's/\($pl[DH][^=]*\)= *"\([^"]*\)";$/\1= _("\2");/g' $class > $class.new - mv $class.new $class - done - - echo "Extracting languages..." - rm locale/messages.po - find . -name '*.[ctpi][ophn][nlpc]' | xgettext -f - --keyword=must -d Domain -L PHP -n -o locale/messages.po - - echo "Merging po files with existing ones" - error=0 - for f in locale/??/LC_MESSAGES; do - echo -n "* merging $f/messages.po: " - [ -f $f/messages.po ] && msgmerge $f/messages.po locale/messages.po --output-file=$f/messages.po.new &> /dev/null - - # Do an extra check for dummy dir 'locale/en/LC_MESSAGES' - if [ $? -ne 0 ]; then - [ "$f" == "locale/en/LC_MESSAGES" ] && $TRUE - fi - - if [ $? -eq 0 ]; then - echo "done"; - else - echo "failed"; - error=1 - fi - - done - - echo "Copying new po files, making backups..." - find . -name messages.po | while read f; do - - if [ -f $ORIG/$f ]; then - mv $ORIG/$f $ORIG/$f.orig - else - continue - fi - - echo $f | grep -q "locale/messages.po" - if [ $? -ne 0 ]; then - echo "* replaced $ORIG/$f" - cp $f.new $ORIG/$f - else - cp $f $ORIG/$f - fi - - done - - rm -rf $TEMPDIR - - echo - error=0 - if [ $error -eq 0 ]; then - if [ $ASSUME_Y -eq 1 ]; then - find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \; - else - read -p "Do you want to erase the message.po.orig files? (y/n)" -n1 ans - - if [ "$ans" == "y" -o "$ans" == "Y" ]; then - find $ORIG/ -type f -name 'messages.po.orig' -exec rm -f {} \; - fi - fi - - else - echo "There were errors during the transition. Please fix!" - exit 1 - fi - -cat <<-EOF - ---------------------------------------------------------------------- - -Now edit all files that have been replaced above (i.e. using kbabel -or gtranslator) and mail the changes to gosa@oss.gonicus.de to be -included in the next release. - -To see the changes you've made in GOsa, run "msgfmt messages.po" on -your freshly edited files and restart your apache after that. Set -the webbrowser to the language you've edited and go back to the -login screen. - ---------------------------------------------------------------------- - -EOF - - popd &> /dev/null -} - -compile_po() -{ - po='messages.po' - mo='messages.mo' - - echo "Compiling po files..." - for f in locale/??/LC_MESSAGES; do - - if [ -f $f/$po ]; then - echo "* compiling $f/$po" - msgfmt $f/$po -o $f/$mo - else - echo "! skipped $f/$po - does not exist" - error=1 - continue - fi - - done -} - -# -# MAIN -# -GENERATE=0 -COMPILE=0 -ASSUME_Y=0 -while getopts ":cgyh" opt -do - case $opt in - c) COMPILE=1 - ;; - g) GENERATE=1; - ;; - y) ASSUME_Y=1; - ;; - h|--help) - echo "Usage: $(basename $0) [-c] [-g] [-y]" - echo " -c compile existing po files into mo files" - echo " -g extract strings from GOsa and generate po files" - echo " -y assume yes" - exit 1 - ;; - esac -done -shift $(($OPTIND - 1)) - -# Default to generate -if [ $GENERATE -eq 0 -a $COMPILE -eq 0 ]; then - GENERATE=1 -fi - -[ $GENERATE -eq 1 ] && generate_po -[ $COMPILE -eq 1 ] && compile_po - -# vim:tabstop=2:expandtab:shiftwidth=2:syntax:ruler: diff --git a/sudo-ldap/locale/messages.po b/sudo-ldap/locale/messages.po deleted file mode 100644 index 0c2a410e0..000000000 --- a/sudo-ldap/locale/messages.po +++ /dev/null @@ -1,81 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-03-27 23:10+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: addons/sudo/class_sudoldapEditRole.inc:100 -msgid "Saving failed!" -msgstr "" - -#: addons/sudo/class_sudoldap.inc:15 addons/sudo/main.inc:106 -msgid "sudo-ldap" -msgstr "" - -#: addons/sudo/class_sudoldap.inc:16 -msgid "This does something" -msgstr "" - -#: addons/sudo/class_sudoldap.inc:175 -msgid "Removing DNS entries failed" -msgstr "" - -#: addons/sudo/sudoldap.tpl:4 -msgid "Sudo Roles" -msgstr "" - -#: addons/sudo/sudoldap.tpl:6 addons/sudo/sudoldap.tpl:8 -msgid "Add" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:1 -msgid "sudo-ldap role" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:4 -msgid "cn" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:8 -msgid "description" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:12 -msgid "sudoUser" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:16 -msgid "sudoHost" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:20 -msgid "sudoCommand" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:24 -msgid "sudoRunAs" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:28 -msgid "sudoOption" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:34 -msgid "Save" -msgstr "" - -#: addons/sudo/sudoldapeditrole.tpl:35 -msgid "Cancel" -msgstr "" diff --git a/sudo-ldap/plugin.dsc b/sudo-ldap/plugin.dsc deleted file mode 100644 index 8d4f4842d..000000000 --- a/sudo-ldap/plugin.dsc +++ /dev/null @@ -1,5 +0,0 @@ -[gosa-plugin] -name = sudo -description = "Sudo manager" -version = 2.5 -author = "Guido Serra " diff --git a/sudo-ldap/schema/sudo.schema b/sudo-ldap/schema/sudo.schema deleted file mode 100644 index 03338a3ec..000000000 --- a/sudo-ldap/schema/sudo.schema +++ /dev/null @@ -1,43 +0,0 @@ -# -# schema file for sudo -# - -attributetype ( 1.3.6.1.4.1.15953.9.1.1 - NAME 'sudoUser' - DESC 'User(s) who may run sudo' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.4.1.15953.9.1.2 - NAME 'sudoHost' - DESC 'Host(s) who may run sudo' - EQUALITY caseExactIA5Match - SUBSTR caseExactIA5SubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.4.1.15953.9.1.3 - NAME 'sudoCommand' - DESC 'Command(s) to be executed by sudo' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.4.1.15953.9.1.4 - NAME 'sudoRunAs' - DESC 'User(s) impersonated by sudo' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -attributetype ( 1.3.6.1.4.1.15953.9.1.5 - NAME 'sudoOption' - DESC 'Options(s) followed by sudo' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 ) - -objectclass ( 1.3.6.1.4.1.15953.9.2.1 NAME 'sudoRole' SUP top STRUCTURAL - DESC 'Sudoer Entries' - MUST ( cn ) - MAY ( sudoUser $ sudoHost $ sudoCommand $ sudoRunAs $ sudoOption $ - description ) - ) - diff --git a/xen/doc/french-explanation b/xen/doc/french-explanation deleted file mode 100644 index 83cf6589a..000000000 --- a/xen/doc/french-explanation +++ /dev/null @@ -1,40 +0,0 @@ -Principe de XEN - -1 serveur physique qui contient l'hyperviseur XEN c'est le dom0 -X serveur virtuel lancer par l'hyperviseur : ce sont les DomuU - -les outils de création de machine xen s'appelle les xen-tools -ils permettent de créer une machine virtuelle en ligne de commande - -xen-tools est configuré par avance en spécifiant certaines options -d'installation ( volume de stockage des machines, quel miroir prendre -pour l'installation , la passerelle par defaut et compagnie ) - -les xen-tools génére un fichier de ce type : - -kernel = '/boot/vmlinuz-2.6.16-xen' -ramdisk = '/boot/initrd.img' -memory = 128 -name = 'ldap-slave1' -root = '/dev/hda1 ro' -disk = [ 'phy:VGdomU/ldap-slave1-root,hda1,w', -'phy:VGdomU/ldap-slave1-swap,hda2,w' ] -vif = ['ip=XX.XXX.XXX.XXX.XXX'] - -c'est ce fichier qui peut être LDAP-ifie - -On peut aussi ldap-ifie le statut de la machine virtuelle : -shutdown = arret -pause = pause -create = demarrage -destroy = crash - -dasn ce cas gosa peut devenir centre de gestion Xen - -Le but du schema xen est de : - -Pour les DomU --> stocker les paramètre des domU --> eventuellement les gérer ( arreter, mettre en pause, demarrer ou -redemarrer) - diff --git a/xen/doc/machintest.cfg b/xen/doc/machintest.cfg deleted file mode 100644 index 13bffaef5..000000000 --- a/xen/doc/machintest.cfg +++ /dev/null @@ -1,40 +0,0 @@ -# -# Configuration file for the Xen instance testmachine created on -# Mon Nov 19 15:37:54 2007. -# - - -# -# Kernel + memory size -# -kernel = '/boot/vmlinuz-2.6.18-4-xen-686' -ramdisk = '/boot/initrd.img-2.6.18-4-xen-686' - -memory = '1024' -vcpus = '2' - - -# -# Disk device(s). -# -root = '/dev/sda1 ro' - -disk = [ 'phy:VGdomU/testmachine-disk,w', 'phy:testmachine-swap,sda2,w' ] - -# -# Hostname -# -name = 'testmachine-disk' - - -# -# Networking -# -vif = [ 'ip=XXX.XXX.XXX.XXX' ] - -# -# Behaviour -# -on_poweroff = 'destroy' -on_reboot = 'restart' -on_crash = 'restart' diff --git a/xen/doc/xen-tools.conf b/xen/doc/xen-tools.conf deleted file mode 100644 index 0621555d2..000000000 --- a/xen/doc/xen-tools.conf +++ /dev/null @@ -1,191 +0,0 @@ -# -# /etc/xen-tools/xen-tools.conf -# -# Global configuration file for the scripts included with Xen-tools. -# -# Values may be set here so they don't need to be specified upon the -# command line. -# -# Steve -# -- -# - - - -# -## -# Output directory for storing loopback images. -# -# If you choose to use loopback images, which are simple to manage but -# slower than LVM partitions, then specify a directory here and uncomment -# the line. -# -# New instances will be stored in subdirectories named after their -# hostnames. -# -## -# dir = /home/xen -# - -# -## -# -# If you don't wish to use loopback images then you may specify an -# LVM volume group here instead -# -## -# lvm = skx-vg - -lvm = VGdomU -# -## -# -# Installation method. -# -# There are four different methods you can use to install a new copy -# of Linux to use in your Xen guest domain: -# -# - Installation via the debootstrap command. -# - Installation via the rpmstrap command. -# - Installation by copying a directory containing a previous installation. -# - Installation by untarring a previously archived image. -# -# NOTE That if you use the "untar", or "copy" options you should ensure -# that the image you're left with matches the 'dist' setting later in -# this file. -# -# Note that you can only uncomment one method - they are mutually exclusive. -# However the command line installation method will allow you to override -# the choice you make here. -# -## -# -# copy = /path/to/pristine/image - -debootstrap = 1 - -# rpmstrap = 1 -# tar = /path/to/img.tar -# - -# -## -# Command definitions. -## -# -# The "debootstrap" and "rpmstrap" commands are hardwired, but if you -# wish to alter the commands invoked when using the "--copy" + "--tar" -# options you can adjust these two settings: -# -# --copy: -# copy-cmd = /bin/cp -a $src/* $dest -# -# --tar: -# tar-cmd = /bin/tar --numeric-owner -xvf $src -# -# - - - -# -## -# Disk and Sizing options. -## -# -size = 1Gb # Disk image size. -memory = 128Mb # Memory size -swap = 1Gb # Swap size -# noswap = 1 # Don't use swap at all for the new system. -fs = ext3 # use the EXT3 filesystem for the disk image. -dist = etch # Default distribution to install. -image = sparse # Specify sparse vs. full disk images. - -# -# Currently supported and tested distributions include: -# -# sid - Debian -# sarge - Debian -# etch - Debian -# dapper - Ubuntu -# centos4 - CentOS 4 -# fedora-core4 - Fedora Core 4 (codname stentz) -# - - - -## -# Networking setup values. -## - -# -# Uncomment and adjust these network settings if you wish to give your -# new instances static IP addresses. -# -gateway = 192.168.1.1 -netmask = 255.255.255.0 -# - -# -# Uncomment this if you wish the images to use DHCP -# -# dhcp = 1 - - -## -# Misc options -## - -# -# Uncomment the following line if you wish to disable the caching -# of downloaded .deb files when using debootstrap to install images. -# -# cache = no -# - -# -# Uncomment the following line if you wish to interactively setup -# a new root password for images. -# -# passwd = 1 - -# -# If you'd like all accounts on your host system which are not present -# on the guest system to be copied over then uncomment the following line. -# -# accounts = 1 -# - -# -# Default kernel and ramdisk to use for the virtual servers -# -#kernel = /boot/vmlinuz-2.6.16-2-xen-686 -#initrd = /boot/initrd.img-2.6.16-2-xen-686 - -kernel = /boot/vmlinuz-2.6.18-4-xen-686 -initrd = /boot/initrd.img-2.6.18-4-xen-686 - -# -# The architecture to use when using debootstrap or rpmstrap. -# -# This is most useful on 64 bit host machines, for other systems it -# doesn't need to be used. -# -# arch=i386 -# - -# -# The default mirror for debootstrap which can be used to install -# Debian Sid, Sarge, and Etch. -# -mirror = http://ftp2.fr.debian.org/debian/ - -# -# A mirror suitable for use when installing the Dapper release of Ubuntu. -# -# mirror = http://gb.archive.ubuntu.com/ubuntu/ - -# -# Uncomment if you wish newly created images to boot once they've been -# created. -# -# boot = 1 diff --git a/xen/schema/xen.schema b/xen/schema/xen.schema deleted file mode 100644 index 8b8aafd66..000000000 --- a/xen/schema/xen.schema +++ /dev/null @@ -1,143 +0,0 @@ -# VERSION 0.1 Antoine .gallavardin@cemagref.fr -# Schema file wiche contains xen parameters - - - -# DESCRIPTION FOR DOMU - -# memory allowed to a DomU in Mo -# ex : 128 -# obligatory -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.1 NAME 'gosaXenDomuMem' - DESC 'Memory allowed to a DomU' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# Max memory allowed to a DomU -# Used by Xen Xen but Don't used by xen-tools -# optional -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.2 NAME 'gosaXenDomuMemMax' - DESC 'Max Memory allowed to a DomU' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# Kernel version use (DomO use by default) -# like vmlinuz -# don't use in commande line by xen-tools -# parameters is stored in global conf file : /etc/xen-tools/xen-tools.cfg -# obligatory -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.3 NAME 'gosaXenDomuKernel' - DESC 'Kernel version use (DomO use by default)' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# RamDisk version use (DomO use by default) -# like initrd.img -# don't use in commande line by xen-tools ( xen-create-image ) -# parameters is stored in global conf file : /etc/xen-tools/xen-tools.cfg -# optional ( depend of tuype of kernel used) -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.4 NAME 'gosaXenDomuRamDisk' - DESC 'RamDisk version use (DomO use by default)' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - - -# Networking interface status dhcp or not -# used by command line : xen-create-image -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.8 NAME 'gosaXenDomuNetworkStatus' - DESC 'Networkinf interface status (DHCP or not)' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# Block device -# XEN-TOOL create by default 2 block device -disk and -swap -# for the moment there is no special parameter in order to create specific block device for /var ou /home -# specified in .conf - - -# Dom0 server used for this domU -# must be filled -# server must contains xen-tools correctly installed -attributetype ( 1.3.6.1.4.1.22262.1.1.10.9 NAME 'gosaXenDomuServerDom0' - DESC 'Dom0 server used for this domU' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - - -# DomU : Installation Method -# it depends of type of linux -# it could be deb, rpm -# specified inb xen-tools.conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.11 NAME 'gosaXenDomuInstallMethod' - DESC 'Installation Method for DomU' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# DomU : Installation Version -# Feisty or gutsy or etch ( see xen-tools.conf for more information ) -# specified inb xen-tools.conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.12 NAME 'gosaXenDomuInstallVersion' - DESC 'Installation Version for DomU' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - - - -# ACTION FOR MANAGING DOMU - -# action when DomO is halting -# don't use by xen-tools -# post install parameters -# what do Xen on this domU when domU is halting ? -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.5 NAME 'gosaXenDomuActionDom0Halt' - DESC 'action when DomO is halting' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# action when DomO is shutdowning -# don't use by xen-tools -# post install parameters -# what do Xen on this domU when domU is shutdowning ? -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.6 NAME 'gosaXenDomuActionDom0Shutdown' - DESC 'action when DomO is Shutdowning' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -# action when DomO is rebootingus -# don't use by xen-tools -# post install parameters -# what do Xen on this domU when domU is rebooting ? -# specified in .conf -attributetype ( 1.3.6.1.4.1.22262.1.1.10.7 NAME 'gosaXenDomuActionDom0Reboot' - DESC 'action when DomO is Rebooting' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - - -# DomU action : Pause Halt Reboot -# don't use by xen-tools -# post install Action -attributetype ( 1.3.6.1.4.1.22262.1.1.10.10 NAME 'gosaXenDomuAction' - DESC 'DomU action : Pause Halt Reboot' - EQUALITY caseExactIA5Match - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 - SINGLE-VALUE) - -- 2.30.2