diff --git a/cdist/conf/type/__consul_template/man.text b/cdist/conf/type/__consul_template/man.text index 66d04457..9db958eb 100644 --- a/cdist/conf/type/__consul_template/man.text +++ b/cdist/conf/type/__consul_template/man.text @@ -31,8 +31,6 @@ batch-size:: consul:: the location of the Consul instance to query (may be an IP address or FQDN) with port. Defaults to 'localhost:8500'. -install-to:: - where to install the binary. Defaults to /usr/local/bin/consul-template max-stale:: the maximum staleness of a query. If specified, Consul will distribute work among all servers instead of just the leader. diff --git a/cdist/conf/type/__consul_template/manifest b/cdist/conf/type/__consul_template/manifest index aeee35bf..edeca89c 100755 --- a/cdist/conf/type/__consul_template/manifest +++ b/cdist/conf/type/__consul_template/manifest @@ -47,9 +47,8 @@ if [ ! -d "$version_dir" ]; then fi state="$(cat "$__object/parameter/state")" -install_to="$(cat "$__object/parameter/install-to")" -__staged_file "$install_to" \ +__staged_file /usr/local/bin/consul-template \ --source "$(cat "$version_dir/source")" \ --cksum "$(cat "$version_dir/cksum")" \ --fetch-command 'curl -s -L "%s"' \ diff --git a/cdist/conf/type/__consul_template/parameter/default/install-to b/cdist/conf/type/__consul_template/parameter/default/install-to deleted file mode 100644 index 8bd33a0a..00000000 --- a/cdist/conf/type/__consul_template/parameter/default/install-to +++ /dev/null @@ -1 +0,0 @@ -/usr/local/bin/consul-template diff --git a/cdist/conf/type/__consul_template/parameter/optional b/cdist/conf/type/__consul_template/parameter/optional index 73c39582..2848edb9 100644 --- a/cdist/conf/type/__consul_template/parameter/optional +++ b/cdist/conf/type/__consul_template/parameter/optional @@ -1,7 +1,6 @@ auth batch-size consul -install-to max-stale retry state diff --git a/cdist/conf/type/__consul_template/todo b/cdist/conf/type/__consul_template/todo index c09e09ac..a3786501 100644 --- a/cdist/conf/type/__consul_template/todo +++ b/cdist/conf/type/__consul_template/todo @@ -1,3 +1,2 @@ -- add support for --install-to in init-system files/templates - add support for latest version 0.7.0 - config file format has changed