From 37fec8b3b550e4192a32646934bda897c3ff8b4b Mon Sep 17 00:00:00 2001 From: Stephan Leemburg Date: Tue, 23 Feb 2016 11:54:08 +0100 Subject: [PATCH 1/6] Added Mitel as a redhat derived OS --- cdist/conf/explorer/os | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cdist/conf/explorer/os b/cdist/conf/explorer/os index 053177eb..b9f3512b 100755 --- a/cdist/conf/explorer/os +++ b/cdist/conf/explorer/os @@ -77,6 +77,11 @@ if grep -q ^Fedora /etc/redhat-release 2>/dev/null; then exit 0 fi +if grep -q ^Mitel /etc/redhat-release 2>/dev/null; then + echo mitel + exit 0 +fi + if [ -f /etc/redhat-release ]; then echo redhat exit 0 From b03a4f2829c71f432e71fe27105e1fbb08c2a074 Mon Sep 17 00:00:00 2001 From: Stephan Leemburg Date: Tue, 23 Feb 2016 12:57:21 +0100 Subject: [PATCH 2/6] Added Mitel as a redhat derived OS --- cdist/conf/explorer/os_version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cdist/conf/explorer/os_version b/cdist/conf/explorer/os_version index 50889429..8f092827 100755 --- a/cdist/conf/explorer/os_version +++ b/cdist/conf/explorer/os_version @@ -51,7 +51,7 @@ case "$($__explorer/os)" in owl) cat /etc/owl-release ;; - redhat|centos) + redhat|centos|mitel) cat /etc/redhat-release ;; slackware) From bf4ece76fde6a357f759ec27b723b9ea79ba9dc9 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Feb 2016 07:17:27 +0100 Subject: [PATCH 3/6] update __consul with new URLs and new versions Signed-off-by: Nico Schottelius --- cdist/conf/type/__consul/files/versions/0.4.1/source | 2 +- cdist/conf/type/__consul/files/versions/0.5.0/source | 2 +- cdist/conf/type/__consul/files/versions/0.5.1/source | 2 +- cdist/conf/type/__consul/files/versions/0.5.2/source | 2 +- cdist/conf/type/__consul/files/versions/0.6.0/cksum | 1 + cdist/conf/type/__consul/files/versions/0.6.0/source | 1 + cdist/conf/type/__consul/files/versions/0.6.1/cksum | 1 + cdist/conf/type/__consul/files/versions/0.6.1/source | 1 + cdist/conf/type/__consul/files/versions/0.6.2/cksum | 1 + cdist/conf/type/__consul/files/versions/0.6.2/source | 1 + cdist/conf/type/__consul/files/versions/0.6.3/cksum | 1 + cdist/conf/type/__consul/files/versions/0.6.3/source | 1 + cdist/conf/type/__consul/manifest | 1 + 13 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 cdist/conf/type/__consul/files/versions/0.6.0/cksum create mode 100644 cdist/conf/type/__consul/files/versions/0.6.0/source create mode 100644 cdist/conf/type/__consul/files/versions/0.6.1/cksum create mode 100644 cdist/conf/type/__consul/files/versions/0.6.1/source create mode 100644 cdist/conf/type/__consul/files/versions/0.6.2/cksum create mode 100644 cdist/conf/type/__consul/files/versions/0.6.2/source create mode 100644 cdist/conf/type/__consul/files/versions/0.6.3/cksum create mode 100644 cdist/conf/type/__consul/files/versions/0.6.3/source diff --git a/cdist/conf/type/__consul/files/versions/0.4.1/source b/cdist/conf/type/__consul/files/versions/0.4.1/source index b1e9908d..7fb949c8 100644 --- a/cdist/conf/type/__consul/files/versions/0.4.1/source +++ b/cdist/conf/type/__consul/files/versions/0.4.1/source @@ -1 +1 @@ -https://dl.bintray.com/mitchellh/consul/0.4.1_linux_amd64.zip +https://releases.hashicorp.com/consul/0.4.1/consul_0.4.1_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.5.0/source b/cdist/conf/type/__consul/files/versions/0.5.0/source index 00a209a5..dc1c33c4 100644 --- a/cdist/conf/type/__consul/files/versions/0.5.0/source +++ b/cdist/conf/type/__consul/files/versions/0.5.0/source @@ -1 +1 @@ -https://dl.bintray.com/mitchellh/consul/0.5.0_linux_amd64.zip +https://releases.hashicorp.com/consul/0.5.0/consul_0.5.0_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.5.1/source b/cdist/conf/type/__consul/files/versions/0.5.1/source index f02a1103..a47eb69c 100644 --- a/cdist/conf/type/__consul/files/versions/0.5.1/source +++ b/cdist/conf/type/__consul/files/versions/0.5.1/source @@ -1 +1 @@ -https://dl.bintray.com/mitchellh/consul/0.5.1_linux_amd64.zip +https://releases.hashicorp.com/consul/0.5.1/consul_0.5.1_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.5.2/source b/cdist/conf/type/__consul/files/versions/0.5.2/source index 991034ce..43b43d55 100644 --- a/cdist/conf/type/__consul/files/versions/0.5.2/source +++ b/cdist/conf/type/__consul/files/versions/0.5.2/source @@ -1 +1 @@ -https://dl.bintray.com/mitchellh/consul/0.5.2_linux_amd64.zip +https://releases.hashicorp.com/consul/0.5.2/consul_0.5.2_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.6.0/cksum b/cdist/conf/type/__consul/files/versions/0.6.0/cksum new file mode 100644 index 00000000..bf41a9b8 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.0/cksum @@ -0,0 +1 @@ +688442448 19798264 consul diff --git a/cdist/conf/type/__consul/files/versions/0.6.0/source b/cdist/conf/type/__consul/files/versions/0.6.0/source new file mode 100644 index 00000000..691f2a87 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.0/source @@ -0,0 +1 @@ +https://releases.hashicorp.com/consul/0.6.0/consul_0.6.0_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.6.1/cksum b/cdist/conf/type/__consul/files/versions/0.6.1/cksum new file mode 100644 index 00000000..aa354351 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.1/cksum @@ -0,0 +1 @@ +3100584780 20416856 consul diff --git a/cdist/conf/type/__consul/files/versions/0.6.1/source b/cdist/conf/type/__consul/files/versions/0.6.1/source new file mode 100644 index 00000000..3b20388f --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.1/source @@ -0,0 +1 @@ +https://releases.hashicorp.com/consul/0.6.1/consul_0.6.1_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.6.2/cksum b/cdist/conf/type/__consul/files/versions/0.6.2/cksum new file mode 100644 index 00000000..9c0b35c5 --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.2/cksum @@ -0,0 +1 @@ +2124180907 20416920 consul diff --git a/cdist/conf/type/__consul/files/versions/0.6.2/source b/cdist/conf/type/__consul/files/versions/0.6.2/source new file mode 100644 index 00000000..b0c6eeed --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.2/source @@ -0,0 +1 @@ +https://releases.hashicorp.com/consul/0.6.2/consul_0.6.2_linux_amd64.zip diff --git a/cdist/conf/type/__consul/files/versions/0.6.3/cksum b/cdist/conf/type/__consul/files/versions/0.6.3/cksum new file mode 100644 index 00000000..886d01bb --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.3/cksum @@ -0,0 +1 @@ +1832669072 20417720 consul diff --git a/cdist/conf/type/__consul/files/versions/0.6.3/source b/cdist/conf/type/__consul/files/versions/0.6.3/source new file mode 100644 index 00000000..fef668be --- /dev/null +++ b/cdist/conf/type/__consul/files/versions/0.6.3/source @@ -0,0 +1 @@ +https://releases.hashicorp.com/consul/0.6.3/consul_0.6.3_linux_amd64.zip diff --git a/cdist/conf/type/__consul/manifest b/cdist/conf/type/__consul/manifest index ea1a728f..eec71d0b 100755 --- a/cdist/conf/type/__consul/manifest +++ b/cdist/conf/type/__consul/manifest @@ -1,6 +1,7 @@ #!/bin/sh # # 2015 Steven Armstrong (steven-cdist at armstrong.cc) +# 2016 Nico Schottelius (nico-cdist at schottelius.org) # # This file is part of cdist. # From f6678b931fc0264f31e66a53b450872045eb0cd3 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Feb 2016 07:18:19 +0100 Subject: [PATCH 4/6] Remove zip package from __consul as it is required on the management host only Signed-off-by: Nico Schottelius --- cdist/conf/type/__consul/manifest | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cdist/conf/type/__consul/manifest b/cdist/conf/type/__consul/manifest index eec71d0b..0187d959 100755 --- a/cdist/conf/type/__consul/manifest +++ b/cdist/conf/type/__consul/manifest @@ -44,9 +44,7 @@ if [ ! -d "$version_dir" ]; then exit 1 fi -__package unzip - -require="__package/unzip" __staged_file /usr/local/bin/consul \ +__staged_file /usr/local/bin/consul \ --source "$(cat "$version_dir/source")" \ --cksum "$(cat "$version_dir/cksum")" \ --fetch-command 'curl -s -L "%s"' \ From fcb9e3edd96f3d4aee1092d4e3c886b7835d1be4 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Feb 2016 07:18:27 +0100 Subject: [PATCH 5/6] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/changelog b/docs/changelog index 0189ed99..1002fbc2 100644 --- a/docs/changelog +++ b/docs/changelog @@ -7,6 +7,12 @@ next: * New type: __pacman_conf_integrate: cdist compatible pacman.conf (Dominique Roux) * Core: Support object ids '.cdist' (Nico Schottelius) * Type __apt_norecommends: Also setup autoremove options (Dmitry Bogatov) + * Type __user_groups: Add NetBSD support (Jonathan A. Kollasch) + * Type __timezone: Add NetBSD support (Jonathan A. Kollasch) + * Type __ccollect_source: Add NetBSD support (Jonathan A. Kollasch) + * Type __directory: Add NetBSD support (Jonathan A. Kollasch) + * Type __file: Add NetBSD support (Jonathan A. Kollasch) + * Type __group: Add NetBSD support (Jonathan A. Kollasch) 3.1.13: 2015-05-16 From 404f2051a829c325a4d43aec8c46f897af37fac5 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Thu, 25 Feb 2016 07:19:32 +0100 Subject: [PATCH 6/6] ++changes Signed-off-by: Nico Schottelius --- docs/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/changelog b/docs/changelog index 1002fbc2..5e73bd2e 100644 --- a/docs/changelog +++ b/docs/changelog @@ -13,6 +13,7 @@ next: * Type __directory: Add NetBSD support (Jonathan A. Kollasch) * Type __file: Add NetBSD support (Jonathan A. Kollasch) * Type __group: Add NetBSD support (Jonathan A. Kollasch) + * Type __consul: Add new consul versions (Nico Schottelius) 3.1.13: 2015-05-16