From 28f40ed903880e5e5e033fdda267a34a20327ca2 Mon Sep 17 00:00:00 2001 From: Nate Brady Date: Tue, 12 Jul 2016 11:12:54 -0700 Subject: [PATCH 01/11] ffead-cpp-apache2 addition --- .../C++/ffead-cpp/benchmark_config.json | 23 ++++++++++ frameworks/C++/ffead-cpp/setup-apache2.sh | 12 +++++ .../linux/frameworks/ffead-cpp-apache.sh | 44 +++++++++++++++++++ toolset/setup/linux/frameworks/ffead-cpp.sh | 2 +- 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 frameworks/C++/ffead-cpp/setup-apache2.sh create mode 100644 toolset/setup/linux/frameworks/ffead-cpp-apache.sh diff --git a/frameworks/C++/ffead-cpp/benchmark_config.json b/frameworks/C++/ffead-cpp/benchmark_config.json index 57e46c13b93..6d26eb24f26 100644 --- a/frameworks/C++/ffead-cpp/benchmark_config.json +++ b/frameworks/C++/ffead-cpp/benchmark_config.json @@ -23,6 +23,29 @@ "display_name": "ffead-cpp", "notes": "", "versus": "" + }, + "apache2": { + "setup_file": "setup", + "json_url": "/te-benchmark/json", + "plaintext_url": "/te-benchmark/plaintext", + "db_url": "/te-benchmark/db", + "query_url": "/te-benchmark/queries?queries=", + "fortune_url": "/te-benchmark/fortunes", + "update_url": "/te-benchmark/updates?queries=", + "port": 8080, + "approach": "Realistic", + "classification": "Fullstack", + "database": "MongoDB", + "framework": "ffead-cpp", + "language": "C++", + "orm": "Full", + "platform": "ffead-cpp-apache", + "webserver": "apache2", + "os": "Linux", + "database_os": "Linux", + "display_name": "ffead-cpp-apache", + "notes": "", + "versus": "" } }] } diff --git a/frameworks/C++/ffead-cpp/setup-apache2.sh b/frameworks/C++/ffead-cpp/setup-apache2.sh new file mode 100644 index 00000000000..429ef31bb60 --- /dev/null +++ b/frameworks/C++/ffead-cpp/setup-apache2.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +fw_depends apache +fw_depends ffead-cpp-apache + +export FFEAD_CPP_PATH=$TROOT/ffead-cpp-2.0 +export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH +echo $FFEAD_CPP_PATH +echo $LD_LIBRARY_PATH +rm -f $FFEAD_CPP_PATH/*.cntrl +rm -f $FFEAD_CPP_PATH/tmp/*.sess +sudo /etc/init.d/apache2 restart > ffead.log 2>&1 \ No newline at end of file diff --git a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh new file mode 100644 index 00000000000..56919fdada7 --- /dev/null +++ b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh @@ -0,0 +1,44 @@ +#!/bin/bash + +RETCODE=$(fw_exists ${IROOT}/ffead-cpp-apache.installed) +[ ! "$RETCODE" == 0 ] || { return 0; } + +sudo apt-get install -y uuid-dev unixodbc unixodbc-dev + +fw_get -o ffead-cpp-2.0.tar.gz https://github.com/sumeetchhetri/ffead-cpp/releases/download/v2.0-Draft-TLV-Fixed-TE_Benchmark/ffead-cpp-2.0-tlfixed-bin.tar.gz +fw_untar ffead-cpp-2.0.tar.gz + +cp -R ffead-cpp-2.0-bin/ ${TROOT}/ffead-cpp-2.0 +rm -rf ffead-cpp-2.0/ + +wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz +tar -xzf mongo-c-driver-1.1.10.tar.gz +cd mongo-c-driver-1.1.10/ +./configure --prefix=${IROOT} --libdir=${IROOT} +make && sudo make install + +FFEADROOT=$TROOT/ffead-cpp-2.0 +ETROOT=${FFEADROOT//\//\\/} +EIROOT=${IROOT//\//\\/} + +sudo sed -i '/^export FFEAD_CPP_PATH=/{h;s/=.*/='"${ETROOT}"'/};${x;/^$/{s//export FFEAD_CPP_PATH='"${ETROOT}"'/;H};x}' /etc/apache2/envvars +sudo sed -i '/^export LD_LIBRARY_PATH=/{h;s/=.*/='"${EIROOT}"':$FFEAD_CPP_PATH\/lib:$LD_LIBRARY_PATH/};${x;/^$/{s//export LD_LIBRARY_PATH='"${EIROOT}"':$FFEAD_CPP_PATH\/lib:$LD_LIBRARY_PATH/;H};x}' /etc/apache2/envvars + +sudo bash -c 'rm -f /etc/apache2/sites-enabled/ffead-site.conf' + +sudo bash -c 'cat > /etc/apache2/sites-enabled/ffead-site.conf < + DocumentRoot '"${TROOT}"'/ffead-cpp-2.0/web + SetHandler ffead_cpp_module + + + Options Indexes FollowSymLinks + AllowOverride None + Require all granted + +EOL' + +touch ${IROOT}/ffead-cpp-apache.installed \ No newline at end of file diff --git a/toolset/setup/linux/frameworks/ffead-cpp.sh b/toolset/setup/linux/frameworks/ffead-cpp.sh index 4860a106d64..32adf984201 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp.sh @@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/ffead-cpp.installed) sudo apt-get install -y uuid-dev unixodbc unixodbc-dev -fw_get -o ffead-cpp-2.0.tar.gz https://github.com/sumeetchhetri/ffead-cpp/files/62038/ffead-cpp-2.0-bin.tar.gz +fw_get -o ffead-cpp-2.0.tar.gz https://github.com/sumeetchhetri/ffead-cpp/releases/download/v2.0-Draft-TLV-Fixed-TE_Benchmark/ffead-cpp-2.0-tlfixed-bin.tar.gz fw_untar ffead-cpp-2.0.tar.gz cp -R ffead-cpp-2.0-bin/ ${TROOT}/ffead-cpp-2.0 From fb31804867a073f3eabdc679a1c0f25915565683 Mon Sep 17 00:00:00 2001 From: Nate Date: Tue, 12 Jul 2016 18:44:25 -0700 Subject: [PATCH 02/11] Update benchmark_config.json --- frameworks/C++/ffead-cpp/benchmark_config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/C++/ffead-cpp/benchmark_config.json b/frameworks/C++/ffead-cpp/benchmark_config.json index 6d26eb24f26..37e2ba70403 100644 --- a/frameworks/C++/ffead-cpp/benchmark_config.json +++ b/frameworks/C++/ffead-cpp/benchmark_config.json @@ -25,7 +25,7 @@ "versus": "" }, "apache2": { - "setup_file": "setup", + "setup_file": "setup-apache2", "json_url": "/te-benchmark/json", "plaintext_url": "/te-benchmark/plaintext", "db_url": "/te-benchmark/db", From c8a21d181b784f21c8122bee34b10a491b5d4404 Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 13 Jul 2016 11:19:34 -0700 Subject: [PATCH 03/11] Update setup-apache2.sh --- frameworks/C++/ffead-cpp/setup-apache2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/C++/ffead-cpp/setup-apache2.sh b/frameworks/C++/ffead-cpp/setup-apache2.sh index 429ef31bb60..0ae12a212aa 100644 --- a/frameworks/C++/ffead-cpp/setup-apache2.sh +++ b/frameworks/C++/ffead-cpp/setup-apache2.sh @@ -9,4 +9,4 @@ echo $FFEAD_CPP_PATH echo $LD_LIBRARY_PATH rm -f $FFEAD_CPP_PATH/*.cntrl rm -f $FFEAD_CPP_PATH/tmp/*.sess -sudo /etc/init.d/apache2 restart > ffead.log 2>&1 \ No newline at end of file +sudo /etc/init.d/apache2 restart > ffead.log 2>&1 From 329eca7e5912f9b17f093cd981fb219c901e5863 Mon Sep 17 00:00:00 2001 From: Nate Date: Wed, 13 Jul 2016 11:19:54 -0700 Subject: [PATCH 04/11] Update ffead-cpp-apache.sh --- toolset/setup/linux/frameworks/ffead-cpp-apache.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh index 56919fdada7..53fc903643f 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh @@ -41,4 +41,4 @@ FFEAD_CPP_PATH '"${TROOT}"'/ffead-cpp-2.0 EOL' -touch ${IROOT}/ffead-cpp-apache.installed \ No newline at end of file +touch ${IROOT}/ffead-cpp-apache.installed From 9c3898d3faab89e70e3b1dc80685b46f361ee7f0 Mon Sep 17 00:00:00 2001 From: sumeetchhetri Date: Wed, 27 Jul 2016 20:55:40 +0000 Subject: [PATCH 05/11] Fixed the failing ffead-cpp-apache2 tests --- frameworks/C++/ffead-cpp/setup.sh | 2 +- toolset/benchmark/benchmarker.py | 1 + toolset/setup/linux/frameworks/ffead-cpp.sh | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frameworks/C++/ffead-cpp/setup.sh b/frameworks/C++/ffead-cpp/setup.sh index 7c9c018f3ba..288e8c75105 100644 --- a/frameworks/C++/ffead-cpp/setup.sh +++ b/frameworks/C++/ffead-cpp/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash fw_depends ffead-cpp - +sudo /etc/init.d/apache2 stop export FFEAD_CPP_PATH=$TROOT/ffead-cpp-2.0 export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH echo $FFEAD_CPP_PATH diff --git a/toolset/benchmark/benchmarker.py b/toolset/benchmark/benchmarker.py index e4cad4001ee..54ecb4510cf 100644 --- a/toolset/benchmark/benchmarker.py +++ b/toolset/benchmark/benchmarker.py @@ -561,6 +561,7 @@ def exit_with_code(code): sudo service postgresql restart sudo service cassandra restart /opt/elasticsearch/elasticsearch restart + sudo /etc/init.d/apache2 stop """) time.sleep(10) diff --git a/toolset/setup/linux/frameworks/ffead-cpp.sh b/toolset/setup/linux/frameworks/ffead-cpp.sh index 32adf984201..a425e23b2de 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp.sh @@ -1,5 +1,7 @@ #!/bin/bash +sudo /etc/init.d/apache2 stop + RETCODE=$(fw_exists ${IROOT}/ffead-cpp.installed) [ ! "$RETCODE" == 0 ] || { return 0; } From 7f0868096cddd4dc20299e60127bc05ca254c7a8 Mon Sep 17 00:00:00 2001 From: sumeetchhetri Date: Wed, 27 Jul 2016 22:24:05 +0000 Subject: [PATCH 06/11] Removed the unnecessary command which was failing the test --- frameworks/C++/ffead-cpp/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frameworks/C++/ffead-cpp/setup.sh b/frameworks/C++/ffead-cpp/setup.sh index 288e8c75105..7c9c018f3ba 100644 --- a/frameworks/C++/ffead-cpp/setup.sh +++ b/frameworks/C++/ffead-cpp/setup.sh @@ -1,7 +1,7 @@ #!/bin/bash fw_depends ffead-cpp -sudo /etc/init.d/apache2 stop + export FFEAD_CPP_PATH=$TROOT/ffead-cpp-2.0 export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH echo $FFEAD_CPP_PATH From f3abb597ddd2a9bf2348844883a113e4cb9962d1 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Jul 2016 10:16:47 +0000 Subject: [PATCH 07/11] Apache does not start if port 80 is already occupied, also fixed binary location to resolve the failing tests --- toolset/setup/linux/frameworks/ffead-cpp-apache.sh | 11 +++++++---- toolset/setup/linux/frameworks/ffead-cpp.sh | 6 +++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh index 53fc903643f..aaf3a3a3c53 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh @@ -8,7 +8,9 @@ sudo apt-get install -y uuid-dev unixodbc unixodbc-dev fw_get -o ffead-cpp-2.0.tar.gz https://github.com/sumeetchhetri/ffead-cpp/releases/download/v2.0-Draft-TLV-Fixed-TE_Benchmark/ffead-cpp-2.0-tlfixed-bin.tar.gz fw_untar ffead-cpp-2.0.tar.gz -cp -R ffead-cpp-2.0-bin/ ${TROOT}/ffead-cpp-2.0 +rm -rf ${TROOT}/ffead-cpp-2.0-bin +cp -R ffead-cpp-2.0-bin/ ${TROOT} +mv ${TROOT}/ffead-cpp-2.0-bin ${TROOT}/ffead-cpp-2.0 rm -rf ffead-cpp-2.0/ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz @@ -21,6 +23,7 @@ FFEADROOT=$TROOT/ffead-cpp-2.0 ETROOT=${FFEADROOT//\//\\/} EIROOT=${IROOT//\//\\/} +sudo sed -i 's/.*Listen 80.*/#Listen 80/' /etc/apache2/ports.conf sudo sed -i '/^export FFEAD_CPP_PATH=/{h;s/=.*/='"${ETROOT}"'/};${x;/^$/{s//export FFEAD_CPP_PATH='"${ETROOT}"'/;H};x}' /etc/apache2/envvars sudo sed -i '/^export LD_LIBRARY_PATH=/{h;s/=.*/='"${EIROOT}"':$FFEAD_CPP_PATH\/lib:$LD_LIBRARY_PATH/};${x;/^$/{s//export LD_LIBRARY_PATH='"${EIROOT}"':$FFEAD_CPP_PATH\/lib:$LD_LIBRARY_PATH/;H};x}' /etc/apache2/envvars @@ -29,12 +32,12 @@ sudo bash -c 'rm -f /etc/apache2/sites-enabled/ffead-site.conf' sudo bash -c 'cat > /etc/apache2/sites-enabled/ffead-site.conf < - DocumentRoot '"${TROOT}"'/ffead-cpp-2.0/web + DocumentRoot '"${FFEADROOT}"'/web SetHandler ffead_cpp_module - + Options Indexes FollowSymLinks AllowOverride None Require all granted diff --git a/toolset/setup/linux/frameworks/ffead-cpp.sh b/toolset/setup/linux/frameworks/ffead-cpp.sh index a425e23b2de..e1b9f97142b 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp.sh @@ -1,7 +1,5 @@ #!/bin/bash -sudo /etc/init.d/apache2 stop - RETCODE=$(fw_exists ${IROOT}/ffead-cpp.installed) [ ! "$RETCODE" == 0 ] || { return 0; } @@ -10,7 +8,9 @@ sudo apt-get install -y uuid-dev unixodbc unixodbc-dev fw_get -o ffead-cpp-2.0.tar.gz https://github.com/sumeetchhetri/ffead-cpp/releases/download/v2.0-Draft-TLV-Fixed-TE_Benchmark/ffead-cpp-2.0-tlfixed-bin.tar.gz fw_untar ffead-cpp-2.0.tar.gz -cp -R ffead-cpp-2.0-bin/ ${TROOT}/ffead-cpp-2.0 +rm -rf ${TROOT}/ffead-cpp-2.0-bin +cp -R ffead-cpp-2.0-bin/ ${TROOT} +mv ${TROOT}/ffead-cpp-2.0-bin ${TROOT}/ffead-cpp-2.0 rm -rf ffead-cpp-2.0/ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz From 7958f603b55d7587fa6b2c8ed5380c67a6ec7478 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Jul 2016 13:31:39 +0000 Subject: [PATCH 08/11] Resolved the ownership issue with apache2 --- frameworks/C++/ffead-cpp/setup-apache2.sh | 4 ++-- .../setup/linux/frameworks/ffead-cpp-apache.sh | 15 ++++++++++----- toolset/setup/linux/frameworks/ffead-cpp.sh | 3 +++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/frameworks/C++/ffead-cpp/setup-apache2.sh b/frameworks/C++/ffead-cpp/setup-apache2.sh index 0ae12a212aa..3ae86f1df8a 100644 --- a/frameworks/C++/ffead-cpp/setup-apache2.sh +++ b/frameworks/C++/ffead-cpp/setup-apache2.sh @@ -7,6 +7,6 @@ export FFEAD_CPP_PATH=$TROOT/ffead-cpp-2.0 export LD_LIBRARY_PATH=$IROOT:$FFEAD_CPP_PATH/lib:$LD_LIBRARY_PATH echo $FFEAD_CPP_PATH echo $LD_LIBRARY_PATH -rm -f $FFEAD_CPP_PATH/*.cntrl -rm -f $FFEAD_CPP_PATH/tmp/*.sess +sudo rm -f $FFEAD_CPP_PATH/*.cntrl +sudo rm -f $FFEAD_CPP_PATH/tmp/*.sess sudo /etc/init.d/apache2 restart > ffead.log 2>&1 diff --git a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh index aaf3a3a3c53..1edcbbf808b 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh @@ -36,12 +36,17 @@ FFEAD_CPP_PATH '"${FFEADROOT}"' DocumentRoot '"${FFEADROOT}"'/web SetHandler ffead_cpp_module + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Require all granted + allow from all + - - Options Indexes FollowSymLinks - AllowOverride None - Require all granted - EOL' +sudo adduser testrunner www-data +sudo chown -R www-data:www-data ${FFEADROOT} +sudo chmod -R g+rw ${FFEADROOT} + touch ${IROOT}/ffead-cpp-apache.installed diff --git a/toolset/setup/linux/frameworks/ffead-cpp.sh b/toolset/setup/linux/frameworks/ffead-cpp.sh index e1b9f97142b..d7496c5e888 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp.sh @@ -13,6 +13,9 @@ cp -R ffead-cpp-2.0-bin/ ${TROOT} mv ${TROOT}/ffead-cpp-2.0-bin ${TROOT}/ffead-cpp-2.0 rm -rf ffead-cpp-2.0/ +sudo chown -R testrunner:testrunner ${TROOT}/ffead-cpp-2.0 +sudo chmod -R g+rw ${TROOT}/ffead-cpp-2.0 + wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz tar -xzf mongo-c-driver-1.1.10.tar.gz cd mongo-c-driver-1.1.10/ From f8e471deb458cdbbed2f0b0d53615e5a0594b938 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 29 Jul 2016 18:53:15 +0000 Subject: [PATCH 09/11] Hope this fixes the apache2 test :-) --- toolset/setup/linux/frameworks/ffead-cpp-apache.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh index 1edcbbf808b..bd740a15482 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh @@ -36,13 +36,12 @@ FFEAD_CPP_PATH '"${FFEADROOT}"' DocumentRoot '"${FFEADROOT}"'/web SetHandler ffead_cpp_module - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Require all granted - allow from all - + + Options Indexes FollowSymLinks MultiViews + AllowOverride None + Require all granted + EOL' sudo adduser testrunner www-data From 5bb06bc49afd51c47270d0c379994c1d71c9625e Mon Sep 17 00:00:00 2001 From: sumeetchhetri Date: Sat, 30 Jul 2016 06:16:34 +0000 Subject: [PATCH 10/11] New approach --- .../linux/frameworks/ffead-cpp-apache.sh | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh index bd740a15482..2398d34696d 100644 --- a/toolset/setup/linux/frameworks/ffead-cpp-apache.sh +++ b/toolset/setup/linux/frameworks/ffead-cpp-apache.sh @@ -8,9 +8,9 @@ sudo apt-get install -y uuid-dev unixodbc unixodbc-dev fw_get -o ffead-cpp-2.0.tar.gz https://github.com/sumeetchhetri/ffead-cpp/releases/download/v2.0-Draft-TLV-Fixed-TE_Benchmark/ffead-cpp-2.0-tlfixed-bin.tar.gz fw_untar ffead-cpp-2.0.tar.gz -rm -rf ${TROOT}/ffead-cpp-2.0-bin -cp -R ffead-cpp-2.0-bin/ ${TROOT} -mv ${TROOT}/ffead-cpp-2.0-bin ${TROOT}/ffead-cpp-2.0 +sudo rm -rf /var/www/ffead-cpp-2.0-bin +sudo cp -R ffead-cpp-2.0-bin/ /var/www +sudo mv /var/www/ffead-cpp-2.0-bin /var/www/ffead-cpp-2.0 rm -rf ffead-cpp-2.0/ wget https://github.com/mongodb/mongo-c-driver/releases/download/1.1.10/mongo-c-driver-1.1.10.tar.gz @@ -19,7 +19,7 @@ cd mongo-c-driver-1.1.10/ ./configure --prefix=${IROOT} --libdir=${IROOT} make && sudo make install -FFEADROOT=$TROOT/ffead-cpp-2.0 +FFEADROOT=/var/www/ffead-cpp-2.0 ETROOT=${FFEADROOT//\//\\/} EIROOT=${IROOT//\//\\/} @@ -34,14 +34,19 @@ LoadModule ffead_cpp_module '"${FFEADROOT}"'/mod_ffeadcpplib.so Listen 8080 FFEAD_CPP_PATH '"${FFEADROOT}"' - DocumentRoot '"${FFEADROOT}"'/web - SetHandler ffead_cpp_module + DocumentRoot '"${FFEADROOT}"'/web + SetHandler ffead_cpp_module + + Options FollowSymLinks + AllowOverride None + Require all denied + + + Options -Indexes +FollowSymLinks +MultiViews + AllowOverride All + Require all granted + - - Options Indexes FollowSymLinks MultiViews - AllowOverride None - Require all granted - EOL' sudo adduser testrunner www-data From fe20c700296618ab076f4fd56b0f49e8ce934927 Mon Sep 17 00:00:00 2001 From: sumeetchhetri Date: Wed, 3 Aug 2016 00:36:23 +0000 Subject: [PATCH 11/11] Removed the apache2 stop line --- toolset/benchmark/benchmarker.py | 1 - 1 file changed, 1 deletion(-) diff --git a/toolset/benchmark/benchmarker.py b/toolset/benchmark/benchmarker.py index 54ecb4510cf..e4cad4001ee 100644 --- a/toolset/benchmark/benchmarker.py +++ b/toolset/benchmark/benchmarker.py @@ -561,7 +561,6 @@ def exit_with_code(code): sudo service postgresql restart sudo service cassandra restart /opt/elasticsearch/elasticsearch restart - sudo /etc/init.d/apache2 stop """) time.sleep(10)