NOISSUE - Clean NginX files, move .gitignores to dirs (#853)

* Remove nginx entrypoint trash, move .gitignore

Signed-off-by: drasko <drasko.draskovic@gmail.com>

* Add node_modules to Aedes .gitignore

Signed-off-by: drasko <drasko.draskovic@gmail.com>

* Move docker .gitignore to nginx

Signed-off-by: drasko <drasko.draskovic@gmail.com>
This commit is contained in:
Drasko DRASKOVIC 2019-09-16 11:47:34 +02:00 committed by Nikola Marčetić
parent 3b19292966
commit 5ef6aa84de
7 changed files with 20 additions and 16 deletions

14
.gitignore vendored
View File

@ -4,19 +4,5 @@
# Set your private global .gitignore: # Set your private global .gitignore:
# https://digitalfortress.tech/tricks/creating-a-global-gitignore/ # https://digitalfortress.tech/tricks/creating-a-global-gitignore/
# Mainflux
build build
# MQTT
mqtt/verne/gpb
mqtt/verne/grpc
mqtt/verne/grpc_client
# Docker
docker/nginx/snippets/mqtt-upstream.conf
docker/nginx/snippets/mqtt-ws-upstream.conf
# Tools
tools/mqtt-bench/mqtt-bench
tools/provision/mfconn.toml
tools/provision/provision

5
docker/nginx/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
# Copyright (c) Mainflux
# SPDX-License-Identifier: Apache-2.0
snippets/mqtt-upstream.conf
snippets/mqtt-ws-upstream.conf

View File

@ -17,6 +17,4 @@ envsubst '
${MF_WS_ADAPTER_PORT} ${MF_WS_ADAPTER_PORT}
${MF_UI_PORT}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf ${MF_UI_PORT}' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf
cp /etc/nginx/nginx.conf /etc/nginx/snippets
exec nginx -g "daemon off;" exec nginx -g "daemon off;"

1
mqtt/aedes/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
node_modules

View File

@ -1,2 +1,7 @@
# Copyright (c) Mainflux
# SPDX-License-Identifier: Apache-2.0
_build _build
gpb gpb
grpc
grpc_client

4
tools/mqtt-bench/.gitignore vendored Normal file
View File

@ -0,0 +1,4 @@
# Copyright (c) Mainflux
# SPDX-License-Identifier: Apache-2.0
mqtt-bench

5
tools/provision/.gitignore vendored Normal file
View File

@ -0,0 +1,5 @@
# Copyright (c) Mainflux
# SPDX-License-Identifier: Apache-2.0
mfconn.toml
provision