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
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
51031106
Commit
51031106
authored
Apr 23, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into erp5-component
parents
0e8f3995
7e9faa7b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
83 additions
and
61 deletions
+83
-61
software/html5as/instance_html5as.cfg
software/html5as/instance_html5as.cfg
+1
-1
software/html5as/software.cfg
software/html5as/software.cfg
+80
-59
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 @
51031106
...
...
@@ -56,7 +56,7 @@ nb_workers = 2
# Network
ip = $${slap-network-information:global-ipv6}
port = 808
0
port = 808
1
# Paths
# Log
...
...
software/html5as/software.cfg
View file @
51031106
[buildout]
versions = versions
extensions = buildout-versions
extends =
../../stack/slapos.cfg
../../component/nginx/buildout.cfg
...
...
@@ -11,22 +6,12 @@ extends =
../../component/dash/buildout.cfg
../../component/tar/buildout.cfg
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
www.slapos.org
launchpad.net
github.com
alastairs-place.net
www.alittletooquiet.net
parts =
dash
tar
curl
nginx
eggs
slapos-cookbook
template
template_nginx_conf
template_downloader
...
...
@@ -34,9 +19,6 @@ parts =
template_mime_types
instance_html5as
[eggs]
recipe = z3c.recipe.scripts
eggs = slapos.cookbook
[template]
recipe = slapos.recipe.template
...
...
@@ -49,13 +31,13 @@ mode = 0644
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance_html5as.cfg
output = ${buildout:directory}/template_html5as.cfg
md5sum =
579eceb768e8d25fb53338fc4fac694
4
md5sum =
41cb6178f760238ca276854873ef936
4
mode = 0644
[template_nginx_conf]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/nginx_conf.in
md5sum =
0ae1fb1c777c332d76f680c681a4f48a
md5sum =
61dc4c82bf48563228ce4dea6c5c6319
filename = nginx_conf.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
@@ -71,7 +53,7 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template_downloader]
recipe = slapos.recipe.download
url = ${:_profile_base_location_}/templates/downloader.in
md5sum =
7b374a03f4086fcae47491d449da1f09
md5sum =
9779e2db6c73d282f802b3407b390ede
filename = downloader.in
mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
...
...
@@ -85,81 +67,120 @@ mode = 0644
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[versions]
zc.buildout = 1.6.0-dev-SlapOS-006
Jinja2 = 2.6
Pygments = 1.5
Werkzeug = 0.8.3
apache-libcloud = 0.12.3
async = 0.6.1
buildout-versions = 1.7
docutils = 0.9.1
hexagonit.recipe.cmmi = 1.6
ipython = 0.13
meld3 = 0.6.8
slapos.cookbook = 0.61
gitdb = 0.5.4
hexagonit.recipe.cmmi = 2.0
meld3 = 0.6.10
pycrypto = 2.6
rdiff-backup = 1.0.5
slapos.recipe.build = 0.11.6
slapos.recipe.cmmi = 0.1.1
slapos.recipe.template = 2.4.2
slapos.recipe.download = 1.0.dev-r4053
slapos.toolbox = 0.34.0
smmap = 0.8.2
z3c.recipe.scripts = 1.0.1
cliff = 1.4.4
cmd2 = 0.6.5.1
prettytable = 0.7.2
requests = 1.2.3
slapos.cookbook = 0.82
cffi = 0.8.2
cryptography = 0.3
plone.recipe.command = 1.1
pyOpenSSL = 0.14
six = 1.6.1
# Required by:
# cffi==0.8.2
pycparser = 2.10
# Required by:
# slapos.cookbook==0.82
lock-file = 2.0
# Required by:
# slapos.core==0.28.2
# slapos.core==0.35.1
# slapos.toolbox==0.34.0
Flask = 0.9
# Required by:
# slapos.
cookbook==0.61
PyXML = 0.8.4
# slapos.
toolbox==0.34.0
GitPython = 0.3.2.RC1
# Required by:
#
netaddr==0.7.7
Sphinx = 1.1.3
#
slapos.toolbox==0.34.0
atomize = 0.1.1
# Required by:
# slapos.cookbook==0.61
# slapos.toolbox==0.34.0
feedparser = 5.1.3
# Required by:
# slapos.cookbook==0.82
inotifyx = 0.2.0
# Required by:
# slapos.cookbook==0.
61
# slapos.core==0.
28.2
# slapos.cookbook==0.
82
# slapos.core==0.
35.1
# xml-marshaller==0.9.7
lxml =
2.3.5
lxml =
3.1.2
# Required by:
# slapos.cookbook==0.
61
netaddr = 0.7.
7
# slapos.cookbook==0.
82
netaddr = 0.7.
10
# Required by:
# slapos.core==0.
28.2
# slapos.core==0.
35.1
netifaces = 0.8
# Required by:
# slapos.cookbook==0.61
# slapos.core==0.28.2
# zc.buildout==1.6.0-dev-SlapOS-006
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# slapos.toolbox==0.34.0
paramiko = 1.10.1
# Required by:
# slapos.
cookbook==0.61
slapos.core = 0.28.2
# slapos.
toolbox==0.34.0
psutil = 0.7.0
# Required by:
# slapos.core==0.
28.2
supervisor = 3.0a12
# slapos.core==0.
35.1
pyflakes = 0.7
# Required by:
# slapos.cookbook==0.61
xml-marshaller = 0.9.7
# slapos.cookbook==0.82
pytz = 2013b
# Required by:
# slapos.cookbook==0.82
# slapos.core==0.35.1
# slapos.toolbox==0.34.0
# zc.buildout==1.6.0-dev-SlapOS-010
# zc.recipe.egg==1.3.2
setuptools = 0.6c12dev-r88846
# Required by:
# slapos.cookbook==0.61
zc.recipe.egg = 1.3.2
# slapos.cookbook==0.82
# slapos.toolbox==0.34.0
slapos.core = 0.35.1
# Required by:
# slapos.core==0.
28.2
zope.interface = 4.0.
1
# slapos.core==0.
35.1
supervisor = 3.0b
1
# Required by:
#
hexagonit.recipe.cmmi==1.6
hexagonit.recipe.download = 1.6nxd002
#
slapos.core==0.35.1
unittest2 = 0.5.1
# Required by:
# slapos.cookbook==0.82
# slapos.toolbox==0.34.0
xml-marshaller = 0.9.7
# Required by:
# slapos.core==0.35.1
zope.interface = 4.0.5
[networkcache]
# signature certificates of the following uploaders.
# Łukasz Nowak
...
...
software/html5as/templates/downloader.in
View file @
51031106
...
...
@@ -6,4 +6,4 @@
rm -r {{ param_html5as['docroot'] }}/*
# 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 @
51031106
...
...
@@ -13,6 +13,7 @@ events {
http {
include {{ param_html5as['path_mime_types'] }};
default_type application/octet-stream;
types_hash_bucket_size 64;
access_log {{ param_html5as['path_access_log'] }} combined;
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