* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3765eb6179d721093c834e3483fdef8232b5b486
@ 2013-08-19 11:24 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-08-19 11:24 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 33396 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via 3765eb6179d721093c834e3483fdef8232b5b486 (commit)
via e726a4716f90f6b19820479967199210bca4bdc8 (commit)
via 57aaa16bf209a9b41b03ba598fce8ce999acc624 (commit)
via 8ec8462ce3a0ac2cac4bdb70daaaeb98aaea4cbc (commit)
via cd4a82251b83ff60540650902925c39550d86e13 (commit)
via 6feadd073796fea103de58593b7d8aa7c4533f2c (commit)
via b8867fe89a7a51e225f54af380b3e4f4b1815771 (commit)
via 9e78ce6142549d6d786fe97c56bf58df6b81e80f (commit)
via 7b1db453c034fd88217f2f9b38ff1c57a9ec1f52 (commit)
via f7e3815db2c732e724d450d1092ed19cfe92b773 (commit)
via c7929cf54604d989986ddb8b6bbf491955c48258 (commit)
from 9fa2cb9c49e3ae3adfb0052409286c4c5267dc5f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3765eb6179d721093c834e3483fdef8232b5b486
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Aug 19 13:23:51 2013 +0200
tor: Only start tor when it has been enabled.
commit e726a4716f90f6b19820479967199210bca4bdc8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Aug 19 13:20:42 2013 +0200
translation: Fix typo.
commit 57aaa16bf209a9b41b03ba598fce8ce999acc624
Merge: 8ec8462 cd4a822
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Aug 19 13:19:13 2013 +0200
Merge remote-tracking branch 'earl/tor' into next
commit 8ec8462ce3a0ac2cac4bdb70daaaeb98aaea4cbc
Author: Timo Eissler <timo(a)eissler.pro>
Date: Sun Aug 18 13:30:03 2013 +0200
xinetd: New package.
commit cd4a82251b83ff60540650902925c39550d86e13
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Aug 18 12:42:24 2013 +0200
tor: added startup files
commit 6feadd073796fea103de58593b7d8aa7c4533f2c
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Aug 18 12:18:50 2013 +0200
tor: new stings added to language files
commit b8867fe89a7a51e225f54af380b3e4f4b1815771
Author: Jan Paul Tuecking <earl(a)ipfire.org>
Date: Sun Aug 18 12:11:58 2013 +0200
tor: added daemon stats and little changes on styling
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/71/update.sh | 3 +-
config/rootfiles/packages/xinetd | 11 ++++
config/xinetd/xinetd.conf | 9 +++
doc/language_issues.es | 2 +
doc/language_issues.fr | 2 +
doc/language_issues.nl | 2 +
doc/language_issues.pl | 2 +
doc/language_issues.ru | 2 +
doc/language_issues.tr | 2 +
doc/language_missings | 8 +++
html/cgi-bin/tor.cgi | 103 +++++++++++++++++++++++++-------
langs/de/cgi-bin/de.pl | 2 +
langs/en/cgi-bin/en.pl | 2 +
lfs/tor | 6 +-
lfs/{bwm-ng => xinetd} | 13 ++--
make.sh | 1 +
src/initscripts/init.d/tor | 6 ++
src/paks/{nginx => xinetd}/install.sh | 8 ++-
src/paks/{cacti => xinetd}/uninstall.sh | 0
src/paks/{apcupsd => xinetd}/update.sh | 0
20 files changed, 152 insertions(+), 32 deletions(-)
create mode 100644 config/rootfiles/packages/xinetd
create mode 100644 config/xinetd/xinetd.conf
mode change 100644 => 100755 html/cgi-bin/tor.cgi
copy lfs/{bwm-ng => xinetd} (93%)
copy src/paks/{nginx => xinetd}/install.sh (90%)
copy src/paks/{cacti => xinetd}/uninstall.sh (100%)
copy src/paks/{apcupsd => xinetd}/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/core/71/update.sh b/config/rootfiles/core/71/update.sh
index 8990b97..e45ccd8 100644
--- a/config/rootfiles/core/71/update.sh
+++ b/config/rootfiles/core/71/update.sh
@@ -39,7 +39,7 @@ cp -f /etc/snort/snort.conf /etc/snort/snort.conf.backup
#
#Stop services
/etc/init.d/snort stop
-
+/etc/init.d/squid stop
#
#Remove old usb-modeswitch file
rm /usr/share/usb_modeswitch/0e8d:0002
@@ -59,6 +59,7 @@ grep "^include $RULE_PATH" /etc/snort/snort.conf.backup >> /etc/snort/snort.conf
#
#Start services
+/etc/init.d/squid start
/etc/init.d/snort start
#
diff --git a/config/rootfiles/packages/xinetd b/config/rootfiles/packages/xinetd
new file mode 100644
index 0000000..4c91ec9
--- /dev/null
+++ b/config/rootfiles/packages/xinetd
@@ -0,0 +1,11 @@
+etc/rc.d/init.d/xinetd
+etc/xinetd.conf
+#etc/xinetd.d
+#usr/man/man5/xinetd.conf.5
+#usr/man/man8/itox.8
+#usr/man/man8/xconv.pl.8
+#usr/man/man8/xinetd.8
+#usr/man/man8/xinetd.log.8
+#usr/sbin/itox
+#usr/sbin/xconv.pl
+usr/sbin/xinetd
diff --git a/config/xinetd/xinetd.conf b/config/xinetd/xinetd.conf
new file mode 100644
index 0000000..b2112a1
--- /dev/null
+++ b/config/xinetd/xinetd.conf
@@ -0,0 +1,9 @@
+defaults
+{
+ instances = 10
+ log_type = SYSLOG daemon
+ log_on_success = HOST PID
+ log_on_failure = HOST
+ #only_from = <your local networks>
+}
+includedir /etc/xinetd.d
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 790ce1a..fe46355 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -642,6 +642,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
+WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -663,6 +664,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
+WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 41d8d9d..d5a1057 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -627,6 +627,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
+WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -648,6 +649,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
+WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 46838b0..c8249ff 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -544,6 +544,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
+WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -565,6 +566,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
+WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 790ce1a..fe46355 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -642,6 +642,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
+WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -663,6 +664,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
+WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 6700696..ef7b31c 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -607,6 +607,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
+WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -628,6 +629,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
+WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 6c4502f..1821fb4 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -540,6 +540,7 @@ WARNING: untranslated string: tor common settings
WARNING: untranslated string: tor configuration
WARNING: untranslated string: tor connected relays
WARNING: untranslated string: tor contact info
+WARNING: untranslated string: tor daemon
WARNING: untranslated string: tor enabled
WARNING: untranslated string: tor errmsg invalid accounting limit
WARNING: untranslated string: tor errmsg invalid ip or mask
@@ -561,6 +562,7 @@ WARNING: untranslated string: tor relay mode private bridge
WARNING: untranslated string: tor relay mode relay
WARNING: untranslated string: tor relay nickname
WARNING: untranslated string: tor relay port
+WARNING: untranslated string: tor service
WARNING: untranslated string: tor socks port
WARNING: untranslated string: tor stats
WARNING: untranslated string: tor traffic limit hard
diff --git a/doc/language_missings b/doc/language_missings
index 3c611e6..865a42a 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -136,6 +136,7 @@
< tor configuration
< tor connected relays
< tor contact info
+< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -158,6 +159,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
+< tor service
< tor socks port
< tor stats
< tor traffic limit hard
@@ -371,6 +373,7 @@
< tor configuration
< tor connected relays
< tor contact info
+< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -393,6 +396,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
+< tor service
< tor socks port
< tor stats
< tor traffic limit hard
@@ -558,6 +562,7 @@
< tor configuration
< tor connected relays
< tor contact info
+< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -580,6 +585,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
+< tor service
< tor socks port
< tor stats
< tor traffic limit hard
@@ -750,6 +756,7 @@
< tor configuration
< tor connected relays
< tor contact info
+< tor daemon
< tor enabled
< tor errmsg invalid accounting limit
< tor errmsg invalid ip or mask
@@ -772,6 +779,7 @@
< tor relay mode relay
< tor relay nickname
< tor relay port
+< tor service
< tor socks port
< tor stats
< tor traffic limit hard
diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
old mode 100644
new mode 100755
index 2a31dd4..a1d0ae7
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -57,9 +57,42 @@ my @accounting_periods = ('daily', 'weekly', 'monthly');
my $TOR_CONTROL_PORT = 9051;
+my $string=();
+my $memory=();
+my @memory=();
+my @pid=();
+my @tor=();
+sub daemonstats
+{
+ $memory = 0;
+ # for pid and memory
+ open(FILE, '/usr/local/bin/addonctrl tor status | ');
+ @tor = <FILE>;
+ close(FILE);
+ $string = join("", @tor);
+ $string =~ s/[a-z_]//gi;
+ $string =~ s/\[[0-1]\;[0-9]+//gi;
+ $string =~ s/[\(\)\.]//gi;
+ $string =~ s/ //gi;
+ $string =~ s/^[//gi;
+ @pid = split(/\s/,$string);
+ if (open(FILE, "/proc/$pid[0]/statm")){
+ my $temp = <FILE>;
+ @memory = split(/ /,$temp);
+ close(FILE);
+ }
+ $memory+=$memory[0];
+}
+daemonstats();
+
our %netsettings = ();
&General::readhash("${General::swroot}/ethernet/settings", \%netsettings);
+our %color = ();
+our %mainsettings = ();
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
+
our %settings = ();
$settings{'TOR_ENABLED'} = 'off';
@@ -192,12 +225,37 @@ sub showMainBox() {
print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
- &Header::openbox('100%', 'left', $Lang::tr{'tor configuration'});
+ &Header::openbox('100%', 'center', $Lang::tr{'tor'});
+
+
+if ( ($memory != 0) && (@pid[0] ne "///") ){
+ print "<table width='95%' cellspacing='0'>";
+ print "<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><strong>$Lang::tr{'tor service'}</strong></td></tr>";
+ print "<tr><td class='base'>$Lang::tr{'tor daemon'}</td>";
+ print "<td align='center' colspan='2' width='75%' bgcolor='${Header::colourgreen}'><font color='white'><strong>$Lang::tr{'running'}</strong></font></td></tr>";
+ print "<tr><td class='base'></td>";
+ print "<td bgcolor='$color{'color20'}' align='center'><strong>PID</strong></td>";
+ print "<td bgcolor='$color{'color20'}' align='center'><strong>$Lang::tr{'memory'}</strong></td></tr>";
+ print "<tr><td class='base'></td>";
+ print "<td bgcolor='$color{'color22'}' align='center'>@pid[0]</td>";
+ print "<td bgcolor='$color{'color22'}' align='center'>$memory KB</td></tr>";
+ print "</table>";
+ } else {
+ print "<table width='95%' cellspacing='0'>";
+ print "<tr><td bgcolor='$color{'color20'}' colspan='3' align='left'><strong>$Lang::tr{'tor service'}</strong></td></tr>";
+ print "<tr><td class='base'>$Lang::tr{'tor daemon'}</td>";
+ print "<td align='center' width='75%' bgcolor='${Header::colourred}'><font color='white'><strong>$Lang::tr{'stopped'}</strong></font></td></tr>";
+ print "</table>";
+ }
+
+ &Header::closebox();
+
+ &Header::openbox('100%', 'center', $Lang::tr{'tor configuration'});
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor common settings'}</b></td>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor common settings'}</b></td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor enabled'}:</td>
@@ -222,12 +280,11 @@ END
print <<END;
<br>
- <hr size='1'>
<br>
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor acls'}</b></td>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor acls'}</b></td>
</tr>
<tr>
<td colspan='2' class='base' width='55%'>
@@ -244,12 +301,11 @@ END
</table>
<br>
- <hr size='1'>
<br>
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor exit nodes'}</b></td>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor exit nodes'}</b></td>
</tr>
<tr>
<td colspan='2' class='base' width='55%'></td>
@@ -276,7 +332,6 @@ END
</td>
</tr>
</table>
- <br><br>
END
&Header::closebox();
@@ -305,10 +360,10 @@ END
}
$selected{'TOR_RELAY_ACCOUNTING_PERIOD'}{$settings{'TOR_RELAY_ACCOUNTING_PERIOD'}} = 'selected';
- &Header::openbox('100%', 'left', $Lang::tr{'tor relay configuration'});
+ &Header::openbox('100%', 'center', $Lang::tr{'tor relay configuration'});
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor relay mode'}:</td>
<td width='30%'>
@@ -342,11 +397,11 @@ END
</tr>
</table>
- <hr size='1'>
+ <br>
- <table width='100%'>
+ <table width='95%'>
<tr>
- <td colspan='4' class='base'><b>$Lang::tr{'tor bandwidth settings'}</b></td>
+ <td colspan='4' class='base' bgcolor='$color{'color20'}'><b>$Lang::tr{'tor bandwidth settings'}</b></td>
</tr>
<tr>
<td width='25%' class='base'>$Lang::tr{'tor bandwidth rate'}:</td>
@@ -407,7 +462,7 @@ END
&Header::closebox();
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td>
<img src='/blob.gif' align='top' alt='*' /> <font class='base'>$Lang::tr{'this field may be blank'}</font>
@@ -418,7 +473,7 @@ END
<hr>
- <table width='100%'>
+ <table width='95%'>
<tr>
<td> </td>
<td align='center'><input type='submit' name='ACTION' value='$Lang::tr{'save'}' /></td>
@@ -429,13 +484,13 @@ END
# If we have a control connection, show the stats.
if ($torctrl) {
- &Header::openbox('100%', 'left', $Lang::tr{'tor stats'});
+ &Header::openbox('100%', 'center', $Lang::tr{'tor stats'});
my @traffic = &TorTrafficStats($torctrl);
if (@traffic) {
print <<END;
- <table width='100%'>
+ <table width='95%'>
END
if ($settings{'TOR_RELAY_ENABLED'} eq 'on') {
@@ -476,7 +531,7 @@ END
my $accounting = &TorAccountingStats($torctrl);
if ($accounting) {
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td colspan='2' class='base'><b>$Lang::tr{'tor accounting'}</b></td>
</tr>
@@ -527,7 +582,7 @@ END
if (@nodes) {
my $nodes_length = scalar @nodes;
print <<END;
- <table width='100%'>
+ <table width='95%'>
<tr>
<td width='40%' class='base'><b>$Lang::tr{'tor connected relays'}</b></td>
<td width='60%' colspan='2'>($nodes_length)</td>
@@ -546,7 +601,11 @@ END
END
if (exists($node->{'country_code'})) {
+ if ($node->{'country_code'} eq '??') {
+ print "<img src='/images/flags/blank.png' border='0' align='absmiddle'/>";
+ } else {
print "<a href='country.cgi#$node->{'country_code'}'><img src='/images/flags/$node->{'country_code'}.png' border='0' align='absmiddle' alt='$node->{'country_code'}'></a>";
+ }
}
print <<END;
@@ -689,6 +748,8 @@ sub BuildConfiguration() {
} else {
system("/usr/local/bin/torctrl stop &>/dev/null");
}
+ # Update pid and memory
+ daemonstats();
}
sub TorConnect() {
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index a0c426f..b55179f 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -1817,6 +1817,7 @@
'tor configuration' => 'Tor-Konfiguration',
'tor connected relays' => 'Verbundene Relays',
'tor contact info' => 'Kontaktinformationen',
+'tor daemon' => 'Daemon',
'tor enabled' => 'Tor einschalten',
'tor errmsg invalid accounting limit' => 'Ungültiges Accounting-Limit',
'tor errmsg invalid ip or mask' => 'Ungültiges IP-Subnetz',
@@ -1839,6 +1840,7 @@
'tor relay mode relay' => 'Nur Relay',
'tor relay nickname' => 'Relay-Nickname',
'tor relay port' => 'Relay-Port',
+'tor service' => 'Tor-Service',
'tor socks port' => 'SOCKS-Port',
'tor stats' => 'Statistiken',
'tor traffic limit hard' => 'Das Übertragungslimit wurde erreicht.',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index b84c6bb..43bd03d 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -1852,6 +1852,7 @@
'tor configuration' => 'Tor Configuration',
'tor connected relays' => 'Connected relays',
'tor contact info' => 'Contact Info',
+'tor daemon' => 'Daemon',
'tor enabled' => 'Enable Tor',
'tor errmsg invalid accounting limit' => 'Invalid accounting limit',
'tor errmsg invalid ip or mask' => 'Invalid IP subnet',
@@ -1875,6 +1876,7 @@
'tor relay mode relay' => 'Relay only',
'tor relay nickname' => 'Relay nickname',
'tor relay port' => 'Relay port',
+'tor service' => 'Tor Service',
'tor socks port' => 'SOCKS port',
'tor stats' => 'Statistics',
'tor traffic limit hard' => 'Traffic limit has been reached.',
diff --git a/lfs/tor b/lfs/tor
index 8bce4be..ae63d96 100644
--- a/lfs/tor
+++ b/lfs/tor
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
-PAK_VER = 1
+PAK_VER = 2
DEPS = "libevent2"
@@ -107,6 +107,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
install -v -m 644 $(DIR_SRC)/config/tor/defaults-torrc \
/usr/share/tor/defaults-torrc
+ # Install start links and backup include file.
+ ln -sf ../init.d/tor /etc/rc.d/rc3.d/S60tor
+ ln -sf ../init.d/tor /etc/rc.d/rc0.d/K40tor
+ ln -sf ../init.d/tor /etc/rc.d/rc6.d/K40tor
install -v -m 644 $(DIR_SRC)/config/backup/includes/tor \
/var/ipfire/backup/addons/includes/tor
@rm -rf $(DIR_APP)
diff --git a/lfs/xinetd b/lfs/xinetd
new file mode 100644
index 0000000..62f34ea
--- /dev/null
+++ b/lfs/xinetd
@@ -0,0 +1,85 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# #
+# 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 3 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, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER = 2.3.15
+
+THISAPP = xinetd-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = xinetd
+PAK_VER = 1
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 77358478fd58efa6366accae99b8b04c
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist:
+ @$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+ @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+ @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+ @$(MD5)
+
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+ @$(PREBUILD)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && ./configure --prefix=/usr
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
+ -mkdir -pv /etc/xinetd.d
+ cp -f $(DIR_SRC)/config/xinetd/xinetd.conf /etc/xinetd.conf
+ @rm -rf $(DIR_APP)
+ @$(POSTBUILD)
diff --git a/make.sh b/make.sh
index 50a5878..bf00b5f 100755
--- a/make.sh
+++ b/make.sh
@@ -752,6 +752,7 @@ buildipfire() {
ipfiremake acpid
ipfiremake fping
ipfiremake telnet
+ ipfiremake xinetd
ipfiremake libgpg-error
ipfiremake libassuan
ipfiremake gpgme
diff --git a/src/initscripts/init.d/tor b/src/initscripts/init.d/tor
index e27241f..4fef577 100644
--- a/src/initscripts/init.d/tor
+++ b/src/initscripts/init.d/tor
@@ -9,6 +9,10 @@
. /etc/sysconfig/rc
. ${rc_functions}
+function tor_is_enabled() {
+ [ "${TOR_ENABLED}" = "on" ] || [ "${TOR_RELAY_ENABLED}" = "on" ]
+}
+
function setup_firewall() {
eval $(/usr/local/bin/readhash /var/ipfire/tor/settings)
@@ -27,6 +31,8 @@ function flush_firewall() {
case "${1}" in
start)
+ tor_is_enabled || exit 0
+
# Setup firewall.
setup_firewall
diff --git a/src/paks/xinetd/install.sh b/src/paks/xinetd/install.sh
new file mode 100644
index 0000000..347fd36
--- /dev/null
+++ b/src/paks/xinetd/install.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+extract_files
+restore_backup ${NAME}
+
+mkdir /etc/xinetd.d
+
+start_service --background ${NAME}
+
+ln -sf ../init.d/${NAME} /etc/rc.d/rc0.d/K30xinetd
+ln -sf ../init.d/${NAME} /etc/rc.d/rc3.d/S30xinetd
+ln -sf ../init.d/${NAME} /etc/rc.d/rc6.d/K30xinetd
diff --git a/src/paks/xinetd/uninstall.sh b/src/paks/xinetd/uninstall.sh
new file mode 100644
index 0000000..a7b8a53
--- /dev/null
+++ b/src/paks/xinetd/uninstall.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+stop_service ${NAME}
+make_backup ${NAME}
+remove_files
diff --git a/src/paks/xinetd/update.sh b/src/paks/xinetd/update.sh
new file mode 100644
index 0000000..89c40d0
--- /dev/null
+++ b/src/paks/xinetd/update.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+############################################################################
+# #
+# This file is part of the IPFire Firewall. #
+# #
+# IPFire 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. #
+# #
+# IPFire 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 IPFire; if not, write to the Free Software #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
+# #
+# Copyright (C) 2007 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+./uninstall.sh
+./install.sh
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-19 11:24 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-19 11:24 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 3765eb6179d721093c834e3483fdef8232b5b486 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox