Commit 28860894 authored by Alain Takoudjou's avatar Alain Takoudjou

Merge branch 'master' into 1.0

parents 9b761c7b 9249d001
...@@ -7,7 +7,6 @@ parts = ...@@ -7,7 +7,6 @@ parts =
extends = extends =
../gettext/buildout.cfg ../gettext/buildout.cfg
../glib/buildout.cfg ../glib/buildout.cfg
../popt/buildout.cfg
[pkg-config] [pkg-config]
<= pkgconfig <= pkgconfig
...@@ -20,15 +19,14 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -20,15 +19,14 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
# build pkg-config twice so that second configure can use pkg-config # build pkg-config twice so that second configure can use pkg-config
# to compute GLIB_CFLAGS and GLIB_LIBS. # to compute GLIB_CFLAGS and GLIB_LIBS.
pre-configure = pre-configure =
./configure --prefix=${:location} --with-installed-glib --with-installed-popt && make ./configure --prefix=${:location} --with-installed-glib && make
configure-options = configure-options =
--with-installed-glib --with-installed-glib
--with-installed-popt
--disable-host-tool --disable-host-tool
environment = environment =
PATH=.:%(PATH)s PATH=.:%(PATH)s
PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig PKG_CONFIG_PATH=${glib:location}/lib/pkgconfig:${pcre:location}/lib/pkgconfig
CPPFLAGS=-I${glib:location}/include -I${popt:location}/include CPPFLAGS=-I${glib:location}/include
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib -L${popt:location}/lib -Wl,-rpath=${popt:location}/lib LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include GLIB_CFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl GLIB_LIBS=-L${glib:location}/lib -lglib-2.0 -lintl
...@@ -37,7 +37,9 @@ class KnownHostsFile(dict): ...@@ -37,7 +37,9 @@ class KnownHostsFile(dict):
if os.path.exists(self._filename): if os.path.exists(self._filename):
with open(self._filename, 'r') as keyfile: with open(self._filename, 'r') as keyfile:
for line in keyfile: for line in keyfile:
host, key = [column.strip() for column in line.split(' ', 1) if line != ""] if line.strip() == "":
continue
host, key = [column.strip() for column in line.split(' ', 1)]
self[host] = key self[host] = key
def _dump(self): def _dump(self):
......
...@@ -36,7 +36,7 @@ recipe = zc.recipe.egg ...@@ -36,7 +36,7 @@ recipe = zc.recipe.egg
eggs = eggs =
zc.buildout zc.buildout
slapos.core slapos.core
slapos.toolbox[agent] slapos.toolbox
erp5.util erp5.util
......
...@@ -62,3 +62,6 @@ md5sum = 621c84f7adcba394686acbaf44cc1d7d ...@@ -62,3 +62,6 @@ md5sum = 621c84f7adcba394686acbaf44cc1d7d
PyXML = 0.8.5 PyXML = 0.8.5
erp5.util = 0.4.45 erp5.util = 0.4.45
slapos.recipe.template = 2.7 slapos.recipe.template = 2.7
setuptools = 19.6.2
zc.buildout = 2.5.2+slapos002
zc.recipe.egg = 2.0.3+slapos001
...@@ -45,4 +45,7 @@ paramiko = 2.0.1 ...@@ -45,4 +45,7 @@ paramiko = 2.0.1
# Required by: # Required by:
# slapos.toolbox = 0.59 # slapos.toolbox = 0.59
passlib = 1.6.5 passlib = 1.6.5
\ No newline at end of file
# slapos.toolbox==0.59
dnspython = 1.14.0
\ No newline at end of file
...@@ -66,7 +66,7 @@ mode = 0644 ...@@ -66,7 +66,7 @@ mode = 0644
recipe = slapos.recipe.template recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-pull-backup.cfg.in url = ${:_profile_base_location_}/instance-pull-backup.cfg.in
output = ${buildout:directory}/instance-pull-backup.cfg output = ${buildout:directory}/instance-pull-backup.cfg
md5sum = 683d178a7ebb60b949d638120dce19ca md5sum = 3892f86fcf850511dc0e6e4983b1961a
mode = 0644 mode = 0644
[template-replicated] [template-replicated]
......
...@@ -32,7 +32,6 @@ offline = true ...@@ -32,7 +32,6 @@ offline = true
[rootdirectory] [rootdirectory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
etc = $${buildout:directory}/etc etc = $${buildout:directory}/etc
home = $${buildout:directory}/home
srv = $${buildout:directory}/srv srv = $${buildout:directory}/srv
bin = $${buildout:directory}/bin bin = $${buildout:directory}/bin
tmp = $${buildout:directory}/tmp tmp = $${buildout:directory}/tmp
...@@ -45,7 +44,7 @@ services = $${rootdirectory:etc}/service ...@@ -45,7 +44,7 @@ services = $${rootdirectory:etc}/service
run = $${rootdirectory:var}/run run = $${rootdirectory:var}/run
backup = $${rootdirectory:srv}/backup backup = $${rootdirectory:srv}/backup
promises = $${rootdirectory:etc}/promise promises = $${rootdirectory:etc}/promise
ssh-home = $${rootdirectory:home}/ssh ssh-home = $${rootdirectory:etc}/ssh
notifier = $${rootdirectory:etc}/notifier notifier = $${rootdirectory:etc}/notifier
[directory] [directory]
...@@ -209,8 +208,8 @@ rotate-num = 30 ...@@ -209,8 +208,8 @@ rotate-num = 30
[sshkeys-directory] [sshkeys-directory]
recipe = slapos.cookbook:mkdirectory recipe = slapos.cookbook:mkdirectory
requests = $${directory:sshkeys}/requests requests = $${directory:sshkeys}/openssl-requests
keys = $${directory:sshkeys}/keys keys = $${directory:sshkeys}/openssl-keys
[pbs-sshkeys-authority] [pbs-sshkeys-authority]
recipe = slapos.cookbook:sshkeys_authority recipe = slapos.cookbook:sshkeys_authority
......
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