Resolved merge conflict by combining changes in README

Author: leandro-navarro

README.md

@@ -1,10 +1,16 @@
 # Cloudy GNU/Linux Distribution 
 
+### About
 A community networking cloud in a box.
 
+The *Cloudy GNU/Linux Distribution* turns your embedded, barebone or mini computer into a *community networking cloud in a box*.
+
+### Installation
+This repository contains the source code for the scripts, daemons and web GUI of Cloudy. To install Cloudy on your network computing device, use the automated installation script located at https://github.com/Clommunity/cloudynitzar.
+
 ## Testing with cloudynitzar.sh [![Build Status](https://travis-ci.org/Clommunity/cloudynitzar.svg?branch=master)](https://travis-ci.org/Clommunity/cloudynitzar)
 
-### About
+### About Cloudynitzar
 Cloudynitzar is a shell script that turns your plain Debian or Ubuntu system into a community networking cloud in a box (i.e. a full-featured Cloudy device). It might as well work on Debian and Ubuntu derivatives, like Linux Mint. Feel free to test and report!
 
 ### Requirements
@@ -19,5 +25,5 @@ From your Debian system run, as root:
 apt-get update; apt-get install -y curl lsb-release
 curl -k https://raw.githubusercontent.com/Clommunity/cloudynitzar/master/cloudynitzar.sh | bash -
 ````
-
-and let the magic begin!
+### Learn more
+You can find more information about Cloudy at https://www.cloudy.community and https://www.clommunity-project.eu.

cdistro

@@ -21,25 +21,102 @@ DEMO=0
 test -f $CONFFILE && . $CONFFILE || exit 0
 
 start() {
-  if [ $DEMO -eq 1 ]; then
-    su - nobody -c "$SERVER $OPTS -S $BINDIP:$PORT -t $DOCROOT >/dev/null 2>&1 &" > /dev/null 2>&1
-    echo $(pidof php) > $PIDFILE
-  else
-    $SERVER $OPTS -S $BINDIP:$PORT -t $DOCROOT >/dev/null 2>&1 &
-    echo $! > $PIDFILE
+  STARTPHP=true
+  STARTPHPSUCCESS=false
+  STARTCDISTRO=true
+  STARTCDISTROSUCCESS=false
+
+  # First, check for a previously started PHP server
+  if [ -f "$PIDFILE" ]; then
+    # Server has been started previously. Check if it is still running
+    if $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN); then
+      echo "cDistro PHP server is already running."
+      STARTPHP=false
+    else
+      echo "cDistro PHP server was already started but crashed. Restarting it..."
+    fi
+  fi
+
+  if [ $STARTPHP = true ]; then
+    echo "Starting cDistro PHP server..."
+    if [ $DEMO -eq 1 ]; then
+      echo "cDistro is in demo mode."
+      su - nobody -c "$SERVER $OPTS -S $BINDIP:$PORT -t $DOCROOT >/dev/null 2>&1 &" > /dev/null 2>&1
+      echo $(pidof php) > $PIDFILE
+    else
+      $SERVER $OPTS -S $BINDIP:$PORT -t $DOCROOT >/dev/null 2>&1 &
+      echo $! > $PIDFILE
+    fi
+
+    # Check if the daemon has been started properly (wait up to 5 seconds)
+    for i in $(seq 1 5); do
+      sleep 1
+      [ -f $PIDFILE ] && $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN) \
+        && kill -0  $(cat $PIDFILE) >/dev/null 2>&1 && echo "cDistro PHP server successfully started." \
+        && STARTPHPSUCCESS=true && break
+    done
+  fi
+
+  $STARTPHP && ! $STARTPHPSUCCESS && echo "cDistro PHP server did not start successfully." && exit 1
+
+  # First, check for a previously started cDistro daemon
+  if [ -f "$PIDDAEMON" ]; then
+    # Server has been started previously. Check if it is still running
+    if kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1; then
+      echo "cDistro daemon is already running."
+        STARTCDISTRO=false
+    else
+        echo "cDistro daemon was already started but crashed. Restarting it..."
+    fi
+  fi
+
+
+  if [ $STARTCDISTRO = true ]; then
+    echo "Starting cDistro daemon..."
+      $DAEMON >/dev/null 2>&1 &
+      echo $! > $PIDDAEMON
+
+    # Check if the daemon has been started properly (wait up to 5 seconds)
+    for i in $(seq 1 5); do
+      sleep 1
+      [ -f $PIDDAEMON ] && kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1 \
+        && echo "cDistro daemon server successfully started." \
+        && STARTCDISTROSUCCESS=true && break
+    done
+
   fi
-  $DAEMON >/dev/null 2>&1 &
-  echo $! > $PIDDAEMON
+
+  $STARTCDISTRO && ! $STARTCDISTROSUCCESS && echo "cDistro daemon server did not start successfully." && exit 1
 }
+
 stop() {
-  kill -9 $(cat $PIDFILE)
-  rm $PIDFILE
-  kill -9 $(cat $PIDDAEMON)
-  rm $PIDDAEMON
+  # Stop cDistro PHP server
+  [ -f $PIDFILE ] && $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN) && \
+    echo "Stopping cDistro PHP server..." && echo "Sending terminate signal to process $(cat $PIDFILE)..." && kill -15 $(cat $PIDFILE) && sleep 1
+
+  [ -f $PIDFILE ] && $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN) && \
+    echo "Sending interrupt signal to process $(cat $PIDFILE)..." && kill -2 $(cat $PIDFILE) && sleep 1
+
+  [ -f $PIDFILE ] && $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN) && \
+    echo "Sending kill signal to process $(cat $PIDFILE)..." && kill -9 $(cat $PIDFILE) && sleep 1
+
+  ! $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN) && [ -f $PIDFILE ] && rm $PIDFILE
+
+  # Stop cDistro daemon
+  [ -f $PIDDAEMON ] && kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1 && echo "Stopping cDistro daemon..." && echo "Sending terminate signal to process $(cat $PIDDAEMON)..." && kill -15 $(cat $PIDDAEMON) && sleep 1
+  [ -f $PIDDAEMON ] && kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1 && echo "Sending interrupt signal to process $(cat $PIDDAEMON)..." && kill -2 $(cat $PIDDAEMON) && sleep 1
+  [ -f $PIDDAEMON ] && kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1 && echo "Sending kill signal to process $(cat $PIDDAEMON)..." && kill -9 $(cat $PIDDAEMON) && sleep 1
+  [ -f $PIDDAEMON ] && ! kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1 && [ -f $PIDDAEMON ] && rm $PIDDAEMON
+
+  # Check that everything is stopped
+  { ! [ -f $PIDFILE ] && ! $(netstat -ant|grep ${BINDIP}|grep ${PORT}|grep -q LISTEN) \
+    && ! { [ -f $PIDDAEMON ] && ! kill -0  $(cat $PIDDAEMON) >/dev/null 2>&1 ;} \
+    && echo "cDistro daemon stopped." && return 0; } || { echo "cDistro daemon was not successfully stopped. Quitting..." && exit 1; }
 }
+
 restart() {
   stop
-  sleep 0.5
+  sleep 1
   start
 }
 

web/config/global.php

@@ -7,7 +7,7 @@
 list($wi_ip, $wi_port) = explode(":", $_SERVER['HTTP_HOST']);
 $protocol="http";
 
-if (isset($conf['PORT_SSL'])) {
+if ( isset($conf['PORT_SSL']) && ( ! isset($conf['ALLOWHTTP']) || $conf['ALLOWHTTP'] === "0")) {
     if (($wi_port != $conf['PORT_SSL']) || ($_SERVER['REMOTE_ADDR'] != "127.0.0.1")) {
         header('Location: https://'.$wi_ip.':'.$conf['PORT_SSL']);
     } else {

web/css/main.css

@@ -24,3 +24,7 @@ footer a {
 	text-decoration: underline;
 
 }
+
+.dataTables_wrapper{
+	font-size: medium;
+}

web/index.php

@@ -26,7 +26,6 @@
 $js_end = array('main');
 $dir_configs="/etc/cloudy";
 
-
 if (isset($user) && !$post_login) {
     // Default
     $controller = "default";
@@ -63,6 +62,16 @@
         $action="notFunctionExist";
     }
     $cb = call_user_func_array($action, $Parameters);
+
+    list($wi_ip, $wi_port) = explode(":", $_SERVER['HTTP_HOST']);
+
+    if (isset($conf['PORT_SSL']) && $wi_port != $conf['PORT_SSL'] && isset ($conf['ALLOWHTTP']) && $conf['ALLOWHTTP'] === "1" ){
+        $https_url = 'https://'.$wi_ip.':'.$conf['PORT_SSL'];
+        $https_alert = "<div class='alert alert-warning text-center'>".t("https_http_pre") . "</br>". "<a href=$https_url>$https_url</a>" . t("https_http_post") . "</div>\n";
+        if (isset ($cb['page']) ){
+            $cb['page'] = $https_alert . $cb['page'];
+        }
+    }
 }
 
 switch ($cb['type']) {

web/js/jquery.dataTables.min.js

@@ -8,6 +8,7 @@
 
 //Buttons
 addS("default_button_back", "Enrere");
+addS("default_button_dummy", "Un botonet");
 addS("default_button_home", "Inici");
 
 //index

web/lang/ca.default.php

@@ -0,0 +1,106 @@
+<?php
+
+
+//alerts
+addS("docker_compose_alert_not_installed", "Docker Compose no está instal·lat");
+addS("docker_compose_alert_no_projects", "No s'ha trobat cap projecte de Docker Compose");
+addS("docker_compose_alert_not_running", "Docker está aturat");
+addS("docker_compose_alert_img_not_available", "No hi ha imatges de Docker disponibles");
+addS("docker_compose_alert_form_name_blank", "El nom del projecte no pot estar en blanc");
+addS("docker_compose_alert_form_name_empty", "No s'ha especificat el nom del projecte");
+addS("docker_compose_alert_form_name_invalid", "El nom del projecte no és vàlid");
+addS("docker_compose_alert_form_name_inuse", "Ja existeix un altre projecte amb el mateix nom");
+addS("docker_compose_alert_form_name_mkdir_fail_pre", "No s'ha pogut crear el directori ");
+addS("docker_compose_alert_form_name_mkdir_fail_post", "");
+addS("docker_compose_alert_form_dcy_put_fail_pre", "No s'ha pogut escriure al fitxer ");
+addS("docker_compose_alert_form_dcy_put_fail_post", "");
+addS("docker_compose_alert_form_dcy_blank", "El fitxer docker-compose.yml está buit");
+addS("docker_compose_alert_form_dcy_empty", "No s'ha especificat cap contingut per al fitxer docker-compose.yml");
+addS("docker_compose_alert_form_dcy_invalid", "El contingut del fitxer docker-compose.yml no és vàlid");
+addS("docker_compose_alert_form_project_pre", "El projecte ");
+addS("docker_compose_alert_form_project_post", " s'ha creat satisfactòriament");
+addS("docker_compose_alert_ps_not_running", "No hi ha contenidors Docker en execució");
+addS("docker_compose_alert_ps_not_stopped", "No hi ha contenidors Docker aturats");
+addS("docker_compose_alert_running", "Docker está executant-se");
+addS("docker_compose_alert_start_message", "S'ha iniciat Docker");
+addS("docker_compose_alert_stop_message", "S'ha aturat Docker");
+
+
+//buttons
+addS("docker_compose_button_install", "Instal·la Docker Compose");
+addS("docker_compose_button_start", "Inicia");
+addS("docker_compose_button_stop", "Atura");
+addS("docker_compose_button_image_rmi", "Esborra imatge");
+addS("docker_compose_button_image_run", "Inicia imatge");
+addS("docker_compose_button_create", "Crea un nou projecte de Docker Compose");
+addS("docker_compose_button_clone", "Clona un projecte de Docker Compose");
+addS("docker_compose_button_manage", "Gestiona");
+addS("docker_compose_button_delete", "Esborra");
+addS("docker_compose_button_back", "Enrere");
+
+
+//flash
+addS("docker_compose_flash_restart_pre", "S'está reiniciant el contenidor ");
+addS("docker_compose_flash_restart_mid", " (ID: ");
+addS("docker_compose_flash_restart_post", ") en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_rm_pre", "S'está esborrant el contenidor ");
+addS("docker_compose_flash_rm_mid", " (ID: ");
+addS("docker_compose_flash_rm_post", ") en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_rmi_pre", "S'está esborrant la imatge ");
+addS("docker_compose_flash_rmi_mid", "");
+addS("docker_compose_flash_rmi_post", " en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_run_pre", "S'está iniciant la imatge ");
+addS("docker_compose_flash_run_mid", "");
+addS("docker_compose_flash_run_post", " en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_pull_pre", "S'está obtenint el contenidor ");
+addS("docker_compose_flash_pull_post", " en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_down_pre", "S'estan aturant tots els contenidors associats al projecte ");
+addS("docker_compose_flash_down_post", " en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_up_pre", "S'está iniciant el projecte ");
+addS("docker_compose_flash_up_post", " en segon pla. Això pot trigar uns segons...");
+addS("docker_compose_flash_delete_pre", "S'ha esborrat el projecte ");
+addS("docker_compose_flash_delete_post", "");
+addS("docker_compose_flash_delete_error_pre", "No s'ha pogut esborrar el directori ");
+addS("docker_compose_flash_delete_error_post", "");
+
+
+//Common
+addS("docker_compose_title", "Docker Compose");
+addS("docker_compose_desc", "Amb Compose, podeu fer servir fitxers Compose per configurar els serveis de la vostra aplicació. Així, emprant una sola comanda, podeu crear i iniciar tots els serveis a partir de la vostra configuració. Compose és genial per a desenvolupament i entorns de proves pilot, així com per a fluxos de treball d'integració continuada. Podeu llegir més sobre Docker Compose <a href='https://docs.docker.com/compose'>aquí</a>.");
+addS("docker_compose_status", "Estat de Docker Compose:");
+addS("docker_compose_subtitle", "Una eina per definir i executar aplicacions Docker multicontenidor");
+
+
+//down
+addS("docker_compose_down_desc_pre", "S'estan aturant tots els contenidors associats al projecte ");
+addS("docker_compose_down_desc_post", ":");
+
+//up
+addS("docker_compose_up_desc_pre", "Contenidors associats al projecte ");
+addS("docker_compose_up_desc_post", ":");
+
+
+//main
+addS("docker_compose_info", "Informació de Docker:");
+addS("docker_compose_interface", "Interfícies de xarxa de Docker:");
+addS("docker_compose_title_containers_running", "Contenidors de Docker en execució:");
+addS("docker_compose_title_containers_stopped", "Contenidors de Docker aturats:");
+addS("docker_compose_title_images", "Imatges de Docker disponibles:");
+
+
+//manage
+addS("docker_compose_manage_desc_pre", "Empreu aquesta pàgina per gestionar el projecte de Docker Compose ");
+addS("docker_compose_manage_desc_post", ".");
+addS("docker_compose_manage_containers", "Contenidors Docker associats:");
+addS("docker_compose_manage_files", "Fitxers del projecte:");
+
+
+//create
+addS("docker_compose_create_desc", "Empreu aquesta pàgina per crear un projecte de Docker Compose nou.");
+addS("docker_compose_create_form_error", "El formulari conté un error:");
+addS("docker_compose_create_form_errors", "El formulari conté errors:");
+addS("docker_compose_create_form_name", "Nom del projecte");
+addS("docker_compose_create_form_name_placeholder", "ElVostreProjecte");
+addS("docker_compose_create_form_name_tooltip", "Escolliu un nom per al vostre projecte de Docker Compose. Feu servir només caràcters alfanumèrics i guionets.");
+addS("docker_compose_create_form_dcy", "docker-compose.yml");
+addS("docker_compose_create_form_dcy_tooltip", "Feu servir el camp de text de dalt per introduir el contingut del vostre fitxer docker-compose.yml.");