diff --git a/software/erp5/instance.cfg b/software/erp5/instance.cfg index 836c2d17e624437e9be50718fc6fd3e12de4a8c9..47b9e9320580abc8db033c67f6f716961c2eaeff 100644 --- a/software/erp5/instance.cfg +++ b/software/erp5/instance.cfg @@ -21,28 +21,6 @@ runzope_binary = ${buildout:bin-directory}/runzope sphinx_searchd_binary = ${sphinx:location}/bin/searchd zabbix_agentd_binary = ${zabbix-agent:location}/sbin/zabbix_agentd -link_binary_list = - ${coreutils:location}/bin/basename - ${coreutils:location}/bin/cat - ${coreutils:location}/bin/cp - ${coreutils:location}/bin/ls - ${coreutils:location}/bin/tr - ${coreutils:location}/bin/uname - ${git:location}/bin/git - ${graphviz:location}/bin/dot - ${grep:location}/bin/grep - ${imagemagick:location}/bin/convert - ${imagemagick:location}/bin/identify - ${mariadb:location}/bin/mysql - ${mariadb:location}/bin/mysqldump - ${pdftk:location}/bin/pdftk - ${sed:location}/bin/sed - ${tesseract:location}/bin/tesseract - ${w3m:location}/bin/w3m - ${poppler:location}/bin/pdfinfo - ${poppler:location}/bin/pdftotext - ${poppler:location}/bin/pdftohtml - environment = LD_LIBRARY_PATH = ${file:location}/lib:${fontconfig:location}/lib:${freetype:location}/lib:${libICE:location}/lib:${libSM:location}/lib:${libX11:location}/lib:${libXau:location}/lib:${libXdmcp:location}/lib:${libXext:location}/lib:${libXinerama:location}/lib:${libxcb:location}/lib:${zlib:location}/lib diff --git a/software/erp5/snippet-master.cfg b/software/erp5/snippet-master.cfg index 3b9d2818990522825eee880ac1e3daed071090a2..e1abc6fb93a5aa78ce95a63763d14c111d169424 100644 --- a/software/erp5/snippet-master.cfg +++ b/software/erp5/snippet-master.cfg @@ -19,6 +19,7 @@ parts = tidstorage cron-entry-tidstorage-backup logrotate-entry-tidstorage + binary-link %(part_list)s eggs-directory = ${buildout:eggs-directory} @@ -165,3 +166,28 @@ cronstamps = $${rootdirectory:etc}/cronstamps/ cronoutput = $${basedirectory:log}/cron/ logrotate-backup = $${basedirectory:backup}/logrotate/ logrotate-entries = $${rootdirectory:etc}/logrotate.d/ + +[binary-link] +recipe = slapos.cookbook:symbolic.link +target-directory = $${rootdirectory:bin} +link-binary = + ${coreutils:location}/bin/basename + ${coreutils:location}/bin/cat + ${coreutils:location}/bin/cp + ${coreutils:location}/bin/ls + ${coreutils:location}/bin/tr + ${coreutils:location}/bin/uname + ${git:location}/bin/git + ${graphviz:location}/bin/dot + ${grep:location}/bin/grep + ${imagemagick:location}/bin/convert + ${imagemagick:location}/bin/identify + ${mariadb:location}/bin/mysql + ${mariadb:location}/bin/mysqldump + ${pdftk:location}/bin/pdftk + ${sed:location}/bin/sed + ${tesseract:location}/bin/tesseract + ${w3m:location}/bin/w3m + ${poppler:location}/bin/pdfinfo + ${poppler:location}/bin/pdftotext + ${poppler:location}/bin/pdftohtml diff --git a/software/erp5/software.cfg b/software/erp5/software.cfg index 0e1660a06d8a3c180f9f692ddc6eba3efe8cba38..73067db443d54abaa9b37a4c28783775b2f06a66 100644 --- a/software/erp5/software.cfg +++ b/software/erp5/software.cfg @@ -60,7 +60,7 @@ configurator_bt5_list = erp5_core_proxy_field_legacy erp5_full_text_myisam_catal [template] recipe = slapos.recipe.template url = ${:_profile_base_location_}/instance.cfg -md5sum = c83acb5533187359b8730072d95ecf92 +md5sum = 592f8206c53b90849b983e6ca0c94ee0 output = ${buildout:directory}/template.cfg mode = 0644 @@ -88,7 +88,7 @@ mode = 0644 [template-snippet-master] recipe = slapos.recipe.template url = ${:_profile_base_location_}/snippet-master.cfg -md5sum = 344e3a2c3a1fda781c9be1dd751abd09 +md5sum = bd649b621d0619983d6dc9f79df554b7 output = ${buildout:directory}/template-snippet-master.cfg mode = 0644