diff options
| author | startxfr <clarue@startx.fr> | 2015-12-07 01:01:22 +0100 |
|---|---|---|
| committer | startxfr <clarue@startx.fr> | 2015-12-07 01:01:22 +0100 |
| commit | 7f9465928d5b149e4fb5f9bc476b8cb7298436fc (patch) | |
| tree | 56e00489d61c122fe7990d750f05c256d2b04d20 /Services/apache | |
| parent | 3e4f13d3b46b87f9892ab936bd537036d20bce02 (diff) | |
| download | phpmyadmin-7f9465928d5b149e4fb5f9bc476b8cb7298436fc.tar.gz phpmyadmin-7f9465928d5b149e4fb5f9bc476b8cb7298436fc.tar.bz2 phpmyadmin-7f9465928d5b149e4fb5f9bc476b8cb7298436fc.tar.xz phpmyadmin-7f9465928d5b149e4fb5f9bc476b8cb7298436fc.zip | |
start refreshing application pma
Diffstat (limited to 'Services/apache')
| -rw-r--r-- | Services/apache/README.md | 2 | ||||
| -rw-r--r-- | Services/apache/docker-compose.yml | 1 | ||||
| -rw-r--r-- | Services/apache/httpd.conf | 2 | ||||
| -rw-r--r-- | Services/apache/sx-httpd.sh | 2 |
4 files changed, 1 insertions, 6 deletions
diff --git a/Services/apache/README.md b/Services/apache/README.md index 9db6367..ed737e1 100644 --- a/Services/apache/README.md +++ b/Services/apache/README.md @@ -29,7 +29,6 @@ service: CONTAINER_SERVICE: "apache" CONTAINER_INSTANCE: "service-apache" SERVER_NAME: "localhost" - DOC_ROOT: "/data/apache" volumes: - "/tmp/container/logs/apache:/data/logs/apache" - "/tmp/container/apache:/data/apache" @@ -91,7 +90,6 @@ CMD ["/bin/run.sh"] | CONTAINER_SERVICE | `string` | `no` | Define the type of service or application provided | SERVER_NAME | `string` | `no` | Server name for this container. If no name localhost will be assigned | HOSTNAME | `auto` | `auto` | Container unique id automatically assigned by docker daemon at startup -| DOC_ROOT | `auto` | `auto` | document root, will use the $APP_PATH variable | LOG_PATH | `auto` | `auto` | default set to /data/logs/apache and used as a volume mountpoint | APP_PATH | `auto` | `auto` | default set to /data/apache and used as a volume mountpoint diff --git a/Services/apache/docker-compose.yml b/Services/apache/docker-compose.yml index 44c8a5b..57bacf0 100644 --- a/Services/apache/docker-compose.yml +++ b/Services/apache/docker-compose.yml @@ -13,7 +13,6 @@ server: CONTAINER_SERVICE: "apache" CONTAINER_INSTANCE: "service-apache" SERVER_NAME: "localhost" - DOC_ROOT: "/data/apache" volumes: - "/tmp/container/logs/apache:/data/logs/apache" - "/tmp/container/apache:/data/apache"
\ No newline at end of file diff --git a/Services/apache/httpd.conf b/Services/apache/httpd.conf index 97672b4..f1bc5af 100644 --- a/Services/apache/httpd.conf +++ b/Services/apache/httpd.conf @@ -1,7 +1,7 @@ # # This file will be copied into /etc/httpd/conf.d/app.conf and loaded when httpd start # -DocumentRoot ${DOC_ROOT} +DocumentRoot ${APP_PATH} ServerName ${SERVER_NAME} ServerAdmin cl@startx.fr diff --git a/Services/apache/sx-httpd.sh b/Services/apache/sx-httpd.sh index 0344f1e..1adec4e 100644 --- a/Services/apache/sx-httpd.sh +++ b/Services/apache/sx-httpd.sh @@ -11,8 +11,6 @@ function check_httpd_environment { if [ ! -v APP_PATH ]; then APP_PATH="/data/apache" export APP_PATH - DOC_ROOT=$APP_PATH - export DOC_ROOT fi if [ ! -v LOG_PATH ]; then LOG_PATH="/data/logs/apache" |