Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
105
Merge Requests
105
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
fa7200f1
Commit
fa7200f1
authored
Feb 03, 2022
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minimize diff with master branch.
parent
c9ef610c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
5 deletions
+15
-5
slapos/recipe/generic_mysql/mysql.py
slapos/recipe/generic_mysql/mysql.py
+1
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+14
-3
stack/erp5/zope.conf.in
stack/erp5/zope.conf.in
+0
-1
stack/slapos-dev.cfg
stack/slapos-dev.cfg
+0
-1
No files found.
slapos/recipe/generic_mysql/mysql.py
View file @
fa7200f1
from
__future__
import
print_function
from
__future__
import
print_function
import
os
import
os
import
subprocess
import
subprocess
import
time
import
time
...
...
stack/erp5/buildout.cfg
View file @
fa7200f1
...
@@ -62,7 +62,6 @@ extends =
...
@@ -62,7 +62,6 @@ extends =
../../software/neoppod/software-zodb5.cfg
../../software/neoppod/software-zodb5.cfg
# keep neoppod extends last
# keep neoppod extends last
parts +=
parts +=
erp5-util-develop
erp5-util-develop
slapos-cookbook
slapos-cookbook
...
@@ -506,6 +505,7 @@ eggs = ${neoppod:eggs}
...
@@ -506,6 +505,7 @@ eggs = ${neoppod:eggs}
typing
typing
pytracemalloc
pytracemalloc
xlrd
xlrd
# Zope
# Zope
${zope.security:egg}
${zope.security:egg}
${zope.container:egg}
${zope.container:egg}
...
@@ -525,30 +525,41 @@ eggs = ${neoppod:eggs}
...
@@ -525,30 +525,41 @@ eggs = ${neoppod:eggs}
${Products.DCWorkflow:egg}
${Products.DCWorkflow:egg}
${Products.GenericSetup:egg}
${Products.GenericSetup:egg}
five.localsitemanager
five.localsitemanager
# Other products
# Other products
Products.DCWorkflowGraph
Products.DCWorkflowGraph
Products.MimetypesRegistry
Products.MimetypesRegistry
Products.ExternalEditor
Products.ExternalEditor
Products.TIDStorage
Products.TIDStorage
Products.LongRequestLogger
Products.LongRequestLogger
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
# BBB: Temporarily keep zope.app.testing awaiting we use newer version of CMF
# (for tests like testCookieCrumbler).
# (for tests like testCookieCrumbler).
zope.app.testing
zope.app.testing
# Currently forked in our repository
# Currently forked in our repository
# Products.PortalTransforms
# Products.PortalTransforms
# Dependency for our fork of PortalTransforms
# Dependency for our fork of PortalTransforms
StructuredText
StructuredText
# Needed for parsing .po files from our Localizer subset
# Needed for parsing .po files from our Localizer subset
polib
polib
# Needed for Google OAuth
# Needed for Google OAuth
google-api-python-client
google-api-python-client
# Need for Facebook OAuth
# Need for Facebook OAuth
facebook-sdk
facebook-sdk
# Used by ERP5 Jupyter backend
# ipykernel
# Used by DiffTool
# Used by DiffTool
xmltodict
xmltodict
deepdiff
deepdiff
unidiff
unidiff
jsonpickle
jsonpickle
# WSGI server
# WSGI server
zope.globalrequest
zope.globalrequest
waitress
waitress
...
@@ -573,7 +584,7 @@ eggs = ${neoppod:eggs}
...
@@ -573,7 +584,7 @@ eggs = ${neoppod:eggs}
Record
Record
# StructuredText
# StructuredText
Zope
Zope
# parameterizing the version of the generated python interpreter name by the
# parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the
# python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance
# installation of python, which we don't want on an instance
...
@@ -606,7 +617,7 @@ Zope-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/0001-O
...
@@ -606,7 +617,7 @@ Zope-patches = ${:_profile_base_location_}/../../component/egg-patch/Zope/0001-O
Zope-patch-options = -p1
Zope-patch-options = -p1
[template-neo]
[template-neo]
recipe =
recipe =
template =
template =
[eggs-all-scripts]
[eggs-all-scripts]
...
...
stack/erp5/zope.conf.in
View file @
fa7200f1
...
@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0
...
@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0
{% endif %}
{% endif %}
{% endif -%}
{% endif -%}
{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
{% if sql_connection_string -%}
{% if sql_connection_string -%}
{% set bt5_repository_url = [] -%}
{% set bt5_repository_url = [] -%}
...
...
stack/slapos-dev.cfg
View file @
fa7200f1
...
@@ -25,7 +25,6 @@ depends = ${slapos-toolbox-dependencies:eggs}
...
@@ -25,7 +25,6 @@ depends = ${slapos-toolbox-dependencies:eggs}
[slapos.cookbook-repository]
[slapos.cookbook-repository]
develop = true
develop = true
branch = zope4
# Used for resiliency tests only
# Used for resiliency tests only
[erp5.util-repository]
[erp5.util-repository]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment