Merge branch 'master' into epel7

This commit is contained in:
Nikos Mavrogiannopoulos 2014-02-17 09:26:05 +01:00
commit ce302d935a
4 changed files with 16 additions and 12 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
/ocserv-0.2.1.tar.xz /ocserv-0.2.1.tar.xz
/ocserv-0.2.3.tar.xz /ocserv-0.2.3.tar.xz
/ocserv-0.3.0.tar.xz /ocserv-0.3.0.tar.xz
/ocserv-0.3.1.tar.xz

View File

@ -30,6 +30,9 @@ udp-port = 4443
# Keepalive in seconds # Keepalive in seconds
keepalive = 32400 keepalive = 32400
# Rekey time in seconds
rekey-time 172800
# Dead peer detection in seconds # Dead peer detection in seconds
dpd = 60 dpd = 60
@ -160,18 +163,15 @@ device = vpns
#ipv4-network = 192.168.1.0 #ipv4-network = 192.168.1.0
#ipv4-netmask = 255.255.255.0 #ipv4-netmask = 255.255.255.0
# Use the keywork local to advertize the local P-t-P address as DNS server #dns = 192.168.2.1
# ipv4-dns = 192.168.2.1
#ipv4-dns = local
# The NBNS server (if any) # The NBNS server (if any)
#ipv4-nbns = 192.168.2.3 #nbns = 192.168.2.3
#ipv6-address = # The IPv6 subnet
#ipv6-dns = #ipv6-network =
# The IPv6 subnet prefix
#ipv6-prefix = #ipv6-prefix =
#dns =
# Prior to leasing any IP from the pool ping it to verify that # Prior to leasing any IP from the pool ping it to verify that
# it is not in use by another (unrelated to this server) host. # it is not in use by another (unrelated to this server) host.
@ -196,8 +196,8 @@ output-buffer = 100
# Configuration files that will be applied per user connection or # Configuration files that will be applied per user connection or
# per group. Each file name on these directories must match the username # per group. Each file name on these directories must match the username
# or the groupname. # or the groupname.
# The options allowed in the configuration files are ipv?-dns, ipv?-nbns, # The options allowed in the configuration files are dns, nbns,
# ipv?-network, ipv?-netmask, ipv6-prefix, iroute and route. # ipv?-network, ipv4-netmask, ipv6-prefix, iroute and route.
# #
# Note that the 'iroute' option allows to add routes on the server # Note that the 'iroute' option allows to add routes on the server
# based on a user or group. The syntax depends on the input accepted # based on a user or group. The syntax depends on the input accepted

View File

@ -1,5 +1,5 @@
Name: ocserv Name: ocserv
Version: 0.3.0 Version: 0.3.1
Release: 2%{?dist} Release: 2%{?dist}
Summary: OpenConnect SSL VPN server Summary: OpenConnect SSL VPN server
@ -157,6 +157,9 @@ rm -rf %{buildroot}
%{_unitdir}/ocserv.service %{_unitdir}/ocserv.service
%changelog %changelog
* Mon Feb 17 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.1-2
- new upstream release
* Wed Jan 29 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.0-2 * Wed Jan 29 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 0.3.0-2
- Generated certificates no longer carry an expiration date. - Generated certificates no longer carry an expiration date.

View File

@ -1 +1 @@
f6d64451ac8c458c7bdd40ee8ff51192 ocserv-0.3.0.tar.xz 22bd81fd4f60e27fe85aac8fd73dada3 ocserv-0.3.1.tar.xz