Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos-caddy
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
Guillaume Hervier
slapos-caddy
Commits
977afb93
Commit
977afb93
authored
Oct 18, 2012
by
Viktor Horvath
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
activate mod_mime for Content-type setting
parent
980c7bf6
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
slapos/recipe/mioga/instantiate.py
slapos/recipe/mioga/instantiate.py
+2
-3
No files found.
slapos/recipe/mioga/instantiate.py
View file @
977afb93
...
@@ -136,10 +136,10 @@ LoadModule dir_module modules/mod_dir.so
...
@@ -136,10 +136,10 @@ LoadModule dir_module modules/mod_dir.so
LoadModule env_module modules/mod_env.so
LoadModule env_module modules/mod_env.so
LoadModule headers_module modules/mod_headers.so
LoadModule headers_module modules/mod_headers.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule mime_module modules/mod_mime.so
LoadModule perl_module modules/mod_perl.so
LoadModule perl_module modules/mod_perl.so
# Basic server configuration
# Basic server configuration
# TODO: how to listen to standard port 80 when we are not root?
PidFile REPL_PID
PidFile REPL_PID
Listen [REPL_IPV6HOST]:REPL_IPV6PORT
Listen [REPL_IPV6HOST]:REPL_IPV6PORT
Listen REPL_IPV4HOST:REPL_IPV6PORT
Listen REPL_IPV4HOST:REPL_IPV6PORT
...
@@ -171,8 +171,7 @@ DavLockDB REPL_DAVLOCK
...
@@ -171,8 +171,7 @@ DavLockDB REPL_DAVLOCK
for
filepath
in
os
.
listdir
(
mioga_prepared_apache_config_dir
):
for
filepath
in
os
.
listdir
(
mioga_prepared_apache_config_dir
):
apache_config_mioga
+=
(
"# Read in from "
+
filepath
+
"
\
n
"
+
apache_config_mioga
+=
(
"# Read in from "
+
filepath
+
"
\
n
"
+
open
(
os
.
path
.
join
(
mioga_prepared_apache_config_dir
,
filepath
)).
read
()
+
"
\
n
"
)
open
(
os
.
path
.
join
(
mioga_prepared_apache_config_dir
,
filepath
)).
read
()
+
"
\
n
"
)
# Internal DAV only accepts its own IPv6 address
# Internal DAV only accepts its own addresses
# TODO: check with what sender address we really arrive at the DAV locations.
apache_config_mioga
=
re
.
sub
(
apache_config_mioga
=
re
.
sub
(
'Allow from localhost'
,
'Allow from localhost'
,
"Allow from "
+
self
.
options
[
'private_ipv4'
]
+
"
\
n
\
t
Allow from "
+
self
.
options
[
'public_ipv6'
],
"Allow from "
+
self
.
options
[
'private_ipv4'
]
+
"
\
n
\
t
Allow from "
+
self
.
options
[
'public_ipv6'
],
...
...
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