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, next has been updated via 6140e7e0c2bac4e885abf230855965b38e689a92 (commit) via f6e120934430a4f3b39115bdc729460a298c20da (commit) via 542b31d622df206df102d4450abef437058d137b (commit) from 953073459e1ab036c21336e7a62b28fc16458bec (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 6140e7e0c2bac4e885abf230855965b38e689a92 Author: Erik Kapfer erik.kapfer@ipfire.org Date: Wed Jun 20 19:58:38 2012 +0200
openvpn: Introduce CCD.
commit f6e120934430a4f3b39115bdc729460a298c20da Author: Erik Kapfer erik.kapfer@ipfire.org Date: Wed Jun 20 19:54:45 2012 +0200
openvpn: Honour DAYS_VALID for CA certificates.
commit 542b31d622df206df102d4450abef437058d137b Author: Erik Kapfer erik.kapfer@ipfire.org Date: Wed Jun 20 19:54:09 2012 +0200
openvpn: Sort connections by name.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/openvpn | 1 + html/cgi-bin/index.cgi | 2 +- html/cgi-bin/ovpnmain.cgi | 7 ++++--- lfs/openvpn | 1 + 4 files changed, 7 insertions(+), 4 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/openvpn b/config/rootfiles/common/openvpn index 18f4d31..6be9a10 100644 --- a/config/rootfiles/common/openvpn +++ b/config/rootfiles/common/openvpn @@ -8,6 +8,7 @@ usr/sbin/openvpn var/ipfire/ovpn var/ipfire/ovpn/ca var/ipfire/ovpn/caconfig +var/ipfire/ovpn/ccd #var/ipfire/ovpn/certs var/ipfire/ovpn/certs/index.txt var/ipfire/ovpn/certs/serial diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi index 07dc9e7..9f55927 100644 --- a/html/cgi-bin/index.cgi +++ b/html/cgi-bin/index.cgi @@ -356,7 +356,7 @@ END END my $id = 0; my $gif; - foreach my $key (keys %confighash) { + foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) { if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) { diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi index 0c4502d..2b4c1fd 100644 --- a/html/cgi-bin/ovpnmain.cgi +++ b/html/cgi-bin/ovpnmain.cgi @@ -334,6 +334,7 @@ sub writeserverconf { print CONF "port $sovpnsettings{'DDEST_PORT'}\n"; print CONF "script-security 3 system\n"; print CONF "ifconfig-pool-persist /var/ipfire/ovpn/ovpn-leases.db 3600\n"; + print CONF "client-config-dir /var/ipfire/ovpn/ccd\n"; print CONF "tls-server\n"; print CONF "ca /var/ipfire/ovpn/ca/cacert.pem\n"; print CONF "cert /var/ipfire/ovpn/certs/servercert.pem\n"; @@ -2910,7 +2911,7 @@ if ($cgiparams{'TYPE'} eq 'net') {
# Sign the certificate request and move it # Sign the host certificate request - system('/usr/bin/openssl', 'ca', '-days', '999999', + system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}", '-batch', '-notext', '-in', $filename, '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem", @@ -3089,7 +3090,7 @@ if ($cgiparams{'TYPE'} eq 'net') { } # Sign the host certificate request - system('/usr/bin/openssl', 'ca', '-days', '999999', + system('/usr/bin/openssl', 'ca', '-days', "$cgiparams{'DAYS_VALID'}", '-batch', '-notext', '-in', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}req.pem", '-out', "${General::swroot}/ovpn/certs/$cgiparams{'NAME'}cert.pem", @@ -3873,7 +3874,7 @@ END ; my $id = 0; my $gif; - foreach my $key (keys %confighash) { + foreach my $key (sort { uc($confighash{$a}[1]) cmp uc($confighash{$b}[1]) } keys %confighash) { if ($confighash{$key}[0] eq 'on') { $gif = 'on.gif'; } else { $gif = 'off.gif'; }
if ($id % 2) { diff --git a/lfs/openvpn b/lfs/openvpn index 4f10e7a..e57aa30 100644 --- a/lfs/openvpn +++ b/lfs/openvpn @@ -84,6 +84,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP)/plugin/down-root && make cp -pvf $(DIR_APP)/plugin/down-root/openvpn-down-root.so /usr/lib/openvpn -mkdir -vp /var/ipfire/ovpn/ca + -mkdir -vp /var/ipfire/ovpn/ccd -mkdir -vp /var/ipfire/ovpn/crls -mkdir -vp /var/ipfire/ovpn/n2nconf -mkdir -vp /var/ipfire/ovpn/scripts
hooks/post-receive -- IPFire 2.x development tree