diff --git a/consul/defaults.yaml b/consul/defaults.yaml index 429f4f7..a86893f 100644 --- a/consul/defaults.yaml +++ b/consul/defaults.yaml @@ -2,15 +2,12 @@ consul: version: 0.6.1 hash: dbb3c348fdb7cdfc03e5617956b243c594a399733afee323e69ef664cdadb1ac - ui_version: 0.6.1 - ui_hash: afccdd540b166b778c7c0483becc5e282bbbb1ee52335bfe94bf757df8c55efc - service: false config: server: false bind_addr: 0.0.0.0 data_dir: /var/consul - ui_dir: /usr/local/share/consul/ui + ui: true enable_debug: false log_level: info encrypt: "" diff --git a/consul/install.sls b/consul/install.sls index 0515edf..ac9a389 100644 --- a/consul/install.sls +++ b/consul/install.sls @@ -77,39 +77,3 @@ consul-link: - name: /usr/local/bin/consul - watch: - file: consul-install - -# Install UI -consul-ui-download: - file.managed: - - name: /tmp/consul_{{ consul.ui_version }}_web_ui.zip - - source: https://releases.hashicorp.com/consul/{{ consul.version }}/consul_{{ consul.ui_version }}_web_ui.zip - - source_hash: sha256={{ consul.ui_hash }} - - unless: test -d /usr/local/share/consul/ui-{{ consul.ui_version }} - -consul-ui-extract: - cmd.wait: - - name: unzip /tmp/consul_{{ consul.ui_version }}_web_ui.zip -d /tmp/dist - - watch: - - file: consul-ui-download - -consul-ui-install: - file.rename: - - name: /usr/local/share/consul/ui-{{ consul.ui_version }} - - source: /tmp/dist - - require: - - file: /usr/local/share/consul - - watch: - - cmd: consul-ui-extract - -consul-ui-clean: - file.absent: - - name: /tmp/consul_{{ consul.ui_version }}_web_ui.zip - - watch: - - file: consul-ui-install - -consul-ui-link: - file.symlink: - - target: ui-{{ consul.ui_version }} - - name: /usr/local/share/consul/ui - - watch: - - file: consul-ui-install