ocserv: if ocserv.conf.local is present append it to ocserv.conf

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
pull/1906/head
Nikos Mavrogiannopoulos 2015-11-01 10:51:21 +01:00
parent 2506f249be
commit 25eeddbb21
2 changed files with 3 additions and 0 deletions

View File

@ -54,6 +54,8 @@ setup_config() {
-e "s#|IPV6ADDR|#$ip6addr#g" \ -e "s#|IPV6ADDR|#$ip6addr#g" \
-e "s/|ENABLE_IPV6|/$enable_ipv6/g" \ -e "s/|ENABLE_IPV6|/$enable_ipv6/g" \
/etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf /etc/ocserv/ocserv.conf.template > /var/etc/ocserv.conf
test -f /etc/ocserv/ocserv.conf.local && cat /etc/ocserv/ocserv.conf.local >> /var/etc/ocserv.conf
} }
setup_users() { setup_users() {

View File

@ -2,6 +2,7 @@
/etc/ocserv/ca.pem /etc/ocserv/ca.pem
/etc/ocserv/server-key.pem /etc/ocserv/server-key.pem
/etc/ocserv/server-cert.pem /etc/ocserv/server-cert.pem
/etc/ocserv/ocserv.conf.local
/etc/ocserv/config-per-user/* /etc/ocserv/config-per-user/*
/etc/ocserv/config-per-group/* /etc/ocserv/config-per-group/*
/etc/ocserv/crl.pem /etc/ocserv/crl.pem