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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaohe Cao
slapos
Commits
9bcecd7c
Commit
9bcecd7c
authored
Oct 17, 2014
by
Alain Takoudjou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix access on certificate authority configuration file
parent
421760d4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
1 deletion
+12
-1
software/slapos-master/instance-erp5.cfg.in
software/slapos-master/instance-erp5.cfg.in
+11
-0
software/slapos-master/software.cfg
software/slapos-master/software.cfg
+1
-1
No files found.
software/slapos-master/instance-erp5.cfg.in
View file @
9bcecd7c
...
@@ -251,6 +251,16 @@ state = {{ dumps(slapparameter_dict.get('state', "('State',)")) }}
...
@@ -251,6 +251,16 @@ state = {{ dumps(slapparameter_dict.get('state', "('State',)")) }}
city = {{ dumps(slapparameter_dict.get('city', 'City')) }}
city = {{ dumps(slapparameter_dict.get('city', 'City')) }}
company = {{ dumps(slapparameter_dict.get('company', 'Compagny')) }}
company = {{ dumps(slapparameter_dict.get('company', 'Compagny')) }}
# XXX - Big hack: Change access for certificate authority configuration
# To allow apache to read openssl.cnf in this folder
[fix-ca-folder]
recipe = plone.recipe.command
stop-on-error = true
command =
chmod -R 770 ${apache-certificate-authority:ca-dir} && \
chmod 644 ${apache-certificate-authority:ca-dir}/openssl.cnf
update-command = ${:command}
[publish]
[publish]
recipe = slapos.cookbook:publish.serialised
recipe = slapos.cookbook:publish.serialised
deadlock-debugger-password = ${deadlock-debugger-password:passwd}
deadlock-debugger-password = ${deadlock-debugger-password:passwd}
...
@@ -267,6 +277,7 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-
...
@@ -267,6 +277,7 @@ hosts-dict = {{ '${' ~ zope_address_list_id_dict.keys()[0] ~ ':connection-hosts-
[buildout]
[buildout]
parts =
parts =
apache-certificate-authority
apache-certificate-authority
fix-ca-folder
publish
publish
eggs-directory = {{ eggs_directory }}
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
...
...
software/slapos-master/software.cfg
View file @
9bcecd7c
...
@@ -70,7 +70,7 @@ mode = 644
...
@@ -70,7 +70,7 @@ mode = 644
[template-erp5]
[template-erp5]
< = download-base-part
< = download-base-part
filename = instance-erp5.cfg.in
filename = instance-erp5.cfg.in
md5sum =
4f271175389a2e67f2092885b69c0208
md5sum =
371157b65c48a9695b256dc335a908e7
[template-balancer]
[template-balancer]
< = download-base-part
< = download-base-part
...
...
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