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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Douglas
slapos
Commits
ff0425ed
Commit
ff0425ed
authored
Jan 17, 2012
by
Romain Courteaud
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Require apache scheme.
This allow to generate non SSL configuration
parent
1d8cd90d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
31 additions
and
16 deletions
+31
-16
slapos/recipe/apache_zope_backend/__init__.py
slapos/recipe/apache_zope_backend/__init__.py
+19
-6
slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
...s/recipe/apache_zope_backend/template/apache.zope.conf.in
+1
-10
slapos/recipe/apache_zope_backend/template/snippet.ssl.in
slapos/recipe/apache_zope_backend/template/snippet.ssl.in
+11
-0
No files found.
slapos/recipe/apache_zope_backend/__init__.py
View file @
ff0425ed
...
@@ -33,10 +33,25 @@ class Recipe(GenericBaseRecipe):
...
@@ -33,10 +33,25 @@ class Recipe(GenericBaseRecipe):
ip
=
self
.
options
[
'ip'
]
ip
=
self
.
options
[
'ip'
]
port
=
self
.
options
[
'port'
]
port
=
self
.
options
[
'port'
]
backend
=
self
.
options
[
'backend'
]
backend
=
self
.
options
[
'backend'
]
apache_conf
=
dict
()
scheme
=
self
.
options
[
'scheme'
]
if
scheme
==
'http'
:
required_path_list
=
[]
apache_conf
[
'ssl_snippet'
]
=
''
elif
scheme
==
'https'
:
key
=
self
.
options
[
'key-file'
]
key
=
self
.
options
[
'key-file'
]
certificate
=
self
.
options
[
'cert-file'
]
certificate
=
self
.
options
[
'cert-file'
]
required_path_list
=
[
key
,
certificate
]
apache_conf
[
'key'
]
=
key
apache_conf
[
'certificate'
]
=
certificate
apache_conf
[
'ssl_snippet'
]
=
pkg_resources
.
resource_string
(
__name__
,
'template/snippet.ssl.in'
)
%
apache_conf
else
:
raise
ValueError
,
"Unsupported scheme %s"
%
scheme
access_control_string
=
self
.
options
[
'access-control-string'
]
access_control_string
=
self
.
options
[
'access-control-string'
]
apache_conf
=
dict
()
apache_conf
[
'pid_file'
]
=
self
.
options
[
'pid-file'
]
apache_conf
[
'pid_file'
]
=
self
.
options
[
'pid-file'
]
apache_conf
[
'lock_file'
]
=
self
.
options
[
'lock-file'
]
apache_conf
[
'lock_file'
]
=
self
.
options
[
'lock-file'
]
apache_conf
[
'ip'
]
=
ip
apache_conf
[
'ip'
]
=
ip
...
@@ -45,8 +60,6 @@ class Recipe(GenericBaseRecipe):
...
@@ -45,8 +60,6 @@ class Recipe(GenericBaseRecipe):
apache_conf
[
'error_log'
]
=
self
.
options
[
'error-log'
]
apache_conf
[
'error_log'
]
=
self
.
options
[
'error-log'
]
apache_conf
[
'access_log'
]
=
self
.
options
[
'access-log'
]
apache_conf
[
'access_log'
]
=
self
.
options
[
'access-log'
]
apache_conf
[
'server_name'
]
=
'%s'
%
apache_conf
[
'ip'
]
apache_conf
[
'server_name'
]
=
'%s'
%
apache_conf
[
'ip'
]
apache_conf
[
'certificate'
]
=
certificate
apache_conf
[
'key'
]
=
key
apache_conf
[
'path'
]
=
'/'
apache_conf
[
'path'
]
=
'/'
apache_conf
[
'access_control_string'
]
=
access_control_string
apache_conf
[
'access_control_string'
]
=
access_control_string
apache_conf
[
'rewrite_rule'
]
=
"RewriteRule (.*) %s$1 [L,P]"
%
backend
apache_conf
[
'rewrite_rule'
]
=
"RewriteRule (.*) %s$1 [L,P]"
%
backend
...
@@ -58,7 +71,7 @@ class Recipe(GenericBaseRecipe):
...
@@ -58,7 +71,7 @@ class Recipe(GenericBaseRecipe):
wrapper
=
self
.
createPythonScript
(
self
.
options
[
'wrapper'
],
__name__
+
wrapper
=
self
.
createPythonScript
(
self
.
options
[
'wrapper'
],
__name__
+
'.apache.runApache'
,
[
'.apache.runApache'
,
[
dict
(
dict
(
required_path_list
=
[
key
,
certificate
]
,
required_path_list
=
required_path_list
,
binary
=
self
.
options
[
'apache-binary'
],
binary
=
self
.
options
[
'apache-binary'
],
config
=
apache_config_file
config
=
apache_config_file
)
)
...
...
slapos/recipe/apache_zope_backend/template/apache.zope.conf.in
View file @
ff0425ed
...
@@ -32,16 +32,7 @@ TraceEnable Off
...
@@ -32,16 +32,7 @@ TraceEnable Off
# As backend is trusting REMOTE_USER header unset it always
# As backend is trusting REMOTE_USER header unset it always
RequestHeader unset REMOTE_USER
RequestHeader unset REMOTE_USER
# SSL Configuration
%(ssl_snippet)s
SSLEngine on
SSLCertificateFile %(certificate)s
SSLCertificateKeyFile %(key)s
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
SSLProxyEngine On
# Log configuration
# Log configuration
ErrorLog "%(error_log)s"
ErrorLog "%(error_log)s"
...
...
slapos/recipe/apache_zope_backend/template/snippet.ssl.in
0 → 100644
View file @
ff0425ed
# SSL Configuration
SSLEngine on
SSLCertificateFile %(certificate)s
SSLCertificateKeyFile %(key)s
SSLRandomSeed startup builtin
SSLRandomSeed connect builtin
SSLProtocol -ALL +SSLv3 +TLSv1
SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM
SSLProxyEngine On
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