From f5940bf731095e07946114a4e79bf380c8ce547c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Diemer?= <stephane.diemer@ubicast.eu>
Date: Thu, 16 Mar 2017 08:47:02 +0100
Subject: [PATCH] Added check with curl after MS installation.

---
 2.Common_services/6.Munin/0_setup.sh           | 7 -------
 5.MediaServer/1.Install_MediaServer/0_setup.sh | 3 +++
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/2.Common_services/6.Munin/0_setup.sh b/2.Common_services/6.Munin/0_setup.sh
index 9bad0efc..82661243 100755
--- a/2.Common_services/6.Munin/0_setup.sh
+++ b/2.Common_services/6.Munin/0_setup.sh
@@ -6,9 +6,6 @@ source /root/envsetup/global-conf.sh
 # munin
 DEBIAN_FRONTEND=noninteractive apt-get install -y ubicast-config
 
-# modify df function https://redmine.ubicast.net/issues/17912
-sed -i "s@-P -l @-P@" /usr/share/munin/plugins/df
-
 
 # configure alerts
 # detect where to insert
@@ -37,7 +34,3 @@ sed -i "s@-P -l @-P@" /usr/share/munin/plugins/df
 #mv /etc/munin/templates /etc/munin/templates.orig
 #cp -pr munin-monitoring-theme/templates/munstrap/static /etc/munin/
 #cp -pr munin-monitoring-theme/templates/munstrap/templates /etc/munin/
-
-# service restart
-service munin restart || true
-service munin-node restart
diff --git a/5.MediaServer/1.Install_MediaServer/0_setup.sh b/5.MediaServer/1.Install_MediaServer/0_setup.sh
index 1f6515e6..43426c45 100755
--- a/5.MediaServer/1.Install_MediaServer/0_setup.sh
+++ b/5.MediaServer/1.Install_MediaServer/0_setup.sh
@@ -6,3 +6,6 @@ DEBIAN_FRONTEND=noninteractive apt-get install -y python3-mediaserver
 
 # MS instance
 msinstaller.py msuser
+
+# Check that the instance responds
+curl --insecure -I "https://$MS_SERVER_NAME/" | grep 200
-- 
GitLab