------------------------------------------------------------------------
+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:
* 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
#
# 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';
$selected{'hangup'} = '';
$selected{'reboot'} = '';
$selected{'shutdown'} = '';
+$selected{'ipsecstart'} = '';
+$selected{'ipsecstop'} = '';
my $selected_profile = 1;
my $checked_days = "checked='checked'";
my $selected_daystart = 1;
# Add / Edit Box
#
-&Header::openbox('100%', 'left', $Lang::tr{'add action'});
+&Header::openbox('100%', 'left', $Lang::tr{'ConnSched add action'});
print <<END
<form method='post' name='addevent' action='$ENV{'SCRIPT_NAME'}'>
<table width='100%' border='0' cellspacing='6' cellpadding='0'>
<tr>
-<td width='15%' class='base'>$Lang::tr{'connscheduler time'}</td>
+<td width='15%' class='base'>$Lang::tr{'ConnSched time'}</td>
<td><select name='ACTION_HOUR'>
END
;
print <<END
</select></td></tr>
<tr><td colspan='2'><hr /></td></tr>
-<tr><td width='15%' class='base'>$Lang::tr{'connscheduler action'}</td><td>
+<tr><td width='15%' class='base'>$Lang::tr{'ConnSched action'}</td><td>
<input type='radio' value='CONNECT' name='ACTION_ACTION' $checked_connect /> <select name='ACTION_CONNECT'>
-<option value='reconnect' $selected{'reconnect'}>$Lang::tr{'reconnect'}</option>
+<option value='reconnect' $selected{'reconnect'}>$Lang::tr{'ConnSched reconnect'}</option>
<option value='dial' $selected{'dial'}>$Lang::tr{'dial'}</option>
<option value='hangup' $selected{'hangup'}>$Lang::tr{'hangup'}</option>
<option value='reboot' $selected{'reboot'}>$Lang::tr{'reboot'}</option>
<option value='shutdown' $selected{'shutdown'}>$Lang::tr{'shutdown'}</option>
+<option value='ipsecstart' $selected{'ipsecstart'}>$Lang::tr{'ConnSched ipsecstart'}</option>
+<option value='ipsecstop' $selected{'ipsecstop'}>$Lang::tr{'ConnSched ipsecstop'}</option>
</select></td></tr>
<tr><td width='15%' class='base'> </td>
-<td><input type='radio' value='PROFILE' name='ACTION_ACTION' $checked_profile /> $Lang::tr{'change profile title'} <select name='ACTION_PROFILENR'>
+<td><input type='radio' value='PROFILE' name='ACTION_ACTION' $checked_profile /> $Lang::tr{'ConnSched change profile title'} <select name='ACTION_PROFILENR'>
END
;
for ($i = 1; $i <= $CONNSCHED::maxprofiles; $i++)
print <<END
</select></td></tr>
<tr><td colspan='2'><hr /></td></tr>
-<tr><td width='15%' class='base'>$Lang::tr{'connscheduler days'}</td>
+<tr><td width='15%' class='base'>$Lang::tr{'ConnSched days'}</td>
<td><input type='radio' value='DAYS' name='ACTION_DAYSTYPE' $checked_days /> <select name='ACTION_DAYSTART'>
END
;
print <<END
</select></td></tr>
-<tr><td width='15%' class='base'> </td><td><input type='radio' value='WEEKDAYS' name='ACTION_DAYSTYPE' $checked_weekdays /> $Lang::tr{'connsched weekdays'}<br />
+<tr><td width='15%' class='base'> </td><td><input type='radio' value='WEEKDAYS' name='ACTION_DAYSTYPE' $checked_weekdays /> $Lang::tr{'ConnSched weekdays'}<br />
<input type='checkbox' name='Mon' $checked_mon />$Lang::tr{'monday'}<br />
<input type='checkbox' name='Tue' $checked_tue />$Lang::tr{'tuesday'}<br />
<input type='checkbox' name='Wed' $checked_wed />$Lang::tr{'wednesday'}<br />
# Box with List of events
#
-&Header::openbox('100%', 'left', $Lang::tr{'scheduled actions'});
+&Header::openbox('100%', 'left', $Lang::tr{'ConnSched scheduled actions'});
print <<END
<table width='100%' border='0' cellspacing='1' cellpadding='0'>
<tr>
print <<END
$trcolor
<td align='center'>$CONNSCHED::config[$id]{'TIME'}</td>
-<td>$Lang::tr{"$CONNSCHED::config[$id]{'ACTION'}"} $CONNSCHED::config[$id]{'PROFILENR'}</td>
+<td>$Lang::tr{"ConnSched $CONNSCHED::config[$id]{'ACTION'}"} $CONNSCHED::config[$id]{'PROFILENR'}</td>
<td>$CONNSCHED::config[$id]{'COMMENT'}</td>
<td align='center'>
<form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
<td align='center'>
<form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='up' />
- <input type='image' name='$Lang::tr{'up'}' src='/images/up.gif' alt='$Lang::tr{'up'}' title='$Lang::tr{'up'}' />
+ <input type='image' name='$Lang::tr{'up'}' src='/images/up.gif' alt='$Lang::tr{'ConnSched up'}' title='$Lang::tr{'ConnSched up'}' />
<input type='hidden' name='ID' value='$id' />
</form>
</td>
<td align='center'>
<form method='post' name='frm$id' action='$ENV{'SCRIPT_NAME'}'>
<input type='hidden' name='ACTION' value='down' />
- <input type='image' name='$Lang::tr{'down'}' src='/images/down.gif' alt='$Lang::tr{'down'}' title='$Lang::tr{'down'}' />
+ <input type='image' name='$Lang::tr{'down'}' src='/images/down.gif' alt='$Lang::tr{'ConnSched down'}' title='$Lang::tr{'ConnSched down'}' />
<input type='hidden' name='ID' value='$id' />
</form>
</td>
'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',
);
'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',
);
include Config
-VER = 3.0.23a
+VER = 3.0.23b
THISAPP = samba-$(VER)
DL_FILE = $(THISAPP).tar.gz
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = e48f196fa51c22ff67463680ce95a58d
+$(DL_FILE)_MD5 = f2d1a513fd7138fd1515d3bdf702f7c7
install : $(TARGET)
&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
+ }
}
}