Skip to content

Commit fb91abe

Browse files
committed
remove unwanted env var from zope.conf
1 parent c641c91 commit fb91abe

File tree

2 files changed

+26
-8
lines changed

2 files changed

+26
-8
lines changed

docker-dev.cfg

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,22 @@ eggs +=
2222

2323
zcml +=
2424
imio.prometheus
25+
environment-vars -=
26+
ACTIVE_BIGBANG True
27+
ADMIN_PASSWORD ${port:admin-password}
28+
; makes shitty json beware
29+
;event-log-custom =
30+
; <syslog>
31+
; address ${port:logs-server}
32+
; facility local3
33+
; format {"timestamp": "%(asctime)s", "hostname": "${facts:hostname}", "process": "zope[%(process)s]:", "cluster": "${port:cluster}", "section": "${:_buildout_section_name_}", "level": "[%(levelname)s]", "name": "%(name)s |", "message": "%(message)s"
34+
; dateformat %b %d %H:%M:%S
35+
; level info
36+
; </syslog>
37+
; <logfile>
38+
; path ${buildout:directory}/var/log/${:_buildout_section_name_}.log
39+
; level INFO
40+
; </logfile>
2541

2642
[instance-async]
2743
debug-mode = off
@@ -48,3 +64,5 @@ eggs +=
4864
collective.big.bang
4965
zcml +=
5066
collective.big.bang
67+
environment-vars +=
68+
ACTIVE_BIGBANG True

docker/docker-compose.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ services:
4747
environment:
4848
- ZEO_CLIENT_CACHE_SIZE=1000MB
4949
- ZODB_CACHE_SIZE=100000
50-
- ADMIN_PASSWORD=admin
50+
- ADMIN_PASSWORD=tata
5151
- CLUSTER=iadelib_pm42
5252
- MOUNTPOINT=demo
5353
- HOSTNAME=instance1
@@ -75,7 +75,7 @@ services:
7575
environment:
7676
- ZEO_CLIENT_CACHE_SIZE=1000MB
7777
- ZODB_CACHE_SIZE=100000
78-
- ADMIN_PASSWORD=admin
78+
- ADMIN_PASSWORD=tata
7979
- CLUSTER=iadelib_pm42
8080
- MOUNTPOINT=demo
8181
- HOSTNAME=instance2
@@ -103,7 +103,7 @@ services:
103103
environment:
104104
- ZEO_CLIENT_CACHE_SIZE=1000MB
105105
- ZODB_CACHE_SIZE=100000
106-
- ADMIN_PASSWORD=admin
106+
- ADMIN_PASSWORD=tata
107107
- CLUSTER=iadelib_pm42
108108
- MOUNTPOINT=demo
109109
- HOSTNAME=instance3
@@ -122,7 +122,7 @@ services:
122122
image: imiobe/iadelib:4.2.9
123123
command: instance-cron
124124
ports:
125-
- "8087"
125+
- "8087:8087"
126126
networks:
127127
- internal
128128
- external
@@ -131,7 +131,7 @@ services:
131131
environment:
132132
- ZEO_CLIENT_CACHE_SIZE=1000MB
133133
- ZODB_CACHE_SIZE=100000
134-
- ADMIN_PASSWORD=admin
134+
- ADMIN_PASSWORD=tata
135135
- PUBLIC_URL=http://localhost/PM
136136
- PLONE_PATH=demo/demo
137137
- CLUSTER=iadelib_pm42
@@ -159,7 +159,7 @@ services:
159159
environment:
160160
- ZEO_CLIENT_CACHE_SIZE=1000MB
161161
- ZODB_CACHE_SIZE=100000
162-
- ADMIN_PASSWORD=admin
162+
- ADMIN_PASSWORD=tata
163163
- CLUSTER=iadelib_pm42
164164
- MOUNTPOINT=demo
165165
- HOSTNAME=worker-async
@@ -188,7 +188,7 @@ services:
188188
environment:
189189
- ZEO_CLIENT_CACHE_SIZE=1000MB
190190
- ZODB_CACHE_SIZE=100000
191-
- ADMIN_PASSWORD=Trololo
191+
- ADMIN_PASSWORD=tata
192192
- CLUSTER=iadelib_pm42
193193
- MOUNTPOINT=demo
194194
- PLONE_PATH=demo/demo
@@ -226,7 +226,7 @@ services:
226226
environment:
227227
- ZEO_CLIENT_CACHE_SIZE=1000MB
228228
- ZODB_CACHE_SIZE=100000
229-
- ADMIN_PASSWORD=admin
229+
- ADMIN_PASSWORD=tata
230230
- CLUSTER=iadelib_pm42
231231
- MOUNTPOINT=demo
232232
- HOSTNAME=debug

0 commit comments

Comments
 (0)