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

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

Browse Source
This commit is contained in:
Arne Fitzenreiter
2013-12-21 10:05:39 +01:00
parent 562e14b01f 5cd3a05bf0
commit 30f68903d3
7 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/common/configroot
View File

@@ -155,6 +155,7 @@ var/ipfire/proxy
#var/ipfire/proxy/calamaris #var/ipfire/proxy/calamaris
#var/ipfire/proxy/calamaris/bin #var/ipfire/proxy/calamaris/bin
#var/ipfire/proxy/settings #var/ipfire/proxy/settings
#var/ipfire/proxy/squid.conf
var/ipfire/qos var/ipfire/qos
#var/ipfire/qos/bin #var/ipfire/qos/bin
#var/ipfire/qos/bin/RRD-func.pl #var/ipfire/qos/bin/RRD-func.pl

1
config/rootfiles/common/i586/strongswan-padlock
View File

@@ -1,2 +1 @@
usr/lib/ipsec/plugins/libstrongswan-padlock.so usr/lib/ipsec/plugins/libstrongswan-padlock.so
usr/lib/ipsec/plugins/libstrongswan-rdrand.so

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

@@ -2,5 +2,6 @@ etc/system-release
etc/issue etc/issue
srv/web/ipfire/cgi-bin/dnsforward.cgi srv/web/ipfire/cgi-bin/dnsforward.cgi
srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/proxy.cgi
usr/local/bin/httpscert
var/ipfire/header.pl var/ipfire/header.pl
var/ipfire/langs var/ipfire/langs

2
lfs/configroot
View File

@@ -68,7 +68,7 @@ $(TARGET) :
fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \ fwhosts/customnetworks fwhosts/customhosts fwhosts/customgroups fwhosts/customservicegrp fwlogs/ipsettings fwlogs/portsettings \
isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \ isdn/settings mac/settings main/disable_nf_sip main/hosts main/routing main/settings net-traffic/settings optionsfw/settings \
ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \ ovpn/ccd.conf ovpn/ccdroute ovpn/ccdroute2 pakfire/settings portfw/config ppp/settings-1 ppp/settings-2 ppp/settings-3 ppp/settings-4 \
ppp/settings-5 ppp/settings proxy/settings proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \ ppp/settings-5 ppp/settings proxy/settings proxy/squid.conf proxy/advanced/settings proxy/advanced/cre/enable remote/settings qos/settings qos/classes qos/subclasses qos/level7config qos/portconfig \
qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \ qos/tosconfig snort/settings tripwire/settings upnp/settings vpn/config vpn/settings vpn/ipsec.conf \
vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \ vpn/ipsec.secrets vpn/caconfig wakeonlan/clients.conf wireless/config wireless/settings; do \
touch $(CONFIG_ROOT)/$$i; \ touch $(CONFIG_ROOT)/$$i; \

6
lfs/strongswan
View File

@@ -34,12 +34,10 @@ TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE)" "i586" ifeq "$(MACHINE)" "i586"
CONFIGURE_OPTIONS = \ CONFIGURE_OPTIONS = \
--enable-padlock \ --enable-padlock
--enable-rdrand
else else
CONFIGURE_OPTIONS = \ CONFIGURE_OPTIONS = \
--disable-padlock \ --disable-padlock
--disable-rdrand
endif endif
############################################################################### ###############################################################################

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="74" # Core Level (Filename) CORE="74" # Core Level (Filename)
PAKFIRE_CORE="73" # Core Level (PAKFIRE) PAKFIRE_CORE="74" # 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

9
src/scripts/httpscert
View File

@@ -6,13 +6,9 @@
# See how we were called. # See how we were called.
case "$1" in case "$1" in
new) new)
# set temporary random file
export RANDFILE=/root/.rnd
if [ ! -f /etc/httpd/server.key ]; then if [ ! -f /etc/httpd/server.key ]; then
echo "Generating https server key." echo "Generating https server key."
/usr/bin/openssl genrsa -rand \ /usr/bin/openssl genrsa -out /etc/httpd/server.key 4096
/boot/vmlinuz:CONFIG_ROOT/ethernet/settings -out \
/etc/httpd/server.key 1024
fi fi
echo "Generating CSR" echo "Generating CSR"
/bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \ /bin/cat /etc/certparams | sed "s/HOSTNAME/`hostname -f`/" | /usr/bin/openssl \
@@ -21,9 +17,6 @@ case "$1" in
/usr/bin/openssl x509 -req -days 999999 -in \ /usr/bin/openssl x509 -req -days 999999 -in \
/etc/httpd/server.csr -signkey /etc/httpd/server.key -out \ /etc/httpd/server.csr -signkey /etc/httpd/server.key -out \
/etc/httpd/server.crt /etc/httpd/server.crt
# unset and remove random file
export -n RANDFILE
rm -f /root/.rnd
;; ;;
read) read)
if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then