webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-11-10 16:44:40 +01:00
parent db7a755dab 6f8891ccc7
commit 88cb3aa68e
6 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/64/filelists/files
View File

@@ -4,3 +4,4 @@ etc/rc.d/init.d/firewall
srv/web/ipfire/cgi-bin/credits.cgi srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/ids.cgi
var/ipfire/outgoing/bin/outgoingfw.pl var/ipfire/outgoing/bin/outgoingfw.pl
var/ipfire/langs

2
config/rootfiles/core/64/update.sh
View File

@@ -46,7 +46,7 @@ extract_files
# #
#Update Language cache #Update Language cache
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
#Rebuild module dep's #Rebuild module dep's
#arch=`uname -m` #arch=`uname -m`

4
langs/es/cgi-bin/es.pl
View File

@@ -1328,14 +1328,10 @@
'ovpn config' => 'Configruación de OVPN', 'ovpn config' => 'Configruación de OVPN',
'ovpn device' => 'Dispositivo OpenVPN', 'ovpn device' => 'Dispositivo OpenVPN',
'ovpn dl' => 'Configuración de descargas OVPN', 'ovpn dl' => 'Configuración de descargas OVPN',
'ovpn errmsg green already pushed' => 'Route for green network is always set',
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
'ovpn log' => 'Registro de log de OVPN', 'ovpn log' => 'Registro de log de OVPN',
'ovpn on blue' => 'OpenVPN en BLUE', 'ovpn on blue' => 'OpenVPN en BLUE',
'ovpn on orange' => 'OpenVPN en ORANGE', 'ovpn on orange' => 'OpenVPN en ORANGE',
'ovpn on red' => 'OpenVPN en RED', 'ovpn on red' => 'OpenVPN en RED',
'ovpn routes push' => 'Routes (one per line):',
'ovpn routes push options' => 'Route push options',
'ovpn server status' => 'Status actual del servidor OpenVPN:', 'ovpn server status' => 'Status actual del servidor OpenVPN:',
'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0', 'ovpn subnet' => 'Subred de OpenVPN (ej. 10.0.10.0/255.255.255.0',
'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.', 'ovpn subnet is invalid' => 'Subred de OpenVPN no es válida.',

4
langs/pl/cgi-bin/pl.pl
View File

@@ -1351,14 +1351,10 @@
'ovpn config' => 'OVPN-Konfig', 'ovpn config' => 'OVPN-Konfig',
'ovpn device' => 'Urządzenie OpenVPN:', 'ovpn device' => 'Urządzenie OpenVPN:',
'ovpn dl' => 'Pobierz konfig OVPN', 'ovpn dl' => 'Pobierz konfig OVPN',
'ovpn errmsg green already pushed' => 'Route for green network is always set',
'ovpn errmsg invalid ip or mask' => 'Invalid network-address or subnetmask',
'ovpn log' => 'Log OVPN', 'ovpn log' => 'Log OVPN',
'ovpn on blue' => 'OpenVPN na int. BLUE', 'ovpn on blue' => 'OpenVPN na int. BLUE',
'ovpn on orange' => 'OpenVPN na int. ORANGE', 'ovpn on orange' => 'OpenVPN na int. ORANGE',
'ovpn on red' => 'OpenVPN na int. RED', 'ovpn on red' => 'OpenVPN na int. RED',
'ovpn routes push' => 'Routes (one per line):',
'ovpn routes push options' => 'Route push options',
'ovpn server status' => 'Stan serwera OpenVPN:', 'ovpn server status' => 'Stan serwera OpenVPN:',
'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)', 'ovpn subnet' => 'Podsieć OpenVPN (np. 10.0.10.0/255.255.255.0)',
'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.', 'ovpn subnet is invalid' => 'Podsieć OpenVPN jest niepoprawna.',

4
lfs/GeoIP
View File

@@ -25,7 +25,7 @@
include Config include Config
VER = 1.17 VER = 1.17
DATVER = 02102012 DATVER = 06112012
THISAPP = Geo-IP-PurePerl-$(VER) THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de $(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
GeoIP.dat-$(DATVER).gz_MD5 = 371c7ea4a8c8b963594ec3031e798696 GeoIP.dat-$(DATVER).gz_MD5 = a8677695b0abecb69707ebe2444e64f9
install : $(TARGET) install : $(TARGET)

2
make.sh
View File

@@ -26,7 +26,7 @@ NAME="IPFire" # Software name
SNAME="ipfire" # Short name SNAME="ipfire" # Short name
VERSION="2.13" # Version number VERSION="2.13" # Version number
CORE="64" # Core Level (Filename) CORE="64" # Core Level (Filename)
PAKFIRE_CORE="63" # Core Level (PAKFIRE) PAKFIRE_CORE="64" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir CONFIG_ROOT=/var/ipfire # Configuration rootdir