From 50308e4fd7c84fa027f5fe3b8101e8853046bd5f Mon Sep 17 00:00:00 2001 From: Val Kulkov Date: Fri, 10 Nov 2017 19:04:59 -0500 Subject: [PATCH] php7: add configuration files to conffiles Two important configuration files, /etc/php7-fpm.conf and /etc/php7-fpm.d/www.conf are silently overwritten on each php7-fpm upgrade or lost on a sysupgrade. This commit adds the conffiles section for php7-fpm and revises the conffiles section for php7. Signed-off-by: Val Kulkov --- lang/php7/Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lang/php7/Makefile b/lang/php7/Makefile index d6bf3308b..82c364b10 100644 --- a/lang/php7/Makefile +++ b/lang/php7/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php PKG_VERSION:=7.1.11 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Michael Heimpold @@ -457,6 +457,7 @@ CONFIGURE_VARS+= \ define Package/php7/conffiles /etc/php.ini +/etc/php7/ endef define Package/php7/install @@ -500,6 +501,12 @@ define Package/php7-fpm/install $(INSTALL_BIN) ./files/php7-fpm.init $(1)/etc/init.d/php7-fpm endef +define Package/php7-fpm/conffiles +/etc/php7-fpm.conf +/etc/php7-fpm.d/ +/etc/config/php7-fpm +endef + define Build/Prepare $(call Build/Prepare/Default) ( cd $(PKG_BUILD_DIR); touch configure.in; ./buildconf --force )