From 9de330ec8dcce9a5e840e7eb237899035d34a5fb Mon Sep 17 00:00:00 2001 From: mrunal4 Date: Tue, 6 Jun 2017 16:52:07 +0530 Subject: [PATCH] Added alias name given on 11th hour --- README-update.md | 8 +- confs/nginx-app.conf | 140 +++++++--------------------------- scripts/git-offline-update.sh | 4 +- 3 files changed, 32 insertions(+), 120 deletions(-) diff --git a/README-update.md b/README-update.md index 958b216..e1260f5 100644 --- a/README-update.md +++ b/README-update.md @@ -22,12 +22,12 @@ This file will contain the details about the update patch. This file also includ Long : ``` 5568dbbbdf0bda549aefbcf8fc6a9352046d7d29 ``` ###qbank: - Short : ``` 5568dbb ``` - Long : ``` 5568dbbbdf0bda549aefbcf8fc6a9352046d7d29 ``` + Short : ``` cf7c138 ``` + Long : ``` cf7c1382638c340b5665d6e7ce7e7f31626aed30 ``` ###OpenAssessmentsClient: - Short : ``` 5568dbb ``` - Long : ``` 5568dbbbdf0bda549aefbcf8fc6a9352046d7d29 ``` + Short : ``` ed2f30d ``` + Long : ``` ed2f30dc65be911ee8f1c80a964e159e289ffe0b ``` diff --git a/confs/nginx-app.conf b/confs/nginx-app.conf index 80baac1..fd03833 100755 --- a/confs/nginx-app.conf +++ b/confs/nginx-app.conf @@ -150,20 +150,28 @@ server { } # Geogebra - all - location /Find-the-rate-Proportional-Reasoning { + location /FindTheRateProportionalReasoning { alias /softwares/Tools/Find-the-rate-Proportional-Reasoning; } - location /Geogebra-Geometric-Reasoning { + location /GeogebraGeometricReasoning { alias /softwares/Tools/Geogebra_Geometric_Reasoning; } - location /Geogebra-Proportional-Reasoning { - alias /softwares/Tools/Geogebra_Proportional_Reasoning; + location /GeogebraProportionalReasoning1 { + alias /softwares/Tools/Geogebra_Proportional_Reasoning1; } - location /Geogebra-Proportional-Reasoning2 { - alias /softwares/Tools/Geogebra_Proportional_Reasoning2; + location /GeogebraProportionalReasoning2/PR-unit2-activity1-q1 { + alias /softwares/Tools/Geogebra_Proportional_Reasoning2/PR_unit2_activity1_q1; + } + + location /GeogebraProportionalReasoning2/PR-unit2-activity1-q3 { + alias /softwares/Tools/Geogebra_Proportional_Reasoning2/PR_unit2_activity1_q3; + } + + location /Geogebra-Proportional-Reasoning2/PR-unit2-activity2-q1 { + alias /softwares/Tools/Geogebra_Proportional_Reasoning2/PR_unit2_activity2_q1; } # FoodSharingTool - en @@ -380,126 +388,30 @@ server { # Ice-cubes-in-lemonade - en - location /Ice-cubes-in-lemonade/en/L1A1 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity1/activity1; - } - - location /Ice-cubes-in-lemonade/en/L1A2 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity1/activity2; - } - - location /Ice-cubes-in-lemonade/en/L1A3 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity1/activity3; - } - - location /Ice-cubes-in-lemonade/en/L1A4 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity1/activity4; - } - - location /Ice-cubes-in-lemonade/en/L1A5 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity1/activity5; - } - - location /Ice-cubes-in-lemonade/en/L2A1 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity2/activity1; - } - - location /Ice-cubes-in-lemonade/en/L2A2 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity2/activity2; - } - - location /Ice-cubes-in-lemonade/en/L2A3 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity2/activity3; - } - - location /Ice-cubes-in-lemonade/en/L2A4 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity2/activity4; + location /IceCubesInLemonade/en/L4A1 { + alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity1; } - location /Ice-cubes-in-lemonade/en/L2A5 { - alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity2/activity5; + location /IceCubesInLemonade/en/L4A2 { + alias /softwares/Tools/Ice-cubes-in-lemonade/en/Activity2; } # Ice-cubes-in-lemonade - hi - location /Ice-cubes-in-lemonade/hi/L1A1 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity1/activity1; - } - - location /Ice-cubes-in-lemonade/hi/L1A2 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity1/activity2; - } - - location /Ice-cubes-in-lemonade/hi/L1A3 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity1/activity3; - } - - location /Ice-cubes-in-lemonade/hi/L1A4 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity1/activity4; + location /IceCubesInLemonade/hi/L4A1 { + alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity1; } - location /Ice-cubes-in-lemonade/hi/L1A5 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity1/activity5; - } - - location /Ice-cubes-in-lemonade/hi/L2A1 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity2/activity1; - } - - location /Ice-cubes-in-lemonade/hi/L2A2 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity2/activity2; - } - - location /Ice-cubes-in-lemonade/hi/L2A3 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity2/activity3; - } - - location /Ice-cubes-in-lemonade/hi/L2A4 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity2/activity4; - } - - location /Ice-cubes-in-lemonade/hi/L2A5 { - alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity2/activity5; + location /IceCubesInLemonade/hi/L4A2 { + alias /softwares/Tools/Ice-cubes-in-lemonade/hi/Activity2; } # Ice-cubes-in-lemonade - te - location /Ice-cubes-in-lemonade/te/L1A1 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity1/activity1; - } - - location /Ice-cubes-in-lemonade/te/L1A2 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity1/activity2; - } - - location /Ice-cubes-in-lemonade/te/L1A3 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity1/activity3; - } - - location /Ice-cubes-in-lemonade/te/L1A4 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity1/activity4; - } - - location /Ice-cubes-in-lemonade/te/L1A5 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity1/activity5; - } - - location /Ice-cubes-in-lemonade/te/L2A1 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity2/activity1; - } - - location /Ice-cubes-in-lemonade/te/L2A2 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity2/activity2; - } - - location /Ice-cubes-in-lemonade/te/L2A3 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity2/activity3; - } - - location /Ice-cubes-in-lemonade/te/L2A4 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity2/activity4; + location /IceCubesInLemonade/te/L4A1 { + alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity1; } - location /Ice-cubes-in-lemonade/te/L2A5 { - alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity2/activity5; + location /IceCubesInLemonade/te/L4A2 { + alias /softwares/Tools/Ice-cubes-in-lemonade/te/Activity2; } diff --git a/scripts/git-offline-update.sh b/scripts/git-offline-update.sh index 1194049..fea34e4 100755 --- a/scripts/git-offline-update.sh +++ b/scripts/git-offline-update.sh @@ -26,8 +26,8 @@ update_patch="${filename%.*.*}"; # git offline update docker code - started -#git_commit_no_docker="bc15f234031e8bc6dd23d9db2a4e462daa4fcdf8"; # Earlier commit no -git_commit_no_docker="9c16225d1031ca20c90b42e53ec830390551f154"; # Commit on 01-06-2017 +#git_commit_no_docker="9c16225d1031ca20c90b42e53ec830390551f154"; # Earlier commit no +git_commit_no_docker="c06ba54cc6119fc10c942b3f26c46556d4db4f80"; # Commit on 06-06-2017 echo -e "\n${cyan}change the directory to /home/docker/code/ ${reset}" cd /home/docker/code/