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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos
Commits
153b8331
Commit
153b8331
authored
Mar 29, 2013
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into erp5-component
parents
8ffe9791
aa467f0f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
12 deletions
+18
-12
component/cloud9/buildout.cfg
component/cloud9/buildout.cfg
+1
-1
component/ruby/buildout.cfg
component/ruby/buildout.cfg
+7
-2
slapos/recipe/apache_frontend/template/apache.conf.in
slapos/recipe/apache_frontend/template/apache.conf.in
+2
-1
software/slaprunner/software.cfg
software/slaprunner/software.cfg
+8
-8
No files found.
component/cloud9/buildout.cfg
View file @
153b8331
...
...
@@ -51,7 +51,7 @@ md5sum = 5dc8cc28447ed3747b8a53c768d872aa
# NODE_PATH=${:destination}/node_modules ${nodejs:node_location} ${:cloud9_js_location}
recipe = plone.recipe.command
stop-on-error = true
commit =
9158bbf9e886e3b96e91239249aca66e420aa8d1
commit =
f7d102bc225c922f116d2cea52a746d64343ea59
repository = https://github.com/ajaxorg/cloud9.git
location = ${buildout:parts-directory}/${:_buildout_section_name_}
environment = export GIT_SSL_NO_VERIFY=true; export PATH=${git:location}/bin:${nodejs:location}/bin:${node-sm:location}/node_modules/sm/bin:$PATH; export CPPFLAGS="-I${libxml2:location}/include -I${nodejs:location}/include"; export LDFLAGS="-L${libxml2:location}/lib -Wl,-rpath=${libxml2:location}/lib"; export HOME=${:location};
...
...
component/ruby/buildout.cfg
View file @
153b8331
[buildout]
extends =
../gdbm/buildout.cfg
../openssl/buildout.cfg
../zlib/buildout.cfg
../readline/buildout.cfg
../ncurses/buildout.cfg
../libyaml/buildout.cfg
parts = ruby
...
...
@@ -12,8 +17,8 @@ md5sum = bc0c715c69da4d1d8bd57069c19f6c0e
configure-options =
--enable-shared --enable-rpath
environment =
C
FLAGS=-I${libyam
l:location}/include
LDFLAGS=-L${
libyaml:location}/lib -Wl,-rpath=${libyam
l:location}/lib
C
PPFLAGS=-I${zlib:location}/include -I${readline:location}/include -I${libyaml:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${gdbm:location}/include -I${openss
l:location}/include
LDFLAGS=-L${
zlib:location}/lib -L${libyaml:location}/lib -L${readline:location}/lib -L${ncurses:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${libyaml:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openss
l:location}/lib
[ruby-1.9]
<= ruby-1.9.3
...
...
slapos/recipe/apache_frontend/template/apache.conf.in
View file @
153b8331
...
...
@@ -22,7 +22,7 @@ ServerTokens Prod
# Log configuration
ErrorLog "%(error_log)s"
LogLevel
warn
LogLevel
info
LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b \"%%{Referer}i\" \"%%{User-Agent}i\"" combined
LogFormat "%%h %%{REMOTE_USER}i %%{Host}i %%l %%u %%t \"%%r\" %%>s %%b" common
CustomLog "%(access_log)s" common
...
...
@@ -130,6 +130,7 @@ Header append Vary User-Agent
<VirtualHost *:%(plain_http_port)s>
RewriteEngine On
SSLProxyEngine on
ProxyPreserveHost On
# Include configuration file not operated by slapos. This file won't be erased
...
...
software/slaprunner/software.cfg
View file @
153b8331
...
...
@@ -61,26 +61,26 @@ slapos.core = 0.34
slapos.libnetworkcache = 0.13.3
slapos.recipe.build = 0.11.5
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.3
3.1
slapos.toolbox = 0.3
4.0
smmap = 0.8.2
xml-marshaller = 0.9.7
z3c.recipe.scripts = 1.0.1
# Required by:
# slapos.core==0.34
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
Flask = 0.9
# Required by:
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
GitPython = 0.3.2.RC1
# Required by:
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
atomize = 0.1.1
# Required by:
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
feedparser = 5.1.3
# Required by:
...
...
@@ -92,11 +92,11 @@ hexagonit.recipe.download = 1.6nxd002
netifaces = 0.8
# Required by:
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
paramiko = 1.9.0
# Required by:
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
psutil = 0.6.1
# Required by:
...
...
@@ -108,7 +108,7 @@ pyflakes = 0.5.0
# slapos.cookbook==0.71.1
# slapos.core==0.34
# slapos.libnetworkcache==0.13.3
# slapos.toolbox==0.3
3.1
# slapos.toolbox==0.3
4.0
# supervisor==3.0b1
# zc.buildout==1.6.0-dev-SlapOS-010
# zope.interface==4.0.3
...
...
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