Ticket #15: lrs_backuppc_admin_tasks2.diff

webmin/lbs/admin.cgi

@@ -109 +109 @@
-    <ul><li><a href='rename.cgi?$redir'>$text{'but_rename'}</a>
-    <li><a href='renamemac.cgi?$redir'>$text{'but_renamemac'}</a>
-    <li><a href='delete.cgi?$redir'>$text{'but_delete'}</a>
+    <li><a href='disable_backuppc.cgi?$redir'>$text{'but_disable_backuppc'}</a>
+    <li><a href='delete_backuppc.cgi?$redir'>$text{'but_delete_backuppc'}</a>
-    </ul>
-EOF
-} else {

webmin/lbs/delete_backuppc.cgi

@@ +1 @@
+#!/usr/bin/perl -w
+#
+# $Id: delete.cgi 4244 2007-04-16 09:10:48Z root $
+#
+# Linbox Rescue Server
+# Copyright (C) 2005  Linbox FAS
+#
+# 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.
+
+use strict;
+
+# rmtree function
+use File::Path;
+
+# get some common functions ...
+require "lbs.pl";
+# ... and vars
+use vars qw (%access %config %in %text $VERSION);
+
+lbs_common::init_lbs_conf() or exit(0);
+
+my %einfo;
+my $lbs_home = $lbs_common::lbsconf{'basedir'};
+my $etherfile = $lbs_home . "/etc/ether";
+my ($mac,$name);
+my ($mesg, $warning);
+my $result;
+my @toremove;
+
+error(text("err_dnf",$lbs_home)) if (not -d $lbs_home);
+error(text("err_fnf",$etherfile)) if (not -f $etherfile);
+
+ReadParse();
+lbs_common::InClean();
+
+# Is the user granted to do this action ?
+error( $text{'acl_error'} ) if ($access{'modify'});
+
+etherLoad($etherfile, \%einfo) or error( lbsGetError() );
+
+# Invalid MAC address
+if (not exists $in{'mac'}) {
+        error($text{'err_invalcgi_nomac'});
+}
+# Seems the users clicked on cancel, redirect to index
+elsif (exists $in{'cancel'}) {
+        redirect("index.cgi");
+}
+# Yeah! Finally someone confirmed his choice, let's delete stuff
+elsif (exists $in{'apply'}) {
+
+    $mac = $in{'mac'};
+    $name = etherGetNameByMac(\%einfo, $mac);
+    # Strip profile
+    $name =~ s/^.*://;
+    # Strip group(s)
+    $name =~ s/^.*\///;
+    # StrToLower
+    $name = lc($name);
+        
+    if (not defined $name) {
+        error(text("err_mac_inval",$mac));
+    }
+        
+    # Drop BackupPC config plus old backups
+    # BackupPC_nightly will remove old files from cpool at its next run
+    my $BACKUPPCCONFDIR="/etc/backuppc";            # FIXME: hardcoded
+    my $BACKUPPCFILESDIR="/var/lib/backuppc/pc";    # FIXME: hardcoded
+
+    # Create an array with all we want to delete
+    push @toremove, "$BACKUPPCCONFDIR/$name.pl" if (-e "$BACKUPPCCONFDIR/$name.pl");
+    push @toremove, "$BACKUPPCFILESDIR/$name" if (-e "$BACKUPPCFILESDIR/$name");
+    # And remove it, then
+    foreach (@toremove) {
+        rmtree($_, 0, 1);
+    }
+    
+    # We need to fix /etc/backuppc/hosts too
+    `perl -i -ne "print unless m/^$name\\s+[0-9]/i" $BACKUPPCCONFDIR/hosts`;
+
+    # And reload BackupPC to re-read hosts
+    `/etc/init.d/backuppc reload`;
+
+    $mesg = text("msg_delete_ok",$name,$mac);
+    lbs_common::print_header( $text{'tit_delete'}, "index", $VERSION);
+    lbs_common::print_html_tabs(['list_of_machines', "clients_list"]);
+
+    print "<h2>$mesg</h2>\n" ;
+
+    menuEnd();
+    footer("", $text{'index'}) ;
+}
+
+# No confirmation asked yet, let's bother the user
+else {
+        
+        $mac = $in{'mac'} ;
+        $name = etherGetNameByMac(\%einfo, $mac) ;
+
+        lbs_common::print_header( $text{'tit_delete'}, "index", $VERSION);
+        lbs_common::print_html_tabs(['list_of_machines', "clients_list"]);
+
+        $mesg = text("msg_delete_confirm_backuppc",$name,$mac);
+        $warning = $text{'msg_delete_warn_backuppc'} ;
+        print_confirmation_form("delete_backuppc.cgi", "<h2>$mesg<br><font color=#FF0000>$warning</font></h2>", "mac", $mac ) ;
+
+        # end of tabs
+        lbs_common::print_end_menu();
+        lbs_common::print_end_menu();
+
+        # end of page
+        footer( "", $text{'index'} );
+}

webmin/lbs/disable_backuppc.cgi

@@ +1 @@
+#!/usr/bin/perl -w
+#
+# $Id: delete.cgi 4244 2007-04-16 09:10:48Z root $
+#
+# Linbox Rescue Server
+# Copyright (C) 2005  Linbox FAS
+#
+# 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.
+
+use strict;
+
+# get some common functions ...
+require "lbs.pl";
+# ... and vars
+use vars qw (%access %config %in %text $VERSION);
+
+lbs_common::init_lbs_conf() or exit(0);
+
+my %einfo;
+my $lbs_home = $lbs_common::lbsconf{'basedir'};
+my $etherfile = $lbs_home . "/etc/ether";
+my ($mac,$name);
+my ($mesg, $warning);
+my $result;
+
+error(text("err_dnf",$lbs_home)) if (not -d $lbs_home);
+error(text("err_fnf",$etherfile)) if (not -f $etherfile);
+
+ReadParse();
+lbs_common::InClean();
+
+# Is the user granted to do this action ?
+error( $text{'acl_error'} ) if ($access{'modify'});
+
+etherLoad($etherfile, \%einfo) or error( lbsGetError() );
+
+# Invalid MAC address
+if (not exists $in{'mac'}) {
+        error($text{'err_invalcgi_nomac'});
+}
+# Seems the users clicked on cancel, redirect to index
+elsif (exists $in{'cancel'}) {
+        redirect("index.cgi");
+}
+# Yeah! Finally someone confirmed his choice, let's disable the host
+elsif (exists $in{'apply'}) {
+
+    $mac = $in{'mac'};
+    $name = etherGetNameByMac(\%einfo, $mac);
+    # Strip profile
+    $name =~ s/^.*://;
+    # Strip group(s)
+    $name =~ s/^.*\///;
+    # StrToLower
+    $name = lc($name);
+
+    if (not defined $name) {
+        error(text("err_mac_inval",$mac));
+    }
+        
+    # Modify host's BackupPC conf file
+    my $BACKUPPCCONFDIR="/etc/backuppc";            # FIXME: hardcoded
+    my $BACKUPPCCONFFILE="$BACKUPPCCONFDIR/$name.pl";
+
+    # Set $Conf{FullPeriod} to -1
+    `perl -pi -e 's/\\\$Conf{FullPeriod}.*\$/\\\$Conf{FullPeriod} = -1;/' $BACKUPPCCONFFILE`;
+
+    $mesg = text("msg_disable_backuppc_ok",$name,$mac);
+    lbs_common::print_header( $text{'tit_disable_backuppc'}, "index", $VERSION);
+    lbs_common::print_html_tabs(['list_of_machines', "clients_list"]);
+
+    print "<h2>$mesg</h2>\n";
+    
+    menuEnd();
+    footer("", $text{'index'});
+}
+
+# No confirmation asked yet, let's bother the user
+else {
+        
+        $mac = $in{'mac'} ;
+        $name = etherGetNameByMac(\%einfo, $mac) ;
+
+        lbs_common::print_header( $text{'tit_disable_backuppc'}, "index", $VERSION);
+        lbs_common::print_html_tabs(['list_of_machines', "clients_list"]);
+
+        $mesg = text("msg_disable_confirm_backuppc",$name,$mac);
+        $warning = $text{'msg_disable_warn_backuppc'} ;
+        print_confirmation_form("disable_backuppc.cgi", "<h2>$mesg<br><font color=#FF0000>$warning</font></h2>", "mac", $mac ) ;
+
+        # end of tabs
+        lbs_common::print_end_menu();
+        lbs_common::print_end_menu();
+
+        # end of page
+        footer( "", $text{'index'} );
+}

webmin/lbs/lang/en

@@ -20 +20 @@
-but_return=Return
-but_rm_machine=Remove this client
-but_sync=Synchronize
+but_disable_backuppc=Disable files backup
+but_delete_backuppc=Delete files backup
-
-err_adminid_mandat=The admin ID is mandatory.
-err_basedirnf=LRS root directory <b>$1</b> not found. You should check <tt>basedir</tt> located into <tt>lbs.conf</tt> .
@@ -166 +168 @@
-msg_conf_partcopy=Partition $1, disk $2 ($3)
-msg_conf_ptabs=Disk $1 partition table
-msg_delete_confirm=Remove host <b>$1</b> ($2) ?
+msg_delete_confirm_backuppc=Remove host <b>$1</b> ($2) from files backups ?
-msg_delete_ok=Host <b>$1</b> ($2) successfully removed.
-msg_delete_warn=WARNING: All information about this host will be deleted, including backups !
+msg_delete_warn_backuppc=WARNING: All information about this host files backups will be deleted, including backups !
-msg_delimg_confirm=Remove image <b>$1</b> ?
-msg_delimg_symlink=This image is just a link to one another. Only this link will be deleted.
-msg_delimg_warn=WARNING: All data about this image will be deleted!
-msg_dhcp_addofentry=Add of entry
-msg_dhcp_formdesc=Add a new host entry in the LRS for system backup
-msg_dhcp_nolic=Sorry, you cannot add more clients. License exhausted.
+msg_disable_backuppc_ok=Files backups disabled sucessfully for host <b>$1</b> ($2).
+msg_disable_confirm_backuppc=Disable files backups for host <b>$1</b> ($2) ?
+msg_disable_warn_backuppc=WARNING: No more automatic files backups will be done. Current backups will stay available.
-msg_imgbase_delconfirm=Remove image <b>$1</b> ?
-msg_imgbase_delwarn=WARNING: All data about this image will be deleted!
-msg_index_empty=No registered host.
@@ -206 +213 @@
-tit_desc=LRS : Description Edition
-tit_details=LRS : Details
-tit_dhcp=LRS : DHCP
+tit_disable_backuppc=LRS: Disable files backup
-tit_error=LRS : Error
-tit_hwinfo=LRS : Hardware Config
-tit_imagesize=Compressed image size (in MB)

webmin/lbs/lang/fr

@@ -20 +20 @@
-but_return=Retour
-but_rm_machine=Effacer cette machine
-but_sync=Synchroniser
+but_disable_backuppc=Désactiver la sauvegarde fichiers
+but_delete_backuppc=Supprimer de la sauvegarde fichiers
-
-err_adminid_mandat=Le mot de passe d'identification est obligatoire.
-err_basedirnf=Le répertoire racine LRS <b>$1</b> est inaccessible. Veuillez vérifier le paramètre <tt>basedir</tt> dans le fichier <tt>lbs.conf</tt> .
@@ -167 +169 @@
-msg_conf_partcopy=Partition $1, disque $2 ($3)
-msg_conf_ptabs=Table de partitions du disque $1
-msg_delete_confirm=Effacer la machine <b>$1</b> ($2) ?
+msg_delete_confirm_backuppc=Effacer la machine <b>$1</b> ($2) de la sauvegarde fichiers ?
-msg_delete_ok=Effacement de la machine <b>$1</b> ($2) effectué avec succès.
-msg_delete_warn=ATTENTION: cela effacera toutes les données concernant cette machine. Y compris ses sauvegardes!
+msg_delete_warn_backuppc=ATTENTION: cela effacera toutes les données concernant la sauvegarde fichiers de cette machine. Y compris ses sauvegardes!
-msg_delimg_confirm=Effacer l'image <b>$1</b> ?
-msg_delimg_symlink=Cette image est juste un lien vers une autre image. Seul le lien lui-même sera effacé.
-msg_delimg_warn=ATTENTION: cela effacera toutes les données concernant cette image!
-msg_dhcp_addofentry=Ajout de l'entrée
-msg_dhcp_formdesc=Ajout d'une nouveau client LRS pour la sauvegarde système
-msg_dhcp_nolic=Désolé, vous ne pouvez plus ajouter d'autres clients. Pas assez de licences.
+msg_disable_backuppc_ok=Sauvegarde fichiers désactivée avec succès pour la machine <b>$1</b> ($2).
+msg_disable_confirm_backuppc=Désactiver la sauvegarde fichiers de <b>$1</b> ($2) ?
+msg_disable_warn_backuppc=ATTENTION: Plus aucune sauvegarde ne sera effectuée automatiquement. Par contres, les sauvegardes actuelles resteront disponibles.
-msg_imgbase_delconfirm=Effacer l'image <b>$1</b> ?
-msg_imgbase_delwarn=ATTENTION: Cela effacera toutes les données concernant cette image !
-msg_index_empty=Aucune machine enregistrée
@@ -207 +214 @@
-tit_desc=LRS : Edition de description
-tit_details=LRS : Détails
-tit_dhcp=LRS : DHCP
+tit_disable_backuppc=LRS: Désactivation sauvegarde fichiers
-tit_error=LRS : Erreur
-tit_hwinfo=LRS : Config matérielle
-tit_imagesize=Taille de l'image compressée (en Mo)