Configuration Issues

This commit is contained in:
WilliamMiceli
2018-06-23 20:10:03 -04:00
parent dc2dcb7a62
commit 06e42f999e
2 changed files with 4 additions and 10 deletions

View File

@@ -7,7 +7,6 @@ services:
environment: environment:
- APP_DEBUG=0 - APP_DEBUG=0
- APP_ENV='production' - APP_ENV='production'
- APP_URL=${APP_URL}
- APP_KEY=${APP_KEY} - APP_KEY=${APP_KEY}
- APP_CIPHER='AES-256-CBC' - APP_CIPHER='AES-256-CBC'
- DB_HOST='db' - DB_HOST='db'
@@ -15,8 +14,6 @@ services:
- DB_TYPE='mysql' - DB_TYPE='mysql'
- DB_USERNAME='ninja' - DB_USERNAME='ninja'
- DB_PASSWORD='ninja' - DB_PASSWORD='ninja'
- MYSQL_ROOT_PASSWORD='ninja'
- MYSQL_DATABASE='ninja'
labels: labels:
io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE} io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
io.rancher.sidekicks: cron, web io.rancher.sidekicks: cron, web
@@ -41,7 +38,6 @@ services:
environment: environment:
- APP_DEBUG=0 - APP_DEBUG=0
- APP_ENV='production' - APP_ENV='production'
- APP_URL=${APP_URL}
- APP_KEY=${APP_KEY} - APP_KEY=${APP_KEY}
- APP_CIPHER='AES-256-CBC' - APP_CIPHER='AES-256-CBC'
- DB_HOST='db' - DB_HOST='db'
@@ -49,8 +45,6 @@ services:
- DB_TYPE='mysql' - DB_TYPE='mysql'
- DB_USERNAME='ninja' - DB_USERNAME='ninja'
- DB_PASSWORD='ninja' - DB_PASSWORD='ninja'
- MYSQL_ROOT_PASSWORD='ninja'
- MYSQL_DATABASE='ninja'
labels: labels:
io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE} io.rancher.scheduler.affinity:host_label: ${LABEL_KEY_VALUE}
networks: networks:
@@ -80,7 +74,7 @@ services:
- "${WEB_PORT}:80" - "${WEB_PORT}:80"
restart: on-failure restart: on-failure
volumes: volumes:
- ${STORAGE_BASE_DIR}${WEB_DIR}:/etc/nginx - ${STORAGE_BASE_DIR}${CONFIG_DIR}/nginx.conf:/etc/nginx/nginx.conf:ro
volumes_from: volumes_from:
- app - app
networks: networks:

View File

@@ -46,11 +46,11 @@ catalog:
default: "/Database" default: "/Database"
required: true required: true
type: string type: string
- variable: "WEB_DIR" - variable: "CONFIG_DIR"
label: "Web Server Data Directory" label: "Configuration Directory"
description: | description: |
The The
default: "/Web" default: "/Config"
required: true required: true
type: string type: string
- variable: "APP_URL" - variable: "APP_URL"