moved volumes to configs

This commit is contained in:
dcore94 2021-05-20 18:58:23 +02:00
parent 33499eb123
commit 981b8e1ac7
2 changed files with 25 additions and 10 deletions

View File

@ -7,11 +7,6 @@ services:
networks:
- conductor-network
- haproxy-public
{% if pep is defined and pep == True %}
volumes:
- "./pep.js:/etc/nginx/pep.js"
- "./config.js:/etc/nginx/config.js"
{% endif %}
deploy:
replicas: 1
placement:
@ -26,6 +21,12 @@ services:
target: /etc/nginx/templates/default.conf.template
- source: nginxbaseconf
target: /etc/nginx/nginx.conf
{% if pep is defined and pep == True %}
- source: pep
target: /etc/nginx/pep.js
- source: pepconfig
target: /etc/nginx/config.js
{% endif %}
networks:
conductor-network:
@ -36,3 +37,10 @@ configs:
file: ./nginx.default.conf
nginxbaseconf:
file: ./nginx.conf
{% if pep is defined and pep == True %}
pep:
file: ./pep.js
pepconfig:
file: ./config.js
{% endif %}

View File

@ -8,11 +8,6 @@ services:
- conductor-network
ports:
- "{{ pep_port }}:80"
{% if pep is defined and pep == True %}
volumes:
- "./pep.js:/etc/nginx/pep.js"
- "./config.js:/etc/nginx/config.js"
{% endif %}
deploy:
replicas: {{ pep_replicas }}
{% if infrastructure != 'local' %}
@ -28,6 +23,12 @@ services:
target: /etc/nginx/templates/default.conf.template
- source: nginxbaseconf
target: /etc/nginx/nginx.conf
{% if pep is defined and pep == True %}
- source: pep
target: /etc/nginx/pep.js
- source: pepconfig
target: /etc/nginx/config.js
{% endif %}
networks:
conductor-network:
@ -37,3 +38,9 @@ configs:
file: ./nginx.default.conf
nginxbaseconf:
file: ./nginx.conf
{% if pep is defined and pep == True %}
pep:
file: ./pep.js
pepconfig:
file: ./config.js
{% endif %}