webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-10 11:05:54 +02:00
Code Issues Packages Projects Releases Wiki Activity
6,063 Commits 2 Branches 1 Tag
d43bb759b1bb6d02a93b63d0dfd82e623685fb21
Commit Graph

892 Commits

Author SHA1 Message Date
Arne Fitzenreiter
57097305a6 Merge remote-tracking branch 'stevee/wlan-client' into next 
Conflicts:
	config/cfgroot/general-functions.pl
 2013-07-06 13:43:51 +02:00
Michael Tremer
49c7cb2328 squid: Include /etc/squid/squid.conf.pre.local. 
This configuration file is included _before_ the
default IPFire configuration.
 2013-06-18 15:59:03 +02:00
Michael Tremer
5a2935b1b3 Add DDNS client for dns.lightningwirelabs.com. 2013-06-12 14:36:51 +02:00
Michael Tremer
61027579bb Implement wireless client on RED. 
http://wishlist.ipfire.org/wish/wireless-client-on-red

Conflicts:
	doc/language_issues.de
	doc/language_issues.en
	doc/language_issues.es
	doc/language_issues.fr
	doc/language_issues.pl
	doc/language_issues.ru
	src/misc-progs/Makefile
 2013-05-29 18:32:51 +02:00
Michael Tremer
7b91d99f45 Update credits.cgi. 2013-05-16 09:54:43 +02:00
Michael Tremer
409f704631 Fix missing closing DIV tag in maniac's theme. 2013-05-16 09:54:07 +02:00
Michael Tremer
cfa7eab02f Revert "ipsec: Shut up strongswan logging." 
This reverts commit 43f4c938c1.

Conflicts:
	config/rootfiles/oldcore/66/update.sh
 2013-05-11 11:42:52 +02:00
Michael Tremer
2ad1a8bc0c Revert "Update accelerator changes from Jörn-Ingo Weigert." 
This reverts commit 5cf2c33968.

Conflicts:
	html/html/themes/ipfire/include/functions.pl
	html/html/themes/maniac/include/functions.pl
	langs/de/cgi-bin/de.pl
	langs/en/cgi-bin/en.pl
 2013-05-11 11:39:36 +02:00
Michael Tremer
67fd2a703d Fix spacing in new uptime bar. 2013-04-30 12:28:34 +02:00
Michael Tremer
5d73f5158c Merge remote-tracking branch 'amarx/10352' into next 2013-04-29 13:14:46 +02:00
Michael Tremer
5cf2c33968 Update accelerator changes from Jörn-Ingo Weigert. 
Conflicts:
	config/rootfiles/core/68/filelists/files
 2013-04-29 13:13:07 +02:00
Alexander Marx
b376fae45c OpenVPN: Bugfix 10352: When opening advanced server options all fields are disabled under IE10 2013-04-29 12:57:01 +02:00
Alexander Marx
ab4cf06cff OpenVPN: Bugfix 10357, now when chaning an VPN N2N or editing an old one the ports are checked. 2013-04-28 05:47:50 +02:00
Kay-Michael Köhler
9b37e91ef6 Make connection tracking list sortable. 2013-04-26 12:23:46 +02:00
Joern-Ingo Weigert
62a13aec4c services.cgi: Fix for depreciate-warning in httpd/error_log 
This patch fixes the depreciate warning in /var/log/httpd/error_log
not to use a hash as reference

So I changed:
[...]
print %link->{$key}
[...]

To:
[...]
print $link{link}
[...]

which solves the warning and should be good in future.

Joern-Ingo Weigert <jiweigert@ipfire.org>
 2013-04-24 17:27:44 +02:00
Michael Tremer
0cf124ab69 ipsec: Set IKE/IPsec lifetime to strongswan defaults. 
As suggested by Tom Rymes:
https://bugzilla.ipfire.org/show_bug.cgi?id=10346
 2013-04-08 14:51:58 +02:00
Arne Fitzenreiter
94ce2cc1b9 samba.cgi: increase network buffers. 2013-03-18 20:26:38 +01:00
Michael Tremer
c1b2758242 Merge remote-tracking branch 'jiweigert/XHTML_1.0' into core68 2013-03-08 16:47:43 +01:00
Joern-Ingo Weigert
70b1b5d22f WUI: Make the shown uptime in the footer more beautiful. 2013-03-08 16:39:32 +01:00
Joern-Ingo Weigert
f4435fd9a5 Correcting margin-bottom of main_inner h3,h4 to fit spacer with sidemenu 2013-03-08 16:36:28 +01:00
Joern-Ingo Weigert
d0d063fe14 Colorize the bandwidth meter and update jquery. 2013-03-08 16:23:13 +01:00
Joern-Ingo Weigert
eea1d2d7e1 Modify Page Header to correct XHTML-Sytax (maniac) 2013-03-04 21:30:22 +01:00
Joern-Ingo Weigert
8ed76a233c Modify Page Header to correct XHTML-Sytax (ipfire) 2013-03-04 21:28:34 +01:00
Arne Fitzenreiter
5627b4c9f2 Merge remote-tracking branch 'stevee/core67-merge' into next 
Conflicts:
	make.sh
 2013-03-03 23:11:17 +01:00
Stefan Schantl
180fffd9ee Merge branch 'ovpn-header-on-index.cgi' into core67-merge 2013-03-03 13:58:23 +01:00
Stefan Schantl
75559f73dc Merge branch 'ovpn-client-pkg-download' into core67-merge 2013-03-03 13:37:15 +01:00
Joern-Ingo Weigert
cfd33ae009 updatexlrator.cgi: Vendor icon "updxl-src-unknown.gif" are used, regardless of presence in image-dir. 
Fixes #10254.
 2013-03-03 13:30:33 +01:00
Alexander Marx
81da1b01e9 ovpnmain.cgi: Change check for pushed dhcp domains. 
The Domainname is now checked against validdomainname instead of validfqdn,
so there's no need of a dotted domainname anymore.

Fixes #10262.
 2013-03-03 13:23:49 +01:00
Stefan Schantl
4715ddb3f0 index.cgi: Show OpenVPN header if server is disabled but N2N connections are used. 
If the ovpn server for roadwarrior connections was stopped, there was no OpenVPN header
displayed on the index.cgi. If there are configured Net-to-Net connections, they
could be established in the background but their  status can be found
on the VPN (IPsec) section which is wrong. If there is also no IPsec
configured there aren't any information about the Net-to-Net connections on the start page.
 2013-03-03 13:05:48 +01:00
Arne Fitzenreiter
725254ef1f samba: remove MAPTOGUEST="Never". 
This option is not supported by samba 3.6.x anymore.
 2013-03-01 19:35:18 +01:00
Alexander Marx
96096995ed ovpnmain.cgi: Fix downloading of client packages. 
It was only possible to download the client packages if the OpenVPN server is running - which is very confusing.

Fixes #10300.
 2013-03-01 19:25:15 +01:00
Arne Fitzenreiter
c0bdb99263 Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next 2013-03-01 00:07:49 +01:00
Arne Fitzenreiter
cdbeabe221 hostapd: fix ascii check and add country code to hostapd.conf. 2013-03-01 00:06:51 +01:00
Jan Behrens
6bea848d34 squid: Compile with --enable-cache-digests. 
Bug #10311
https://bugzilla.ipfire.org/show_bug.cgi?id=10311
 2013-03-01 00:03:20 +01:00
Arne Fitzenreiter
56c2cc6542 wlanap.cgi: use monitor device only if it exist. 2013-02-24 15:52:24 +01:00
Arne Fitzenreiter
3af89eb585 wlanap.cgi: check pwd for non-ascii chars. 2013-02-24 13:47:41 +01:00
Arne Fitzenreiter
fe3f3050bd wlanap.cgi: set channel manually if no channels are reported. 2013-02-24 13:44:03 +01:00
Arne Fitzenreiter
eb7fff99fc backupiso: disable on arm (we have no iso). 
and fix syntax error.
 2013-02-15 19:16:06 +01:00
Arne Fitzenreiter
b34fdcae83 proxy: allow access to IPFire itself if nets are blocked. 
This fixes missing pictures on blocking pages.
fixes #10138
 2013-02-14 19:33:37 +01:00
Michael Tremer
40d3e72956 QoS: Don't create template when bandwidth is empty. 2013-02-14 15:35:43 +01:00
Stefan Schantl
48d9bbba75 qos: Remove advanced settings. 2013-02-13 21:35:54 +01:00
Arne Fitzenreiter
ea31a62aad graphs: add mmcblk to media graphs. 2013-02-05 02:10:50 +01:00
Arne Fitzenreiter
3e30714aa7 snort: fix sourcefire rules downloads. 2013-02-02 09:57:14 +01:00
Arne Fitzenreiter
745d9c0717 Revert "Revert "snort: Update to 2.9.4."" 
This reverts commit f17d112c04.
 2013-02-02 09:50:49 +01:00
Arne Fitzenreiter
4a29f8541b vpnmain: disabled address check. 
this temporary fixes bug #10294 until the check was fixed to check the
complete source and dest net.
 2013-02-02 09:40:15 +01:00
Stefan Schantl
dcfc6334b9 proxy.cgi: Allow to set a hostname as upstream proxy. 
Fixes #10215.
 2013-01-22 19:38:12 +01:00
Stefan Schantl
e201b6d537 proxy.cgi: Also allow to use a hostname for the LDAP server. 
Fixes #10265.
 2013-01-21 21:15:50 +01:00
Alexander Marx
8b6f424c03 SQUID : BUG 10280: extended patch, so that 0 is a valid value for disk-cache 2013-01-20 17:06:48 +01:00
Michael Tremer
60cc2e54a7 vpnmain.cgi: Fix selection of AES-192 as ESP cipher. 2013-01-15 15:57:29 +01:00
Michael Tremer
b2531cb080 vpnmain.cgi: Allow to use PSK if public IP is '%defaultroute'. 
Openswan did not support to use PSKs on net-to-net connections,
when the public IP of the IPFire box was "%defaultroute".
However, it is required to set the public IP to "%defaultroute"
on NAT-ed devices (such as UMTS connections in Germany) to
connect to other sites as the IPFire box does not know
the real public IP address.
 2013-01-15 15:45:29 +01:00