Explorar el Código

Fix bug in elgg-install.sh and creation of elgg-config directory

Kévio Vieira de Castro hace 11 años
padre
commit
ad95d4c0d9
Se han modificado 5 ficheros con 30 adiciones y 5 borrados
  1. 1 0
      .gitignore
  2. 4 3
      docker-compose.yml
  3. 8 0
      elgg-docker.sublime-project
  4. 6 0
      elgg-install.php
  5. 11 2
      elgg-install.sh

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+elgg-docker.sublime-workspace

+ 4 - 3
docker-compose.yml

@@ -1,18 +1,19 @@
 web:
   build: .
   ports:
-    - "8000:80"
+    - "8080:80"
   links:
     - mysql
   volumes:
-    - .:/var/www/html/
+    - ~/WebProjects/elgg/:/var/www/html/
   environment:
     MYSQL_USER: root
     MYSQL_PASS: root-pass
     ELGG_USERNAME: admin
     ELGG_PASSWORD: admin-pass
+    ELGG_WWW_ROOT: http://localhost:8080
 mysql:
   image: mysql:5.6  
   environment:
     MYSQL_DATABASE: elgg
-    MYSQL_ROOT_PASSWORD: root-pass
+    MYSQL_ROOT_PASSWORD: root-pass

+ 8 - 0
elgg-docker.sublime-project

@@ -0,0 +1,8 @@
+{
+	"folders":
+	[
+		{
+			"path": "."
+		}
+	]
+}

+ 6 - 0
elgg-install.php

@@ -64,4 +64,10 @@ foreach ($mods as $key => $folder) {
 	}
 }
 
+echo "Installation is complete.\n";
+echo "Open in your browser: {$params['wwwroot']}\n";
+echo "Elgg access credentials:\n";
+echo "Elgg admin username: {$params['username']}\n";
+echo "Elgg admin pass: {$params['password']}\n";
+
 exit(0);

+ 11 - 2
elgg-install.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+set -e
+
 WAIT_MYSQL_START="30" # In seconds
 MYSQL_PORT="$MYSQL_PORT"
 MYSQL_USER="$MYSQL_USER"
@@ -12,10 +14,17 @@ while ! netcat $ELGG_DB_HOST $MYSQL_PORT >/dev/null 2>&1 < /dev/null; do
   i=`expr $i + 1`
   if [ $i -ge $MYSQL_LOOPS ]; then
     echo "$(date) - ${ELGG_DB_HOST}:${MYSQL_PORT} still not reachable, giving up."
-    exit 0
+    exit 1
   fi
-  echo "$(date) - waiting for ${ELGG_DB_HOST}:${MYSQL_PORT}... $i/$MYSQL_LOOPS."
+  echo "$(date) - waiting for ${ELGG_DB_HOST}:${MYSQL_PORT}... $i/$WAIT_MYSQL_START."
   sleep 1
 done
+echo "The MySQL server is ready."
 
+echo "Starting installation elgg."
+#This directory will hold Elgg's ``settings.php`` file after installation.
+if [ ! -d "${ELGG_PATH}elgg-config/" ]; then
+	mkdir "${ELGG_PATH}elgg-config/"
+	chown -R www-data:www-data "${ELGG_PATH}elgg-config/"
+fi
 php	/elgg-docker/elgg-install.php