From 213b52934c32287345fd6d68d7d29b81047a8b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20Kervella?= <kervella.mael@gmail.com>
Date: Wed, 16 May 2018 00:17:10 +0000
Subject: [PATCH] Update for javascript-common conf and add commands to
 changelog

---
 CHANGELOG.md    | 31 ++++++++++++++++++++-----------
 install_re2o.sh |  7 ++++++-
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c749362..3dc6318b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,22 @@
-Datepicker
-=======
-Install libjs-jquery
-Install libjs-jquery-ui
-Install libjs-jquery-timepicker
-Install libjs-bootstrap
-Install (if not) javascript-common
-Enable (if not) javascript-common conf
+## Datepicker
+
+Install libjs-jquery libjs-jquery-ui libjs-jquery-timepicker libjs-bootstrap javascript-common
+```
+apt-get -y install \
+    libjs-jquery \
+    libjs-jquery-ui \
+    libjs-jquery-timepicker \
+    libjs-bootstrap \
+    javascript-common
+```
+Enable javascript-common conf
+```
+a2enconf javascript-common
+```
 
 Delete old jquery files :
-	rm -rf static_files/js/jquery-ui-*
-	rm -rf static_files/js/jquery-2.2.4.min.js
-    static/css/jquery-ui-timepicker-addon.css
+```
+rm -r static_files/js/jquery-ui-*
+rm static_files/js/jquery-2.2.4.min.js
+rm static/css/jquery-ui-timepicker-addon.css
+```
diff --git a/install_re2o.sh b/install_re2o.sh
index ec787005..2fea14b9 100755
--- a/install_re2o.sh
+++ b/install_re2o.sh
@@ -321,6 +321,7 @@ install_re2o_server() {
         libssl-dev \
         python3-crypto \
         python3-git \
+        javascript-common \
         libjs-jquery \
         libjs-jquery-ui \
         libjs-jquery-timepicker \
@@ -507,6 +508,7 @@ install_re2o_server() {
     #######################
 
     echo "Setting up web server ..."
+
     if [ $web_serveur == 1 ]; then
 
         echo "Setting up Apache2 web server ..."
@@ -514,6 +516,7 @@ install_re2o_server() {
         apt-get -y install apache2 libapache2-mod-wsgi-py3
         a2enmod ssl
         a2enmod wsgi
+        a2enconf javascript-common
 
         if [ $is_tls == 1 ]; then
             echo "Setting up TLS with LE for Apache2 web server ..."
@@ -554,6 +557,8 @@ install_re2o_server() {
 
     fi
 
+    echo "Setting up web server: Done"
+
 
 
     ###########################
@@ -565,7 +570,7 @@ install_re2o_server() {
     # Prompt to inform the installation process is over
     TITLE="End of the setup"
     MSGBOX="You can now visit $url_server and connect with the credentials you just entered. This user hhas the superuser rights, meaning he can access and do everything."
-    end=$(dialog --clear --BACKTITLE "$BACKTITLE"\
+    end=$(dialog --clear --BACKTITLE "$BACKTITLE" \
         --title "$TITLE" --msgbox "$MSGBOX" \
         $HEIGHT $WIDTH 2>&1 >/dev/tty)
 }