collapse www.conf into php-fpm.conf, makes it easier to manage with M…

…PF policy rendering/service restart with one file.
cfengine · Oct 10, 2024 · 78098c5 · 78098c5
1 parent 2796501
commit 78098c5
Show file tree

Hide file tree

Showing 5 changed files with 491 additions and 504 deletions.
diff --git a/deps-packaging/php/cfbuild-php.spec b/deps-packaging/php/cfbuild-php.spec
@@ -7,7 +7,6 @@ Release: 1
 Source0: php-%{php_version}.tar.gz
 Source1: php.ini
 Source2: php-fpm.conf
-Source3: www.conf
 License: MIT
 Group: Other
 Url: http://example.com/
@@ -113,9 +112,7 @@ make
 rm -rf ${RPM_BUILD_ROOT}
 mkdir -p ${RPM_BUILD_ROOT}%{prefix}/httpd/conf
 cp %{prefix}/httpd/conf/httpd.conf ${RPM_BUILD_ROOT}%{prefix}/httpd/conf
-mkdir -p ${RPM_BUILD_ROOT}%{prefix}/httpd/php/etc/php-fpm.d
 cp ${RPM_BUILD_ROOT}/../../SOURCES/php-fpm.conf ${RPM_BUILD_ROOT}%{prefix}/httpd/php/etc
-cp ${RPM_BUILD_ROOT}/../../SOURCES/www.conf ${RPM_BUILD_ROOT}%{prefix}/httpd/php/etc/php-fpm.d
 
 INSTALL_ROOT=${RPM_BUILD_ROOT} make install
 

diff --git a/deps-packaging/php/debian/cfbuild-php.install b/deps-packaging/php/debian/cfbuild-php.install
@@ -4,5 +4,4 @@
 /var/cfengine/httpd/modules/libphp.so
 /var/cfengine/httpd/php/lib/php.ini
 /var/cfengine/httpd/php/etc/php-fpm.conf
-/var/cfengine/httpd/php/etc/php-fpm.d/www.conf
 /var/cfengine/httpd/php/sbin/php-fpm
diff --git a/deps-packaging/php/debian/rules b/deps-packaging/php/debian/rules
@@ -94,9 +94,7 @@ install: build
 
 	mkdir -p $(CURDIR)/debian/tmp$(PREFIX)/httpd/conf
 	cp $(PREFIX)/httpd/conf/httpd.conf $(CURDIR)/debian/tmp$(PREFIX)/httpd/conf/httpd.conf
-	mkdir -p $(CURDIR)/debian/tmp$(PREFIX)/httpd/php/etc/php-fpm.d
 	cp $(CURDIR)/php-fpm.conf $(CURDIR)/debian/tmp$(PREFIX)/httpd/php/etc/
-	cp $(CURDIR)/www.conf $(CURDIR)/debian/tmp$(PREFIX)/httpd/php/etc/php-fpm.d/
 
 	INSTALL_ROOT=$(CURDIR)/debian/tmp CPPFLAGS="-I$(PREFIX)/include" LD_LIBRARY_PATH="$(PREFIX)/lib" LD_RUN_PATH="$(PREFIX)/lib" $(MAKE) install