diff --git a/Makefile b/Makefile index dd33ddb..5bdbf62 100644 --- a/Makefile +++ b/Makefile @@ -27,7 +27,7 @@ web: tools: module $(INSTALL) -d -m 0755 $(BINDIR)/$(NAME) $(INSTALL) -d -m 0774 /etc/evoauth - $(INSTALL) -m 0770 admin/Evoauth.pl $(BINDIR)/$(NAME) + $(INSTALL) -m 0770 admin/Evoauth.pl $(BINDIR)/$(NAME)/evoauth $(INSTALL) -m 0600 install/evoauth.conf /etc/evoauth $(INSTALL) -m 0600 install/evoauth.rules /etc/evoauth diff --git a/admin/lib/Evoauth/Iptables.pm b/admin/lib/Evoauth/Iptables.pm index 93bce30..f19d359 100644 --- a/admin/lib/Evoauth/Iptables.pm +++ b/admin/lib/Evoauth/Iptables.pm @@ -25,6 +25,7 @@ close(RULES); sub Alter() { my $action = shift; + my $login = shift; my $ip = shift; # mode ajout diff --git a/htdocs/activation.php b/htdocs/activation.php index d9e6a1d..0aed4d9 100644 --- a/htdocs/activation.php +++ b/htdocs/activation.php @@ -56,7 +56,7 @@ else { function loadrules() { // activation des règles de firewall - system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -a ".$_SESSION['ip']); + system("/usr/bin/sudo /usr/local/bin/evoauth -a ".$_SESSION['ip']); // passage au statut authentifié update_statut($_SESSION['login'], "1"); diff --git a/htdocs/edit.php b/htdocs/edit.php index d8f6272..d996c04 100644 --- a/htdocs/edit.php +++ b/htdocs/edit.php @@ -276,7 +276,7 @@ if (isset($_SESSION['login'])) $ip = current($resultat); // désactivation de l'utilisateur dans le firewall - system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -d $ip"); + system("/usr/bin/sudo /usr/local/bin/evoauth -d $ip"); // variable nécessaire pour interdir le prochain refresh setkick($ip, "1"); diff --git a/htdocs/fin.php b/htdocs/fin.php index bf00d60..e0e63fd 100644 --- a/htdocs/fin.php +++ b/htdocs/fin.php @@ -11,7 +11,7 @@ delrules(); function delrules() { // suppression des règles de firewall - system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -d ".$_SESSION['ip']." > /dev/null"); + system("/usr/bin/sudo /usr/local/bin/evoauth -d ".$_SESSION['ip']." > /dev/null"); update_statut($_SESSION['login'], "0"); } diff --git a/htdocs/popup_fin.php b/htdocs/popup_fin.php index 8bb26fb..f5965fd 100644 --- a/htdocs/popup_fin.php +++ b/htdocs/popup_fin.php @@ -11,7 +11,7 @@ delrules(); function delrules() { // suppression des règles de firewall - system("/usr/bin/sudo /usr/local/share/evoauth/Evoauth.pl -d ".$_SESSION['ip']."> /dev/null"); + system("/usr/bin/sudo /usr/local/bin/evoauth -d ".$_SESSION['ip']."> /dev/null"); update_statut($_SESSION['login'], "0"); } diff --git a/install/crontab.sample b/install/crontab.sample index 0f67fce..3fad8e7 100644 --- a/install/crontab.sample +++ b/install/crontab.sample @@ -4,4 +4,4 @@ # mois # jour de la semaine # commande (mode vérification d'Evoauth) -* * * * * /usr/local/share/evoauth/Evoauth.pl -c +* * * * * /usr/local/bin/evoauth -c