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
Romain Courteaud
slapos
Commits
d305ad72
Commit
d305ad72
authored
Aug 24, 2012
by
Thomas Lechauve
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add mimes types to nginx configuration.
parent
506ef1f1
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
97 additions
and
3 deletions
+97
-3
software/html5as/instance_html5as.cfg
software/html5as/instance_html5as.cfg
+7
-0
software/html5as/software.cfg
software/html5as/software.cfg
+11
-2
software/html5as/templates/mime_types.in
software/html5as/templates/mime_types.in
+78
-0
software/html5as/templates/nginx_conf.in
software/html5as/templates/nginx_conf.in
+1
-1
No files found.
software/html5as/instance_html5as.cfg
View file @
d305ad72
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
parts =
parts =
nginx_conf
nginx_conf
html5as_bin
html5as_bin
mime_types
publish-connection-information
publish-connection-information
eggs-directory = ${buildout:eggs-directory}
eggs-directory = ${buildout:eggs-directory}
...
@@ -68,6 +69,7 @@ docroot = $${basedirectory:data}
...
@@ -68,6 +69,7 @@ docroot = $${basedirectory:data}
default_index = $${basedirectory:data}/index.html
default_index = $${basedirectory:data}/index.html
# Config files
# Config files
path_nginx_conf = $${rootdirectory:etc}/nginx.conf
path_nginx_conf = $${rootdirectory:etc}/nginx.conf
path_mime_types = $${rootdirectory:etc}/mime_types
# Executables
# Executables
bin_nginx = ${nginx:location}/sbin/nginx
bin_nginx = ${nginx:location}/sbin/nginx
bin_html5as = $${basedirectory:services}/html5as
bin_html5as = $${basedirectory:services}/html5as
...
@@ -85,6 +87,11 @@ context =
...
@@ -85,6 +87,11 @@ context =
section param_html5as html5as
section param_html5as html5as
section param_tempdir tempdirectory
section param_tempdir tempdirectory
[mime_types]
recipe = slapos.recipe.template:jinja2
template = ${template_mime_types:location}/${template_mime_types:filename}
rendered = $${html5as:path_mime_types}
[html5as_bin]
[html5as_bin]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
template = ${template_html5as_bin:location}/${template_html5as_bin:filename}
template = ${template_html5as_bin:location}/${template_html5as_bin:filename}
...
...
software/html5as/software.cfg
View file @
d305ad72
...
@@ -28,6 +28,7 @@ parts =
...
@@ -28,6 +28,7 @@ parts =
template
template
template_nginx_conf
template_nginx_conf
template_html5as_bin
template_html5as_bin
template_mime_types
instance_html5as
instance_html5as
[eggs]
[eggs]
...
@@ -45,13 +46,13 @@ mode = 0644
...
@@ -45,13 +46,13 @@ mode = 0644
recipe = slapos.recipe.template
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg
url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg
md5sum =
4e797931c1497f3d637c3695afa77977
md5sum =
dd362b85a84d30936084aac91a0c711c
mode = 0644
mode = 0644
[template_nginx_conf]
[template_nginx_conf]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/nginx_conf.in
url = ${:_profile_base_location_}/templates/nginx_conf.in
md5sum =
6cf7acfa6ca350687d0900bf5221f0e4
md5sum =
0ae1fb1c777c332d76f680c681a4f48a
filename = nginx_conf.in
filename = nginx_conf.in
mode = 0644
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -64,6 +65,14 @@ filename = html5as_bin.in
...
@@ -64,6 +65,14 @@ filename = html5as_bin.in
mode = 0644
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_mime_types]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/mime_types.in
md5sum = 4ef94a7b458d885cd79ba0b930a5727e
filename = mime_types.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[versions]
[versions]
zc.buildout = 1.6.0-dev-SlapOS-006
zc.buildout = 1.6.0-dev-SlapOS-006
Jinja2 = 2.6
Jinja2 = 2.6
...
...
software/html5as/templates/mime_types.in
0 → 100644
View file @
d305ad72
types {
text/html html htm shtml;
text/css css;
text/xml xml rss;
image/gif gif;
image/jpeg jpeg jpg;
application/x-javascript js;
application/atom+xml atom;
text/mathml mml;
text/plain txt;
text/vnd.sun.j2me.app-descriptor jad;
text/vnd.wap.wml wml;
text/x-component htc;
image/png png;
image/tiff tif tiff;
image/vnd.wap.wbmp wbmp;
image/x-icon ico;
image/x-jng jng;
image/x-ms-bmp bmp;
image/svg+xml svg svgz;
application/java-archive jar war ear;
application/mac-binhex40 hqx;
application/msword doc;
application/pdf pdf;
application/postscript ps eps ai;
application/rtf rtf;
application/vnd.ms-excel xls;
application/vnd.ms-powerpoint ppt;
application/vnd.wap.wmlc wmlc;
application/vnd.google-earth.kml+xml kml;
application/vnd.google-earth.kmz kmz;
application/x-7z-compressed 7z;
application/x-cocoa cco;
application/x-java-archive-diff jardiff;
application/x-java-jnlp-file jnlp;
application/x-makeself run;
application/x-perl pl pm;
application/x-pilot prc pdb;
application/x-rar-compressed rar;
application/x-redhat-package-manager rpm;
application/x-sea sea;
application/x-shockwave-flash swf;
application/x-stuffit sit;
application/x-tcl tcl tk;
application/x-x509-ca-cert der pem crt;
application/x-xpinstall xpi;
application/xhtml+xml xhtml;
application/zip zip;
application/octet-stream bin exe dll;
application/octet-stream deb;
application/octet-stream dmg;
application/octet-stream eot;
application/octet-stream iso img;
application/octet-stream msi msp msm;
application/ogg ogx;
audio/midi mid midi kar;
audio/mpeg mpga mpega mp2 mp3 m4a;
audio/ogg oga ogg spx;
audio/x-realaudio ra;
audio/webm weba;
video/3gpp 3gpp 3gp;
video/mp4 mp4;
video/mpeg mpeg mpg mpe;
video/ogg ogv;
video/quicktime mov;
video/webm webm;
video/x-flv flv;
video/x-mng mng;
video/x-ms-asf asx asf;
video/x-ms-wmv wmv;
video/x-msvideo avi;
}
software/html5as/templates/nginx_conf.in
View file @
d305ad72
...
@@ -11,7 +11,7 @@ events {
...
@@ -11,7 +11,7 @@ events {
}
}
http {
http {
#include mime.types
;
include {{ param_html5as['path_mime_types'] }}
;
default_type application/octet-stream;
default_type application/octet-stream;
access_log {{ param_html5as['path_access_log'] }} combined;
access_log {{ param_html5as['path_access_log'] }} combined;
index index.html;
index index.html;
...
...
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