From 79734207aff293e48ea91a9552060b553c43b089 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Fri, 8 Jul 2016 20:46:26 +0800
Subject: [PATCH] upgrade moodle to 3.1

---
 moodle/Dockerfile               | 12 +++++-------
 node-red/arm/docker-compose.yml |  2 +-
 node-red/docker-compose.yml     |  2 +-
 pptpd/README.md                 |  2 +-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/moodle/Dockerfile b/moodle/Dockerfile
index e047190..b5dacc6 100644
--- a/moodle/Dockerfile
+++ b/moodle/Dockerfile
@@ -47,15 +47,13 @@ RUN set -xe \
                          libxml2-dev \
     && rm -rf /var/lib/apt/lists/*
 
-WORKDIR /var/www/html
-
-ENV MOODLE_VER 3.0.1+
-ENV MOODLE_MD5 560c9b2ff110d9d833513e3e2568d79b
-ENV MOODLE_URL https://download.moodle.org/download.php/direct/stable30/moodle-latest-30.tgz
-ENV MOODLE_FILE moodle.tgz
+ENV MOODLE_VERSION 3.1
+ENV MOODLE_FILE moodle-${MOODLE_VERSION}.tgz
+ENV MOODLE_URL https://download.moodle.org/download.php/stable31/${MOODLE_FILE}
+ENV MOODLE_MD5 970a17ea97d2a1dc2354fd975206f531
 
 RUN curl -sSL ${MOODLE_URL} -o ${MOODLE_FILE} \
-    && echo "${MOODLE_MD5} ${MOODLE_FILE}" | md5sum -c \
+    && echo "${MOODLE_MD5}  ${MOODLE_FILE}" | md5sum -c \
     && tar xzf ${MOODLE_FILE} --strip 1 \
     && rm ${MOODLE_FILE} \
     && chown -R www-data:www-data .
diff --git a/node-red/arm/docker-compose.yml b/node-red/arm/docker-compose.yml
index 7cec8cb..5602955 100644
--- a/node-red/arm/docker-compose.yml
+++ b/node-red/arm/docker-compose.yml
@@ -3,5 +3,5 @@ node-red:
   ports:
     - "1880:1880"
   volumes:
-    - ./node-red:/root/.node-red
+    - ./data:/root/.node-red
   restart: always
diff --git a/node-red/docker-compose.yml b/node-red/docker-compose.yml
index 0b4f7f3..4b3a26b 100644
--- a/node-red/docker-compose.yml
+++ b/node-red/docker-compose.yml
@@ -3,5 +3,5 @@ node-red:
   ports:
     - "1880:1880"
   volumes:
-    - ./node-red:/root/.node-red
+    - ./data:/root/.node-red
   restart: always
diff --git a/pptpd/README.md b/pptpd/README.md
index 217cb25..f21208e 100644
--- a/pptpd/README.md
+++ b/pptpd/README.md
@@ -68,7 +68,7 @@ file: chap-secrets
 username    *       password        *
 ```
 
-> Please use strong password in `cha-secrets` file to protect your server.
+> Please use strong password in `chap-secrets` file to protect your server.
 
 ## Server Setup