Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
alecs_myu
erp5
Commits
f4d9ba9e
Commit
f4d9ba9e
authored
May 18, 2011
by
Łukasz Nowak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename to follow reality.
parent
2611b701
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
slapos/recipe/erp5/setup.py
slapos/recipe/erp5/setup.py
+1
-1
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
+2
-2
No files found.
slapos/recipe/erp5/setup.py
View file @
f4d9ba9e
...
...
@@ -6,7 +6,7 @@ from setuptools import setup, find_packages
# "."], stdout=subprocess.PIPE).communicate()[0]))
name
=
"slapos.recipe.erp5"
version
=
'1.1-dev-1
79
'
version
=
'1.1-dev-1
80
'
def
read
(
name
):
return
open
(
name
).
read
()
...
...
slapos/recipe/erp5/src/slapos/recipe/erp5/__init__.py
View file @
f4d9ba9e
...
...
@@ -80,7 +80,7 @@ class Recipe(BaseSlapRecipe):
dict
(
zodb_root_path
=
zodb_root_path
)),
with_timerservice
=
True
)
key
,
certificate
=
self
.
requestCertificate
(
'Login Based Access'
)
apache_conf
=
dict
(
apache_login
=
self
.
install
Login
Apache
(
ip
=
self
.
getGlobalIPv6Address
(),
apache_login
=
self
.
install
Backend
Apache
(
ip
=
self
.
getGlobalIPv6Address
(),
port
=
13000
,
backend
=
zope_access
,
key
=
key
,
certificate
=
certificate
))
self
.
installERP5Site
(
user
,
password
,
zope_access
,
mysql_conf
,
conversion_server_conf
,
memcached_conf
,
kumo_conf
,
self
.
site_id
)
...
...
@@ -724,7 +724,7 @@ class Recipe(BaseSlapRecipe):
'template/apache.zope.conf.in'
)
%
apache_conf
return
self
.
createConfigurationFile
(
prefix
+
'.conf'
,
apache_conf_string
)
def
install
Login
Apache
(
self
,
ip
,
port
,
backend
,
key
,
certificate
,
def
install
Backend
Apache
(
self
,
ip
,
port
,
backend
,
key
,
certificate
,
suffix
=
''
,
access_control_string
=
None
):
ssl_template
=
"""SSLEngine on
SSLCertificateFile %(login_certificate)s
...
...
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