Commit 83d7ae3c authored by Jérome Perrin's avatar Jérome Perrin

Unify empty line at end of file with editorconfig

Introduce an [editorconfig] configuration file to tell developer editors that we want an empty line at end of file.

After making softwares and component uses a buildout.hash.cfg file, run [eclint] fix to apply the style.

eclint is also added in the commit hooks (that one can install with `npm install` from the root of this repository)

[editorconfig]: https://editorconfig.org/
[eclint]: https://github.com/jedmao/eclint

See merge request nexedi/slapos!757
parents 7c168be0 304ad995
Pipeline #10895 failed with stage
in 0 seconds
root = true
[*.{cfg,in,md,json}]
end_of_line = lf
charset = utf-8
insert_final_newline = true
[**.json]
indent_style = space
indent_size = 2
# business templates metadata
[**/bt/**]
insert_final_newline = false
......@@ -201,4 +201,4 @@ Listen {{ ip }}:{{ port }}
RewriteRule ^/{{path}}(.*) {{ backend }}/VirtualHostBase/https/{{ ip }}:{{ port }}/VirtualHostRoot/_vh_{{ path }}$1 [L,P]
{% endfor -%}
</VirtualHost>
{% endfor -%}
\ No newline at end of file
{% endfor -%}
......@@ -14,5 +14,4 @@
# not need these here).
[template-apache-backend-conf]
filename = apache-backend.conf.in
md5sum = ace264843228af84d025797f520ce70f
md5sum = 6f51eaa9930e7a7ef959de7c510c7c2f
......@@ -10,4 +10,4 @@ url = https://github.com/P-H-C/phc-winner-argon2/archive/20190702.tar.gz
md5sum = 0f234cc21ac6cebfe373da6afa70bb1d
configure-command = :
make-options =
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
\ No newline at end of file
PREFIX=${buildout:parts-directory}/${:_buildout_section_name_}
......@@ -71,4 +71,3 @@ install =
extract_dir = self.extract(self.download(*options[guessPlatform()].split()))
os.mkdir(location)
shutil.copy(os.path.join(extract_dir, 'chromedriver'), location)
......@@ -28,5 +28,3 @@ entry-points =
scripts =
paster=cloudooo_paster
runCloudoooUnitTest
......@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command}
command = ${coreutils-output:test} -x ${:crond} -a -x ${:crontab} -a ! -u ${:crontab}
crond = ${dcron:location}/sbin/crond
crontab = ${dcron:location}/bin/crontab
\ No newline at end of file
crontab = ${dcron:location}/bin/crontab
......@@ -16,4 +16,4 @@ location = ${buildout:parts-directory}/${:_buildout_section_name_}
dtach-bin = dtach
command =
mkdir -p ${:location}/bin
cp -rp ${dtach-build:compile-directory}/dtach-${dtach-build:version}/${:dtach-bin} ${:location}/bin
\ No newline at end of file
cp -rp ${dtach-build:compile-directory}/dtach-${dtach-build:version}/${:dtach-bin} ${:location}/bin
......@@ -23,4 +23,4 @@ post-install = cp f2c ${:location}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
environment =
CPPFLAGS=-I${libf2c:location}/include
LDFLAGS=-L${libf2c:location}/lib
\ No newline at end of file
LDFLAGS=-L${libf2c:location}/lib
......@@ -119,4 +119,4 @@ environment =
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
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
\ No newline at end of file
PATH=${pkgconfig:location}/bin:${yasm:location}/bin:%(PATH)s
[template-fonts-conf]
filename = fonts.conf.in
md5sum = 6967e553630d107fc0a59b14de8b0251
......@@ -32,4 +32,3 @@ eggs =
futures
PIL
gateone
......@@ -15,4 +15,4 @@ configure-options =
# restrict building to libraries only, we don't care about binaries
# and specially docs which would require more dependencies (e.g. xmlto):
make-options =
SUBDIRS=lib
\ No newline at end of file
SUBDIRS=lib
......@@ -5,4 +5,4 @@ url = https://git.savannah.gnu.org/gitweb/?p=config.git;a=snapshot;h=5e531d39185
md5sum = ffe323c69b6f21aa28e900f76febd3d6
configure-command = :
make-targets =
make-binary = cp -r . @@LOCATION@@
\ No newline at end of file
make-binary = cp -r . @@LOCATION@@
......@@ -55,4 +55,3 @@ environment =
# 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
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:
#!/bin/sh
export BUNDLE_GEMFILE=${helloweb-ruby-bundle:path}/Gemfile
exec ${bundler:bundle} exec sh -c 'helloweb.rb "$@"' ${:_buildout_section_name_} "$@"
......@@ -13,4 +13,4 @@ md5sum = 1f9f9155682fe8946a97c08896109508
environment =
PATH=${pkgconfig:location}/bin:${automake:location}/bin:${autoconf:location}/bin:${libtool:location}/bin:%(PATH)s
configure-options =
--prefix="${buildout:parts-directory}/${:_buildout_section_name_}"
\ No newline at end of file
--prefix="${buildout:parts-directory}/${:_buildout_section_name_}"
......@@ -20,4 +20,4 @@ configure-options =
--prefix=${buildout:parts-directory}/${:_buildout_section_name_}
make-options = -j1
environment =
PATH=${bison:location}/bin:%(PATH)s
\ No newline at end of file
PATH=${bison:location}/bin:%(PATH)s
......@@ -25,4 +25,4 @@ post-install =
[ -d lib64 ] && ln -s lib64 lib
[libcap]
<= libcap2
\ No newline at end of file
<= libcap2
......@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi
url = https://hyperrealm.github.io/libconfig/dist/libconfig-1.7.2.tar.gz
md5sum = 6bd98ee3a6e6b9126c82c916d7a9e690
......@@ -26,5 +26,3 @@ configure-options =
--without-libinnodb-prefix
--without-libsasl-prefix
--without-libsasl2-prefix
......@@ -9,4 +9,4 @@ recipe = slapos.recipe.cmmi
shared = true
url = http://pyyaml.org/download/libyaml/yaml-0.1.6.tar.gz
md5sum = 5fe00cda18ca5daeb43762b80c38e06e
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/
\ No newline at end of file
pre-configure = cp -f ${gnu-config:location}/config.sub ${gnu-config:location}/config.guess config/
......@@ -6,4 +6,3 @@ parts =
recipe = slapos.recipe.cmmi
url = https://freefr.dl.sourceforge.net/project/lksctp/lksctp-tools/lksctp-tools-1.0.17.tar.gz
md5sum = 68e9b8fa4d4e331029b247b72d46d7a5
......@@ -20,4 +20,3 @@ make-options =
environment =
PATH=${bison:location}/bin:${flex:location}/bin:%(PATH)s
......@@ -4,6 +4,7 @@ extends =
../pkgconfig/buildout.cfg
../libpng/buildout.cfg
../freetype/buildout.cfg
./buildout.hash.cfg
parts =
matplotlib
......@@ -11,10 +12,9 @@ parts =
[matplotlibrc]
recipe = slapos.recipe.template:jinja2
location = ${buildout:parts-directory}/${:_buildout_section_name_}
template = ${:_profile_base_location_}/matplotlibrc.in
template = ${:_profile_base_location_}/${:filename}
rendered = ${matplotlibrc:location}/matplotlibrc
mode = 0644
md5sum = 849f48f08bea21dd10d3825867cb1561
backend = agg
context =
key backend matplotlibrc:backend
......
[matplotlibrc]
filename = matplotlibrc.in
md5sum = 47a737b8f4db0b329e2b3fd70e5a325c
backend : {{ backend }}
\ No newline at end of file
backend : {{ backend }}
......@@ -136,4 +136,3 @@ component = vbucketmigrator
component-configure-options =
--without-sasl
--with-isasl
......@@ -5,4 +5,4 @@ parts = netcat
[netcat]
recipe = slapos.recipe.cmmi
url = http://sourceforge.net/projects/netcat/files/netcat/0.7.1/netcat-0.7.1.tar.gz
md5sum = 088def25efe04dcdd1f8369d8926ab34
\ No newline at end of file
md5sum = 088def25efe04dcdd1f8369d8926ab34
......@@ -38,4 +38,4 @@ stop-on-error = true
update-command = ${:command}
command = ${coreutils-output:test} -x ${:ssh} -a -x ${:keygen}
ssh = ${openssh:location}/bin/ssh
keygen = ${openssh:location}/bin/ssh-keygen
\ No newline at end of file
keygen = ${openssh:location}/bin/ssh-keygen
......@@ -127,4 +127,3 @@ template = inline:
mode = 0755
rendered = ${buildout:bin-directory}/${:_buildout_section_name_}
perl-bin = ${:rendered}
......@@ -11,4 +11,4 @@ configure-options =
--disable-static
[x86-cygwin-popt]
patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
\ No newline at end of file
patches = ${:_profile_base_location_}/cygwin-popt-1.16-src.patch
......@@ -18,4 +18,4 @@ shared = true
url = https://github.com/google/protobuf/releases/download/v3.4.0/protobuf-cpp-3.4.0.tar.gz
md5sum = 6d59dad503bea5ad420fd09ddad84481
environment =
LDFLAGS=-Wl,-rpath=${zlib:location}/lib
\ No newline at end of file
LDFLAGS=-Wl,-rpath=${zlib:location}/lib
......@@ -14,4 +14,3 @@ recipe = zc.recipe.egg
eggs =
${lxml-python:egg}
slapos.cookbook
......@@ -30,4 +30,4 @@ command = set -e
go.importpath = github.com/signal18/replication-manager
repository = https://github.com/signal18/replication-manager
branch = 2.1
revision = 9167a82c81af8f7be41cf51bc9be8a37dc3d8c03
\ No newline at end of file
revision = 9167a82c81af8f7be41cf51bc9be8a37dc3d8c03
......@@ -29,4 +29,4 @@ location = ${:output}
<= go-git-package
go.importpath = github.com/restic/restic
repository = https://github.com/restic/restic
revision = v0.9.6
\ No newline at end of file
revision = v0.9.6
......@@ -27,4 +27,4 @@ configure-command =
environment =
PATH=${autoconf:location}/bin:${automake:location}/bin:${git:location}/bin:${libtool:location}/bin:${m4:location}/bin:%(PATH)s
CFLAGS = -I${zlib:location}/include
LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
\ No newline at end of file
LDFLAGS = -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
......@@ -11,4 +11,4 @@ url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz
version = 1.7.3.2
md5sum = aec3154f7854580cfab0c2d81e910519
environment =
LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
\ No newline at end of file
LDFLAGS=-L${openssl:location}/lib -Wl,-rpath=${openssl:location}/lib
......@@ -42,5 +42,3 @@ environment =
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
PATH=${cmake:location}/bin:${pkgconfig:location}/bin:%(PATH)s
......@@ -25,4 +25,4 @@ environment =
PATH=${m4:location}/bin:${autoconf:location}/bin:${automake:location}/bin:${pkgconfig:location}/bin:${libtool:location}/bin:%(PATH)s
CPPFLAGS=-I${gettext:location}/include -I${mariadb:location}/include
LDFLAGS=-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib -L${mariadb:location}/lib -Wl,-rpath=${mariadb:location}/lib
ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal
\ No newline at end of file
ACLOCAL_PATH=${pkgconfig:location}/share/aclocal:${gettext:location}/share/aclocal:${libtool:location}/share/aclocal
......@@ -50,4 +50,3 @@ recipe = slapos.recipe.build:download
destination = ${tesseract-traineddata:location}/tessdata/osd.traineddata
url = https://github.com/tesseract-ocr/tessdata/raw/590567f20dc044f6948a8e2c61afc714c360ad0e/osd.traineddata
md5sum = 7611737524efd1ce2dde67eff629bbcf
......@@ -31,4 +31,4 @@ recipe = plone.recipe.command
stop-on-error = true
update-command = ${:command}
command = ${coreutils-output:test} -x ${:catalina}
catalina = ${tomcat7:location}/bin/catalina.sh
\ No newline at end of file
catalina = ${tomcat7:location}/bin/catalina.sh
......@@ -11,4 +11,4 @@ url = http://oligarchy.co.uk/xapian/1.2.12/xapian-core-1.2.12.tar.gz
md5sum = faf33a3945edbe4c848627750856cbeb
environment =
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
\ No newline at end of file
LDFLAGS = -L${zlib:location}/lib -Wl,-R${zlib:location}/lib -L${libuuid:location}/lib -Wl,-R${libuuid:location}/lib
This diff is collapsed.
{
"dependencies": {
"eclint": "^2.8.1",
"husky": "^1.1.2",
"lint-staged": "^7.3.0"
},
"lint-staged": {
"*": [
"eclint fix",
"git add"
],
"*.json": [
"python2 ./format-json",
"git add"
......
......@@ -32,4 +32,4 @@ resthost=%(listen_ip)s
#operator=accords
# Password (default: co-system)
#password=co-system
\ No newline at end of file
#password=co-system
......@@ -14,4 +14,4 @@
tls="0"
current="0"
/>
</os_configs>
\ No newline at end of file
</os_configs>
......@@ -15,4 +15,3 @@ if expected != "" and value != expected:
if not_expected != "" and value == not_expected:
print "FAIL: %%s == %%s" %% (value, not_expected)
sys.exit(127)
......@@ -121,4 +121,4 @@ TypesConfig "%(mime_types)s"
AddType application/x-compress .Z
AddType application/x-gzip .gz .tgz
AddType application/x-httpd-php .php .phtml .php5 .php4
AddType application/x-httpd-php-source .phps
\ No newline at end of file
AddType application/x-httpd-php-source .phps
......@@ -16,4 +16,4 @@ file_uploads = On
upload_max_filesize = 8M
post_max_size = 8M
magic_quotes_gpc=Off
output_buffering=Off
\ No newline at end of file
output_buffering=Off
......@@ -2,4 +2,4 @@
echo $$ > %(pid_file)s
exec %(command)s \
%(parameter)s
\ No newline at end of file
%(parameter)s
......@@ -2,4 +2,3 @@
path %(path)s
# pack-gc false
</filestorage>
......@@ -50,4 +50,3 @@ pycurl = 7.43.0
slapos.recipe.download = 1.0
slapos.recipe.template = 4.4
smmap = 0.9.0
......@@ -14,7 +14,7 @@
# not need these here).
[instance]
filename = instance.cfg
md5sum = 4c7936accb3658871b635158198b7905
md5sum = 1fbb72e4305ded9614ee80c0ee17b672
[instance-apache]
filename = instance-apachephp.cfg
......@@ -30,4 +30,4 @@ md5sum = c5695762361b801c284ee23a150cd1f1
[template-httpd-conf-hash]
filename = templates/apache.conf.in
md5sum = 6788381fadd8ca96f892d33df3163da0
md5sum = 4fc3f853abf702aeb6653942d4fb85d8
......@@ -9,4 +9,4 @@ offline = true
[switch_softwaretype]
recipe = slapos.cookbook:softwaretype
default = ${instance-apache:output}
mariadb = ${instance-mariadb:output}
\ No newline at end of file
mariadb = ${instance-mariadb:output}
......@@ -105,4 +105,4 @@ LoadModule rewrite_module modules/mod_rewrite.so
LoadModule headers_module modules/mod_headers.so
LoadModule dir_module modules/mod_dir.so
LoadModule php5_module modules/libphp5.so
LoadModule alias_module modules/mod_alias.so
\ No newline at end of file
LoadModule alias_module modules/mod_alias.so
......@@ -14,7 +14,7 @@
# not need these here).
[template]
filename = instance.cfg
md5sum = f686f765e55d1dce2e55a400f0714b3e
md5sum = 4adae801babadd9aed6112c1ff209076
[template-apache-frontend]
filename = instance-apache-frontend.cfg
......@@ -34,7 +34,7 @@ md5sum = b3d5a3573fa381fec954ad5cbf1575a0
[template-replicate-publish-slave-information]
filename = templates/replicate-publish-slave-information.cfg.in
md5sum = 665e83d660c9b779249b2179d7ce4b4e
md5sum = 7c0025a35dc62eb3cbfd07a6b04d659e
[template-apache-frontend-configuration]
filename = templates/apache.conf.in
......@@ -50,7 +50,7 @@ md5sum = f20d6c3d2d94fb685f8d26dfca1e822b
[template-default-virtualhost]
filename = templates/000.conf.in
md5sum = d98a01182f38868612948c87d5231428
md5sum = 5fcc11ea7f3eae38b0135b94dfc42dd5
[template-default-slave-virtualhost]
filename = templates/default-virtualhost.conf.in
......@@ -58,7 +58,7 @@ md5sum = 7890469ecc5e7f46be5b2c3074a09b52
[template-cached-slave-virtualhost]
filename = templates/cached-virtualhost.conf.in
md5sum = 1a1a53d9ac4a1591c017d86850a94796
md5sum = f97dfcfae80527e242f285c9ebf11b27
[template-log-access]
filename = templates/template-log-access.conf.in
......@@ -66,11 +66,11 @@ md5sum = a20683faba37b5b9c035783e811dd88d
[template-empty]
filename = templates/empty.in
md5sum = c2314c3a9c3412a38d14b312d3df83c1
md5sum = 7155b18edfe128825b8d1f48071454a6
[template-wrapper]
filename = templates/wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config]
filename = templates/trafficserver/records.config.jinja2
......@@ -94,7 +94,7 @@ md5sum = 82d74a7f2aceb2b4a7acc6259291b7f2
[template-apache-lazy-script-call]
filename = templates/apache-lazy-script-call.sh.in
md5sum = ebe5d3d19923eb812a40019cb11276d8
md5sum = 44e235d0451932f1232f9d9e0ecc59f9
[template-apache-graceful-script]
filename = templates/apache-graceful-script.sh.in
......
......@@ -47,4 +47,3 @@ extra-context =
# Must match the key id in [switch-softwaretype] which uses this section.
raw software_type RootSoftwareInstance-default-custom-personal-replicate
raw template_monitor ${monitor2-template:rendered}
......@@ -14,4 +14,3 @@ smmap = 0.9.0
numpy = 1.16.4
websockify = 0.8.0
......@@ -19,4 +19,4 @@
ServerName www.example.org
ErrorDocument 404 /notfound.html
</VirtualHost>
\ No newline at end of file
</VirtualHost>
......@@ -48,4 +48,3 @@
RewriteRule ^/(.*)$ {{ slave_parameter.get('https_backend_url', '') }}/$1 [L,P]
</VirtualHost>
{{ content }}
\ No newline at end of file
{{ content }}
......@@ -48,4 +48,4 @@ parts =
eggs-directory = {{ eggs_directory }}
develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
\ No newline at end of file
offline = true
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
{{ content }}
......@@ -18,7 +18,7 @@ md5sum = 5c94d952305552dcbeaeaeb27dd28f3b
[template-nginx-configuration]
filename = template-nginx.cfg.in
md5sum = a7012aac9b47ddd4e3aa3197aee1ffac
md5sum = fc4f258e3ae56e0c9596484d736ccfed
[template-dcron-service]
filename = template-dcron-service.sh.in
......@@ -34,7 +34,7 @@ md5sum = 5cbd64f04da0601ba4286516a6161f5e
[template-crontab]
filename = template-crontab.in
md5sum = 072be0fd04896880c931d44d8eabde37
md5sum = f1f82101258de19068262b7213fc478b
[status2rss]
filename = status2rss.py
......
# min(0-59) hours(0-23) day(1-31) month(1-12) dow(0-7) command
MAILTO=admins@erp5.org
......@@ -18,7 +18,7 @@ md5sum = dae3bf6daf851b5610a1a6bd83057b29
[template-common]
filename = instance-common.cfg.in
md5sum = c801b7f9f11f0965677c22e6bbe9281b
md5sum = 5784bea3bd608913769ff9a8afcccb68
[template-apache-frontend]
filename = instance-apache-frontend.cfg.in
......@@ -62,11 +62,11 @@ md5sum = f8068179333ce19e95df561c70073857
[template-empty]
_update_hash_filename_ = templates/empty.in
md5sum = c2314c3a9c3412a38d14b312d3df83c1
md5sum = 7155b18edfe128825b8d1f48071454a6
[template-wrapper]
_update_hash_filename_ = templates/wrapper.in
md5sum = 8cde04bfd0c0e9bd56744b988275cfd8
md5sum = 975177dedf677d24e14cede5d13187ce
[template-trafficserver-records-config]
_update_hash_filename_ = templates/trafficserver/records.config.jinja2
......@@ -86,7 +86,7 @@ md5sum = 217a6c801b8330b0b825f7b8b4c77184
[template-caddy-lazy-script-call]
_update_hash_filename_ = templates/apache-lazy-script-call.sh.in
md5sum = b9f73f6323f9fceea054c46c854d2862
md5sum = 77d60840591de67b64ab3572e46273a0
[template-graceful-script]
_update_hash_filename_ = templates/graceful-script.sh.in
......
......@@ -10,4 +10,4 @@ partition_id = ${slap-connection:partition-id}
server_url = ${slap-connection:server-url}
software_release_url = ${slap-connection:software-release-url}
key_file = ${slap-connection:key-file}
cert_file = ${slap-connection:cert-file}
\ No newline at end of file
cert_file = ${slap-connection:cert-file}
{{ content }}
\ No newline at end of file
{{ content }}
#!${dash-output:dash}
{{ content }}
\ No newline at end of file
{{ content }}
[template]
filename = instance.cfg
md5sum = bed788dee6daf05349c4577e7a7f1299
[instance-davstorage]
filename = instance-davstorage.cfg
md5sum = 081f97f9e575af7a4b7f9afc7c80dd4a
......@@ -9,6 +9,7 @@ extends =
../../component/logrotate/buildout.cfg
../../component/lxml-python/buildout.cfg
../../component/gzip/buildout.cfg
./buildout.hash.cfg
parts =
apache-php
......@@ -35,14 +36,12 @@ strip-top-level-dir = true
[template]
# Default template for the instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum = bed788dee6daf05349c4577e7a7f1299
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/template.cfg
mode = 0644
[instance-davstorage]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-davstorage.cfg
md5sum = b83b0351a0f46aac35d52e681270ff03
url = ${:_profile_base_location_}/${:filename}
output = ${buildout:directory}/template-davstorage.cfg
mode = 0644
......@@ -187,4 +187,4 @@ return = domain
#path = $${basedirectory:promises}/frontend-ajaxupload
#url = $${request-frontend-ajaxupload:connection-site_url}
#dash_path = ${dash:location}/bin/dash
#curl_path = ${curl:location}/bin/curl
\ No newline at end of file
#curl_path = ${curl:location}/bin/curl
[instance]
filename = instance.cfg
md5sum = 94e1cd21bbdf7cabb5834223859407e0
\ No newline at end of file
md5sum = 646e50cfa93681e8bd85767621c7a39d
......@@ -75,4 +75,3 @@ log = $${:var}/log
[publish-connection-parameter]
recipe = slapos.cookbook:publishurl
url = $${dream_platform_parameter:url}
[buildout]
extends =
../../stack/erp5/buildout.cfg
......@@ -22,4 +22,4 @@ recipe = slapos.recipe.template:jinja2
template = inline:#!/bin/sh
echo "Hello : $(date)" >> $${directory:log}/log.log
rendered = $${directory:script}/log-writer
mode = 700
\ No newline at end of file
mode = 700
[template]
_update_hash_filename_ = instance.cfg
md5sum = 7ab2a242df988bf5c10bf8002acac3bd
[instance-etherpad-lite]
_update_hash_filename_ = instance-etherpad-lite.cfg
md5sum = 7ead62829a85f5922bb9ed0fc8dfb0df
[template-conf]
_update_hash_filename_ = templates/settings.json.in
md5sum = 19ab39e6b3256c82fd54ce074488b136
[template-run-script]
_update_hash_filename_ = templates/run.sh.in
md5sum = eac870b5f30e735e109a48913af2fae3
[template-deps-script]
_update_hash_filename_ = templates/installDeps.sh.in
md5sum = 53d0d53d419bd9ee592d3e1a1c84c758
......@@ -15,6 +15,7 @@ extends =
../../component/git/buildout.cfg
../../component/nodejs/buildout.cfg
../../component/postgresql/buildout.cfg
./buildout.hash.cfg
parts =
postgresql
......@@ -49,44 +50,36 @@ git-executable = ${git:location}/bin/git
[template]
# Default template for the instance.
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance.cfg
md5sum = 7ab2a242df988bf5c10bf8002acac3bd
url = ${:_profile_base_location_}/${:_update_hash_filename_}
output = ${buildout:directory}/template.cfg
mode = 0644
[instance-etherpad-lite]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-etherpad-lite.cfg
md5sum = 28710a9a23320dd472387d81a698d12d
url = ${:_profile_base_location_}/${:_update_hash_filename_}
output = ${buildout:directory}/template-etherpad-lite.cfg
mode = 0644
[template-conf]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/${:_update_hash_filename_}
mode = 0644
filename = settings.json.in
md5sum = 19ab39e6b3256c82fd54ce074488b136
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template-run-script]
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/${:_update_hash_filename_}
mode = 0644
filename = run.sh.in
md5sum = eac870b5f30e735e109a48913af2fae3
location = ${buildout:parts-directory}/${:_buildout_section_name_}
[template-deps-script]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/templates/${:filename}
url = ${:_profile_base_location_}/${:_update_hash_filename_}
etherpad-location = ${etherpad-lite-repository:location}
nodejs-location = ${nodejs:location}
curl-location = ${curl:location}
postgre-location = ${postgresql:location}
mode = 0755
md5sum = 53d0d53d419bd9ee592d3e1a1c84c758
filename = installDeps.sh.in
output = ${etherpad-lite-repository:location}/bin/installDeps.sh
[install-deps]
......
......@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command}
command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
\ No newline at end of file
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
......@@ -75,4 +75,4 @@ recipe = slapos.cookbook:check_url_available
path = $${basedirectory:promises}/frontend-etherpad
url = $${request-frontend:connection-site_url}
dash_path = ${dash:location}/bin/dash
curl_path = ${curl:location}/bin/curl
\ No newline at end of file
curl_path = ${curl:location}/bin/curl
......@@ -29,4 +29,4 @@ stop-on-error = true
update-command = ${:command}
command =
grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link &&
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
\ No newline at end of file
grep parts ${buildout:develop-eggs-directory}/slapos.toolbox.egg-link
[template]
_update_hash_filename_ = instance.cfg.in
md5sum = 428669a609aca3e0a7cae1387d332a75
[template-gateone]
filename = instance-gateone.cfg.in
md5sum = 7c4cb83d6ccf5a5bcdb7b972123ac3e4
[template-logrotate-base]
_update_hash_filename_ = instance-logrotate-base.cfg.in
md5sum = ebee34c726f30fff95a9e0ea167a635f
[template-nginx-conf]
_update_hash_filename_ = templates/nginx.conf.in
md5sum = fe055886e255d9dea9f9f29008f6e780
......@@ -154,4 +154,3 @@ develop-eggs-directory = {{ develop_eggs_directory }}
offline = true
[slap-parameter]
......@@ -47,4 +47,3 @@ backup = ${:srv}/backup
etc = ${buildout:directory}/etc
services = ${:etc}/service
log = ${buildout:directory}/var/log
......@@ -13,6 +13,7 @@ extends =
../../component/dtach/buildout.cfg
../../component/nginx/buildout.cfg
../../stack/slapos.cfg
./buildout.hash.cfg
parts =
slapos-cookbook
......@@ -76,8 +77,7 @@ context =
[template]
< = template-jinja2-base
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
md5sum = 428669a609aca3e0a7cae1387d332a75
template = ${:_profile_base_location_}/${:_update_hash_filename_}
extra-context =
key dash_location dash:location
key dtach_location dtach:location
......@@ -93,13 +93,10 @@ extra-context =
[template-gateone]
< = download-base
filename = instance-gateone.cfg.in
md5sum = e7096a17c36c3bd27a011de57b7abfc1
[template-logrotate-base]
< = template-jinja2-base
filename = instance-logrotate-base.cfg
md5sum = f28fbd310944f321ccb34b2a34c82005
extra-context =
key dcron_location dcron:location
key gzip_location gzip:location
......@@ -109,7 +106,6 @@ extra-context =
< = download-base
url = ${:_profile_base_location_}/templates/${:filename}.in
filename = nginx.conf
md5sum = 3d80d73a9cfffca6687813d86ddc25ba
[check-recipe]
recipe = plone.recipe.command
......@@ -118,4 +114,4 @@ update-command = ${:command}
command =
grep parts ${buildout:develop-eggs-directory}/gateone.egg-link
[versions]
\ No newline at end of file
[versions]
......@@ -48,4 +48,4 @@ http {
proxy_set_header Connection "upgrade";
}
}
}
\ No newline at end of file
}
......@@ -30,7 +30,7 @@ md5sum = 61d1d04b9347b3168a1ad7676e4681ef
[gitconfig.in]
_update_hash_filename_ = template/gitconfig.in
md5sum = 7782f5c5d75663c2586e28d029c51e49
md5sum = eb1230fee50067924ba89f4dc6e82fa9
[gitlab-parameters.cfg]
_update_hash_filename_ = gitlab-parameters.cfg
......@@ -50,11 +50,11 @@ md5sum = f4cc0bc898b8d59010d61473e2adc53b
[gitaly-config.toml.in]
_update_hash_filename_ = template/gitaly-config.toml.in
md5sum = 056d7ed09e1bf20d022d3ef6b9363e00
md5sum = 0f1ec4077dab586cc003ae13f689eda2
[instance-gitlab.cfg.in]
_update_hash_filename_ = instance-gitlab.cfg.in
md5sum = 6effe68f7ef240780d1027dd834a562c
md5sum = dfeff229aa696bb6b6051a2aff4301fe
[instance-gitlab-export.cfg.in]
_update_hash_filename_ = instance-gitlab-export.cfg.in
......@@ -62,7 +62,7 @@ md5sum = 2af7dcf63f74e5edc53a3ff11fa4989b
[instance-gitlab-test.cfg.in]
_update_hash_filename_ = instance-gitlab-test.cfg.in
md5sum = 60714fb4e6c869c41bd5e9fada1b6e40
md5sum = 7ba08928e6a8998ec8ed1bb97851b726
[macrolib.cfg.in]
_update_hash_filename_ = macrolib.cfg.in
......@@ -70,7 +70,7 @@ md5sum = a56a44e96f65f5ed20211bb6a54279f4
[nginx-gitlab-http.conf.in]
_update_hash_filename_ = template/nginx-gitlab-http.conf.in
md5sum = 79d2b4e8a32abf7a74a3d4528844c593
md5sum = cd7471a8c5d6f6bc848c62ce62dca966
[nginx.conf.in]
_update_hash_filename_ = template/nginx.conf.in
......@@ -86,11 +86,11 @@ md5sum = 7c89a730889e3224548d9abe51a2d719
[smtp_settings.rb.in]
_update_hash_filename_ = template/smtp_settings.rb.in
md5sum = e2144b03f7247636143c65dc81550d75
md5sum = 4e1ced687a86e4cfff2dde91237e3942
[template-gitlab-resiliency-restore.sh.in]
_update_hash_filename_ = template/template-gitlab-resiliency-restore.sh.in
md5sum = 590fcadf26085fdd17487175bc0a469d
md5sum = 16b9f52f00d55feab7e31a88029ad351
[unicorn.rb.in]
_update_hash_filename_ = template/unicorn.rb.in
......
......@@ -31,4 +31,4 @@ revision = 3f6c4deec8834bdcd2c28c7c5eeacd8211e759b5
<= go-git-package
go.importpath = lab.nexedi.com/kirr/go123
repository = https://lab.nexedi.com/kirr/go123.git
revision = 56bf8f815a
\ No newline at end of file
revision = 56bf8f815a
......@@ -57,4 +57,3 @@ command =
touch ${:backup-done}
fi
update-command = ${:command}
......@@ -839,4 +839,4 @@ command =
# Promise, gitlab can connect to gitaly:
# sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT]
\ No newline at end of file
# sudo gitlab-rake gitlab:tcp_check[GITALY_SERVER_IP,GITALY_LISTEN_PORT]
......@@ -49,4 +49,3 @@ dir = "{{ gitaly.location }}/ruby"
[gitlab-shell]
# The directory where gitlab-shell is installed
dir = "{{ gitlab_shell_work.location }}"
......@@ -23,4 +23,4 @@
[core]
autocrlf = input
[gc]
auto = 0
\ No newline at end of file
auto = 0
......@@ -213,4 +213,3 @@ server {
<%= @custom_gitlab_server_config %>
#}
}
......@@ -29,4 +29,3 @@ end
# SMTP disabled in instance configuration (see `smtp_enable` parameter).
# Mail sending, if enabled (see `email_enabled`), will be done via sendmail.
{% endif %}
......@@ -112,4 +112,4 @@ else
echo 'Backup restoration failed.'
fi
exit $RESTORE_EXIT_CODE
\ No newline at end of file
exit $RESTORE_EXIT_CODE
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.
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