From 10cb16c2b8945c02b5e7e2221bc6335d48996369 Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Wed, 15 May 2019 11:15:27 +0200
Subject: add php to httpd benchmark

restructure httpd and php-fpm setup
OBJDIR/etc holds configs
OBJDIR/run holds pid files
OBJDIR/log holds all log files

don't daemonize nginx
---
 src/benchmarks/httpd/Makefile | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'src/benchmarks/httpd/Makefile')

diff --git a/src/benchmarks/httpd/Makefile b/src/benchmarks/httpd/Makefile
index 6175d59..dff3efe 100644
--- a/src/benchmarks/httpd/Makefile
+++ b/src/benchmarks/httpd/Makefile
@@ -2,17 +2,35 @@ OBJDIR ?= obj
 
 .PHONY = all clean
 
-all: $(OBJDIR)/html $(OBJDIR)/nginx
+all: $(OBJDIR)/html $(OBJDIR)/php $(OBJDIR)/etc/nginx $(OBJDIR)/etc/php $(OBJDIR)/logs $(OBJDIR)/run
 
 $(OBJDIR)/html: html | $(OBJDIR)
 	cp -r html $(OBJDIR)/html
 
-$(OBJDIR)/nginx: nginx/nginx.conf | $(OBJDIR)
-	mkdir -p $@/logs
+$(OBJDIR)/php: php | $(OBJDIR)
+	cp -r php $(OBJDIR)/php
+
+$(OBJDIR)/logs: | $(OBJDIR)
+	mkdir -p $@
+
+$(OBJDIR)/run: | $(OBJDIR)
+	mkdir -p $@
+
+$(OBJDIR)/etc/nginx: etc/nginx/nginx.conf | $(OBJDIR)/etc
+	mkdir -p $@
 	sed "s|OBJDIR|$(OBJDIR)|" $< > $@/nginx.conf
 
+$(OBJDIR)/etc/php: etc/php/php.ini etc/php/php-fpm.conf etc/php/php-fpm.d/www.conf | $(OBJDIR)
+	mkdir -p $@/php-fpm.d/
+	sed "s|OBJDIR|$(OBJDIR)|" etc/php/php.ini > $@/php.ini
+	sed "s|OBJDIR|$(OBJDIR)|" etc/php/php-fpm.conf > $@/php-fpm.conf
+	sed "s|OBJDIR|$(OBJDIR)|" etc/php/php-fpm.d/www.conf > $@/php-fpm.d/www.conf
+
 $(OBJDIR):
 	mkdir -p $@
 
+$(OBJDIR)/etc:
+	mkdir -p $@
+
 clean:
 	rm -rf $(OBJDIR)
-- 
cgit v1.2.3