Skip to content

Commit

Permalink
Added alias name given on 11th hour
Browse files Browse the repository at this point in the history
  • Loading branch information
mrunal4 committed Jun 6, 2017
1 parent c06ba54 commit 9de330e
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 120 deletions.
8 changes: 4 additions & 4 deletions README-update.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 ```



Expand Down
140 changes: 26 additions & 114 deletions confs/nginx-app.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}


Expand Down
4 changes: 2 additions & 2 deletions scripts/git-offline-update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down

0 comments on commit 9de330e

Please sign in to comment.