Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ocserv: use ocserv.upgrade to save configured files

Browse source 
Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
This commit is contained in:
Nikos Mavrogiannopoulos 2015-01-19 22:52:42 +01:00
parent 7f0b553169
commit 1a67e62e7e
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/ocserv/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ocserv PKG_NAME:=ocserv
PKG_VERSION:=0.8.9 PKG_VERSION:=0.8.9
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -87,6 +87,8 @@ define Package/ocserv/install
$(INSTALL_CONF) ./files/ocserv.conf.template $(1)/etc/ocserv/ocserv.conf.template $(INSTALL_CONF) ./files/ocserv.conf.template $(1)/etc/ocserv/ocserv.conf.template
$(INSTALL_DIR) $(1)/etc/config $(INSTALL_DIR) $(1)/etc/config
$(INSTALL_CONF) ./files/config $(1)/etc/config/ocserv $(INSTALL_CONF) ./files/config $(1)/etc/config/ocserv
$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
$(INSTALL_DATA) ./files/ocserv.upgrade $(1)/lib/upgrade/keep.d/ocserv
endef endef
$(eval $(call BuildPackage,ocserv)) $(eval $(call BuildPackage,ocserv))

6
net/ocserv/files/ocserv.init
View file

@ -99,6 +99,12 @@ start() {
hostname=`uci show ddns|grep domain|head -1|cut -d '=' -f 2 2>/dev/null` hostname=`uci show ddns|grep domain|head -1|cut -d '=' -f 2 2>/dev/null`
[ -z "$hostname" ] && hostname=`uci get system.@system[0].hostname 2>/dev/null` [ -z "$hostname" ] && hostname=`uci get system.@system[0].hostname 2>/dev/null`
[ -f /etc/config/ocserv-dir/ca-key.pem ] && mv /etc/config/ocserv-dir/ca-key.pem /etc/ocserv/ca-key.pem
[ -f /etc/config/ocserv-dir/ca.pem ] && mv /etc/config/ocserv-dir/ca.pem /etc/ocserv/ca.pem
[ -f /etc/config/ocserv-dir/server-key.pem ] && mv /etc/config/ocserv-dir/server-key.pem /etc/ocserv/server-key.pem
[ -f /etc/config/ocserv-dir/server-cert.pem ] && mv /etc/config/ocserv-dir/server-cert.pem /etc/ocserv/server-cert.pem
[ -d /etc/config/ocserv-dir ] && rmdir /etc/config/ocserv-dir
[ ! -f /etc/ocserv/ca-key.pem ] && [ -x /usr/bin/certtool ] && { [ ! -f /etc/ocserv/ca-key.pem ] && [ -x /usr/bin/certtool ] && {
logger -t ocserv "Generating CA certificate..." logger -t ocserv "Generating CA certificate..."
mkdir -p /etc/ocserv/pki/ mkdir -p /etc/ocserv/pki/

7
net/ocserv/files/ocserv.upgrade Normal file
View file

@ -0,0 +1,7 @@
/etc/ocserv/ca-key.pem
/etc/ocserv/ca.pem
/etc/ocserv/server-key.pem
/etc/ocserv/server-cert.pem
/etc/ocserv/config-per-user/*
/etc/ocserv/config-per-group/*
/etc/ocserv/crl.pem