From 957fb958c6166364c1b3648098a582b3b112d897 Mon Sep 17 00:00:00 2001 From: ms Date: Mon, 21 Aug 2006 19:15:32 +0000 Subject: [PATCH] =?utf8?q?Programmupdate:=20=20=20*=20Samba=203.0.23a=20--?= =?utf8?q?>=203.0.23b=20Ge=C3=A4ndert:=20=20=20*=20ConnectionScheduler=20k?= =?utf8?q?ann=20jetzt=20VPNs=20starten/beenden.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@254 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- doc/ChangeLog | 8 ++++++++ doc/packages-list.txt | 1 + html/cgi-bin/connscheduler.cgi | 37 +++++++++++++++++++++------------- langs/de/cgi-bin/de.pl | 28 +++++++++++++------------ langs/en/cgi-bin/en.pl | 30 ++++++++++++++------------- lfs/samba | 4 ++-- src/scripts/connscheduler | 14 +++++++++++++ 7 files changed, 79 insertions(+), 43 deletions(-) diff --git a/doc/ChangeLog b/doc/ChangeLog index 9c6a72887b..3d5b9aad31 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,12 @@ ------------------------------------------------------------------------ +r253 | ms | 2006-08-20 22:12:57 +0200 (Sun, 20 Aug 2006) | 5 lines + +Fixes: + * libPNG12 fehlte für makegraphs + * md5sums erhielten den falschen Namen (ohne Unterstrich) +Geändert: + * QoS leicht erweitert. +------------------------------------------------------------------------ r252 | ms | 2006-08-19 22:26:47 +0200 (Sat, 19 Aug 2006) | 2 lines Geaendert: diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 3b536a8e8f..40f016cfd0 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -209,6 +209,7 @@ * rp-pppoe-3.5 * rrdtool-1.0.49 * samba-3.0.23a + * samba-3.0.23b * sata300_sataii150_tx_series_linux2.4_open_source_1.00.0.15 * screen-4.0.2 * sed-4.0.9 diff --git a/html/cgi-bin/connscheduler.cgi b/html/cgi-bin/connscheduler.cgi index 1ad7ff16c9..382cefe8ac 100644 --- a/html/cgi-bin/connscheduler.cgi +++ b/html/cgi-bin/connscheduler.cgi @@ -4,19 +4,24 @@ # # This code is distributed under the terms of the GPL # +# +# 2006-04-xx created by weizen_42 at ipcop-forum dot de +# 2006-06-xx added reboot and shutdown +# 2006-08-20 added ipsecctrl +# use strict; # enable only the following on debugging purpose -#use warnings; -#use CGI::Carp 'fatalsToBrowser'; +use warnings; +use CGI::Carp 'fatalsToBrowser'; require '/var/ipfire/general-functions.pl'; require "${General::swroot}/lang.pl"; require "${General::swroot}/header.pl"; -require '/var/ipfire/connscheduler/lib.pl'; +require '/var/ipcop/connscheduler/lib.pl'; my $buttontext = $Lang::tr{'add'}; my $hiddenvalue = 'add'; @@ -40,6 +45,8 @@ $selected{'dial'} = ''; $selected{'hangup'} = ''; $selected{'reboot'} = ''; $selected{'shutdown'} = ''; +$selected{'ipsecstart'} = ''; +$selected{'ipsecstop'} = ''; my $selected_profile = 1; my $checked_days = "checked='checked'"; my $selected_daystart = 1; @@ -249,13 +256,13 @@ if ( ($cgiparams{'ACTION'} eq 'down') || ($cgiparams{'ACTION'} eq 'up') ) # Add / Edit Box # -&Header::openbox('100%', 'left', $Lang::tr{'add action'}); +&Header::openbox('100%', 'left', $Lang::tr{'ConnSched add action'}); print < - + - - - + - @@ -407,7 +416,7 @@ for my $id ( 0 .. $#CONNSCHED::config ) print <$CONNSCHED::config[$id]{'TIME'} - + diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 25d258dff9..751cc8ad2f 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1491,24 +1491,26 @@ 'WakeOnLan' => 'Wake On LAN', 'wol wakeup' => 'WakeUp', 'magic packet send to:' => 'Sende WOL-Paket an', -'add action' => 'Aktion hinzufügen', -'change profile title' => 'Wechsle zu Profil:', -'connscheduler' => 'Connection Scheduler', -'connscheduler action' => 'Aktion:', -'connscheduler days' => 'Tage:', -'connscheduler time' => 'Zeit:', -'connsched weekdays' => 'Wochentage:', -'down' => 'Runter', -'reconnect' => 'Neu verbinden', -'scheduled actions' => 'Geplante Aktionen', -'scheduler' => 'Scheduler', -'select profile' => 'Wähle Profil', -'up' => 'Hoch', 'hardware graphs' => 'Hardware-Diagramme', 'net config' => 'Netzwerk-Konfiguration', 'net config type' => 'Netzwerk-Konfigurations-Typ', 'net config type help' => 'GREEN ist das lokale Netzwerk, RED ist das Internet, BLUE ist WLAN, ORANGE ist die DMZ.', 'net address' => 'Netzadresse', +'connscheduler' => 'Connection Scheduler', +'ConnSched add action' => 'Aktion hinzufügen', +'ConnSched change profile title' => 'Wechsle zu Profil:', +'ConnSched action' => 'Aktion:', +'ConnSched days' => 'Tage:', +'ConnSched time' => 'Zeit:', +'ConnSched weekdays' => 'Wochentage:', +'ConnSched down' => 'Runter', +'ConnSched reconnect' => 'Neu verbinden', +'ConnSched scheduled actions' => 'Geplante Aktionen', +'ConnSched scheduler' => 'Scheduler', +'ConnSched select profile' => 'Wähle Profil', +'ConnSched up' => 'Hoch', +'ConnSched ipsecstart' => 'VPN (re)start', +'ConnSched ipsecstop' => 'VPN stop', ); diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index adfe6a8a94..ea7f88bc15 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1523,24 +1523,26 @@ 'invalid mac address' => 'Invalid MAC address', 'WakeOnLan' => 'Wake On LAN', 'wol wakeup' => 'WakeUp', -'magic packet send to:' => 'Magic packet send to', -'add action' => 'Add action', -'change profile title' => 'Change to profile:', -'connscheduler' => 'Connection Scheduler', -'connscheduler action' => 'Action:', -'connscheduler days' => 'Days:', -'connscheduler time' => 'Time:', -'connsched weekdays' => 'Days of the week:', -'down' => 'Down', -'reconnect' => 'Reconnect', -'scheduled actions' => 'Scheduled actions', -'scheduler' => 'Scheduler', -'select profile' => 'Select profile', -'up' => 'Up', +'magic packet send to:' => 'Magic packet send to:', 'hardware graphs' => 'hardware graphs', 'net config' => 'Network configuration', 'net config type' => 'kind of network configuration', 'net config type help' => 'GREEN is the local network, RED is the internet, BLUE is WLAN, ORANGE is the DMZ.', 'net address' => 'net address', +'connscheduler' => 'Connection Scheduler', +'ConnSched add action' => 'Add action', +'ConnSched change profile title' => 'Change to profile:', +'ConnSched action' => 'Action:', +'ConnSched days' => 'Days:', +'ConnSched time' => 'Time:', +'ConnSched weekdays' => 'Days of the week:', +'ConnSched down' => 'Down', +'ConnSched reconnect' => 'Reconnect', +'ConnSched scheduled actions' => 'Scheduled actions', +'ConnSched scheduler' => 'Scheduler', +'ConnSched select profile' => 'Select profile', +'ConnSched up' => 'Up', +'ConnSched ipsecstart' => 'VPN (re)start', +'ConnSched ipsecstop' => 'VPN stop', ); diff --git a/lfs/samba b/lfs/samba index b1a8ddda66..7d5381139c 100644 --- a/lfs/samba +++ b/lfs/samba @@ -26,7 +26,7 @@ include Config -VER = 3.0.23a +VER = 3.0.23b THISAPP = samba-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = e48f196fa51c22ff67463680ce95a58d +$(DL_FILE)_MD5 = f2d1a513fd7138fd1515d3bdf702f7c7 install : $(TARGET) diff --git a/src/scripts/connscheduler b/src/scripts/connscheduler index 9a4e44fe83..c4ea8dc1d4 100644 --- a/src/scripts/connscheduler +++ b/src/scripts/connscheduler @@ -210,5 +210,19 @@ sub timer &General::log("ConnSched shutdown"); system ("/usr/local/bin/ipfirereboot", "down"); } + elsif ( $CONNSCHED::config[$i]{'ACTION'} eq 'ipsecstart' ) + { + &General::log("ConnSched ipsecstart"); + system ("/usr/local/bin/ipsecctrl", "S"); + } + elsif ( $CONNSCHED::config[$i]{'ACTION'} eq 'ipsecstop' ) + { + &General::log("ConnSched ipsecstop"); + system ("/usr/local/bin/ipsecctrl", "D"); + } + else + { + # okay ? an event we don't know about + } } } -- 2.39.2
$Lang::tr{'connscheduler time'}$Lang::tr{'ConnSched time'}
$Lang::tr{'connscheduler action'} +
$Lang::tr{'ConnSched action'}  
  $Lang::tr{'change profile title'}  $Lang::tr{'ConnSched change profile title'} 
$Lang::tr{'connscheduler days'}
$Lang::tr{'ConnSched days'}  
  $Lang::tr{'connsched weekdays'}
+
  $Lang::tr{'ConnSched weekdays'}
  $Lang::tr{'monday'}
  $Lang::tr{'tuesday'}
  $Lang::tr{'wednesday'}
@@ -375,7 +384,7 @@ END # Box with List of events # -&Header::openbox('100%', 'left', $Lang::tr{'scheduled actions'}); +&Header::openbox('100%', 'left', $Lang::tr{'ConnSched scheduled actions'}); print <
$Lang::tr{"$CONNSCHED::config[$id]{'ACTION'}"} $CONNSCHED::config[$id]{'PROFILENR'}$Lang::tr{"ConnSched $CONNSCHED::config[$id]{'ACTION'}"} $CONNSCHED::config[$id]{'PROFILENR'} $CONNSCHED::config[$id]{'COMMENT'}
@@ -433,14 +442,14 @@ $trcolor
- +
- +