update web

dockers/web/first.sh

@@ -9,12 +9,9 @@ cd $(dirname $0)
 
 WEB_URL="${httpProto}://${domain}"
 
-if ! [[ "$(docker ps -f name=${webServName} | grep -w ${webServName})" ]]; then
-    printKazError "Web not running... abort"
-    exit
-fi
+checkDockerRunning "${webServName}" "Web" || exit
 
-if [ $(ls "${DOCK_VOL}/web_html/_data/"  2>/dev/null | wc -l) -le 2 ] ; then
+if [ $(ls "${DOCK_VOL}/web_html/_data/"  2>/dev/null | wc -l) -le 4 ] ; then
     printKazMsg "\n  *** Premier lancement de WEB"
 
     rsync -aAHXh --info=progress2 ./html/ "${DOCK_VOL}/web_html/_data/"

dockers/web/web-gen.sh

@@ -4,8 +4,6 @@ KAZ_ROOT=$(cd "$(dirname $0)/../.."; pwd)
 . "${KAZ_ROOT}/bin/.commonFunctions.sh"
 setKazVars
 
-printKazMsg "\n  *** Web update config"
-
 #TMPL=html/index.tmpl.html
 #CONF=html/index.html
 TEST_TMPL="${DOCK_VOL}/web_html/_data/status/allServices.tmpl.html"
@@ -18,15 +16,19 @@ availableServices=(
     www
     ${webmailHost}
     listes
-    ${dokuwikiHost}
-    ${fileHost}
-    ${padHost}
+    ${fileHost}    
+    ${ldapHost}
+    ${quotasHost}
+    ${cachetHost}
     ${calcHost}
+    ${padHost}
     ${dateHost}
+    # garradin : need orga
+    ${dokuwikiHost}
+    ${gitHost}
+    ${matterHost}
     ${cloudHost}
     ${officeHost}
-    ${matterHost}
-    ${gitHost}
     vigilo
 )
 
@@ -51,33 +53,32 @@ cat > "${TEST_TMPL}" <<EOF
 EOF
 
 for service in ${availableServices[@]} ; do
-    echo "    <div><p><a href=\"__HTTP_PROTO__://${service}.__DOMAIN__\">${service}</a></p><iframe src=\"__HTTP_PROTO__://${service}.__DOMAIN__\"></iframe></div>"
-done >> "${TEST_TMPL}"
+    echo "    <div><p><a href=\"__HTTP_PROTO__://${service}.__DOMAIN__\">${service}</a></p><iframe src=\"__HTTP_PROTO__://${service}.__DOMAIN__\"></iframe></div>" >> "${TEST_TMPL}"
+done
+
 echo "    <br/>" >> "${TEST_TMPL}"
 
 declare -a availableOrga
 availableOrga=$(getList "${KAZ_CONF_DIR}/container-orga.list")
 
-echo "web-gen: orga"
 for orga in ${availableOrga[@]} ; do
     orgaName=${orga%-orga}
     echo "    <H1>${orgaName}</H1>"
     for service in $("${KAZ_COMP_DIR}/${orga}/orga-gen.sh" -l | sed -e "s/collabora/office/" ); do
+ 	# echo "    <div><p><a href=\"__HTTP_PROTO__://${orgaName}-${service}.__DOMAIN__\">${orgaName}-${service}</a></p><iframe src=\"__HTTP_PROTO__://${orgaName}-${service}.__DOMAIN__\"></iframe></div>"
  	echo "    <div><p><a href=\"__HTTP_PROTO__://${orgaName}-${service}.__DOMAIN__\">${orgaName}-${service}</a></p></div>"
     done
     echo "    <br/>"
 done >> "${TEST_TMPL}"
 
-echo "web-gen: extrenal"
 for extrenal in $("${KAZ_BIN_DIR}/foreign-domain.sh" -l) ; do
     echo "    <H1>${extrenal}</H1>"
+    # echo "    <div><p><a href=\"__HTTP_PROTO__://${extrenal}\">${extrenal}</a></p><iframe src=\"__HTTP_PROTO__://${extrenal}\"></iframe></div>"
     echo "    <div><p><a href=\"__HTTP_PROTO__://${extrenal}\">${extrenal}</a></p></div>"
     echo "    <br/>"
 done >> "${TEST_TMPL}"
 
-echo "    </html>" >> "${TEST_TMPL}"
-
-echo "web-gen: end"
+echo "    <br/><br/><br/></html>" >> "${TEST_TMPL}"
 
 ########################################
 #"${APPLY_TMPL}" "${TMPL}" "${CONF}"