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
7e9faa7b
Commit
7e9faa7b
authored
Apr 22, 2014
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
html5as: fix instanciation inside a runner
parent
873f9452
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
software/html5as/instance_html5as.cfg
software/html5as/instance_html5as.cfg
+1
-1
software/html5as/software.cfg
software/html5as/software.cfg
+3
-3
software/html5as/templates/downloader.in
software/html5as/templates/downloader.in
+1
-1
software/html5as/templates/nginx_conf.in
software/html5as/templates/nginx_conf.in
+1
-0
No files found.
software/html5as/instance_html5as.cfg
View file @
7e9faa7b
...
@@ -56,7 +56,7 @@ nb_workers = 2
...
@@ -56,7 +56,7 @@ nb_workers = 2
# Network
# Network
ip = $${slap-network-information:global-ipv6}
ip = $${slap-network-information:global-ipv6}
port = 808
0
port = 808
1
# Paths
# Paths
# Log
# Log
...
...
software/html5as/software.cfg
View file @
7e9faa7b
...
@@ -31,13 +31,13 @@ mode = 0644
...
@@ -31,13 +31,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 =
579eceb768e8d25fb53338fc4fac694
4
md5sum =
41cb6178f760238ca276854873ef936
4
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 =
0ae1fb1c777c332d76f680c681a4f48a
md5sum =
61dc4c82bf48563228ce4dea6c5c6319
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_}
...
@@ -53,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
@@ -53,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_downloader]
[template_downloader]
recipe = slapos.recipe.download
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/downloader.in
url = ${:_profile_base_location_}/templates/downloader.in
md5sum =
7b374a03f4086fcae47491d449da1f09
md5sum =
9779e2db6c73d282f802b3407b390ede
filename = downloader.in
filename = downloader.in
mode = 0644
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
software/html5as/templates/downloader.in
View file @
7e9faa7b
...
@@ -6,4 +6,4 @@
...
@@ -6,4 +6,4 @@
rm -r {{ param_html5as['docroot'] }}/*
rm -r {{ param_html5as['docroot'] }}/*
# Download and extract website tarball into docroot directory
# Download and extract website tarball into docroot directory
exec {{ param_html5as['path_curl'] }} -s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}
exec {{ param_html5as['path_curl'] }} -
k
s {{ download_url }} | {{ param_html5as['path_tar'] }} -z -x -C {{ param_html5as['docroot'] }}
software/html5as/templates/nginx_conf.in
View file @
7e9faa7b
...
@@ -13,6 +13,7 @@ events {
...
@@ -13,6 +13,7 @@ events {
http {
http {
include {{ param_html5as['path_mime_types'] }};
include {{ param_html5as['path_mime_types'] }};
default_type application/octet-stream;
default_type application/octet-stream;
types_hash_bucket_size 64;
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