php7: add configuration files to conffiles 5105/head
authorVal Kulkov <val.kulkov@gmail.com>
Sat, 11 Nov 2017 00:04:59 +0000 (19:04 -0500)
committerVal Kulkov <val.kulkov@gmail.com>
Sat, 11 Nov 2017 00:50:34 +0000 (19:50 -0500)
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 <val.kulkov@gmail.com>
lang/php7/Makefile

index d6bf3308b13f5291030e4350932ab551e5405354..82c364b1050a8a1b13bea26f4e18a0523ce1aa6d 100644 (file)
@@ -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 <mhei@heimpold.de>
 
@@ -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 )