From 3d6dc6c193cc7d39d118751b08af795503567837 Mon Sep 17 00:00:00 2001
From: Alessandro Segala <43508+ItalyPaleAle@users.noreply.github.com>
Date: Sat, 9 Feb 2019 15:39:03 -0800
Subject: [PATCH 1/2] Using Redis for storing PHP sessions

---
 nested/vmsetupparams.json   |  1 +
 scripts/helper_functions.sh |  1 +
 scripts/setup_controller.sh |  1 +
 scripts/setup_webserver.sh  | 30 +++++++++++++++++++-----------
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/nested/vmsetupparams.json b/nested/vmsetupparams.json
index 10353e2..fe6e9a3 100644
--- a/nested/vmsetupparams.json
+++ b/nested/vmsetupparams.json
@@ -40,6 +40,7 @@
             "lampProfile": {
                 "storageAccountName": "[parameters('lampCommon').storageAccountName]",
                 "storageAccountKey": "[parameters('storageAccountKey')]",
+                "redisDeploySwitch": "[parameters('lampCommon').redisDeploySwitch]",
                 "redisDns": "[parameters('lampCommon').redisDns]",
                 "redisKey": "[parameters('redisKey')]",
                 "syslogServer": "[parameters('lampCommon').ctlrVmName]",
diff --git a/scripts/helper_functions.sh b/scripts/helper_functions.sh
index de6b5eb..ae8c843 100644
--- a/scripts/helper_functions.sh
+++ b/scripts/helper_functions.sh
@@ -31,6 +31,7 @@ function get_setup_params_from_configs_json
     export dbadminpass=$(echo $json | jq -r .dbServerProfile.adminPassword)
     export storageAccountName=$(echo $json | jq -r .lampProfile.storageAccountName)
     export storageAccountKey=$(echo $json | jq -r .lampProfile.storageAccountKey)
+    export redisDeploySwitch=$(echo $json | jq -r .lampProfile.redisDeploySwitch)
     export redisDns=$(echo $json | jq -r .lampProfile.redisDns)
     export redisAuth=$(echo $json | jq -r .lampProfile.redisKey)
     export dbServerType=$(echo $json | jq -r .dbServerProfile.type)
diff --git a/scripts/setup_controller.sh b/scripts/setup_controller.sh
index 343e4d1..467cb35 100644
--- a/scripts/setup_controller.sh
+++ b/scripts/setup_controller.sh
@@ -41,6 +41,7 @@ set -ex
     echo $dbadminpass          >> /tmp/vars.txt
     echo $storageAccountName   >> /tmp/vars.txt
     echo $storageAccountKey    >> /tmp/vars.txt
+    echo $redisDeploySwitch    >> /tmp/vars.txt
     echo $redisDns             >> /tmp/vars.txt
     echo $redisAuth            >> /tmp/vars.txt
     echo $dbServerType                >> /tmp/vars.txt
diff --git a/scripts/setup_webserver.sh b/scripts/setup_webserver.sh
index 752d4ee..934051b 100644
--- a/scripts/setup_webserver.sh
+++ b/scripts/setup_webserver.sh
@@ -28,18 +28,21 @@ lamp_on_azure_configs_json_path=${1}
 
 get_setup_params_from_configs_json $lamp_on_azure_configs_json_path || exit 99
 
-echo $glusterNode    >> /tmp/vars.txt
-echo $glusterVolume  >> /tmp/vars.txt
-echo $siteFQDN >> /tmp/vars.txt
-echo $httpsTermination >> /tmp/vars.txt
-echo $syslogServer >> /tmp/vars.txt
-echo $dbServerType >> /tmp/vars.txt
-echo $fileServerType >> /tmp/vars.txt
-echo $storageAccountName >> /tmp/vars.txt
-echo $storageAccountKey >> /tmp/vars.txt
-echo $nfsVmName >> /tmp/vars.txt
-echo $nfsByoIpExportPath >> /tmp/vars.txt
+echo $glusterNode         >> /tmp/vars.txt
+echo $glusterVolume       >> /tmp/vars.txt
+echo $siteFQDN            >> /tmp/vars.txt
+echo $httpsTermination    >> /tmp/vars.txt
+echo $syslogServer        >> /tmp/vars.txt
+echo $dbServerType        >> /tmp/vars.txt
+echo $fileServerType      >> /tmp/vars.txt
+echo $storageAccountName  >> /tmp/vars.txt
+echo $storageAccountKey   >> /tmp/vars.txt
+echo $nfsVmName           >> /tmp/vars.txt
+echo $nfsByoIpExportPath  >> /tmp/vars.txt
 echo $htmlLocalCopySwitch >> /tmp/vars.txt
+echo $redisDeploySwitch   >> /tmp/vars.txt
+echo $redisDns            >> /tmp/vars.txt
+echo $redisAuth           >> /tmp/vars.txt
 
 check_fileServerType_param $fileServerType
 
@@ -180,6 +183,11 @@ EOF
   sed -i "s/;opcache.enable.*/opcache.enable = 1/" $PhpIni
   sed -i "s/;opcache.memory_consumption.*/opcache.memory_consumption = 256/" $PhpIni
   sed -i "s/;opcache.max_accelerated_files.*/opcache.max_accelerated_files = 8000/" $PhpIni
+  # Redis for sessions
+  if [ "$redisDeploySwitch" = "true" ]; then
+    sed -i "s/session.save_handler.*/session.save_handler = redis/" $PhpIni
+    sed -i "s/;session.save_path.*/session.save_path = \"tcp://$redisDns:6379?auth=$redisAuth\"/" $PhpIni
+  fi
     
   # Remove the default nginx site
   rm -f /etc/nginx/sites-enabled/default

From 7ed905b68c5bd4d3b06286e3608c72176f32cbfd Mon Sep 17 00:00:00 2001
From: Alessandro Segala <43508+ItalyPaleAle@users.noreply.github.com>
Date: Thu, 14 Feb 2019 15:30:56 -0800
Subject: [PATCH 2/2] Fixed sed command

---
 scripts/setup_webserver.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/setup_webserver.sh b/scripts/setup_webserver.sh
index 934051b..7947e9f 100644
--- a/scripts/setup_webserver.sh
+++ b/scripts/setup_webserver.sh
@@ -186,7 +186,7 @@ EOF
   # Redis for sessions
   if [ "$redisDeploySwitch" = "true" ]; then
     sed -i "s/session.save_handler.*/session.save_handler = redis/" $PhpIni
-    sed -i "s/;session.save_path.*/session.save_path = \"tcp://$redisDns:6379?auth=$redisAuth\"/" $PhpIni
+    sed -i "s/;session.save_path.*/session.save_path = \"tcp:\/\/$redisDns:6379?auth=$redisAuth\"/" $PhpIni
   fi
     
   # Remove the default nginx site