ffead-cpp-apache2 addition

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": ""
     }
   }]
 }

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

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 <<EOL
+LoadModule ffead_cpp_module '"${FFEADROOT}"'/mod_ffeadcpplib.so
+Listen 8080
+FFEAD_CPP_PATH '"${TROOT}"'/ffead-cpp-2.0
+<VirtualHost *:8080>
+        DocumentRoot '"${TROOT}"'/ffead-cpp-2.0/web
+        SetHandler ffead_cpp_module
+</VirtualHost>
+<Directory '"${TROOT}"'/ffead-cpp-2.0/web/>
+        Options Indexes FollowSymLinks
+        AllowOverride None
+        Require all granted
+</Directory>
+EOL'
+
+touch ${IROOT}/ffead-cpp-apache.installed

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