Commit 6505b1b1 authored by Jérome Perrin's avatar Jérome Perrin

all: make sure we have newline at end of file

done with eclint fix
parent 90fb4af2
Pipeline #9496 failed with stage
in 0 seconds
...@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }} ...@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }}
RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P] RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P]
{% endfor -%} {% endfor -%}
</VirtualHost> </VirtualHost>
{% endfor -%} {% endfor -%}
\ No newline at end of file
...@@ -14,5 +14,4 @@ ...@@ -14,5 +14,4 @@
# not need these here). # not need these here).
[template-apache-backend-conf] [template-apache-backend-conf]
filename = apache-backend.conf.in filename = apache-backend.conf.in
md5sum = bb8c175a93336f0e1838fd47225426f9 md5sum = 909d36278b8be42566a25c4ded4b631e
...@@ -10,4 +10,4 @@ url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz ...@@ -10,4 +10,4 @@ url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz
md5sum = 0f234cc21ac6cebfe373da6afa70bb1d md5sum = 0f234cc21ac6cebfe373da6afa70bb1d
configure-command = : configure-command = :
make-options = make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_} PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
\ No newline at end of file
...@@ -71,4 +71,3 @@ install = ...@@ -71,4 +71,3 @@ install =
extract_dir = self.extract(self.download(*options[guessPlatform()].split())) extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
os.mkdir(location) os.mkdir(location)
shutil.copy(os.path.join(extract_dir, 'chromedriver'), location) shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
...@@ -28,5 +28,3 @@ entry-points = ...@@ -28,5 +28,3 @@ entry-points =
scripts = scripts =
paster=cloudooo_paster paster=cloudooo_paster
runCloudoooUnitTest runCloudoooUnitTest
...@@ -29,4 +29,4 @@ stop-on-error = true ...@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab} command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab}
crond = ${dcron:location}/sbin/crond crond = ${dcron:location}/sbin/crond
crontab = ${dcron:location}/bin/crontab crontab = ${dcron:location}/bin/crontab
\ No newline at end of file
...@@ -16,4 +16,4 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_} ...@@ -16,4 +16,4 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
dtach-bin = dtach dtach-bin = dtach
command = command =
mkdir -p ${:location}/bin mkdir -p ${:location}/bin
cp -rp ${dtach-build:compile-directory}/dtach-${dtach-build:version}/${:dtach-bin} ${:location}/bin cp -rp ${dtach-build:compile-directory}/dtach-${dtach-build:version}/${:dtach-bin} ${:location}/bin
\ No newline at end of file
...@@ -23,4 +23,4 @@ post-install = cp f2c ${:location} ...@@ -23,4 +23,4 @@ post-install = cp f2c ${:location}
location = ${buildout:parts-directory}/${:_buildout_section_name_} location = ${buildout:parts-directory}/${:_buildout_section_name_}
environment = environment =
CPPFLAGS=-I${libf2c:location}/include CPPFLAGS=-I${libf2c:location}/include
LDFLAGS=-L${libf2c:location}/lib LDFLAGS=-L${libf2c:location}/lib
\ No newline at end of file
...@@ -119,4 +119,4 @@ environment = ...@@ -119,4 +119,4 @@ environment =
PKG_CONFIG_PATH=${:pkg_config_depends} PKG_CONFIG_PATH=${:pkg_config_depends}
CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include CPPFLAGS=-I${bzip2:location}/include -I${libogg:location}/include -I${libtheora:location}/include -I${opencore-amr:location}/include -I${lame:location}/include
LDFLAGS=-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${buildout:parts-directory}/${:_buildout_section_name_}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${libxcb:location}/lib -L${libogg:location}/lib -L${libvorbis:location}/lib -Wl,-rpath=${libvorbis:location}/lib -L${libtheora:location}/lib -Wl,-rpath=${libtheora:location}/lib -L${libvpx:location}/lib -Wl,-rpath=${libvpx:location}/lib -L${libx264:location}/lib -Wl,-rpath=${libx264:location}/lib -L${lame:location}/lib -Wl,-rpath=${lame:location}/lib -L${opencore-amr:location}/lib -Wl,-rpath=${opencore-amr:location}/lib -Wl,-rpath=${zlib:location}/lib
PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s
\ No newline at end of file
[template-fonts-conf] [template-fonts-conf]
filename = fonts.conf.in filename = fonts.conf.in
md5sum = 6967e553630d107fc0a59b14de8b0251 md5sum = 6967e553630d107fc0a59b14de8b0251
...@@ -32,4 +32,3 @@ eggs = ...@@ -32,4 +32,3 @@ eggs =
futures futures
PIL PIL
gateone gateone
...@@ -15,4 +15,4 @@ configure-options = ...@@ -15,4 +15,4 @@ configure-options =
# restrict building to libraries only, we don't care about binaries # restrict building to libraries only, we don't care about binaries
# and specially docs which would require more dependencies (e.g. xmlto): # and specially docs which would require more dependencies (e.g. xmlto):
make-options = make-options =
SUBDIRS=lib SUBDIRS=lib
\ No newline at end of file
...@@ -55,4 +55,3 @@ environment = ...@@ -55,4 +55,3 @@ environment =
# not taken from pkg-config result... # not taken from pkg-config result...
CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include CPPFLAGS=-I${cairo:location}/include -I${inputproto:location}/include -I${libX11:location}/include -I${libXi:location}/include -I${xproto:location}/include -I${kbproto:location}/include -I${libXrender:location}/include -I${renderext:location}/include -I${libXext:location}/include -I${libX11:location}/include -I${libXinerama:location}/include -I${gdk-pixbuf:location}/include -I${libXrandr:location}/include -I${xfixes:location}/include -I${libXcomposite:location}/include -I${xdamage:location}/include -I${fixesproto:location}/include
LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib LDFLAGS=-L${libX11:location}/lib -L${libXi:location}/lib -L${libXext:location}/lib -L${libXrender:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib -L${libX11:location}/lib -Wl,-rpath=${libX11:location}/lib -L${libXinerama:location}/lib -Wl,-rpath=${libXinerama:location}/lib -L${gdk-pixbuf:location}/lib -Wl,-rpath=${gdk-pixbuf:location}/lib -L${libXrandr:location}/lib -Wl,-rpath=${libXrandr:location}/lib -L${xfixes:location}/lib -Wl,-rpath=${xfixes:location}/lib -L${libXcomposite:location}/lib -Wl,-rpath=${libXcomposite:location}/lib -L${xdamage:location}/lib -Wl,-rpath=${xdamage:location}/lib
...@@ -102,5 +102,3 @@ input = inline: ...@@ -102,5 +102,3 @@ input = inline:
#!/bin/sh #!/bin/sh
export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@" exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
...@@ -13,4 +13,4 @@ md5sum = 1f9f9155682fe8946a97c08896109508 ...@@ -13,4 +13,4 @@ md5sum = 1f9f9155682fe8946a97c08896109508
environment = environment =
PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:%(PATH)s PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:%(PATH)s
configure-options = configure-options =
--prefix="${buildout:parts-directory}/${:_buildout_section_name_}" --prefix="${buildout:parts-directory}/${:_buildout_section_name_}"
\ No newline at end of file
...@@ -20,4 +20,4 @@ configure-options = ...@@ -20,4 +20,4 @@ configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_} --prefix=${buildout:parts-directory}/${:_buildout_section_name_}
make-options = -j1 make-options = -j1
environment = environment =
PATH=${bison:location}/bin:%(PATH)s PATH=${bison:location}/bin:%(PATH)s
\ No newline at end of file
...@@ -25,4 +25,4 @@ post-install = ...@@ -25,4 +25,4 @@ post-install =
[ -d lib64 ] && ln -s lib64 lib [ -d lib64 ] && ln -s lib64 lib
[libcap] [libcap]
<= libcap2 <= libcap2
\ No newline at end of file
...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz
md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690 md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690
...@@ -26,5 +26,3 @@ configure-options = ...@@ -26,5 +26,3 @@ configure-options =
--without-libinnodb-prefix --without-libinnodb-prefix
--without-libsasl-prefix --without-libsasl-prefix
--without-libsasl2-prefix --without-libsasl2-prefix
...@@ -6,4 +6,3 @@ parts = ...@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz
md5sum = 68e9b8fa4d4e331029b247b72d46d7a5 md5sum = 68e9b8fa4d4e331029b247b72d46d7a5
...@@ -20,4 +20,3 @@ make-options = ...@@ -20,4 +20,3 @@ make-options =
environment = environment =
PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
[matplotlibrc] [matplotlibrc]
filename = matplotlibrc.in filename = matplotlibrc.in
md5sum = 849f48f08bea21dd10d3825867cb1561 md5sum = 47a737b8f4db0b329e2b3fd70e5a325c
backend : {{ backend }} backend : {{ backend }}
\ No newline at end of file
...@@ -136,4 +136,3 @@ component = vbucketmigrator ...@@ -136,4 +136,3 @@ component = vbucketmigrator
component-configure-options = component-configure-options =
--without-sasl --without-sasl
--with-isasl --with-isasl
...@@ -5,4 +5,4 @@ parts = netcat ...@@ -5,4 +5,4 @@ parts = netcat
[netcat] [netcat]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/netcat/files/netcat/0.7.1/netcat-0.7.1.tar.gz url = http://sourceforge.net/projects/netcat/files/netcat/0.7.1/netcat-0.7.1.tar.gz
md5sum = 088def25efe04dcdd1f8369d8926ab34 md5sum = 088def25efe04dcdd1f8369d8926ab34
\ No newline at end of file
...@@ -38,4 +38,4 @@ stop-on-error = true ...@@ -38,4 +38,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = ${coreutils-output:test} -x ${:ssh} -a -x ${:keygen} command = ${coreutils-output:test} -x ${:ssh} -a -x ${:keygen}
ssh = ${openssh:location}/bin/ssh ssh = ${openssh:location}/bin/ssh
keygen = ${openssh:location}/bin/ssh-keygen keygen = ${openssh:location}/bin/ssh-keygen
\ No newline at end of file
...@@ -127,4 +127,3 @@ template = inline: ...@@ -127,4 +127,3 @@ template = inline:
mode = 0755 mode = 0755
rendered = ${buildout:bin-directory}/${:_buildout_section_name_} rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
perl-bin = ${:rendered} perl-bin = ${:rendered}
...@@ -11,4 +11,4 @@ configure-options = ...@@ -11,4 +11,4 @@ configure-options =
--disable-static --disable-static
[x86-cygwin-popt] [x86-cygwin-popt]
patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
\ No newline at end of file
...@@ -18,4 +18,4 @@ shared = true ...@@ -18,4 +18,4 @@ shared = true
url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
md5sum = 6d59dad503bea5ad420fd09ddad84481 md5sum = 6d59dad503bea5ad420fd09ddad84481
environment = environment =
LDFLAGS=-Wl,-rpath=${zlib:location}/lib LDFLAGS=-Wl,-rpath=${zlib:location}/lib
\ No newline at end of file
...@@ -14,4 +14,3 @@ recipe = zc.recipe.egg ...@@ -14,4 +14,3 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
slapos.cookbook slapos.cookbook
...@@ -27,4 +27,4 @@ configure-command = ...@@ -27,4 +27,4 @@ configure-command =
environment = environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
CFLAGS = -I${zlib:location}/include CFLAGS = -I${zlib:location}/include
LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
\ No newline at end of file
...@@ -42,5 +42,3 @@ environment = ...@@ -42,5 +42,3 @@ environment =
CPPFLAGS=${:CMAKE_CFLAGS} CPPFLAGS=${:CMAKE_CFLAGS}
LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib LDFLAGS=-L${bzip2:location}/lib -L${mbedtls:location}/lib -L${lksctp-tools:location}/lib -L${libconfig:location}/lib -L${boost-lib:location}/lib -L${fftw3:location}/lib
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
...@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download ...@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download
destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata
url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata
md5sum = 7611737524efd1ce2dde67eff629bbcf md5sum = 7611737524efd1ce2dde67eff629bbcf
...@@ -31,4 +31,4 @@ recipe = plone.recipe.command ...@@ -31,4 +31,4 @@ recipe = plone.recipe.command
stop-on-error = true stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = ${coreutils-output:test} -x ${:catalina} command = ${coreutils-output:test} -x ${:catalina}
catalina = ${tomcat7:location}/bin/catalina.sh catalina = ${tomcat7:location}/bin/catalina.sh
\ No newline at end of file
...@@ -71,4 +71,4 @@ environment = ...@@ -71,4 +71,4 @@ environment =
MYSQL_CONFIG=${mariadb:location}/bin/mysql_config MYSQL_CONFIG=${mariadb:location}/bin/mysql_config
ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${libtool:location}/share/aclocal
\ No newline at end of file
...@@ -44,4 +44,3 @@ script = ...@@ -44,4 +44,3 @@ script =
Run=0""") Run=0""")
opera_config.close() opera_config.close()
os.chmod(wrapper_location, 0766) os.chmod(wrapper_location, 0766)
...@@ -223,4 +223,4 @@ environment = ...@@ -223,4 +223,4 @@ environment =
CPPFLAGS=-I${f2c:location}/include -I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include CPPFLAGS=-I${f2c:location}/include -I${zlib:location}/include -I${xz-utils:location}/include -I${readline:location}/include -I${libexpat:location}/include -I${libffi:location}/include -I${ncurses:location}/include -I${ncurses:location}/include/ncursesw -I${bzip2:location}/include -I${gdbm:location}/include -I${openssl:location}/include -I${sqlite3:location}/include -I${gettext:location}/include
LD_LIBRARY_PATH=${libpng:location}/lib:${gcc-8.2:location}/lib:${gcc-8.2:location}/lib64:${openssl:location}/lib:${readline:location}/lib:${libexpat:location}/lib:${xz-utils:location}/lib:${sqlite3:location}/lib:${gdbm:location}/lib:${bzip2:location}/lib:${ncurses:location}/lib:${libffi:location}/lib LD_LIBRARY_PATH=${libpng:location}/lib:${gcc-8.2:location}/lib:${gcc-8.2:location}/lib64:${openssl:location}/lib:${readline:location}/lib:${libexpat:location}/lib:${xz-utils:location}/lib:${sqlite3:location}/lib:${gdbm:location}/lib:${bzip2:location}/lib:${ncurses:location}/lib:${libffi:location}/lib
LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib LDFLAGS=-L${zlib:location}/lib -L${xz-utils:location}/lib -L${readline:location}/lib -L${libexpat:location}/lib -L${libffi:location}/lib -L${ncurses:location}/lib -L${bzip2:location}/lib -L${gdbm:location}/lib -L${openssl:location}/lib -L${sqlite3:location}/lib -Wl,-rpath=${zlib:location}/lib -Wl,-rpath=${xz-utils:location}/lib -Wl,-rpath=${readline:location}/lib -Wl,-rpath=${libexpat:location}/lib -Wl,-rpath=${libffi:location}/lib -Wl,-rpath=${ncurses:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${gdbm:location}/lib -Wl,-rpath=${openssl:location}/lib -Wl,-rpath=${sqlite3:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -Wl,-rpath=${file:location}/lib
PYTHON_EXECUTABLE=${python3.7:location}/bin/python3.7 PYTHON_EXECUTABLE=${python3.7:location}/bin/python3.7
\ No newline at end of file
...@@ -11,4 +11,4 @@ url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz ...@@ -11,4 +11,4 @@ url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
md5sum = faf33a3945edbe4c848627750856cbeb md5sum = faf33a3945edbe4c848627750856cbeb
environment = environment =
CPPFLAGS = -I${zlib:location}/include -I${libuuid:location}/include CPPFLAGS = -I${zlib:location}/include -I${libuuid:location}/include
LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib
\ No newline at end of file
...@@ -50,4 +50,3 @@ pycurl = 7.43.0 ...@@ -50,4 +50,3 @@ pycurl = 7.43.0
slapos.recipe.download = 1.0 slapos.recipe.download = 1.0
slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
smmap = 0.9.0 smmap = 0.9.0
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[instance] [instance]
filename = instance.cfg filename = instance.cfg
md5sum = 4c7936accb3658871b635158198b7905 md5sum = 1fbb72e4305ded9614ee80c0ee17b672
[instance-apache] [instance-apache]
filename = instance-apachephp.cfg filename = instance-apachephp.cfg
...@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1 ...@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1
[template-httpd-conf-hash] [template-httpd-conf-hash]
filename = templates/apache.conf.in filename = templates/apache.conf.in
md5sum = 6788381fadd8ca96f892d33df3163da0 md5sum = 4fc3f853abf702aeb6653942d4fb85d8
...@@ -9,4 +9,4 @@ offline = true ...@@ -9,4 +9,4 @@ offline = true
[switch_softwaretype] [switch_softwaretype]
recipe = slapos.cookbook:softwaretype recipe = slapos.cookbook:softwaretype
default = ${instance-apache:output} default = ${instance-apache:output}
mariadb = ${instance-mariadb:output} mariadb = ${instance-mariadb:output}
\ No newline at end of file
...@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so ...@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so LoadModule headers_module modules/mod_headers.so
LoadModule dir_module modules/mod_dir.so LoadModule dir_module modules/mod_dir.so
LoadModule php5_module modules/libphp5.so LoadModule php5_module modules/libphp5.so
LoadModule alias_module modules/mod_alias.so LoadModule alias_module modules/mod_alias.so
\ No newline at end of file
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# not need these here). # not need these here).
[template] [template]
filename = instance.cfg filename = instance.cfg
md5sum = f686f765e55d1dce2e55a400f0714b3e md5sum = 4adae801babadd9aed6112c1ff209076
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg filename = instance-apache-frontend.cfg
...@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0 ...@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0
[template-replicate-publish-slave-information] [template-replicate-publish-slave-information]
filename = templates/replicate-publish-slave-information.cfg.in filename = templates/replicate-publish-slave-information.cfg.in
md5sum = 665e83d660c9b779249b2179d7ce4b4e md5sum = 7c0025a35dc62eb3cbfd07a6b04d659e
[template-apache-frontend-configuration] [template-apache-frontend-configuration]
filename = templates/apache.conf.in filename = templates/apache.conf.in
...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b ...@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-virtualhost] [template-default-virtualhost]
filename = templates/000.conf.in filename = templates/000.conf.in
md5sum = d98a01182f38868612948c87d5231428 md5sum = 5fcc11ea7f3eae38b0135b94dfc42dd5
[template-default-slave-virtualhost] [template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in filename = templates/default-virtualhost.conf.in
...@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52 ...@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52
[template-cached-slave-virtualhost] [template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in filename = templates/cached-virtualhost.conf.in
md5sum = 1a1a53d9ac4a1591c017d86850a94796 md5sum = f97dfcfae80527e242f285c9ebf11b27
[template-log-access] [template-log-access]
filename = templates/template-log-access.conf.in filename = templates/template-log-access.conf.in
...@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d ...@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d
[template-empty] [template-empty]
filename = templates/empty.in filename = templates/empty.in
md5sum = c2314c3a9c3412a38d14b312d3df83c1 md5sum = 7155b18edfe128825b8d1f48071454a6
[template-wrapper] [template-wrapper]
filename = templates/wrapper.in filename = templates/wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config] [template-trafficserver-records-config]
filename = templates/trafficserver/records.config.jinja2 filename = templates/trafficserver/records.config.jinja2
...@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2 ...@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2
[template-apache-lazy-script-call] [template-apache-lazy-script-call]
filename = templates/apache-lazy-script-call.sh.in filename = templates/apache-lazy-script-call.sh.in
md5sum = ebe5d3d19923eb812a40019cb11276d8 md5sum = 44e235d0451932f1232f9d9e0ecc59f9
[template-apache-graceful-script] [template-apache-graceful-script]
filename = templates/apache-graceful-script.sh.in filename = templates/apache-graceful-script.sh.in
......
...@@ -47,4 +47,3 @@ extra-context = ...@@ -47,4 +47,3 @@ extra-context =
# Must match the key id in [switch-softwaretype] which uses this section. # Must match the key id in [switch-softwaretype] which uses this section.
raw software_type RootSoftwareInstance-default-custom-personal-replicate raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw template_monitor ${monitor2-template:rendered} raw template_monitor ${monitor2-template:rendered}
...@@ -14,4 +14,3 @@ smmap = 0.9.0 ...@@ -14,4 +14,3 @@ smmap = 0.9.0
numpy = 1.16.4 numpy = 1.16.4
websockify = 0.8.0 websockify = 0.8.0
...@@ -19,4 +19,4 @@ ...@@ -19,4 +19,4 @@
ServerName www.example.org ServerName www.example.org
ErrorDocument 404 /notfound.html ErrorDocument 404 /notfound.html
</VirtualHost> </VirtualHost>
\ No newline at end of file
...@@ -19,4 +19,3 @@ else ...@@ -19,4 +19,3 @@ else
{{ lazy_command }} {{ lazy_command }}
fi fi
fi fi
...@@ -48,4 +48,3 @@ ...@@ -48,4 +48,3 @@
RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P] RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
</VirtualHost> </VirtualHost>
{{ content }} {{ content }}
\ No newline at end of file
...@@ -48,4 +48,4 @@ parts = ...@@ -48,4 +48,4 @@ parts =
eggs-directory = {{ eggs_directory }} eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }} develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
\ No newline at end of file
#!${dash-output:dash} #!${dash-output:dash}
{{ content }} {{ content }}
\ No newline at end of file
...@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b ...@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
[template-nginx-configuration] [template-nginx-configuration]
filename = template-nginx.cfg.in filename = template-nginx.cfg.in
md5sum = a7012aac9b47ddd4e3aa3197aee1ffac md5sum = fc4f258e3ae56e0c9596484d736ccfed
[template-dcron-service] [template-dcron-service]
filename = template-dcron-service.sh.in filename = template-dcron-service.sh.in
...@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e ...@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e
[template-crontab] [template-crontab]
filename = template-crontab.in filename = template-crontab.in
md5sum = 072be0fd04896880c931d44d8eabde37 md5sum = f1f82101258de19068262b7213fc478b
[status2rss] [status2rss]
filename = status2rss.py filename = status2rss.py
......
# min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command # min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command
MAILTO=admins@erp5.org MAILTO=admins@erp5.org
...@@ -81,4 +81,3 @@ server { ...@@ -81,4 +81,3 @@ server {
} }
} }
...@@ -18,7 +18,7 @@ md5sum = 816bc8179cf4195a35e07f22c36679fa ...@@ -18,7 +18,7 @@ md5sum = 816bc8179cf4195a35e07f22c36679fa
[template-common] [template-common]
filename = instance-common.cfg.in filename = instance-common.cfg.in
md5sum = c801b7f9f11f0965677c22e6bbe9281b md5sum = 5784bea3bd608913769ff9a8afcccb68
[template-apache-frontend] [template-apache-frontend]
filename = instance-apache-frontend.cfg.in filename = instance-apache-frontend.cfg.in
...@@ -66,11 +66,11 @@ md5sum = f8068179333ce19e95df561c70073857 ...@@ -66,11 +66,11 @@ md5sum = f8068179333ce19e95df561c70073857
[template-empty] [template-empty]
filename = templates/empty.in filename = templates/empty.in
md5sum = c2314c3a9c3412a38d14b312d3df83c1 md5sum = 7155b18edfe128825b8d1f48071454a6
[template-wrapper] [template-wrapper]
filename = templates/wrapper.in filename = templates/wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8 md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config] [template-trafficserver-records-config]
filename = templates/trafficserver/records.config.jinja2 filename = templates/trafficserver/records.config.jinja2
...@@ -90,7 +90,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184 ...@@ -90,7 +90,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184
[template-caddy-lazy-script-call] [template-caddy-lazy-script-call]
filename = templates/apache-lazy-script-call.sh.in filename = templates/apache-lazy-script-call.sh.in
md5sum = b9f73f6323f9fceea054c46c854d2862 md5sum = 77d60840591de67b64ab3572e46273a0
[template-graceful-script] [template-graceful-script]
filename = templates/graceful-script.sh.in filename = templates/graceful-script.sh.in
......
...@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id} ...@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url} server_url = ${slap-connection:server-url}
software_release_url = ${slap-connection:software-release-url} software_release_url = ${slap-connection:software-release-url}
key_file = ${slap-connection:key-file} key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file} cert_file = ${slap-connection:cert-file}
\ No newline at end of file
...@@ -21,4 +21,3 @@ else ...@@ -21,4 +21,3 @@ else
rm -f $PIDFILE rm -f $PIDFILE
fi fi
fi fi
{{ content }} {{ content }}
\ No newline at end of file
#!${dash-output:dash} #!${dash-output:dash}
{{ content }} {{ content }}
\ No newline at end of file
...@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299 ...@@ -4,4 +4,4 @@ md5sum = bed788dee6daf05349c4577e7a7f1299
[instance-davstorage] [instance-davstorage]
filename = instance-davstorage.cfg filename = instance-davstorage.cfg
md5sum = b83b0351a0f46aac35d52e681270ff03 md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a
...@@ -187,4 +187,4 @@ return = domain ...@@ -187,4 +187,4 @@ return = domain
#path = $${basedirectory:promises}/frontend-ajaxupload #path = $${basedirectory:promises}/frontend-ajaxupload
#url = $${request-frontend-ajaxupload:connection-site_url} #url = $${request-frontend-ajaxupload:connection-site_url}
#dash_path = ${dash:location}/bin/dash #dash_path = ${dash:location}/bin/dash
#curl_path = ${curl:location}/bin/curl #curl_path = ${curl:location}/bin/curl
\ No newline at end of file
[instance] [instance]
filename = instance.cfg filename = instance.cfg
md5sum = 94e1cd21bbdf7cabb5834223859407e0 md5sum = 646e50cfa93681e8bd85767621c7a39d
\ No newline at end of file
...@@ -75,4 +75,3 @@ log = $${:var}/log ...@@ -75,4 +75,3 @@ log = $${:var}/log
[publish-connection-parameter] [publish-connection-parameter]
recipe = slapos.cookbook:publishurl recipe = slapos.cookbook:publishurl
url = $${dream_platform_parameter:url} url = $${dream_platform_parameter:url}
[buildout] [buildout]
extends = extends =
../../stack/erp5/buildout.cfg ../../stack/erp5/buildout.cfg
...@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2 ...@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2
template = inline:#!/bin/sh template = inline:#!/bin/sh
echo "Hello : $(date)" >> $${directory:log}/log.log echo "Hello : $(date)" >> $${directory:log}/log.log
rendered = $${directory:script}/log-writer rendered = $${directory:script}/log-writer
mode = 700 mode = 700
\ No newline at end of file
...@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd ...@@ -4,7 +4,7 @@ md5sum = 7ab2a242df988bf5c10bf8002acac3bd
[instance-etherpad-lite] [instance-etherpad-lite]
_update_hash_filename_ = instance-etherpad-lite.cfg _update_hash_filename_ = instance-etherpad-lite.cfg
md5sum = 28710a9a23320dd472387d81a698d12d md5sum = 7ead62829a85f5922bb9ed0fc8dfb0df
[template-conf] [template-conf]
_update_hash_filename_ = templates/settings.json.in _update_hash_filename_ = templates/settings.json.in
......
...@@ -29,4 +29,4 @@ stop-on-error = true ...@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
\ No newline at end of file
...@@ -75,4 +75,4 @@ recipe = slapos.cookbook:check_url_available ...@@ -75,4 +75,4 @@ recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend-etherpad path = $${basedirectory:promises}/frontend-etherpad
url = $${request-frontend:connection-site_url} url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl curl_path = ${curl:location}/bin/curl
\ No newline at end of file
...@@ -29,4 +29,4 @@ stop-on-error = true ...@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command} update-command = ${:command}
command = command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link && grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
\ No newline at end of file
...@@ -4,12 +4,12 @@ md5sum = 428669a609aca3e0a7cae1387d332a75 ...@@ -4,12 +4,12 @@ md5sum = 428669a609aca3e0a7cae1387d332a75
[template-gateone] [template-gateone]
filename = instance-gateone.cfg.in filename = instance-gateone.cfg.in
md5sum = e7096a17c36c3bd27a011de57b7abfc1 md5sum = 7c4cb83d6ccf5a5bcdb7b972123ac3e4
[template-logrotate-base] [template-logrotate-base]
_update_hash_filename_ = instance-logrotate-base.cfg.in _update_hash_filename_ = instance-logrotate-base.cfg.in
md5sum = f28fbd310944f321ccb34b2a34c82005 md5sum = ebee34c726f30fff95a9e0ea167a635f
[template-nginx-conf] [template-nginx-conf]
_update_hash_filename_ = templates/nginx.conf.in _update_hash_filename_ = templates/nginx.conf.in
md5sum = 3d80d73a9cfffca6687813d86ddc25ba md5sum = fe055886e255d9dea9f9f29008f6e780
...@@ -154,4 +154,3 @@ develop-eggs-directory = {{ develop_eggs_directory }} ...@@ -154,4 +154,3 @@ develop-eggs-directory = {{ develop_eggs_directory }}
offline = true offline = true
[slap-parameter] [slap-parameter]
...@@ -47,4 +47,3 @@ backup = ${:srv}/backup ...@@ -47,4 +47,3 @@ backup = ${:srv}/backup
etc = ${buildout:directory}/etc etc = ${buildout:directory}/etc
services = ${:etc}/service services = ${:etc}/service
log = ${buildout:directory}/var/log log = ${buildout:directory}/var/log
...@@ -48,4 +48,4 @@ http { ...@@ -48,4 +48,4 @@ http {
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";
} }
} }
} }
\ No newline at end of file
...@@ -30,7 +30,7 @@ md5sum = 61d1d04b9347b3168a1ad7676e4681ef ...@@ -30,7 +30,7 @@ md5sum = 61d1d04b9347b3168a1ad7676e4681ef
[gitconfig.in] [gitconfig.in]
_update_hash_filename_ = template/gitconfig.in _update_hash_filename_ = template/gitconfig.in
md5sum = 7782f5c5d75663c2586e28d029c51e49 md5sum = eb1230fee50067924ba89f4dc6e82fa9
[gitlab-parameters.cfg] [gitlab-parameters.cfg]
_update_hash_filename_ = gitlab-parameters.cfg _update_hash_filename_ = gitlab-parameters.cfg
...@@ -50,11 +50,11 @@ md5sum = f4cc0bc898b8d59010d61473e2adc53b ...@@ -50,11 +50,11 @@ md5sum = f4cc0bc898b8d59010d61473e2adc53b
[gitaly-config.toml.in] [gitaly-config.toml.in]
_update_hash_filename_ = template/gitaly-config.toml.in _update_hash_filename_ = template/gitaly-config.toml.in
md5sum = 056d7ed09e1bf20d022d3ef6b9363e00 md5sum = 0f1ec4077dab586cc003ae13f689eda2
[instance-gitlab.cfg.in] [instance-gitlab.cfg.in]
_update_hash_filename_ = instance-gitlab.cfg.in _update_hash_filename_ = instance-gitlab.cfg.in
md5sum = 6effe68f7ef240780d1027dd834a562c md5sum = dfeff229aa696bb6b6051a2aff4301fe
[instance-gitlab-export.cfg.in] [instance-gitlab-export.cfg.in]
_update_hash_filename_ = instance-gitlab-export.cfg.in _update_hash_filename_ = instance-gitlab-export.cfg.in
...@@ -62,7 +62,7 @@ md5sum = 2af7dcf63f74e5edc53a3ff11fa4989b ...@@ -62,7 +62,7 @@ md5sum = 2af7dcf63f74e5edc53a3ff11fa4989b
[instance-gitlab-test.cfg.in] [instance-gitlab-test.cfg.in]
_update_hash_filename_ = instance-gitlab-test.cfg.in _update_hash_filename_ = instance-gitlab-test.cfg.in
md5sum = a4ad76856db98e508af7e773d9ff78f9 md5sum = 326e9a6b18d3a5761d15a5b0cf8cdd72
[macrolib.cfg.in] [macrolib.cfg.in]
_update_hash_filename_ = macrolib.cfg.in _update_hash_filename_ = macrolib.cfg.in
...@@ -70,7 +70,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4 ...@@ -70,7 +70,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4
[nginx-gitlab-http.conf.in] [nginx-gitlab-http.conf.in]
_update_hash_filename_ = template/nginx-gitlab-http.conf.in _update_hash_filename_ = template/nginx-gitlab-http.conf.in
md5sum = 79d2b4e8a32abf7a74a3d4528844c593 md5sum = cd7471a8c5d6f6bc848c62ce62dca966
[nginx.conf.in] [nginx.conf.in]
_update_hash_filename_ = template/nginx.conf.in _update_hash_filename_ = template/nginx.conf.in
...@@ -86,11 +86,11 @@ md5sum = 7c89a730889e3224548d9abe51a2d719 ...@@ -86,11 +86,11 @@ md5sum = 7c89a730889e3224548d9abe51a2d719
[smtp_settings.rb.in] [smtp_settings.rb.in]
_update_hash_filename_ = template/smtp_settings.rb.in _update_hash_filename_ = template/smtp_settings.rb.in
md5sum = e2144b03f7247636143c65dc81550d75 md5sum = 4e1ced687a86e4cfff2dde91237e3942
[template-gitlab-resiliency-restore.sh.in] [template-gitlab-resiliency-restore.sh.in]
_update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in _update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in
md5sum = 590fcadf26085fdd17487175bc0a469d md5sum = 16b9f52f00d55feab7e31a88029ad351
[unicorn.rb.in] [unicorn.rb.in]
_update_hash_filename_ = template/unicorn.rb.in _update_hash_filename_ = template/unicorn.rb.in
......
...@@ -31,4 +31,4 @@ revision = 3f6c4deec8834bdcd2c28c7c5eeacd8211e759b5 ...@@ -31,4 +31,4 @@ revision = 3f6c4deec8834bdcd2c28c7c5eeacd8211e759b5
<= go-git-package <= go-git-package
go.importpath = lab.nexedi.com/kirr/go123 go.importpath = lab.nexedi.com/kirr/go123
repository = https://lab.nexedi.com/kirr/go123.git repository = https://lab.nexedi.com/kirr/go123.git
revision = 56bf8f815a revision = 56bf8f815a
\ No newline at end of file
...@@ -58,4 +58,3 @@ command = ...@@ -58,4 +58,3 @@ command =
touch ${:backup-done} touch ${:backup-done}
fi fi
update-command = ${:command} update-command = ${:command}
...@@ -839,4 +839,4 @@ command = ...@@ -839,4 +839,4 @@ command =
# Promise, gitlab can connect to gitaly: # Promise, gitlab can connect to gitaly:
# sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT] # sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT]
\ No newline at end of file
...@@ -49,4 +49,3 @@ dir = "{{ gitaly.location }}/ruby" ...@@ -49,4 +49,3 @@ dir = "{{ gitaly.location }}/ruby"
[gitlab-shell] [gitlab-shell]
# The directory where gitlab-shell is installed # The directory where gitlab-shell is installed
dir = "{{ gitlab_shell_work.location }}" dir = "{{ gitlab_shell_work.location }}"
...@@ -23,4 +23,4 @@ ...@@ -23,4 +23,4 @@
[core] [core]
autocrlf = input autocrlf = input
[gc] [gc]
auto = 0 auto = 0
\ No newline at end of file
...@@ -213,4 +213,3 @@ server { ...@@ -213,4 +213,3 @@ server {
<%= @custom_gitlab_server_config %> <%= @custom_gitlab_server_config %>
#} #}
} }
...@@ -29,4 +29,3 @@ end ...@@ -29,4 +29,3 @@ end
# SMTP disabled in instance configuration (see `smtp_enable` parameter). # SMTP disabled in instance configuration (see `smtp_enable` parameter).
# Mail sending, if enabled (see `email_enabled`), will be done via sendmail. # Mail sending, if enabled (see `email_enabled`), will be done via sendmail.
{% endif %} {% endif %}
...@@ -112,4 +112,4 @@ else ...@@ -112,4 +112,4 @@ else
echo 'Backup restoration failed.' echo 'Backup restoration failed.'
fi fi
exit $RESTORE_EXIT_CODE exit $RESTORE_EXIT_CODE
\ No newline at end of file
...@@ -19,7 +19,7 @@ md5sum = 13f4f3806522b265dd1912ff169d146d ...@@ -19,7 +19,7 @@ md5sum = 13f4f3806522b265dd1912ff169d146d
[influxdb-config-file] [influxdb-config-file]
filename = influxdb-config-file.cfg.in filename = influxdb-config-file.cfg.in
md5sum = 7ce85159c0664b251e249eac4b37bea4 md5sum = a28972ced3e0f4aa776e43a9c44717c0
[telegraf-config-file] [telegraf-config-file]
filename = telegraf-config-file.cfg.in filename = telegraf-config-file.cfg.in
......
...@@ -131,4 +131,3 @@ bind-address = "[{{ influxdb['local-host'] }}]:{{ influxdb['rpc-port'] }}" ...@@ -131,4 +131,3 @@ bind-address = "[{{ influxdb['local-host'] }}]:{{ influxdb['rpc-port'] }}"
enabled = true enabled = true
query-stats-enabled = false query-stats-enabled = false
run-interval = "1s" run-interval = "1s"
...@@ -74,4 +74,3 @@ rdiff-backup = 1.0.5+SlapOSPatched001 ...@@ -74,4 +74,3 @@ rdiff-backup = 1.0.5+SlapOSPatched001
slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
smmap = 0.8.2 smmap = 0.8.2
plone.recipe.command = 1.1 plone.recipe.command = 1.1
#!${dash-output:dash} #!${dash-output:dash}
{{ content }} {{ content }}
\ No newline at end of file
...@@ -22,7 +22,7 @@ md5sum = 09803fb71404edbccb32c44a0040dae4 ...@@ -22,7 +22,7 @@ md5sum = 09803fb71404edbccb32c44a0040dae4
[template-validator] [template-validator]
filename = instance-validator.cfg.in filename = instance-validator.cfg.in
md5sum = f2609d1f526ba6349b1374e3631a9f7c md5sum = 2be286e367e37ce9e504170cd3a08007
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
......
...@@ -83,4 +83,4 @@ parts = ...@@ -83,4 +83,4 @@ parts =
eggs-directory = ${buildout:eggs-directory} eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory} develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true offline = true
\ No newline at end of file
...@@ -15,11 +15,11 @@ ...@@ -15,11 +15,11 @@
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = cd8648ca8a4a098e1a6faf7246f0d395 md5sum = 342fcf3fc18e33fa4f940518dab6af5c
[template-nginx-service] [template-nginx-service]
filename = template-nginx-service.sh.in filename = template-nginx-service.sh.in
md5sum = 529532e1240a66bdf39e3cbbef90ba87 md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
[template-nginx-configuration] [template-nginx-configuration]
filename = template-nginx.cfg.in filename = template-nginx.cfg.in
......
...@@ -131,4 +131,4 @@ configuration._ = {} ...@@ -131,4 +131,4 @@ configuration._ = {}
recipe = recipe =
depends = depends =
$${nginx-listen-promise:recipe} $${nginx-listen-promise:recipe}
$${xvfb-promise:recipe} $${xvfb-promise:recipe}
\ No newline at end of file
...@@ -121,4 +121,4 @@ output = ${buildout:directory}/runTestSuite.in ...@@ -121,4 +121,4 @@ output = ${buildout:directory}/runTestSuite.in
slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
selenium = 3.14.1 selenium = 3.14.1
urllib3 = 1.24 urllib3 = 1.24
certifi = 2018.10.15 certifi = 2018.10.15
\ No newline at end of file
...@@ -15,4 +15,4 @@ then ...@@ -15,4 +15,4 @@ then
fi fi
exec ${nginx-output:nginx} \ exec ${nginx-output:nginx} \
-c $${nginx-configuration:output} -c $${nginx-configuration:output}
\ No newline at end of file
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-jupyter-notebook] [instance-jupyter-notebook]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = ba4e4c582b81deeb7339a13c82bbf34b md5sum = 1d5fe6cc4e48672ae7be1c223794a932
[jupyter-notebook-config] [jupyter-notebook-config]
filename = jupyter_notebook_config.py.jinja filename = jupyter_notebook_config.py.jinja
......
...@@ -149,4 +149,3 @@ context = ...@@ -149,4 +149,3 @@ context =
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:symbolic.link
target-directory = ${directory:jupyter_custom_dir} target-directory = ${directory:jupyter_custom_dir}
link-binary = {{ custom_js_location }}/custom.js link-binary = {{ custom_js_location }}/custom.js
...@@ -51,7 +51,7 @@ md5sum = 6ea26f88252bf899c966d0f5675e7176 ...@@ -51,7 +51,7 @@ md5sum = 6ea26f88252bf899c966d0f5675e7176
[template-ansible-promise] [template-ansible-promise]
filename = template/ansible-promise.in filename = template/ansible-promise.in
md5sum = 2036bf145f472f62ef8dee5e729328fd md5sum = b7e87479a289f472b634a046b44b5257
[template-kvm-run] [template-kvm-run]
filename = template/template-kvm-run.in filename = template/template-kvm-run.in
...@@ -63,15 +63,15 @@ md5sum = 3827b4f7624de190cf5f5d37e3b72e86 ...@@ -63,15 +63,15 @@ md5sum = 3827b4f7624de190cf5f5d37e3b72e86
[template-apache-conf] [template-apache-conf]
filename = template/apache.conf.in filename = template/apache.conf.in
md5sum = ac97f6a52e1c5a19a646242ef85abb8a md5sum = e818aa16b3c736a0c2de3ec981663534
[template-content] [template-content]
filename = template/template-content.in filename = template/template-content.in
md5sum = 822737e483864bf255ad1259237bef2a md5sum = 752c91a4a6b72f5cf8226d6b940015f8
[template-qemu-ready] [template-qemu-ready]
filename = template/qemu-is-ready.in filename = template/qemu-is-ready.in
md5sum = b304eec8e2cb71f10ea83cac22f6db12 md5sum = fb330a796fadb6cd5c85217f80a42af3
[file-download-script] [file-download-script]
filename = template/download_file.in filename = template/download_file.in
......
...@@ -199,4 +199,3 @@ pycurl = 7.43.0 ...@@ -199,4 +199,3 @@ pycurl = 7.43.0
slapos.recipe.template = 4.4 slapos.recipe.template = 4.4
smmap = 0.9.0 smmap = 0.9.0
numpy = 1.16.4 numpy = 1.16.4
...@@ -56,4 +56,4 @@ if __name__ == "__main__": ...@@ -56,4 +56,4 @@ if __name__ == "__main__":
result = check_result() result = check_result()
if not result[0]: if not result[0]:
raise Exception('Failed to run Ansible in %s, result is: \n%s' % (vm_name, raise Exception('Failed to run Ansible in %s, result is: \n%s' % (vm_name,
result[1])) result[1]))
\ No newline at end of file
...@@ -60,4 +60,4 @@ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded ...@@ -60,4 +60,4 @@ SetEnvIf X-Forwarded-For "^.*\..*\..*\..*" forwarded
# Require all denied # Require all denied
AllowOverride None AllowOverride None
Require all granted Require all granted
</Directory> </Directory>
\ No newline at end of file
...@@ -20,4 +20,4 @@ else ...@@ -20,4 +20,4 @@ else
>&2 echo "$(tail $log_file)" >&2 echo "$(tail $log_file)"
exit 1 exit 1
fi fi
fi fi
\ No newline at end of file
...@@ -4,4 +4,4 @@ ...@@ -4,4 +4,4 @@
{% for content in content_list.split(sep) -%} {% for content in content_list.split(sep) -%}
{{ content }} {{ content }}
{% endfor -%} {% endfor -%}
{% endif -%} {% endif -%}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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