Skip to content

Commit c641c91

Browse files
committed
Replace make standard-config by collective.big.bang
1 parent dae9c33 commit c641c91

File tree

6 files changed

+10
-13
lines changed

6 files changed

+10
-13
lines changed

Makefile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,9 @@ buildout: ## Runs bootstrap if needed and builds the buildout
3434
echo "Starting Buildout on $(shell date)"
3535
rm -f .installed.cfg
3636
if ! test -f bin/buildout;then make bootstrap; else make install-requirements;fi
37-
# reinstall requirements in case it changed since last bootstrap
38-
if ! test -f var/filestorage/Data.fs; then make standard-config;fi
3937
if test -z "$(args)" ;then bin/python bin/buildout;else bin/python bin/buildout -c $(args);fi
4038
echo "Finished on $(shell date)"
4139

42-
.PHONY: standard-config
43-
standard-config: ## Creates a standard plone site
44-
if ! test -f bin/buildout;then make bootstrap;fi
45-
bin/python bin/buildout -c standard-config.cfg
46-
47-
4840
.PHONY: run
4941
run: ## Runs buildout if needed and starts instance1 in foregroud
5042
if test -z "$(args)" ;then make buildout;else make buildout "$(args)";fi

base.cfg

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ eggs =
131131
Products.ZNagios
132132
zc.z3monitor
133133
imio.prometheus
134+
collective.big.bang
134135

135136
zcml =
136137
Products.PloneMeeting-overrides
@@ -139,14 +140,14 @@ zcml =
139140
zc.z3monitor
140141
collective.monitor
141142
imio.prometheus
143+
collective.big.bang
142144

143145
[instance-async]
144146
<= instance1
145147
http-address = ${port:instance-async-http}
146148
zserver-threads = 4
147149
debug-mode = on
148150
verbose-security = on
149-
zope-conf-additional =
150151
zcml-additional =
151152
<include package="plone.app.async" file="multi_db_worker.zcml" />
152153
environment-vars =

dev.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ auto-checkout =
4747
collective.js.iframeresizer
4848
collective.js.tooltipster
4949
collective.querynextprev
50+
collective.big.bang
5051
# collective.fingerpointing
5152
# collective.upgrade
5253
# communesplone.layout

prod.cfg

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,11 @@ zope-conf-additional =
2020
</product-config>
2121
${zope-conf:additional}
2222
${zope-conf:zamqp}
23+
environment-vars -=
24+
ACTIVE_BIGBANG True
2325

2426
[instance3]
25-
<= instance1
27+
<= instance2
2628
http-address = ${port:instance3-http}
2729
zope-conf-additional =
2830
<product-config five.z2monitor>
@@ -32,7 +34,7 @@ zope-conf-additional =
3234
${zope-conf:zamqp}
3335

3436
[instance4]
35-
<= instance1
37+
<= instance2
3638
http-address = ${port:instance4-http}
3739
zope-conf-additional =
3840
<product-config five.z2monitor>
@@ -42,7 +44,7 @@ zope-conf-additional =
4244
${zope-conf:zamqp}
4345

4446
[instance-debug]
45-
<= instance1
47+
<= instance2
4648
http-address = ${port:instance-debug-http}
4749
debug-mode = on
4850
verbose-security = on

sources.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ collective.messagesviewlet = git ${remotes:collective}/collective.messagesviewle
3535
collective.querynextprev = git ${remotes:collective}/collective.querynextprev.git pushurl=${remotes:collective_push}/collective.querynextprev.git
3636
collective.upgrade = git ${remotes:collective}/collective.upgrade.git pushurl=${remotes:collective_push}/collective.upgrade.git
3737
collective.solr = git ${remotes:collective}/collective.solr.git branch=master
38+
collective.big.bang = git ${remotes:collective}/collective.big.bang.git pushurl=${remotes:collective_push}/collective.big.bang.git branch=main
3839

3940
communesplone.layout = git ${remotes:imio}/communesplone.layout.git pushurl=${remotes:imio_push}/communesplone.layout.git
4041
ftw.labels = git ${remotes:ftw}/ftw.labels.git pushurl=${remotes:ftw_push}/ftw.labels.git

versions.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ setuptools = 44.1.1
44
pip = 20.3.4
55

66
imio.prometheus = 1.0.0
7-
collective.big.bang = 1.0a2
7+
collective.big.bang = 1.0a3
88

99
# Required by:
1010
# imio.prometheus

0 commit comments

Comments
 (0)