From baec48635ea5b20ec1aa9c485b9bbadee60376c7 Mon Sep 17 00:00:00 2001 From: opensides Date: Thu, 17 Sep 2009 15:22:23 +0000 Subject: [PATCH] - Corrected mix of french and english - Removed non needed file git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14281 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/gofax/manifest | 6 ------ gosa-plugins/nagios/contrib/goNagios.pl | 26 ++++++++++++------------- gosa-plugins/samba/contrib/goSamba.pl | 17 ++++++++-------- 3 files changed, 22 insertions(+), 27 deletions(-) delete mode 100644 gosa-plugins/gofax/manifest diff --git a/gosa-plugins/gofax/manifest b/gosa-plugins/gofax/manifest deleted file mode 100644 index 8c16043b0..000000000 --- a/gosa-plugins/gofax/manifest +++ /dev/null @@ -1,6 +0,0 @@ -[manifest] -name = gofax -description = GOfax integration for GOsa. -author = Cajus Pollmeier -version = 1.0 -depends = gosa-core diff --git a/gosa-plugins/nagios/contrib/goNagios.pl b/gosa-plugins/nagios/contrib/goNagios.pl index 754681dbc..81afe1657 100755 --- a/gosa-plugins/nagios/contrib/goNagios.pl +++ b/gosa-plugins/nagios/contrib/goNagios.pl @@ -52,7 +52,7 @@ my ($i,$file,$ldap,@nagiosmail, $usercontact,$members,@contactname,@nagiosalias,$j,@entries ); -# Les parametres de connexion proviennent du fichier smbldap-bind.conf +# The connexion parameters are in gosa_bind.conf my $gosa_bind_conf="/etc/gosa_bind.conf"; my $gosa_ldap_conf="/etc/gosaldap.conf"; my %config_bind = &read_conf($gosa_bind_conf); @@ -90,7 +90,7 @@ my $password=$config_bind{masterPw}; - #Partie pour l'objectClass NAgios Contact + #Part of the ObjectClass NAgios Contact $mesg = $ldap->search(filter=>"(&(objectClass~=nagiosContact))", base=>$peopleou,scope=>$scope); @entries = $mesg->entries; $i=0; @@ -109,7 +109,7 @@ my $password=$config_bind{masterPw}; $nb_user=$i; - #Partie pour l'objectClass NAgios Group + #Part of the ObjectClass NAgios Group $mesg = $ldap->search(filter=>"(&(objectClass~=nagiosContactGroup))", base=>$groupeou,scope=>$scope); @entries = $mesg->entries; $i=0; @@ -131,7 +131,7 @@ my $password=$config_bind{masterPw}; $userlist1.=$admindef; - #Partie pour l'objectClass NagiosAuth + #Part of the ObjectClass NagiosAuth $stdout.="\n\n\n\n\nAuthorization for the different Information in Nagios\n"."-" x 53;$stdout.="\n"; $mesg = $ldap->search(filter=>"(&(objectClass~=nagiosAuth)(AuthorizedSystemInformation~=checked))", base=>$peopleou,scope=>$scope); @entries = $mesg->entries; @@ -216,9 +216,9 @@ sub modiffile_contact() { $file=$_[0]; my $text=""; - open(FH,"$file") || die "Probleme d'ouverture du fichier $file"; + open(FH,"$file") || die "Can't open file $file"; $stdout.="\n\n"; $stdout.=" "x10;$stdout.="-"x25;$stdout.=" "x10; - $stdout.="\n\n$nb_user utilisateur(s) ajouté(s) dans le fichier $file\n"; + $stdout.="\n\n$nb_user user(s) added in file $file\n"; for($i=0;$i<$nb_user;$i++) { $text.="\n\ndefine contact{\n"; @@ -232,7 +232,7 @@ sub modiffile_contact() $text.="\n}\n\n"; } close(FH); - open(FH,"> $file") || die "Probleme d'ouverture du fichier $file"; + open(FH,"> $file") || die "Can't open file $file"; print FH "$text"; close(FH); @@ -244,9 +244,9 @@ sub modiffile_group() $text=""; $j=0; $i=0; - open(FH,"$file") || die "Probleme d'ouverture du fichier $file"; + open(FH,"$file") || die "Can't open $file"; $stdout.="\n\n"; $stdout.=" "x10;$stdout.="-"x25;$stdout.=" "x10; - $stdout.="\n\n$nb_groupe groupe(s) ajouté(s) dans le fichier $file\n"; + $stdout.="\n\n$nb_groupe group(s) added in file $file\n"; for($i=0;$i<$nb_groupe;$i++) { $text.="\n\ndefine contact{\n"; @@ -262,7 +262,7 @@ sub modiffile_group() } close(FH); - open(FH,"> $file") || die "Probleme d'ouverture du fichier $file"; + open(FH,"> $file") || die "Can't open file $file"; print FH "$text"; close(FH); @@ -272,7 +272,7 @@ sub modiffile_cgi() { $file=$_[0]; $text=""; - open(FH,"$file") || die "Probleme d'ouverture du fichier $file"; + open(FH,"$file") || die "Can't open file $file"; while() { $line=$_; @@ -287,7 +287,7 @@ sub modiffile_cgi() else {$text.=$line}; } close(FH); - open(FH,"> $file") || die "Probleme d'ouverture du fichier $file"; + open(FH,"> $file") || die "Can't open file $file"; print FH "$text"; close(FH); @@ -296,7 +296,7 @@ sub modiffile_cgi() sub read_conf() { my %conf; - open (CONFIGFILE, "$_[0]") || die "Unable to open $_[0] for reading !\n"; + open (CONFIGFILE, "$_[0]") || die "Can't open $_[0] for reading !\n"; while () { chomp($_); ## throw away comments diff --git a/gosa-plugins/samba/contrib/goSamba.pl b/gosa-plugins/samba/contrib/goSamba.pl index ef7b210b4..f7087bab3 100755 --- a/gosa-plugins/samba/contrib/goSamba.pl +++ b/gosa-plugins/samba/contrib/goSamba.pl @@ -2,6 +2,7 @@ # Copyright (C) 2005 Guillaume Delecourt +# Copyright (c) 2009 Benoit Mortier # # 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 @@ -27,10 +28,10 @@ use Net::LDAP::LDIF; # Variables a config $admin="cn=ldapadmin,dc=example,dc=be"; $password=""; -$peopleou="ou=People,dc=example,dc=be"; +$peopleou="ou=people,dc=example,dc=be"; $base="dc=example,dc=be"; $scope="one"; # par defaut -$dump_file="myldaptree.ldif"; +$dump_file="samba-before-gosa.ldif"; $server="localhost"; @@ -50,7 +51,7 @@ $comm=$ARGV[0]; if($comm eq "del" && @ARGV >1 ) { - print "You asked to delete attribute : "; + print "You asked to delete attributes : "; $i=1; while($ARGV[$i] ne "") { @@ -62,7 +63,7 @@ if($comm eq "del" && @ARGV >1 ) $ldap->bind($admin,password=>$password); - print "ldap connection" .$ldap; + print "ldap connection " .$ldap; $mesg = $ldap->search(filter=>"(objectClass=*)",base=>$peopleou,scope=>$scope); @entries = $mesg->entries; @@ -122,7 +123,7 @@ elsif($comm eq "modif" && @ARGV >1) @entries = $mesg->entries; foreach $entry (@entries) { $mesg = $ldap->modify($entry->dn(), replace => { "$ARGV[1]" => "$ARGV[2]" } ); - print $entry->dn()."\n\tattribut $ARGV[1] modifié avec la valeur $ARGV[2]\n"; + print $entry->dn()."\n\tattribut $ARGV[1] modified with the value $ARGV[2]\n"; } $ldap->unbind; exit(0); @@ -141,10 +142,10 @@ sub help() print_banner; print "Usage: $0 [-?] command\n"; print "\t-? show this help message\n"; - print "\tgosa -> add GOsa attributes for the whole the people branch !\n"; - print "\tdel attribut -> Remove an attribute for the whole people branch !\n"; + print "\tgosa -> add GOsa attributes to the people branch !\n"; + print "\tdel -> Remove an attribute from the people branch !\n"; print "\tmodif -> to modify the attribute\n"; - print "\tdump to dump the whole ldap tree\n"; + print "\tdump -> dump the whole ldap tree\n"; exit (1); } -- 2.30.2