Commit f9a585a2 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin

Merge branch 'nodejs' into kvm

parents 89e34968 b74a0ce8
master 1.0 apache-unified-frontend arnau asterisk cedric.ln-erp5-cluster cloudooo cloudooo-clusterise-split cygwin cygwin-0 cygwin-res-resstack davstorage-ajaxplorer dream drop_mt_index_in_BTreeFolder2 drupal erp5 erp5-cluster erp5-cluster-monitoring erp5-cluster-scalability erp5-cluster-z2.13 erp5-cluster-z2.13-scalability erp5-cluster-z2.13-scalability-N erp5-component erp5-component-libressl erp5-component-subversion-1.7 erp5-component-subversion-1.8 erp5-component-z2.12 erp5-frontend erp5-mysql-insecure-password erp5-postfix erp5-rkm erp5-scikit erp5-split-tidstorage erp5-vifib erp5-z2.12 erp5_kernel_jupyter erp5testnode-scalability erp5testnode-scalability-rebase-erp5testnode erp5testnode-seb erp5testnode_newfirefox etherpad-lite frontend-monitor-slave-configuration gcc-4.7 gitlab-test gitlab-test-8.6.1 glpi grid-computing hexaglobe-watermarking hexaglobe-watermarking-replicated improved-hello-world ipnb_st ipython ipython_notebook ivan jupyter_wendelin kvm-iaas lamp-edge-jinja mac manual-kvm mkr monitor-stack new-frontend officejs_testrunner openblas-make-ext-options openstack palo palo_etl_wip patch-1 postfix postgres rafael_agent re6st-master reafs/heads/ipython request-recipe scikit-notmerge shebang_limitation shellinabox_password_promise_delay slapos-master-cluster slappromise slapprunner-shellinabox-wip slaprunner systematic systematic-nginx testnode_software_link ttrm varnish webrunner.custom-personal wendelin_notebook wordpress-nginx zabbix-upload-monitor zerovm zerovm-test zimbra zimbra-kvm 1.0.33 1.0.32 1.0.31 1.0.30 1.0.29 1.0.28 1.0.27 1.0.26 1.0.25 1.0.24 1.0.23 1.0.22 1.0.21 1.0.20 1.0.19 1.0.18 1.0.17 1.0.16 1.0.15 1.0.14 1.0.13 1.0.12 1.0.11 1.0.10 1.0.9 1.0.8.1 1.0.8 1.0.7 1.0.6 1.0.5 1.0.4 1.0.3 1.0.2 1.0.1 vifib-20150331 vifib-20150203 vifib-20150130 vifib-20150123 vifib-20150116 vifib-20141222 vifib-20141119 slaprunner-resilient-v1 slaprunner-resilient-v1-RC1 slapos.core-1.0.0rc6-1 slapos.cookbook-0.103 slapos.cookbook-0.102 slapos.cookbook-0.101 slapos.cookbook-0.100 slapos.cookbook-0.99 slapos.cookbook-0.98 slapos.cookbook-0.97 slapos.cookbook-0.96 slapos.cookbook-0.95 slapos.cookbook-0.94 slapos.cookbook-0.93 slapos.cookbook-0.92 slapos.cookbook-0.91 slapos.cookbook-0.90 slapos.cookbook-0.89 slapos.cookbook-0.88 slapos.cookbook-0.87 slapos.cookbook-0.86 slapos.cookbook-0.85 slapos.cookbook-0.84.2 slapos.cookbook-0.84.1 slapos.cookbook-0.84 slapos.cookbook-0.83.1 slapos.cookbook-0.83 slapos.cookbook-0.82 slapos.cookbook-0.81 slapos.cookbook-0.80 slapos.cookbook-0.79 slapos.cookbook-0.78.5 slapos.cookbook-0.78.4 slapos.cookbook-0.78.3 slapos.cookbook-0.78.2 slapos.cookbook-0.78.1 slapos.cookbook-0.78.0 slapos.cookbook-0.77.1 slapos.cookbook-0.77.0 slapos.cookbook-0.76.0 slapos.cookbook-0.75.0 slapos.cookbook-0.74.0 slapos.cookbook-0.73.1 slapos.cookbook-0.72.0 slapos.cookbook-0.71.4 slapos.cookbook-0.71.3 slapos.cookbook-0.71.2 slapos.cookbook-0.71.1 slapos.cookbook-0.71 slapos.cookbook-0.70 slapos.cookbook-0.69 slapos.cookbook-0.68.1 slapos.cookbook-0.68 slapos.cookbook-0.67 slapos.cookbook-0.66 slapos.cookbook-0.64.2 slapos.cookbook-0.64.1 slapos.cookbook-0.64 slapos.cookbook-0.63 slapos.cookbook-0.62 slapos.cookbook-0.61 slapos.cookbook-0.60 slapos.cookbook-0.59 slapos.cookbook-0.58 slapos.cookbook-0.57 slapos.cookbook-0.55 slapos.cookbook-0.54.1 slapos.cookbook-0.54 slapos.cookbook-0.53 slapos.cookbook-0.51 slapos.cookbook-0.50 slapos.cookbook-0.49 slapos.cookbook-0.48 slapos.cookbook-0.47 slapos.cookbook-0.46 slapos.cookbook-0.45 slapos.cookbook-0.44 slapos.cookbook-0.43 slapos.cookbook-0.42 slapos.cookbook-0.41 slapos-legacy-flask-stack slapos-159 slapos-0.271 slapos-0.270 slapos-0.269 slapos-0.268 slapos-0.267 slapos-0.266 slapos-0.265 slapos-0.264 slapos-0.263 slapos-0.262 slapos-0.261 slapos-0.260 slapos-0.259.2 slapos-0.259.1 slapos-0.259 slapos-0.258 slapos-0.257 slapos-0.256 slapos-0.255 slapos-0.254 slapos-0.253.3 slapos-0.253.2 slapos-0.253.1 slapos-0.253 slapos-0.252.1 slapos-0.252 slapos-0.251 slapos-0.250.2 slapos-0.250.1 slapos-0.250 slapos-0.249.1 slapos-0.249 slapos-0.248.1 slapos-0.248 slapos-0.247.1 slapos-0.247 slapos-0.246 slapos-0.245 slapos-0.244 slapos-0.243 slapos-0.242 slapos-0.241 slapos-0.240.0 slapos-0.240 slapos-0.239 slapos-0.238 slapos-0.237 slapos-0.236 slapos-0.235 slapos-0.234 slapos-0.233 slapos-0.232 slapos-0.231 slapos-0.230 slapos-0.229 slapos-0.228 slapos-0.227 slapos-0.226 slapos-0.225 slapos-0.224 slapos-0.223.1 slapos-0.223 slapos-0.222 slapos-0.221 slapos-0.220 slapos-0.219 slapos-0.218.2 slapos-0.218.1 slapos-0.218 slapos-0.217 slapos-0.217-B1 slapos-0.216 slapos-0.215 slapos-0.214 slapos-0.213 slapos-0.212 slapos-0.211 slapos-0.210 slapos-0.209 slapos-0.208 slapos-0.207 slapos-0.206 slapos-0.205 slapos-0.204 slapos-0.203 slapos-0.202 slapos-0.201 slapos-0.200 slapos-0.199 slapos-0.199-hotfix-20140409 slapos-0.198 slapos-0.197 slapos-0.196 slapos-0.195 slapos-0.194-RC3 slapos-0.194-RC2 slapos-0.194-RC1 slapos-0.193 slapos-0.192 slapos-0.191 slapos-0.190 slapos-0.189 slapos-0.188 slapos-0.187 slapos-0.186 slapos-0.185 slapos-0.184 slapos-0.183 slapos-0.182 slapos-0.181 slapos-0.180 slapos-0.179 slapos-0.178 slapos-0.177.5 slapos-0.177.4 slapos-0.177.3 slapos-0.177.2 slapos-0.177.1 slapos-0.177 slapos-0.176.4 slapos-0.176.3 slapos-0.176.2 slapos-0.176.1 slapos-0.176 slapos-0.175 slapos-0.174 slapos-0.173 slapos-0.172 slapos-0.171 slapos-0.170 slapos-0.169 slapos-0.168.9 slapos-0.168.8 slapos-0.168.7 slapos-0.168.6 slapos-0.168.5 slapos-0.168.4 slapos-0.168.3 slapos-0.168.2 slapos-0.168.1 slapos-0.168 slapos-0.167 slapos-0.166 slapos-0.165 slapos-0.164 slapos-0.163 slapos-0.162 slapos-0.161 slapos-0.160 slapos-0.159 slapos-0.158 slapos-0.157 slapos-0.156 slapos-0.155 slapos-0.154 slapos-0.153 slapos-0.152 slapos-0.151 slapos-0.150 slapos-0.149 slapos-0.148 slapos-0.147 slapos-0.146 slapos-0.145 slapos-0.144 slapos-0.143 slapos-0.142 slapos-0.141 slapos-0.140 slapos-0.139 slapos-0.138 slapos-0.137 slapos-0.136 slapos-0.135.1 slapos-0.135 slapos-0.134 slapos-0.133 slapos-0.132 slapos-0.131 slapos-0.130 slapos-0.129 slapos-0.128 slapos-0.127 slapos-0.126 slapos-0.125 slapos-0.124 slapos-0.123 slapos-0.122 slapos-0.121 slapos-0.120 slapos-0.119 slapos-0.118 slapos-0.117.1 slapos-0.117 slapos-0.116 slapos-0.115 slapos-0.114 slapos-0.113 slapos-0.112 slapos-0.111 slapos-0.110 slapos-0.109 slapos-0.108 slapos-0.107 slapos-0.106 slapos-0.105 slapos-0.104 slapos-0.103 slapos-0.102 slapos-0.101 slapos-0.100 slapos-0.99 slapos-0.98.2 slapos-0.98.1 slapos-0.98 slapos-0.97 slapos-0.96 slapos-0.95 slapos-0.94 slapos-0.93 slapos-0.92 slapos-0.91 slapos-0.90 slapos-0.89 slapos-0.88 slapos-0.87 slapos-0.86 slapos-0.85 slapos-0.84 slapos-0.83 slapos-0.82 slapos-0.81 slapos-0.80 slapos-0.79 slapos-0.78 slapos-0.77 slapos-0.76 slapos-0.75.2 slapos-0.75.1 slapos-0.75 slapos-0.74 mr80_review_2 frontend_parameter_doc_review1 erp5-cluster-0.1.1 cygwin-resstack-3 cygwin-resstack-2 cygwin-resstack-1 cygwin-cachetest-4 cygwin-cachetest-3 cygwin-cachetest-2 cygwin-cachetest-1 apache_frontend_prod_test
No related merge requests found
Changes
=======
0.38 (Unreleased)
-----------------
* No change yet.
0.37 (2011-11-24)
-----------------
* KVM : allow access to several KVM instances without SSL certificate duplicate
problem. [Cedric de Saint Martin]
0.36 (2011-11-16)
-----------------
......
......@@ -15,8 +15,8 @@ parts =
recipe = hexagonit.recipe.cmmi
# url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
# Circumvent kernel.org downtime
url = http://ftp.free.fr/mirrors/ftp.kernel.org/software/scm/git/git-1.7.4.5.tar.bz2
md5sum = 2fa6c4c847ed87523cf55de54af457eb
url = http://git-core.googlecode.com/files/git-1.7.7.4.tar.gz
md5sum = 2f3277475b8da2eb92cef54c4c641a2c
configure-options =
--with-curl=${curl:location}
--with-openssl=${openssl:location}
......
[buildout]
extends =
../git/buildout.cfg
../pkgconfig/buildout.cfg
../openssl/buildout.cfg
../python-2.7/buildout.cfg
../zlib/buildout.cfg
parts =
nodejs
[nodejs]
# Server-side Javascript.
<= nodejs-0.4
[nodejs-0.4]
recipe = hexagonit.recipe.cmmi
url = http://nodejs.org/dist/node-v0.4.12.tar.gz
md5sum = a6375eaa43db5356bf443e25b828ae16
configure-options =
--openssl-includes=${openssl:location}/include
--openssl-libpath=${openssl:location}/lib
make-options = -j1
environment =
PATH=${pkgconfig:location}/bin:${python2.7:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${openssl:location}/lib/pkgconfig/
CPPFLAGS=-I${zlib:location}/include
LDFLAGS=-Wl,-rpath=${openssl:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
[npm]
# Node.js Package Manager
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
commit = 3136abc5c6b3ed332c4700ece24450fada63639b
branch = upstream
origin = https://github.com/isaacs/npm.git
git-bin = ${git:location}/bin/git
command = (${:git-bin} clone --quiet ${:origin} ${:location} && cd ${:location} && ${:git-bin} reset --hard ${:commit} && ${:location}/configure --prefix=${:location} &&${:git-bin} submodule update --init --recursive && ${nodejs:location}/bin/node cli.js install npm -g -f) || (rm -fr ${:location}; exit 1)
update-command =
# After installing, add the following path to your NODE_PATH enviornment
# variable to have npm libraries picked up:
# {HOMEBREW_PREFIX}/lib/node_modules
......@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import glob
import os
version = '0.36'
version = '0.38-dev'
name = 'slapos.cookbook'
long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n"
......
This diff is collapsed.
%(file_list)s {
daily
dateext
rotate 30
compress
notifempty
sharedscripts
create
postrotate
%(postrotate)s
endscript
olddir %(olddir)s
}
This diff is collapsed.
"/%(reference)s": {
"port": %(port)s,
"host": "%(host)s",
"https": %(https)s
}
\ No newline at end of file
[buildout]
parts =
instance
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
[instance]
recipe = ${instance-recipe:egg}:${instance-recipe:module}
node_binary = ${nodejs:location}/bin/node
npm_binary = ${npm:location}/bin/npm
openssl_binary = ${openssl:location}/bin/openssl
dcrond_binary = ${dcron:location}/sbin/crond
[buildout]
extends =
../../stack/nodejs.cfg
parts =
template
node
npm
dcron
logrotate
# Buildoutish
eggs
instance-recipe-egg
# XXX: Workaround of SlapOS limitation
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
# development / fast switching environment for whole software
unzip = true
[instance-recipe]
# Note: In case if specific instantiation recipe is used this is the place to
# put its name
egg = slapos.cookbook
module = kvm-frontend
[instance-recipe-egg]
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
[template]
# Default template for apache instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum = 7686228221c684fe772d63a5fe581c74
output = ${buildout:directory}/template.cfg
mode = 0644
[buildout]
extends =
../component/lxml-python/buildout.cfg
../component/nodejs/buildout.cfg
../stack/shacache-client.cfg
find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
# Use only quite well working sites.
allow-hosts =
*.nexedi.org
*.python.org
*.sourceforge.net
alastairs-place.net
dist.repoze.org
effbot.org
github.com
peak.telecommunity.com
psutil.googlecode.com
www.dabeaz.com
parts =
# template
eggs
# instance-recipe-egg
nodejs
npm
[eggs]
recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
slapos.cookbook
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment