* [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. fd71513f75bfe0af6cb1e69ccb8df75957d131da
@ 2013-12-30 18:37 git
0 siblings, 0 replies; only message in thread
From: git @ 2013-12-30 18:37 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 24350 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, fifteen has been updated
via fd71513f75bfe0af6cb1e69ccb8df75957d131da (commit)
via 349b93f67401d79548620da0bd9f695a36ae2823 (commit)
via ba263fbbb9d10ceab94ffe6640e164e7c9423e51 (commit)
via b447d23666fa4ffc5a063cc1712ae750caed4e0d (commit)
via b71c52dd6fea7f873677c3c9d0df4dc8d526afed (commit)
via 1d0a260a8b804e43037a2c0aa3ef9bae1ddca656 (commit)
via 4f2aca6d2b1bd49b1fc090af657726f2ce011086 (commit)
via d58c41f1ef6aa5bc0178f4351ddc110dc6159b2d (commit)
via aa29e9e46c30e8af9984dec30dc5e821af8f0168 (commit)
from 481988c68d1380d918f42cb109a72c854826ffc7 (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 fd71513f75bfe0af6cb1e69ccb8df75957d131da
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Dec 30 19:36:46 2013 +0100
Set version to 2.15 beta1.
commit 349b93f67401d79548620da0bd9f695a36ae2823
Merge: ba263fb b447d23
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Dec 30 13:55:34 2013 +0100
Merge remote-tracking branch 'origin/next' into fifteen
Conflicts:
config/rootfiles/core/70/exclude
config/rootfiles/core/70/meta
config/rootfiles/core/71/exclude
config/rootfiles/core/71/meta
config/rootfiles/core/72/filelists/strongswan
config/rootfiles/core/72/meta
config/rootfiles/core/73/exclude
config/rootfiles/core/73/meta
config/rootfiles/core/fifteen/exclude
config/rootfiles/core/fifteen/filelists/strongswan
config/rootfiles/core/fifteen/meta
config/rootfiles/oldcore/70/exclude
config/rootfiles/oldcore/70/meta
config/rootfiles/oldcore/71/exclude
config/rootfiles/oldcore/71/meta
config/rootfiles/oldcore/72/filelists/strongswan
config/rootfiles/oldcore/72/meta
config/rootfiles/oldcore/73/exclude
config/rootfiles/oldcore/73/filelists/GeoIP
config/rootfiles/oldcore/73/filelists/hwdata
config/rootfiles/oldcore/73/filelists/openssh
config/rootfiles/oldcore/73/filelists/php
config/rootfiles/oldcore/73/meta
commit ba263fbbb9d10ceab94ffe6640e164e7c9423e51
Merge: 481988c 1d0a260
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Dec 30 13:45:10 2013 +0100
Merge remote-tracking branch 'origin/next' into fifteen
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/openvpn | 2 +-
config/rootfiles/core/{74 => 75}/exclude | 0
config/rootfiles/core/75/filelists/files | 6 ++++
config/rootfiles/core/{74 => 75}/meta | 0
config/rootfiles/{oldcore/72 => core/75}/update.sh | 33 ++++++++--------------
config/rootfiles/oldcore/72/filelists/strongswan | 1 -
.../rootfiles/oldcore/{54 => 73}/filelists/GeoIP | 0
.../rootfiles/oldcore/{58 => 73}/filelists/hwdata | 0
.../rootfiles/oldcore/{36 => 73}/filelists/openssh | 0
config/rootfiles/oldcore/{47 => 73}/filelists/php | 0
config/rootfiles/{core => oldcore}/74/exclude | 0
.../rootfiles/{core => oldcore}/74/filelists/files | 0
.../74/filelists/i586/strongswan-padlock | 0
.../{core => oldcore}/74/filelists/openvpn | 0
.../rootfiles/{core => oldcore}/74/filelists/squid | 0
.../{core => oldcore}/74/filelists/strongswan | 0
config/rootfiles/{core => oldcore}/74/meta | 0
config/rootfiles/{core => oldcore}/74/update.sh | 0
html/cgi-bin/ovpnmain.cgi | 2 +-
lfs/openvpn | 3 +-
make.sh | 6 ++--
21 files changed, 25 insertions(+), 28 deletions(-)
copy config/rootfiles/core/{74 => 75}/exclude (100%)
create mode 100644 config/rootfiles/core/75/filelists/files
copy config/rootfiles/core/{74 => 75}/meta (100%)
copy config/rootfiles/{oldcore/72 => core/75}/update.sh (85%)
delete mode 120000 config/rootfiles/oldcore/72/filelists/strongswan
copy config/rootfiles/oldcore/{54 => 73}/filelists/GeoIP (100%)
copy config/rootfiles/oldcore/{58 => 73}/filelists/hwdata (100%)
copy config/rootfiles/oldcore/{36 => 73}/filelists/openssh (100%)
copy config/rootfiles/oldcore/{47 => 73}/filelists/php (100%)
rename config/rootfiles/{core => oldcore}/74/exclude (100%)
rename config/rootfiles/{core => oldcore}/74/filelists/files (100%)
rename config/rootfiles/{core => oldcore}/74/filelists/i586/strongswan-padlock (100%)
rename config/rootfiles/{core => oldcore}/74/filelists/openvpn (100%)
rename config/rootfiles/{core => oldcore}/74/filelists/squid (100%)
rename config/rootfiles/{core => oldcore}/74/filelists/strongswan (100%)
rename config/rootfiles/{core => oldcore}/74/meta (100%)
rename config/rootfiles/{core => oldcore}/74/update.sh (100%)
Difference in files:
diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn
index ae6d6ee..d1b836a 100644
--- a/config/rootfiles/common/openvpn
+++ b/config/rootfiles/common/openvpn
@@ -5,6 +5,7 @@
usr/lib/openvpn/plugins/openvpn-plugin-auth-pam.so
#usr/lib/openvpn/plugins/openvpn-plugin-down-root.la
usr/lib/openvpn/plugins/openvpn-plugin-down-root.so
+usr/lib/openvpn/verify
usr/sbin/openvpn
#usr/share/doc/openvpn
#usr/share/doc/openvpn/COPYING
@@ -31,4 +32,3 @@ var/ipfire/ovpn/ovpn-leases.db
var/ipfire/ovpn/ovpnconfig
var/ipfire/ovpn/scripts
var/ipfire/ovpn/settings
-var/ipfire/ovpn/verify
diff --git a/config/rootfiles/core/74/exclude b/config/rootfiles/core/74/exclude
deleted file mode 100644
index 321a931..0000000
--- a/config/rootfiles/core/74/exclude
+++ /dev/null
@@ -1,17 +0,0 @@
-srv/web/ipfire/html/proxy.pac
-boot/config.txt
-etc/udev/rules.d/30-persistent-network.rules
-etc/collectd.custom
-etc/shadow
-etc/ipsec.conf
-etc/ipsec.secrets
-etc/ipsec.user.conf
-etc/ipsec.user.secrets
-var/log/cache
-var/updatecache
-etc/localtime
-var/ipfire/ovpn
-etc/ssh/ssh_config
-etc/ssh/sshd_config
-etc/ssl/openssl.cnf
-var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/74/filelists/files b/config/rootfiles/core/74/filelists/files
deleted file mode 100644
index 52d0178..0000000
--- a/config/rootfiles/core/74/filelists/files
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/system-release
-etc/issue
-srv/web/ipfire/cgi-bin/dnsforward.cgi
-srv/web/ipfire/cgi-bin/proxy.cgi
-usr/local/bin/httpscert
-var/ipfire/header.pl
-var/ipfire/langs
diff --git a/config/rootfiles/core/74/filelists/i586/strongswan-padlock b/config/rootfiles/core/74/filelists/i586/strongswan-padlock
deleted file mode 120000
index 2412824..0000000
--- a/config/rootfiles/core/74/filelists/i586/strongswan-padlock
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/core/74/filelists/openvpn b/config/rootfiles/core/74/filelists/openvpn
deleted file mode 120000
index 493f3f7..0000000
--- a/config/rootfiles/core/74/filelists/openvpn
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/core/74/filelists/squid b/config/rootfiles/core/74/filelists/squid
deleted file mode 120000
index 2dc8372..0000000
--- a/config/rootfiles/core/74/filelists/squid
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/core/74/filelists/strongswan b/config/rootfiles/core/74/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/core/74/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/core/74/meta b/config/rootfiles/core/74/meta
deleted file mode 100644
index d547fa8..0000000
--- a/config/rootfiles/core/74/meta
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/core/74/update.sh b/config/rootfiles/core/74/update.sh
deleted file mode 100644
index ca26b51..0000000
--- a/config/rootfiles/core/74/update.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/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 3 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) 2013 IPFire-Team <info(a)ipfire.org>. #
-# #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-
-#
-# Remove old core updates from pakfire cache to save space...
-core=74
-for (( i=1; i<=$core; i++ ))
-do
- rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
-done
-
-
-#
-#Stop services
-/etc/init.d/ipsec stop
-/etc/init.d/squid stop
-
-
-#
-#Extract files
-extract_files
-
-if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then
- (
- eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)
-
- if [ "${TRANSPARENT_PORT}" = "81" ]; then
- TRANSPARENT_PORT="$(( ${TRANSPARENT_PORT} + 1 ))"
- sed -e "s/^TRANSPARENT_PORT=.*/TRANSPARENT_PORT=${TRANSPARENT_PORT}/" \
- -i /var/ipfire/proxy/advanced/settings
- fi
- )
-fi
-
-# Regenerate squid configuration files.
-/srv/web/ipfire/cgi-bin/proxy.cgi
-chown nobody:nobody /var/ipfire/proxy/squid.conf
-
-#
-#Start services
-/etc/init.d/squid start
-
-if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
- /etc/init.d/ipsec start
-fi
-
-#
-#Update Language cache
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-
-sync
-
-# This update need a reboot...
-#touch /var/run/need_reboot
-
-#
-#Finish
-/etc/init.d/fireinfo start
-sendprofile
-#Don't report the exitcode last command
-exit 0
diff --git a/config/rootfiles/core/75/exclude b/config/rootfiles/core/75/exclude
new file mode 100644
index 0000000..321a931
--- /dev/null
+++ b/config/rootfiles/core/75/exclude
@@ -0,0 +1,17 @@
+srv/web/ipfire/html/proxy.pac
+boot/config.txt
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/log/cache
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/core/75/filelists/files b/config/rootfiles/core/75/filelists/files
new file mode 100644
index 0000000..647eb26
--- /dev/null
+++ b/config/rootfiles/core/75/filelists/files
@@ -0,0 +1,6 @@
+etc/system-release
+etc/issue
+opt/pakfire/lib/functions.pl
+usr/lib/openvpn/verify
+var/ipfire/header.pl
+var/ipfire/langs
diff --git a/config/rootfiles/core/75/meta b/config/rootfiles/core/75/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/core/75/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/75/update.sh b/config/rootfiles/core/75/update.sh
new file mode 100644
index 0000000..3fd00fe
--- /dev/null
+++ b/config/rootfiles/core/75/update.sh
@@ -0,0 +1,60 @@
+#!/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 3 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) 2013 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+# Remove old core updates from pakfire cache to save space...
+core=75
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+# Stop services
+
+# Extract files
+extract_files
+
+# Start services
+
+# Replace path to verify script.
+if [ -r "/var/ipfire/ovpn/server.conf" ]; then
+ sed -e "s@^tls-verify.*@tls-verify /usr/lib/openvpn/verify(a)g" \
+ -i /var/ipfire/ovpn/server.conf
+fi
+
+# Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+# Finish
+/etc/init.d/fireinfo start
+sendprofile
+
+# Don't report the exitcode last command
+exit 0
diff --git a/config/rootfiles/oldcore/72/filelists/strongswan b/config/rootfiles/oldcore/72/filelists/strongswan
deleted file mode 120000
index 90c727e..0000000
--- a/config/rootfiles/oldcore/72/filelists/strongswan
+++ /dev/null
@@ -1 +0,0 @@
-../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/73/filelists/GeoIP b/config/rootfiles/oldcore/73/filelists/GeoIP
new file mode 100644
index 0000000..0258236
--- /dev/null
+++ b/config/rootfiles/oldcore/73/filelists/GeoIP
@@ -0,0 +1 @@
+usr/local/share/GeoIP/GeoIP.dat
diff --git a/config/rootfiles/oldcore/73/filelists/hwdata b/config/rootfiles/oldcore/73/filelists/hwdata
new file mode 100644
index 0000000..5a9672f
--- /dev/null
+++ b/config/rootfiles/oldcore/73/filelists/hwdata
@@ -0,0 +1,2 @@
+usr/share/hwdata/pci.ids
+usr/share/hwdata/usb.ids
diff --git a/config/rootfiles/oldcore/73/filelists/openssh b/config/rootfiles/oldcore/73/filelists/openssh
new file mode 120000
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/oldcore/73/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/73/filelists/php b/config/rootfiles/oldcore/73/filelists/php
new file mode 120000
index 0000000..1ae48d7
--- /dev/null
+++ b/config/rootfiles/oldcore/73/filelists/php
@@ -0,0 +1 @@
+../../../common/php
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/74/exclude b/config/rootfiles/oldcore/74/exclude
new file mode 100644
index 0000000..321a931
--- /dev/null
+++ b/config/rootfiles/oldcore/74/exclude
@@ -0,0 +1,17 @@
+srv/web/ipfire/html/proxy.pac
+boot/config.txt
+etc/udev/rules.d/30-persistent-network.rules
+etc/collectd.custom
+etc/shadow
+etc/ipsec.conf
+etc/ipsec.secrets
+etc/ipsec.user.conf
+etc/ipsec.user.secrets
+var/log/cache
+var/updatecache
+etc/localtime
+var/ipfire/ovpn
+etc/ssh/ssh_config
+etc/ssh/sshd_config
+etc/ssl/openssl.cnf
+var/state/dhcp/dhcpd.leases
diff --git a/config/rootfiles/oldcore/74/filelists/files b/config/rootfiles/oldcore/74/filelists/files
new file mode 100644
index 0000000..52d0178
--- /dev/null
+++ b/config/rootfiles/oldcore/74/filelists/files
@@ -0,0 +1,7 @@
+etc/system-release
+etc/issue
+srv/web/ipfire/cgi-bin/dnsforward.cgi
+srv/web/ipfire/cgi-bin/proxy.cgi
+usr/local/bin/httpscert
+var/ipfire/header.pl
+var/ipfire/langs
diff --git a/config/rootfiles/oldcore/74/filelists/i586/strongswan-padlock b/config/rootfiles/oldcore/74/filelists/i586/strongswan-padlock
new file mode 120000
index 0000000..2412824
--- /dev/null
+++ b/config/rootfiles/oldcore/74/filelists/i586/strongswan-padlock
@@ -0,0 +1 @@
+../../../../common/i586/strongswan-padlock
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/74/filelists/openvpn b/config/rootfiles/oldcore/74/filelists/openvpn
new file mode 120000
index 0000000..493f3f7
--- /dev/null
+++ b/config/rootfiles/oldcore/74/filelists/openvpn
@@ -0,0 +1 @@
+../../../common/openvpn
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/74/filelists/squid b/config/rootfiles/oldcore/74/filelists/squid
new file mode 120000
index 0000000..2dc8372
--- /dev/null
+++ b/config/rootfiles/oldcore/74/filelists/squid
@@ -0,0 +1 @@
+../../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/74/filelists/strongswan b/config/rootfiles/oldcore/74/filelists/strongswan
new file mode 120000
index 0000000..90c727e
--- /dev/null
+++ b/config/rootfiles/oldcore/74/filelists/strongswan
@@ -0,0 +1 @@
+../../../common/strongswan
\ No newline at end of file
diff --git a/config/rootfiles/oldcore/74/meta b/config/rootfiles/oldcore/74/meta
new file mode 100644
index 0000000..d547fa8
--- /dev/null
+++ b/config/rootfiles/oldcore/74/meta
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/oldcore/74/update.sh b/config/rootfiles/oldcore/74/update.sh
new file mode 100644
index 0000000..ca26b51
--- /dev/null
+++ b/config/rootfiles/oldcore/74/update.sh
@@ -0,0 +1,84 @@
+#!/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 3 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) 2013 IPFire-Team <info(a)ipfire.org>. #
+# #
+############################################################################
+#
+. /opt/pakfire/lib/functions.sh
+/usr/local/bin/backupctrl exclude >/dev/null 2>&1
+
+#
+# Remove old core updates from pakfire cache to save space...
+core=74
+for (( i=1; i<=$core; i++ ))
+do
+ rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
+done
+
+
+#
+#Stop services
+/etc/init.d/ipsec stop
+/etc/init.d/squid stop
+
+
+#
+#Extract files
+extract_files
+
+if [ -e "/var/ipfire/proxy/enable" ] || [ -e "/var/ipfire/proxy/enable_blue" ]; then
+ (
+ eval $(/usr/local/bin/readhash /var/ipfire/proxy/advanced/settings)
+
+ if [ "${TRANSPARENT_PORT}" = "81" ]; then
+ TRANSPARENT_PORT="$(( ${TRANSPARENT_PORT} + 1 ))"
+ sed -e "s/^TRANSPARENT_PORT=.*/TRANSPARENT_PORT=${TRANSPARENT_PORT}/" \
+ -i /var/ipfire/proxy/advanced/settings
+ fi
+ )
+fi
+
+# Regenerate squid configuration files.
+/srv/web/ipfire/cgi-bin/proxy.cgi
+chown nobody:nobody /var/ipfire/proxy/squid.conf
+
+#
+#Start services
+/etc/init.d/squid start
+
+if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
+ /etc/init.d/ipsec start
+fi
+
+#
+#Update Language cache
+perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
+
+sync
+
+# This update need a reboot...
+#touch /var/run/need_reboot
+
+#
+#Finish
+/etc/init.d/fireinfo start
+sendprofile
+#Don't report the exitcode last command
+exit 0
diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 7eccf98..81a7450 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -380,7 +380,7 @@ sub writeserverconf {
if ($sovpnsettings{DHCP_WINS} ne '') {
print CONF "max-clients $sovpnsettings{MAX_CLIENTS}\n";
}
- print CONF "tls-verify /var/ipfire/ovpn/verify\n";
+ print CONF "tls-verify /usr/lib/openvpn/verify\n";
print CONF "crl-verify /var/ipfire/ovpn/crls/cacrl.pem\n";
print CONF "user nobody\n";
print CONF "group nobody\n";
diff --git a/lfs/openvpn b/lfs/openvpn
index 87daf07..727d374 100644
--- a/lfs/openvpn
+++ b/lfs/openvpn
@@ -93,8 +93,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
chown -R root:root /var/ipfire/ovpn/scripts
chown -R nobody:nobody /var/ipfire/ovpn
chown root.nobody /var/log/ovpnserver.log
- chmod 755 /var/ipfire/ovpn/verify
chmod 660 /var/log/ovpnserver.log
chmod 700 /var/ipfire/ovpn/certs
+ mv -v /var/ipfire/ovpn/verify /usr/lib/openvpn/verify
+ chmod 755 /usr/lib/openvpn/verify
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/make.sh b/make.sh
index bb47b52..5aabdf8 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.13" # Version number
-CORE="74" # Core Level (Filename)
-PAKFIRE_CORE="74" # Core Level (PAKFIRE)
+VERSION="2.15" # Version number
+CORE="76-beta1" # Core Level (Filename)
+PAKFIRE_CORE="75" # Core Level (PAKFIRE)
GIT_BRANCH=`git status | head -n1 | cut -d" " -f4` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-12-30 18:37 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-12-30 18:37 [git.ipfire.org] IPFire 2.x development tree branch, fifteen, updated. fd71513f75bfe0af6cb1e69ccb8df75957d131da git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox