diff --git a/software/repman/buildout.hash.cfg b/software/repman/buildout.hash.cfg index 1e1104acd7516b4b95e004839e02ba1a6370fa93..26acf4d137b82a3361d34aec93cc5e610a9ba878 100644 --- a/software/repman/buildout.hash.cfg +++ b/software/repman/buildout.hash.cfg @@ -14,7 +14,7 @@ # not need these here). [instance.cfg] filename = instance.cfg.in -md5sum = fd0df2c4a91c1e478b72cbaeb6c021c3 +md5sum = 8a08be95a04f1a47098c4fdef80bdfed [instance-repman.cfg] _update_hash_filename_ = instance-repman.cfg.jinja2.in diff --git a/software/repman/instance.cfg.in b/software/repman/instance.cfg.in index 23468083442f329c0d513de9da703328534bfad5..5c538300e4f6fe10cbefa5d0400bcadf6e97b755 100644 --- a/software/repman/instance.cfg.in +++ b/software/repman/instance.cfg.in @@ -46,7 +46,7 @@ context = # program binaries raw bash_bin {{ bash_location }}/bin/bash - raw jq_bin {{ jq_location }}/jq + raw jq_bin {{ jq_location }}/bin/jq raw curl_bin {{ curl_location }}/bin/curl ${:extra-context} diff --git a/software/repman/software.cfg b/software/repman/software.cfg index 149bb2a5e087fa1ba636f120b95b967563fe331f..1ad5baa765265e4a0962659034cf44811318f06c 100644 --- a/software/repman/software.cfg +++ b/software/repman/software.cfg @@ -17,6 +17,7 @@ extends = ../../component/proxysql/buildout.cfg ../../component/socat/buildout.cfg ../../component/rsync/buildout.cfg + ../../component/jq/buildout.cfg ../../stack/supervisord/buildout.cfg ../../stack/monitor/buildout.cfg ../neoppod/software-common.cfg @@ -50,7 +51,7 @@ context = key buildout_bin_directory buildout:bin-directory key dbjobs_in dbjobs-in:target key dash_location dash:location - key jq_location jq-binary:location + key jq_location jq:location key logrotate_cfg template-logrotate-base:rendered key gowork_bin gowork:bin key gzip_location gzip:location @@ -87,14 +88,6 @@ context = key proxysql_location proxysql:location -[jq-binary] -recipe = hexagonit.recipe.download -url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-linux64 -md5sum = 1fffde9f3c7944f063265e9a5e67ae4f -filename = jq -mode = 0755 -download-only = true - [download-file] recipe = slapos.recipe.build:download url = ${:_profile_base_location_}/${:_update_hash_filename_}