From 1393a0c8f8ffba8d00184ce810c9c1f916f0e132 Mon Sep 17 00:00:00 2001 From: ms Date: Sun, 19 Aug 2007 21:55:19 +0000 Subject: [PATCH] dhcpcd.exe geschrieben. asterisk.cgis geloescht. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@787 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/rootfiles/common/apache2 | 4 - config/rootfiles/common/initscripts | 1 + html/cgi-bin/asterisk.cgi/calls | 116 ------------- html/cgi-bin/asterisk.cgi/conf | 161 ------------------- html/cgi-bin/asterisk.cgi/status | 147 ----------------- lfs/dhcpcd | 2 +- src/initscripts/init.d/networking/dhcpcd.exe | 32 ++++ 7 files changed, 34 insertions(+), 429 deletions(-) delete mode 100644 html/cgi-bin/asterisk.cgi/calls delete mode 100644 html/cgi-bin/asterisk.cgi/conf delete mode 100644 html/cgi-bin/asterisk.cgi/status create mode 100644 src/initscripts/init.d/networking/dhcpcd.exe diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2 index 04fa07b348..d8b6ccd20b 100644 --- a/config/rootfiles/common/apache2 +++ b/config/rootfiles/common/apache2 @@ -1255,10 +1255,6 @@ etc/httpd/conf/uid.conf etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf etc/httpd/conf/vhosts.d/ipfire-interface.conf srv/web/ipfire/cgi-bin/aliases.cgi -#srv/web/ipfire/cgi-bin/asterisk.cgi -#srv/web/ipfire/cgi-bin/asterisk.cgi/calls -#srv/web/ipfire/cgi-bin/asterisk.cgi/conf -#srv/web/ipfire/cgi-bin/asterisk.cgi/status srv/web/ipfire/cgi-bin/backup.cgi srv/web/ipfire/cgi-bin/chpasswd.cgi srv/web/ipfire/cgi-bin/connections.cgi diff --git a/config/rootfiles/common/initscripts b/config/rootfiles/common/initscripts index 8be1328ee3..810246afdf 100644 --- a/config/rootfiles/common/initscripts +++ b/config/rootfiles/common/initscripts @@ -32,6 +32,7 @@ etc/rc.d/init.d/network #etc/rc.d/init.d/networking etc/rc.d/init.d/networking/any etc/rc.d/init.d/networking/blue +etc/rc.d/init.d/networking/dhcpcd.exe etc/rc.d/init.d/networking/green etc/rc.d/init.d/networking/orange etc/rc.d/init.d/networking/red diff --git a/html/cgi-bin/asterisk.cgi/calls b/html/cgi-bin/asterisk.cgi/calls deleted file mode 100644 index 99e2520862..0000000000 --- a/html/cgi-bin/asterisk.cgi/calls +++ /dev/null @@ -1,116 +0,0 @@ -#!/usr/bin/perl - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); - -my (%asterisksettings, %checked); - -my %cgiparams; - -&Header::getcgihash(\%cgiparams); - -$asterisksettings{'ACTION'} = ''; - -$file = "/var/log/asterisk/cdr-csv/Master.csv"; - -open(DATEN, "$file") or die "Can't open file: $file: $!\n"; -@datafile = ; -close(DATEN); - -&Header::openpage('asterisk', 1, ''); - -&Header::openbigbox('100%', 'LEFT'); - -if ($cgiparams{'ACTION'} eq $Lang::tr{'update'}) -{ - $mday3 = $cgiparams{'day3'}; - $mon3 = $cgiparams{'month3'}; - $jahr3 = $cgiparams{'year3'}; - $mday4 = $cgiparams{'day4'}; - $mon4 = $cgiparams{'month4'}; - $jahr4 = $cgiparams{'year4'}; -} -else -{ - @datum3 = localtime(time()); - ($sec3,$min3,$stunde3,$mday3,$mon3,$jahr3,$wday3,$yday3,$isdst3)=@datum3; - $jahr3 = $jahr3 + 1900; - $mon3 = $mon3+1; - if ($mon3 < 10) { $mon3 = "0$mon3"; } - if ($mday3 <10) { $mday3= "0$mday3";} - $sec4 = $sec3; - $min4 = $min3; - $stunde4 = $stunde3; - $mday4 = $mday3; - $mon4 = $mon3; - $jahr4 = $jahr3; - $wday4 = $wday3; - $isdst4 = $isdst3; -} - -if ($errormessage) { - &openbox('100%', 'LEFT', $tr{'error messages'}); - print "$errormessage \n"; - &closebox(); -} - -print "
\n"; - -&Header::openbox('100%', 'LEFT', 'Filter'); - -print < -
 Tag:Monat:Jahr:
Von: -
Bis: - -
Von oder zum Anrufer mit der ID/Nummer: - -
-
-END -; - -&Header::closebox(); - -&Header::openbox('100%', 'LEFT', 'Anrufe'); -print "
Anfrufer Angerufene CallerID Start des Anrufs Ende des Anrufs Dauer (in Sek.) Status"; -print "
 "; -foreach $line (reverse @datafile) { -chomp $line; -(@spalten) = split (/,/, $line); -$spalten[1] =~ s/"//g; -$spalten[2] =~ s/"//g; -$spalten[4] =~ s/"//g; -$spalten[10]=~ s/"//g; -$spalten[11]=~ s/"//g; -$spalten[13]=~ s/"//g; -$spalten[14]=~ s/"//g; -(@zdatum) = split (/ /, $spalten[11]); -(@datu) = split (/-/, $zdatum[0]); -(@dzeit) = split (/:/, $zdatum[1]); -$datum1 = $datu[0].$datu[1].$datu[2]; -@datum2_1 = localtime(time()); -($sec,$min,$stunde,$mday,$mon,$jahr,$wday,$yday,$isdst)=@datum2_1; -$jahr = $jahr + 1900; -$mon = $mon+1; -if ($mon < 10) { $mon = "0$mon"; } -if ($mday <10) { $mday= "0$mday";} -$datum2 = $jahr.$mon.$mday; -$datum3_1 = $jahr3.$mon3.$mday3; -$datum4_1 = $jahr4.$mon4.$mday4; -$datum2 = $datum2-100; -if ($datum1 ge $datum3_1 && $datum1 le $datum4_1 && ($cgiparams{'number'} eq '' || $cgiparams{'number'} eq $spalten[1] || $cgiparams{'number'} eq $spalten[2])) { -print "
$spalten[1] $spalten[2] $spalten[4] $spalten[10] $spalten[11] $spalten[13] $spalten[14]\n";} -} -print "
"; - -&Header::closebox(); - -print "\n"; - -&Header::closebigbox(); - -&Header::closepage(); diff --git a/html/cgi-bin/asterisk.cgi/conf b/html/cgi-bin/asterisk.cgi/conf deleted file mode 100644 index aadbdb8b64..0000000000 --- a/html/cgi-bin/asterisk.cgi/conf +++ /dev/null @@ -1,161 +0,0 @@ -#!/usr/bin/perl - -require '/var/ipfire/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); - -my %cgiparams; - -&Header::getcgihash(\%cgiparams); - -&Header::openpage('asterisk', 1, ''); - -&Header::openbigbox('100%', 'LEFT'); - -if ($cgiparams{'ACTION'} eq $Lang::tr{'save'}) - { - $conf_file = $cgiparams{'save_path'}; - open (FILE, ">$conf_file") or die "Kann die Datei nicht speichern: $!"; - flock (FILE, 2); - print FILE "$cgiparams{'textarea'}"; - close FILE; - &Header::openbox('100%', 'LEFT', 'info'); - print "$conf_file wurde gespeichert"; - &Header::closebox(); - } - -if ($cgiparams{'ACTION'} eq Bearbeiten) - { - $conf_file = $cgiparams{'conf_file'}; - } - -if ($conf_file eq '') { - $conf_file='/etc/asterisk/extensions.conf'; - } - -if ($cgiparams{'ACTION'} eq extensions) - { - $conf_file='/etc/asterisk/extensions.conf'; - } - -if ($cgiparams{'ACTION'} eq sip) - { - $conf_file='/etc/asterisk/sip.conf'; - } - -if ($cgiparams{'ACTION'} eq iax) - { - $conf_file='/etc/asterisk/iax.conf'; - } - - - - -if ($errormessage) { - &Header::openbox('100%', 'LEFT', $tr{'error messages'}); - print "$errormessage \n"; - &Header::closebox(); -} - -$cgiparams{'ACTION'} = ''; - -print "
\n"; - -if ($conf_file ne '') { - -&Header::openbox('100%', 'LEFT', $conf_file); - print < -
\n - -
-

-

-

- -END -; - -&Header::closebox(); -} - -&Header::openbox('100%', 'LEFT', 'Dateiauswahl'); - -my $dir = '/vbar/ipfire/asterisk/'; -my @dateien; - -listFiles ($dir); - -print < - - - - -
 "; - -sub listFiles { -local *DH; -my ($item, $pfad); -my $dir = shift; - -opendir (DH, $dir) or return; -while ($item = readdir (DH)) { -next if ( $item =~ /^\./ ); -$pfad = ( ($dir =~ /\/$/) ? ($dir . $item) : ($dir . '/'.$item) ); -push (@dateien, $pfad) if (-f $pfad); -listFiles ($pfad) if (-d $pfad); -} -closedir (DH); -} - -sub listFiles2 { -local *DH2; -my ($item2, $pfad2); -my $dir2 = shift; - -opendir (DH2, $dir2) or return; -while ($item2 = readdir (DH2)) { -next if ( $item2 =~ /^\./ ); -$pfad2 = ( ($dir2 =~ /\/$/) ? ($dir2 . $item2) : ($dir2 . '/'.$item2) ); -push (@dateien2, $pfad2) if (-f $pfad2); -listFiles2 ($pfad2) if (-d $pfad2); -} -closedir (DH2); -} - - -&Header::closebox(); - -print "\n"; - -&Header::closebigbox(); - -&Header::closepage(); diff --git a/html/cgi-bin/asterisk.cgi/status b/html/cgi-bin/asterisk.cgi/status deleted file mode 100644 index c6af9e22ea..0000000000 --- a/html/cgi-bin/asterisk.cgi/status +++ /dev/null @@ -1,147 +0,0 @@ -#!/usr/bin/perl - -require '/var/ipcop/general-functions.pl'; -require "${General::swroot}/lang.pl"; -require "${General::swroot}/header.pl"; - -&Header::showhttpheaders(); - -my %asterisksettings; - -&Header::getcgihash(\%asterisksettings); - -&Header::openpage('asterisk', 1, ''); - -&Header::openbigbox('100%', 'LEFT'); - -if ($asterisksettings{'ACTION'} eq $Lang::tr{'save'}) -{ - - &General::writehash("${General::swroot}/asterisk/settings", \%asterisksettings); - - if ($asterisksettings{'ENABLE_AST'} eq 'on') - { - &General::log('Asterisk is enabled'); - system ('/bin/touch', "${General::swroot}/asterisk/enable"); - } - else - { - &General::log('Asterisk is disabled'); - unlink "${General::swroot}/asterisk/enable"; - } - - if ($asterisksettings{'ENABLE_CAPI'} eq 'on') - { - &General::log('CAPI is enabled'); - system ('/bin/touch', "${General::swroot}/asterisk/capi"); - } - else - { - &General::log('CAPI is disabled'); - unlink "${General::swroot}/asterisk/capi"; - } - - if ($asterisksettings{'ENABLE_ZAP'} eq 'on') - { - &General::log('Zaptel is enabled'); - system ('/bin/touch', "${General::swroot}/asterisk/zap"); - } - else - { - &General::log('Zaptel is disabled'); - unlink "${General::swroot}/asterisk/zap"; - } - - { - &General::writehash("${General::swroot}/asterisk/settings", \%asterisksettings); - } - - system("/usr/local/bin/asteriskoff >/dev/null 2>&1"); - system("/bin/sleep 2"); - system("/usr/local/bin/amportalconf >/dev/null 2>&1"); - system("/usr/local/bin/asteriskmodules >/dev/null 2>&1"); - system("/usr/local/bin/asteriskon >/dev/null 2>&1"); - &General::log('Asterisk config changed'); -} - -&General::readhash("${General::swroot}/asterisk/settings", \%asterisksettings); - -$checked{'ENABLE_AST'}{'off'} = ''; -$checked{'ENABLE_AST'}{'on'} = ''; -$checked{'ENABLE_AST'}{$asterisksettings{'ENABLE_AST'}} = 'CHECKED'; - -$checked{'ENABLE_CAPI'}{'off'} = ''; -$checked{'ENABLE_CAPI'}{'on'} = ''; -$checked{'ENABLE_CAPI'}{$asterisksettings{'ENABLE_CAPI'}} = 'CHECKED'; - -$checked{'ENABLE_ZAP'}{'off'} = ''; -$checked{'ENABLE_ZAP'}{'on'} = ''; -$checked{'ENABLE_ZAP'}{$asterisksettings{'ENABLE_ZAP'}} = 'CHECKED'; - -if ($errormessage) { - &Header::openbox('100%', 'LEFT', $tr{'error messages'}); - print "$errormessage \n"; - &Header::closebox(); -} - -if ($message) { - &Header::openbox('100%', 'LEFT', 'Message'); - print "$message \n"; - &Header::closebox(); -} - -print "
\n"; - -&Header::openbox('100%', 'LEFT', 'Status:'); - print < - - - - - - - - - - - - - - - - - - - - - - -
asteriskAktiviert:
Load CAPI kernel modules:Aktiviert:
Load ZAP kernel modules:Aktiviert:
  
-END -; - -&Header::closebox(); - -&Header::openbox('100%', 'LEFT', 'Asterisk:'); - print < - - - - - - - - - - - -
 Konfiguration 
 Anrufe 
-END -; -&Header::closebox(); - -&Header::closebigbox(); - -&Header::closepage(); diff --git a/lfs/dhcpcd b/lfs/dhcpcd index 2b717875f0..701d3f5a76 100644 --- a/lfs/dhcpcd +++ b/lfs/dhcpcd @@ -76,6 +76,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --mandir=/usr/share/man --disable-nls cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install - ln -sf /etc/rc.d/init.d/net/red/update $(CONFIG_ROOT)/dhcpc/dhcpcd.exe + ln -sf /etc/rc.d/init.d/networking/dhcpcd.exe $(CONFIG_ROOT)/dhcpc/dhcpcd.exe @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/src/initscripts/init.d/networking/dhcpcd.exe b/src/initscripts/init.d/networking/dhcpcd.exe new file mode 100644 index 0000000000..5349960cb2 --- /dev/null +++ b/src/initscripts/init.d/networking/dhcpcd.exe @@ -0,0 +1,32 @@ +#!/bin/sh +######################################################################## +# Begin +# +# Description : DHCP Client Script +# +# Authors : Michael Tremer - mitch@ipfire.org +# +# Version : 01.00 +# +# Notes : +# +######################################################################## + +eval $(/usr/local/bin/readhash "$1") +case "$2" in + up) + logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with old IP=${IPADDR}" + touch /var/ipfire/red/active + ;; + new) + logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been configured with new IP=${IPADDR}" + [ -e "/var/ipfire/red/active" ] || touch /var/ipfire/red/active + fi + ;; + down) + logger -p local0.info -t dhcpcd.exe[$$] "${INTERFACE} has been brought down" + rm -f /var/ipfire/red/active + ;; +esac + +# End -- 2.39.2