webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 03:25:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/next' into fifteen

Browse Source 
Conflicts:
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.nl
	doc/language_issues.pl
	doc/language_issues.tr
	doc/language_missings
This commit is contained in:
Michael Tremer
2013-10-03 14:26:33 +02:00
parent 78403883e2 2d685e1d4c
commit 0203401cf5
27 changed files with 130 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/initscripts/init.d/dnsmasq
View File

@@ -50,8 +50,8 @@ case "${1}" in
boot_mesg "Starting Domain Name Service Proxy..."
eval $(/usr/local/bin/readhash /var/ipfire/ethernet/settings)
ARGS=
[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="-s $DOMAIN_NAME_GREEN"
ARGS="$CUSTOM_ARGS"
[ "$DOMAIN_NAME_GREEN" != "" ] && ARGS="$ARGS -s $DOMAIN_NAME_GREEN"
echo > /var/ipfire/red/resolv.conf # Clear it
if [ -e "/var/ipfire/red/dns1" ]; then
@@ -73,8 +73,6 @@ case "${1}" in
# Add custom forward dns zones.
ARGS="${ARGS} $(dns_forward_args /var/ipfire/dnsforward/config)"
ARGS="$ARGS $CUSTOM_ARGS"
loadproc /usr/sbin/dnsmasq -l /var/state/dhcp/dhcpd.leases $ARGS
if [ "${SHOW_SRV}" -eq 1 ] && [ "${DNS1}" != "" -o "${DNS2}" != "" ]; then

4
src/initscripts/init.d/tor
View File

@@ -24,6 +24,10 @@ function setup_firewall() {
if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_PORT}" ]; then
iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_PORT}" -j ACCEPT
fi
if [ "${TOR_RELAY_ENABLED}" = "on" -a -n "${TOR_RELAY_DIRPORT}" ] && [ "${TOR_RELAY_DIRPORT}" -ne 0 ]; then
iptables -A TOR_INPUT -p tcp --dport "${TOR_RELAY_DIRPORT}" -j ACCEPT
fi
}
function flush_firewall() {

4
src/paks/fetchmail/install.sh
View File

@@ -25,3 +25,7 @@
extract_files
restore_backup ${NAME}
start_service --background ${NAME}
ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail

2
src/paks/fetchmail/uninstall.sh
View File

@@ -25,3 +25,5 @@
stop_service ${NAME}
make_backup ${NAME}
remove_files
rm -f /etc/rc.d/rc*.d/*fetchmail

8
src/paks/postfix/install.sh
View File

@@ -27,6 +27,8 @@ postalias /etc/aliases
# Set postfix's hostname
postconf -e "myhostname=$(hostname -f)"
/etc/init.d/postfix start
ln -sf ../init.d/fetchmail /etc/rc.d/rc0.d/K25fetchmail
ln -sf ../init.d/fetchmail /etc/rc.d/rc3.d/S35fetchmail
ln -sf ../init.d/fetchmail /etc/rc.d/rc6.d/K25fetchmail
# Enable autostart for postfix
ln -sf ../init.d/postfix /etc/rc.d/rc0.d/K25postfix
ln -sf ../init.d/postfix /etc/rc.d/rc3.d/S35postfix
ln -sf ../init.d/postfix /etc/rc.d/rc6.d/K25postfix

12
src/patches/iptraf-ng-1.1.4-tcplog_flowrate_msg.patch Normal file
View File

@@ -0,0 +1,12 @@
diff -Nur iptraf-ng-1.1.4-orig/src/tcptable.c iptraf-ng-1.1.4/src/tcptable.c
--- iptraf-ng-1.1.4-orig/src/tcptable.c 2013-07-23 15:06:11.000000000 +0200
+++ iptraf-ng-1.1.4/src/tcptable.c 2013-08-28 19:10:33.000000000 +0200
@@ -444,6 +444,8 @@
size_t bufsize)
{
time_t interval = time(NULL) - entry->conn_starttime;
+ if (interval < 1)
+ interval = 1;
char rbuf[64];
rate_print(entry->bcount / interval, rbuf, sizeof(rbuf));