From 05a6fe72c04bd785fa289b7b5fd9bc8f871ea3a1 Mon Sep 17 00:00:00 2001
From: startxfr <clarue@startx.fr>
Date: Mon, 28 Dec 2015 04:47:44 +0100
Subject: change in doc for nodejs + fix in startup script
---
Services/README.md | 4 ++--
Services/apache/sx-httpd.sh | 2 +-
Services/mariadb/run.sh | 2 +-
Services/mongo/run.sh | 2 +-
Services/postgres/run.sh | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
(limited to 'Services')
diff --git a/Services/README.md b/Services/README.md
index ab66e3f..6e80c53 100644
--- a/Services/README.md
+++ b/Services/README.md
@@ -25,7 +25,7 @@ your project and start using stable or experimental services in your application
| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](mariadb/README.md)
| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](memcache/README.md)
| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](mongo/README.md)
-| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](nodejs/README.md)
+| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:21` `:22` `:23` | `:6` `:7` | [manual](nodejs/README.md)
| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](ooconv/README.md)
| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](php/README.md)
| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:20` `:21` `:22` `:23` | `:6` `:7` | [manual](postgres/README.md)
@@ -52,7 +52,7 @@ your project and start using stable or experimental services in your application
| MariaDB | [`startx/sv-mariadb`](https://hub.docker.com/r/startx/sv-mariadb) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
| Memcache | [`startx/sv-memcache`](https://hub.docker.com/r/startx/sv-memcache) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
| MongoDB | [`startx/sv-mongo`](https://hub.docker.com/r/startx/sv-mongo) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
-| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
+| nodejs | [`startx/sv-nodejs`](https://hub.docker.com/r/startx/sv-nodejs) | `:latest` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
| ooconv | [`startx/sv-ooconv`](https://hub.docker.com/r/startx/sv-ooconv) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
| php | [`startx/sv-php`](https://hub.docker.com/r/startx/sv-php) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
| postgreSQL | [`startx/sv-postgres`](https://hub.docker.com/r/startx/sv-postgres) | `:latest` `:fc20` `:fc21` `:fc22` `:fc23` | `:centos6` `:centos7` |
diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh
index 1adec4e..b850ee3 100644
--- a/Services/apache/sx-httpd.sh
+++ b/Services/apache/sx-httpd.sh
@@ -87,5 +87,5 @@ function stop_server {
function start_daemon {
echo "=> Starting httpd daemon ..." | tee -a $STARTUPLOG
display_container_started | tee -a $STARTUPLOG
- exec /usr/sbin/apachectl -D FOREGROUND
+ exec /usr/sbin/apachectl && tail -f $LOG_PATH/error.log
}
diff --git a/Services/mariadb/run.sh b/Services/mariadb/run.sh
index 4dad331..c11f784 100644
--- a/Services/mariadb/run.sh
+++ b/Services/mariadb/run.sh
@@ -45,7 +45,7 @@ function display_container_mariadb_header {
function begin_config {
echo "=> BEGIN MARIADB CONFIGURATION"
if [[ ! -d $DATA_PATH ]]; then
- echo "log directory $DATA_PATH not found"
+ echo "data directory $DATA_PATH not found"
mkdir -p $DATA_PATH; chmod 0774 $DATA_PATH
echo "data directory $DATA_PATH CREATED"
else
diff --git a/Services/mongo/run.sh b/Services/mongo/run.sh
index 598b716..14e00db 100644
--- a/Services/mongo/run.sh
+++ b/Services/mongo/run.sh
@@ -45,7 +45,7 @@ function display_container_mongodb_header {
function begin_config {
echo "=> BEGIN MONGODB CONFIGURATION"
if [[ ! -d $DATA_PATH ]]; then
- echo "log directory $DATA_PATH not found"
+ echo "data directory $DATA_PATH not found"
mkdir -p $DATA_PATH; chmod 0774 $DATA_PATH
echo "data directory $DATA_PATH CREATED"
else
diff --git a/Services/postgres/run.sh b/Services/postgres/run.sh
index de130fc..1c5436d 100644
--- a/Services/postgres/run.sh
+++ b/Services/postgres/run.sh
@@ -54,7 +54,7 @@ function display_container_postgresql_header {
function begin_config {
echo "=> BEGIN POSTGRESQL CONFIGURATION"
if [[ ! -d $DATA_PATH ]]; then
- echo "log directory $DATA_PATH not found"
+ echo "data directory $DATA_PATH not found"
mkdir -p $DATA_PATH; chmod 0774 $DATA_PATH
echo "data directory $DATA_PATH CREATED"
else
--
cgit v1.2.3